Update mapinfos with new cvars names and cdtracks

diff --git a/maps/abyss.mapinfo b/maps/abyss.mapinfo
index ab096c593f38e2d22395c73239963e466b4656a7..48f5ed7528d6ce8b696d97a67a29a3d8044c6625 100644 (file)
--- a/maps/abyss.mapinfo
+++ b/maps/abyss.mapinfo
@@ -1,5 +1,5 @@
 title Abyss
-description Large CTF arena.
+description Large CTF arena
 author kuniu the frogg
 cdtrack 14
 has weapons

diff --git a/maps/afterslime.mapinfo b/maps/afterslime.mapinfo
index 5e45e0b3e57ada4bf4826b9b213b6477d9feee05..4f7962b72995f8304aadcb3f300f9141f8d6ce2a 100644 (file)
--- a/maps/afterslime.mapinfo
+++ b/maps/afterslime.mapinfo
@@ -10,4 +10,4 @@ gametype ca
 gametype ft
 gametype ka
 gametype kh
-gametype dom
+gametype dom
\ No newline at end of file

diff --git a/maps/catharsis.mapinfo b/maps/catharsis.mapinfo
index 61e095ff8bee0fb44a0ef86ce7c043e9b34cfd68..b68e6f4f9d3ce057b1c5a09c45ff5e4d623d5c85 100755 (executable)
--- a/maps/catharsis.mapinfo
+++ b/maps/catharsis.mapinfo
@@ -1,6 +1,6 @@
 title Catharsis
 description Medium-sized CTF level with crystals
 author Justin
-has weapons
-gametype ctf
 cdtrack 16
+has weapons
+gametype ctf
\ No newline at end of file

diff --git a/maps/courtfun.mapinfo b/maps/courtfun.mapinfo
index 50b431e69b87a01d35e8cb33a20711c33b8a6f0c..7c30c44dec97734bc9ad16237786b023508696f5 100644 (file)
--- a/maps/courtfun.mapinfo
+++ b/maps/courtfun.mapinfo
@@ -19,18 +19,20 @@ settemp_for_type rc g_pickup_rockets 8
 settemp_for_type rc g_pickup_rockets_weapon 8
 
 settemp_for_type cts g_use_ammunition 0
-settemp_for_type cts g_weaponreplace_electro 0
-settemp_for_type cts g_weaponreplace_grenadelauncher 0
-settemp_for_type cts g_weaponreplace_hagar 0
-settemp_for_type cts g_weaponreplace_nex 0
-settemp_for_type cts g_weaponreplace_rocketlauncher 0
-settemp_for_type cts g_weaponreplace_uzi 0
-settemp_for_type cts g_powerup_shield 0
-settemp_for_type cts g_start_weapon_shotgun 0
-settemp_for_type cts g_start_weapon_laser 1
+settemp_for_type cts g_balance_electro_weaponreplace_electro ""
+settemp_for_type cts g_balance_mortar_weaponreplace ""
+settemp_for_type cts g_balance_hagar_weaponreplace ""
+settemp_for_type cts g_balance_vortex_weaponreplace ""
+settemp_for_type cts g_balance_devastator_weaponreplace ""
+settemp_for_type cts g_balance_machinegun_weaponreplace ""
+settemp_for_type cts g_powerups 0
+settemp_for_type cts g_balance_shotgun_weaponstart 0
+settemp_for_type cts g_balance_shotgun_weaponstartoverride 1
+settemp_for_type cts g_balance_blaster_weaponstart 1
+settemp_for_type cts g_balance_blaster_weaponstartoverride 1
 settemp_for_type cts g_cts_finish_kill_delay 0
 
 settemp_for_type ons g_powerups 0
 
 clientsettemp_for_type all r_water 1
-clientsettemp_for_type all r_water_resolutionmultiplier 1
+clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file

diff --git a/maps/dance.mapinfo b/maps/dance.mapinfo
index 4a900fca33ddfd0239085ea89a301bcb7216789e..2be91cce674e918bf18b592a2751eb084d251e84 100644 (file)
--- a/maps/dance.mapinfo
+++ b/maps/dance.mapinfo
@@ -8,4 +8,4 @@ gametype lms
 gametype kh
 gametype ft
 gametype ca
-gametype ka
+gametype ka
\ No newline at end of file

diff --git a/maps/darkzone.mapinfo b/maps/darkzone.mapinfo
index 67af01a007d1fc39a400dd8e9332849205f20171..01878f17e47e7f74abc723d0a22973c84cc70004 100644 (file)
--- a/maps/darkzone.mapinfo
+++ b/maps/darkzone.mapinfo
@@ -1,7 +1,7 @@
 title Darkzone
 description Xonotic remake of a classic map from Quake1: Q1DM6. Recommended for cut-throat duels
-author Cortez, C.Brutail, SavageX
-cdtrack 5
+author Cortez, CuBe0wL, SavageX
+cdtrack 15
 has weapons
 gametype dm
 gametype lms
@@ -15,4 +15,4 @@ gametype ft
 // optional: settemp_for_type (all|gametypename) cvarname value
 // optional: clientsettemp_for_type (all|gametypename) cvarname value
 // optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z
-// optional: hidden
+// optional: hidden
\ No newline at end of file

diff --git a/maps/drain.mapinfo b/maps/drain.mapinfo
index c31d03457e5f08a85110a62050af3ab0e10155ae..2bc8a684540bc535d5fd2d8587414c7ba60fa39e 100644 (file)
--- a/maps/drain.mapinfo
+++ b/maps/drain.mapinfo
@@ -9,4 +9,4 @@ gametype ca
 gametype kh
 gametype ft
 gametype ka
-gametype tdm
+gametype tdm
\ No newline at end of file

diff --git a/maps/fuse.mapinfo b/maps/fuse.mapinfo
index d06a732fa0b9b2dd9a3c9a1295eb8891dbc139d8..f6a69ce7f65bb4ea0e296087b2b76f963cd7b07d 100644 (file)
--- a/maps/fuse.mapinfo
+++ b/maps/fuse.mapinfo
@@ -5,14 +5,15 @@ cdtrack 4
 has weapons
 // uncomment this if you added turrets: has turrets
 // uncomment this if you added vehicles: has vehicles
-gametype dm // defaults: timelimit=20 pointlimit=30 leadlimit=0
-gametype lms // defaults: timelimit=20 lives=9 leadlimit=0
-gametype ka // defaults: timelimit=20 pointlimit=30
+gametype dm
+gametype lms
+gametype ka
 gametype kh
 gametype ft
 gametype ca
+gametype tdm
 // optional: fog density red green blue alpha mindist maxdist
 // optional: settemp_for_type (all|gametypename) cvarname value
 // optional: clientsettemp_for_type (all|gametypename) cvarname value
 // optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z
-// optional: hidden
+// optional: hidden
\ No newline at end of file

diff --git a/maps/g-23.mapinfo b/maps/g-23.mapinfo
index 0e8fa2ec1b2eeb8272848eb08743cbb878ae5f93..730c62ce4d40a939282f0607fb4c69ae9a787d05 100644 (file)
--- a/maps/g-23.mapinfo
+++ b/maps/g-23.mapinfo
@@ -9,5 +9,4 @@ gametype ca
 gametype kh
 gametype tdm
 gametype ft
-gametype ka
-
+gametype ka
\ No newline at end of file

diff --git a/maps/glowplant.mapinfo b/maps/glowplant.mapinfo
index 13440ec3172bcb890ce4b74e83399dbb80a43c17..63dca4f32a0c395203abeb499ca48ef28980c9be 100644 (file)
--- a/maps/glowplant.mapinfo
+++ b/maps/glowplant.mapinfo
@@ -1,7 +1,7 @@
 title Glow Plant
 description A nuclear power plant with a LOT of blue glowy stuff...
 author tZork, Cuinnton, Debugger
-cdtrack 4
+cdtrack 17
 has weapons
 gametype dm
 gametype tdm
@@ -13,4 +13,4 @@ gametype ft
 gametype ka
 
 clientsettemp_for_type all r_water 1
-clientsettemp_for_type all r_water_resolutionmultiplier 1
+clientsettemp_for_type all r_water_resolutionmultiplier 1
\ No newline at end of file

diff --git a/maps/implosion.mapinfo b/maps/implosion.mapinfo
index f6b8729799f8c92966c100e27bdc3c380b7e7082..2ed40e386396d904c8de86b01505c035d7bfc6e5 100644 (file)
--- a/maps/implosion.mapinfo
+++ b/maps/implosion.mapinfo
@@ -8,7 +8,6 @@ gametype ft
 gametype kh
 gametype ka
 gametype ca
-gametype dm
 gametype tdm
 gametype lms
-gametype dom
+gametype dom
\ No newline at end of file

diff --git a/maps/leave_em_behind.mapinfo b/maps/leave_em_behind.mapinfo
index 178b1006a687d3dfa007de52f60806ef33fdf0f5..207906ff6e0a9e31c776ef675d35d16eea93506d 100644 (file)
--- a/maps/leave_em_behind.mapinfo
+++ b/maps/leave_em_behind.mapinfo
@@ -1,9 +1,11 @@
-title Leave'em behind
+title Leave'em Behind
 description A very small race map
-author C.Brutail, Cortez
+author CuBe0wL, Cortez
 cdtrack 11
-settemp_for_type all g_start_weapon_shotgun 0
-//settemp_for_type all g_start_weapon_laser 0
+settemp_for_type all g_balance_shotgun_weaponstart 0
+settemp_for_type all g_balance_shotgun_weaponoverride 1
+//settemp_for_type all g_balance_blaster_wepaonstart 0
+//settemp_for_type all g_balance_blaster_wepaonstartoverride 1
 // uncomment this if you added weapon pickups: has weapons
 gametype rc timelimit=10 qualifying_timelimit=5
 gametype cts
@@ -11,4 +13,4 @@ gametype cts
 // optional: settemp_for_type (all|gametypename) cvarname value
 // optional: clientsettemp_for_type (all|gametypename) cvarname value
 // optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z
-// optional: hidden
+// optional: hidden
\ No newline at end of file

diff --git a/maps/lightspeed.mapinfo b/maps/lightspeed.mapinfo
index 181d2f41f453bed53b16b547d88d28b4cfbf2ccf..94c4d96dbd66af88feb3eb7a5b38bcb927f4b989 100644 (file)
--- a/maps/lightspeed.mapinfo
+++ b/maps/lightspeed.mapinfo
@@ -1,8 +1,8 @@
 title Lightspeed
 description Very small, 1on1 CTF map. Key to survive: move as fast, as the speed of light!
-author C.Brutail, Mirio
+author CuBe0wL
 cdtrack 10
 has weapons
 gametype ctf
 settemp_for_type all g_start_ammo_shells 20 
-hidden
+hidden
\ No newline at end of file

diff --git a/maps/newtonian-nightmare.mapinfo b/maps/newtonian-nightmare.mapinfo
index 1c444ddae47d8358515b1fd18aa218514d7ee471..d706549f0672077331f00acf33c31d3f89690af9 100644 (file)
--- a/maps/newtonian-nightmare.mapinfo
+++ b/maps/newtonian-nightmare.mapinfo
@@ -1,7 +1,7 @@
 title Newtonian Nightmare
 description The modified physics of this orbiting battleground is Sir Isaac's worst nightmare
-author C.Brutail, Debugger
-cdtrack 8
+author CuBe0wL, Debugger
+cdtrack 19
 has weapons
 gametype ctf
-clientsettemp_for_type all r_water 1
+clientsettemp_for_type all r_water 1
\ No newline at end of file

diff --git a/maps/nexballarena.mapinfo b/maps/nexballarena.mapinfo
index dba7916828918bd72cf2ae30888b95d3379bd7fa..f9c0d4e9ca0c181e6214bf40d67ebf06d5ba9e52 100644 (file)
--- a/maps/nexballarena.mapinfo
+++ b/maps/nexballarena.mapinfo
@@ -1,5 +1,5 @@
 title Nexball Arena
 description Small, simple, enclosed arena for finding out who's the true nexball champion! No obstacles in the way...
-author Revenant, Cortez, tZork, C.Brutail, FruitieX
+author Revenant, Cortez, tZork, CuBe0wL, FruitieX
 cdtrack 11
-gametype nb
+gametype nb
\ No newline at end of file

diff --git a/maps/oilrig.mapinfo b/maps/oilrig.mapinfo
index fdb51d8c1eaba78a0dcf4649c1b01ad3a672b269..058b016d5fff977de050466a6e60aa1a3864efa4 100644 (file)
--- a/maps/oilrig.mapinfo
+++ b/maps/oilrig.mapinfo
@@ -1,5 +1,5 @@
 title Oilrig
-description A very large open map designed after an offshore oil rig.
+description A very large open map designed after an offshore oil rig
 author Tronyn, Debugger, SavageX, Dustin Geeraert, Garth Hendy
 cdtrack 8
 has weapons
@@ -9,4 +9,4 @@ gametype tdm
 gametype ca
 gametype kh
 gametype ft
-gametype ka
+gametype ka
\ No newline at end of file

diff --git a/maps/runningman.mapinfo b/maps/runningman.mapinfo
index e1b1077c465ce075066aa47255fa4dc35b55355f..67eda8cdf57eda42defdc69cb184d7f5d0d83bbd 100644 (file)
--- a/maps/runningman.mapinfo
+++ b/maps/runningman.mapinfo
@@ -1,9 +1,9 @@
 title Running Man
 description Medium-sized, fast enclosed map
-author FruitieX, Cortez, Paul Evers, Debugger
+author FruitieX, Cortez, Strahlemann, Debugger
 cdtrack 6
 has weapons
 gametype dm
 gametype lms
 gametype ka
-clientsettemp_for_type all r_water 1
+clientsettemp_for_type all r_water 1
\ No newline at end of file

diff --git a/maps/runningmanctf.mapinfo b/maps/runningmanctf.mapinfo
index 9b37e4ca51f94469b79f6ec0941d373399458d2a..03f73f375ca1127bfa6bdf435b9e6493998b3c22 100644 (file)
--- a/maps/runningmanctf.mapinfo
+++ b/maps/runningmanctf.mapinfo
@@ -1,6 +1,6 @@
 title Running Man CTF
 description Medium-sized, fast enclosed map supporting multiple gamemodes.
-author FruitieX, Cortez, Paul Evers, Debugger
+author FruitieX, Cortez, Strahlemann, Debugger
 cdtrack 6
 has weapons
 gametype tdm
@@ -10,4 +10,4 @@ gametype ons
 gametype dom
 gametype ft
 gametype kh
-clientsettemp_for_type all r_water 1
+clientsettemp_for_type all r_water 1
\ No newline at end of file

diff --git a/maps/solarium.mapinfo b/maps/solarium.mapinfo
index 862bd37e10d8ea4575f0bbad3ba0ac2aff86f55a..8193bb9118060c40eec9910e43d25ae407f6bcc9 100644 (file)
--- a/maps/solarium.mapinfo
+++ b/maps/solarium.mapinfo
@@ -1,9 +1,6 @@
 title Solarium
 description Medium sized open map, good for 3 to 6 players
-// Special thanks to: Maikmerten, matthiaskrgr, Samuncle, and the rest of the dev team for all their help and support.
-
-author theShadow, Mirio
-
+author theShadow
 cdtrack 3
 has weapons
 gametype dm
@@ -13,3 +10,5 @@ gametype ca
 gametype ka
 gametype ft
 gametype kh
+
+// Special thanks to: Maikmerten, matthiaskrgr, Samuncle, and the rest of the dev team for all their help and support.
\ No newline at end of file

diff --git a/maps/space-elevator.mapinfo b/maps/space-elevator.mapinfo
index 0b97c238761c1b00b22a2baed9c0d0eaaa3c2faf..f7f5fa04a2cfb114aa0cd33707749ed7597b3899 100644 (file)
--- a/maps/space-elevator.mapinfo
+++ b/maps/space-elevator.mapinfo
@@ -3,5 +3,5 @@ description Medium sized CTF space floater
 author FruitieX, Mirio, Cuinnton
 has weapons
 gametype ctf
-cdtrack 4
-clientsettemp_for_type all r_water 1
+cdtrack 18
+clientsettemp_for_type all r_water 1
\ No newline at end of file

diff --git a/maps/stormkeep.mapinfo b/maps/stormkeep.mapinfo
index 441c625fda9bc8114e4861ee608c56c4c853208c..b21dd8696d332d8e3e5bb0f3d132ccfc0b4d2067 100644 (file)
--- a/maps/stormkeep.mapinfo
+++ b/maps/stormkeep.mapinfo
@@ -1,6 +1,7 @@
 title Stormkeep
 description Medium sized indoor map, well suited for team games
 author FruitieX, Cuinnton, SavageX, Strahlemann, W. Libert, tZork, Mirio
+cdtrack 5
 has weapons
 gametype dm
 gametype tdm
@@ -11,10 +12,9 @@ gametype kh
 gametype ca
 gametype ft
 gametype ka
-cdtrack 5
 // optional: fog density red green blue alpha mindist maxdist
 // optional: settemp_for_type (all|gametypename) cvarname value
 // optional: clientsettemp_for_type (all|gametypename) cvarname value
 // optional: size mins_x mins_y mins_z maxs_x maxs_y maxs_z
 // optional: hidden
-clientsettemp_for_type all r_water 1
+clientsettemp_for_type all r_water 1
\ No newline at end of file

diff --git a/maps/techassault.mapinfo b/maps/techassault.mapinfo
index ad6553548b183f271617fbd6d27808139589c77c..af5bceb634becbc1b56182a7b897b72d706c40d2 100644 (file)
--- a/maps/techassault.mapinfo
+++ b/maps/techassault.mapinfo
@@ -8,4 +8,4 @@ cdtrack 13
 // optional: settemp_for_type (all|gametypename) cvarname value
 // optional: clientsettemp_for_type (all|gametypename) cvarname value
 size -5800 -3500 -2048 7000 3500 1536
-// optional: hidden
+// optional: hidden
\ No newline at end of file

diff --git a/maps/vorix.mapinfo b/maps/vorix.mapinfo
index 91714732a670985c837c1cbe052ee3ac5b9c7873..c3deeaa2bb65ffb6951662fa8964128e4fc67905 100644 (file)
--- a/maps/vorix.mapinfo
+++ b/maps/vorix.mapinfo
@@ -1,7 +1,6 @@
 title Vorix
 description This is Vorix!
 author packer
-cdtrack 6
+cdtrack 17
 has weapons
-gametype ctf
- 
+gametype ctf
\ No newline at end of file

diff --git a/maps/xoylent.mapinfo b/maps/xoylent.mapinfo
index 0788ced382f69291868a576e96451c196b7a8a83..d515a80b675935df98ab22c3a2f2ed3e5e20912d 100644 (file)
--- a/maps/xoylent.mapinfo
+++ b/maps/xoylent.mapinfo
@@ -1,7 +1,7 @@
 title Xoylent
 description A remake of Soylent
 author sev, Strahlemann
-cdtrack 6
+cdtrack 7
 has weapons
 gametype dm
 gametype lms