mapinfo

diff --git a/maps/abyss.jpg b/maps/abyss.jpg
index a955cd5bf19f8ffa83e8c491fc4bd60a10727acd..003cd0bcdea26a95bef0a7435aad91c6b8d975c1 100644 (file)
Binary files a/maps/abyss.jpg and b/maps/abyss.jpg differ

diff --git a/maps/abyss.map b/maps/abyss.map
index 713f18f2946f3b75436beb47ddcaf177b26882ce..9730679059157eed50e0f64058092b7938876588 100644 (file)
--- a/maps/abyss.map
+++ b/maps/abyss.map
@@ -110139,21 +110139,16 @@ brushDef
 }
 {
 "classname" "info_autoscreenshot"
-"origin" "-475.53952 -1239.74243 394.492096"
-"angles" "12.8045654 41.050415 0"
+"origin" "1654.22583 -140.141235 593.956909"
+"angles" "24.0216064 -14.1229248 0"
 }
 {
 "classname" "info_autoscreenshot"
-"origin" "2202.486084 -2137.091309 81.552094"
-"angles" "12.801977 161.243683 0"
+"origin" "482.025543 -292.455536 692.238953"
+"angles" "20.3302002 145.524902 0"
 }
 {
 "classname" "info_autoscreenshot"
-"origin" "-360.787537 612.514954 739.474731"
-"angles" "27.176882 -66.188782 0"
-}
-{
-"classname" "info_autoscreenshot"
-"origin" "5478.990723 811.229675 106.627594"
-"angles" "-1.572815 -35.407349 0"
+"origin" "2176.28979 -2271.66626 109.393311"
+"angles" "1.71386719 133.813477 0"
 }

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.jpg b/maps/drain.jpg
new file mode 100644 (file)
index 0000000..d223d14
Binary files /dev/null and b/maps/drain.jpg differ

diff --git a/maps/drain.map b/maps/drain.map
index 417e7ac5c72a50d9692ed431842c119f2f556229..80dd550fbbb6382a179cdf5a18fba1a03e4318c7 100644 (file)
--- a/maps/drain.map
+++ b/maps/drain.map
@@ -8671,14 +8671,6 @@ trak5x/base-pipe1d
 ( 236 -70 16 ) ( 234 -68 24 ) ( 234 -68 16 ) trak5x/base-base1a 352 352 0 -0.125 0.125 134217728 0 0
 }
 {
-( 272 -56 200 ) ( 272 -96 200 ) ( 128 -56 200 ) common/clip 0 224 0 0.25 0.25 0 0 0
-( 272 -56 224 ) ( 128 -56 224 ) ( 272 -56 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 280 -48 224 ) ( 280 -48 64 ) ( 280 -88 224 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 128 -96 0 ) ( 272 -96 0 ) ( 128 -56 0 ) common/clip 0 224 0 0.25 0.25 0 0 0
-( 128 -88 64 ) ( 128 -88 224 ) ( 272 -88 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 64 -88 64 ) ( 64 -48 64 ) ( 64 -88 224 ) common/clip 0 0 0 0.25 0.25 0 0 0
-}
-{
 ( 128 160 8 ) ( 64 160 8 ) ( 128 160 -8 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
 ( 128 160 8 ) ( 128 160 -8 ) ( 128 -96 8 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
 ( 64 -96 -8 ) ( 128 -96 -8 ) ( 64 160 -8 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
@@ -8686,6 +8678,38 @@ trak5x/base-pipe1d
 ( 64 -96 -8 ) ( 64 160 -8 ) ( 64 -96 8 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
 ( 64 64 192 ) ( 128 64 64 ) ( 64 -64 192 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
 }
+{
+( 72 -96 288 ) ( 72 -160 288 ) ( 64 -96 288 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 72 -32 40 ) ( 64 -32 40 ) ( 72 -32 0 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 66 -32 40 ) ( 66 -32 0 ) ( 66 -96 40 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 64 -160 0 ) ( 72 -160 0 ) ( 64 -96 0 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 64 -160 0 ) ( 64 -160 40 ) ( 72 -160 0 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 64 -160 0 ) ( 64 -96 0 ) ( 64 -160 40 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 82 -110 288 ) ( 82 -112 288 ) ( 64 -110 288 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 176 -110 288 ) ( 158 -110 288 ) ( 176 -110 224 ) common/clip 136 0 0 0.25 0.25 0 0 0
+( 288 -112 288 ) ( 288 -112 224 ) ( 288 -114 288 ) common/clip 8 0 0 0.25 0.25 0 0 0
+( 60 -112 4 ) ( 78 -112 4 ) ( 60 -110 4 ) common/clip 16 0 0 0.25 0.25 0 0 0
+( 64 -112 224 ) ( 64 -112 288 ) ( 82 -112 224 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 64 -112 224 ) ( 64 -110 224 ) ( 64 -112 288 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 272 -74 288 ) ( 272 -110 288 ) ( 270 -74 288 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 262 576 288 ) ( 260 576 288 ) ( 262 576 4 ) common/clip 40 0 0 0.25 0.25 0 0 0
+( 272 -74 288 ) ( 272 -74 4 ) ( 272 -110 288 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 270 -110 4 ) ( 272 -110 4 ) ( 270 -74 4 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 270 -110 4 ) ( 270 -110 288 ) ( 272 -110 4 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 270 442 4 ) ( 270 478 4 ) ( 270 442 288 ) common/clip 96 0 0 0.25 0.25 0 0 0
+}
+{
+( 338 -808 -62 ) ( 338 -848 -62 ) ( 296 -808 -62 ) phillipk1x/floors-pk01_pan_floor02a 243.8094482422 186.1826171875 0 0.1640625 0.1718750298 0 0 0
+( 338 -804 -62 ) ( 296 -804 -62 ) ( 338 -804 -64 ) phillipk1x/floors-pk01_gra_floor02 0 248 0 0.25 0.25 0 0 0
+( 338 -808 -62 ) ( 338 -808 -64 ) ( 338 -848 -62 ) phillipk1x/floors-pk01_gra_floor02 0 248 0 0.25 0.25 0 0 0
+( 296 -848 -64 ) ( 338 -848 -64 ) ( 296 -808 -64 ) phillipk1x/floors-pk01_pan_floor02a 243.8094482422 186.1826171875 0 0.1640625 0.1718750298 0 0 0
+( 296 -848 -64 ) ( 296 -848 -62 ) ( 338 -848 -64 ) phillipk1x/floors-pk01_gra_floor02 0 248 0 0.25 0.25 0 0 0
+( 296 -848 -64 ) ( 296 -808 -64 ) ( 296 -848 -62 ) phillipk1x/floors-pk01_gra_floor02 0 248 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "func_group"
@@ -11866,3 +11890,11 @@ trak5x/base-pipe1d
 "respawntime" "35"
 "respawntimejitter" "10"
 }
+{
+"classname" "item_shells"
+"origin" "-436.000000 -824.000000 -64.000000"
+}
+{
+"classname" "item_strength"
+"origin" "318.000000 -826.000000 -62.000000"
+}

diff --git a/maps/drain.map.options b/maps/drain.map.options
index 6a351c5c3fa0b0bf27624d41f9b843699e46587f..5fd71631dcccd9ca3ca36d77e5bf97c8129fb733 100644 (file)
--- a/maps/drain.map.options
+++ b/maps/drain.map.options
@@ -4,4 +4,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 13a
+Version: 13b

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/drain.tga b/maps/drain.tga
deleted file mode 100644 (file)
index 5ea0c06..0000000
Binary files a/maps/drain.tga and /dev/null differ

diff --git a/maps/fuse.jpg b/maps/fuse.jpg
new file mode 100644 (file)
index 0000000..292fafd
Binary files /dev/null and b/maps/fuse.jpg differ

diff --git a/maps/fuse.map b/maps/fuse.map
index 00f6c44ec1cc9e3b3285f3dc995307f32e343596..bd7343aa0b3bf71d957c6fe424da28f7698b18be 100644 (file)
--- a/maps/fuse.map
+++ b/maps/fuse.map
@@ -37815,3 +37815,7 @@ brushDef
 "origin" "-1668.90649 3.70419025 38.9989548"
 "angles" "18.7426758 -48.9605713 0"
 }
+{
+"classname" "item_strength"
+"origin" "-256.000000 -1272.000000 -296.000000"
+}

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/fuse.tga b/maps/fuse.tga
deleted file mode 100644 (file)
index 553498a..0000000
Binary files a/maps/fuse.tga and /dev/null differ

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 6b507e372f6029676710e799bf8150e6a9661a19..23804aabf2940ba2d6b41b8cea5a82c388580f19 100644 (file)
--- a/maps/glowplant.mapinfo
+++ b/maps/glowplant.mapinfo
@@ -1,6 +1,6 @@
 title Glow Plant
 description A nuclear power plant with a LOT of blue glowy stuff...
-author tZork, Cuinnton, Debugger, Mirio
+author tZork, Cuinnton, Debugger
 cdtrack 14
 has weapons
 gametype dm

diff --git a/maps/implosion.jpg b/maps/implosion.jpg
new file mode 100644 (file)
index 0000000..2059965
Binary files /dev/null and b/maps/implosion.jpg differ

diff --git a/maps/implosion.map b/maps/implosion.map
index 0eb2e6a88aed7141f4ff59171aa19f4dbd99e204..94ca7cc64deef4fcdd1acb0934867f3d637cf644 100644 (file)
--- a/maps/implosion.map
+++ b/maps/implosion.map
@@ -6070,11 +6070,11 @@ common/caulk
 }
 {
 ( 112 -2704 448 ) ( 112 -2728 448 ) ( 80 -2704 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 112 -2696 576 ) ( 80 -2696 576 ) ( 112 -2696 384 ) trak5x/trim-trim3d 0 384 90 0.5 0.5 0 0 0
-( 576 -2704 576 ) ( 576 -2704 384 ) ( 576 -2728 576 ) trak5x/trim-trim3d 0 256 90 0.5 0.5 0 0 0
+( 112 -2696 576 ) ( 80 -2696 576 ) ( 112 -2696 384 ) trak5x/trim-trim3d 0 82 90 0.5 0.5 0 0 0
+( 576 -2704 576 ) ( 576 -2704 384 ) ( 576 -2728 576 ) trak5x/trim-trim3d 0 82 90 0.5 0.5 0 0 0
 ( 80 -2728 384 ) ( 112 -2728 384 ) ( 80 -2704 384 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0
 ( 80 -2752 384 ) ( 80 -2752 576 ) ( 112 -2752 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 64 -2728 384 ) ( 64 -2704 384 ) ( 64 -2728 576 ) trak5x/trim-trim3d 0 272 90 0.5 0.5 0 0 0
+( 64 -2728 384 ) ( 64 -2704 384 ) ( 64 -2728 576 ) trak5x/trim-trim3d 0 82 90 0.5 0.5 0 0 0
 }
 {
 patchDef2
@@ -9196,9 +9196,9 @@ trak5x/base-base1b
 {
 ( 896 -3648 448 ) ( 896 -3704 448 ) ( 760 -3648 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 896 -3648 448 ) ( 760 -3648 448 ) ( 896 -3648 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 576 -3664 448 ) ( 576 -3664 384 ) ( 576 -3720 448 ) trak5x/trim-trim3d 0 256 90 0.5 0.5 0 0 0
+( 576 -3664 448 ) ( 576 -3664 384 ) ( 576 -3720 448 ) trak5x/trim-trim3d 0 82 90 0.5 0.5 0 0 0
 ( 760 -3704 384 ) ( 896 -3704 384 ) ( 760 -3648 384 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0
-( 760 -3704 384 ) ( 760 -3704 448 ) ( 896 -3704 384 ) trak5x/trim-trim3d 0 384 90 0.5 0.5 0 0 0
+( 760 -3704 384 ) ( 760 -3704 448 ) ( 896 -3704 384 ) trak5x/trim-trim3d 0 82 90 0.5 0.5 0 0 0
 ( 64 -3704 384 ) ( 64 -3648 384 ) ( 64 -3704 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 }
 {
@@ -16083,7 +16083,7 @@ trak5x/base-base1b
 {
 ( 576 -3496 448 ) ( 576 -3648 448 ) ( 512 -3496 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 576 -2752 448 ) ( 512 -2752 448 ) ( 576 -2752 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 576 -3496 448 ) ( 576 -3496 384 ) ( 576 -3648 448 ) trak5x/trim-trim3d 0 256 90 0.5 0.5 0 0 0
+( 576 -3496 448 ) ( 576 -3496 384 ) ( 576 -3648 448 ) trak5x/trim-trim3d 0 82 90 0.5 0.5 0 0 0
 ( 512 -3648 384 ) ( 576 -3648 384 ) ( 512 -3496 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 512 -3648 384 ) ( 512 -3648 448 ) ( 576 -3648 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 512 -3648 384 ) ( 512 -3496 384 ) ( 512 -3648 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -33571,11 +33571,11 @@ common/caulk
 }
 {
 ( 4304 -3184 448 ) ( 4304 -3160 448 ) ( 4336 -3184 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 4304 -3192 576 ) ( 4336 -3192 576 ) ( 4304 -3192 384 ) trak5x/trim-trim3b 0 384 90 0.5 0.5 0 0 0
-( 3840 -3184 576 ) ( 3840 -3184 384 ) ( 3840 -3160 576 ) trak5x/trim-trim3b 0 256 90 0.5 0.5 0 0 0
+( 4304 -3192 576 ) ( 4336 -3192 576 ) ( 4304 -3192 384 ) trak5x/trim-trim3b 0 -128 90 0.5 0.5 0 0 0
+( 3840 -3184 576 ) ( 3840 -3184 384 ) ( 3840 -3160 576 ) trak5x/trim-trim3b 0 -128 90 0.5 0.5 0 0 0
 ( 4336 -3160 384 ) ( 4304 -3160 384 ) ( 4336 -3184 384 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0
 ( 4336 -3136 384 ) ( 4336 -3136 576 ) ( 4304 -3136 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 4352 -3160 384 ) ( 4352 -3184 384 ) ( 4352 -3160 576 ) trak5x/trim-trim3d 0 272 90 0.5 0.5 0 0 0
+( 4352 -3160 384 ) ( 4352 -3184 384 ) ( 4352 -3160 576 ) trak5x/trim-trim3b 0 -128 90 0.5 0.5 0 0 0
 }
 {
 patchDef2
@@ -36681,9 +36681,9 @@ trak5x/base-base1b
 {
 ( 3520 -2240 448 ) ( 3520 -2184 448 ) ( 3656 -2240 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 3520 -2240 448 ) ( 3656 -2240 448 ) ( 3520 -2240 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 3840 -2224 448 ) ( 3840 -2224 384 ) ( 3840 -2168 448 ) trak5x/trim-trim3b 0 256 90 0.5 0.5 0 0 0
+( 3840 -2224 448 ) ( 3840 -2224 384 ) ( 3840 -2168 448 ) trak5x/trim-trim3b 0 -128 90 0.5 0.5 0 0 0
 ( 3656 -2184 384 ) ( 3520 -2184 384 ) ( 3656 -2240 384 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0
-( 3656 -2184 384 ) ( 3656 -2184 448 ) ( 3520 -2184 384 ) trak5x/trim-trim3b 0 384 90 0.5 0.5 0 0 0
+( 3656 -2184 384 ) ( 3656 -2184 448 ) ( 3520 -2184 384 ) trak5x/trim-trim3b 0 -128 90 0.5 0.5 0 0 0
 ( 4352 -2184 384 ) ( 4352 -2240 384 ) ( 4352 -2184 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 }
 {
@@ -43568,7 +43568,7 @@ trak5x/base-base1b
 {
 ( 3840 -2392 448 ) ( 3840 -2240 448 ) ( 3904 -2392 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 3840 -3136 448 ) ( 3904 -3136 448 ) ( 3840 -3136 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 3840 -2392 448 ) ( 3840 -2392 384 ) ( 3840 -2240 448 ) trak5x/trim-trim3b 0 256 90 0.5 0.5 0 0 0
+( 3840 -2392 448 ) ( 3840 -2392 384 ) ( 3840 -2240 448 ) trak5x/trim-trim3b 0 -128 90 0.5 0.5 0 0 0
 ( 3904 -2240 384 ) ( 3840 -2240 384 ) ( 3904 -2392 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 3904 -2240 384 ) ( 3904 -2240 448 ) ( 3840 -2240 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 3904 -2240 384 ) ( 3904 -2392 384 ) ( 3904 -2240 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -78684,7 +78684,7 @@ logos/logo02_yellow_glowy
 {
 "classname" "dom_controlpoint"
 "origin" "488.000000 -2352.000000 -368.000000"
-"message" " has captured the ^2Red mega armor ^3control point"
+"message" " has captured the ^2Red Mega Armor ^3control point"
 }
 {
 "classname" "dom_controlpoint"
@@ -78700,7 +78700,7 @@ logos/logo02_yellow_glowy
 {
 "classname" "dom_controlpoint"
 "origin" "3928.000000 -3536.000000 -368.000000"
-"message" " has captured the ^2Blue mega armor ^3control point"
+"message" " has captured the ^2Blue Mega Armor ^3control point"
 "angle" "-179.999985"
 }
 {

diff --git a/maps/implosion.map.options b/maps/implosion.map.options
index 027b4b8a0bab0ced14bd5143a8336db211af12e3..1f5ccb0958ad8f3791a82929a4a85926aed6a8e8 100644 (file)
--- a/maps/implosion.map.options
+++ b/maps/implosion.map.options
@@ -1,4 +1,5 @@
 -bsp +
 -vis -fast +
 -light -fast -deluxe -patchshadows -samples 3 -lightmapsize 512 -bounce 1 -fastbounce -bouncegrid -dirty -dirtscale 2
--minimap +
\ No newline at end of file
+-minimap +
+Version: 1b
\ 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/implosion.tga b/maps/implosion.tga
deleted file mode 100644 (file)
index 9d305b8..0000000
Binary files a/maps/implosion.tga and /dev/null differ

diff --git a/maps/leave_em_behind.mapinfo b/maps/leave_em_behind.mapinfo
index 178b1006a687d3dfa007de52f60806ef33fdf0f5..da8789db8af687e6fceb3fed2a3ca8c73139f432 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_weaponstartoverride 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..388fea5c296f5ce760f1df01ac9b06951c6d009d 100644 (file)
--- a/maps/space-elevator.mapinfo
+++ b/maps/space-elevator.mapinfo
@@ -4,4 +4,4 @@ author FruitieX, Mirio, Cuinnton
 has weapons
 gametype ctf
 cdtrack 4
-clientsettemp_for_type all r_water 1
+clientsettemp_for_type all r_water 1
\ No newline at end of file

diff --git a/maps/stormkeep.map b/maps/stormkeep.map
index 2523b7284a4a626e7e7e7aa236e5f9ec74069848..0e1b840c6eac1bb56081fdd32d15ccc5340ff9c9 100644 (file)
--- a/maps/stormkeep.map
+++ b/maps/stormkeep.map
@@ -19805,8 +19805,8 @@ exx/base-metal03
 }
 {
 "classname" "info_player_deathmatch"
-"angle" "225"
-"origin" "1472 896 0"
+"origin" "1760.000000 336.000000 0.000000"
+"angle" "-180.000000"
 }
 {
 "classname" "item_cells"

diff --git a/maps/stormkeep.map.options b/maps/stormkeep.map.options
index bace8666236da06425c83a9e9e0bb078498b131b..a798180e103c2f890a6b74ddb3b66f0e43217e2d 100644 (file)
--- a/maps/stormkeep.map.options
+++ b/maps/stormkeep.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 10
\ No newline at end of file
+Version: 10a
\ 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