Remove gametypefilter and fix z-fight

[xonotic/xonotic-maps.pk3dir.git] / maps / warfare.map

diff --git a/maps/warfare.map b/maps/warfare.map
index df2cdaac927787d7c43598dcf93b7386438dcdf5..0c820c0013885542df488ba08918f778a20440d1 100644 (file)
--- a/maps/warfare.map
+++ b/maps/warfare.map
@@ -6941,13 +6941,13 @@ exx/base-metal01
 ( 128 -640 312 ) ( 64 -640 312 ) ( 128 -592 312 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -640 312 ) ( 128 -640 312 ) ( 128 -640 304 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 128 -592 320 ) ( 128 -640 304 ) ( 128 -640 320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 128 -592 312 ) ( 64 -592 312 ) ( 128 -592 304 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 128 -576 312 ) ( 64 -576 312 ) ( 128 -576 304 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -640 304 ) ( 64 -592 320 ) ( 64 -640 320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 128 -480 304 ) ( 64 -528 304 ) ( 128 -528 304 ) exx/trim-psimple04 0 0 0 0.25 0.25 0 0 0
 ( 128 -528 312 ) ( 64 -528 312 ) ( 128 -480 312 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 64 -528 312 ) ( 128 -528 312 ) ( 128 -528 304 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 64 -512 312 ) ( 128 -512 312 ) ( 128 -512 304 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 128 -480 320 ) ( 128 -528 304 ) ( 128 -528 320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 128 -480 312 ) ( 64 -480 312 ) ( 128 -480 304 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 64 -528 304 ) ( 64 -480 320 ) ( 64 -528 320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -7211,44 +7211,44 @@ exx/base-metal01
 ( -56 -656 160 ) ( -56 -416 152 ) ( -56 -656 152 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 72 -584 304 ) ( 72 -584 320 ) ( 64 -592 320 ) common/caulk 64 128 0 0.25 0.25 0 0 0
-( 120 -584 312 ) ( 72 -584 312 ) ( 72 -584 308 ) common/caulk 32 128 0 0.25 0.25 0 0 0
-( 120 -584 320 ) ( 120 -584 304 ) ( 128 -592 320 ) common/caulk 64 128 0 0.25 0.25 0 0 0
-( 64 -592 312 ) ( 128 -592 312 ) ( 128 -592 304 ) common/caulk 32 128 0 0.25 0.25 0 0 0
-( 72 -584 312 ) ( 120 -584 312 ) ( 128 -592 312 ) common/caulk 32 192 0 0.25 0.25 0 0 0
-( 120 -584 308 ) ( 72 -584 308 ) ( 128 -592 304 ) exx/wall-metal01b 480 352 180 0.25 0.25 0 0 0
+( 72 -568 304 ) ( 72 -568 320 ) ( 64 -576 320 ) common/caulk 0 128 0 0.25 0.25 0 0 0
+( 120 -568 312 ) ( 72 -568 312 ) ( 72 -568 308 ) common/caulk 32 128 0 0.25 0.25 0 0 0
+( 120 -568 320 ) ( 120 -568 304 ) ( 128 -576 320 ) common/caulk 0 128 0 0.25 0.25 0 0 0
+( 64 -576 312 ) ( 128 -576 312 ) ( 128 -576 304 ) common/caulk 32 128 0 0.25 0.25 0 0 0
+( 72 -568 312 ) ( 120 -568 312 ) ( 128 -576 312 ) common/caulk 32 0 0 0.25 0.25 0 0 0
+( 120 -568 308 ) ( 72 -568 308 ) ( 128 -576 304 ) exx/wall-metal01b 480 288 180 0.25 0.25 0 0 0
 }
 {
-( 120 -584 304 ) ( 120 -584 320 ) ( 128 -592 320 ) common/caulk 64 128 0 0.25 0.25 0 0 0
-( 120 -536 312 ) ( 120 -584 312 ) ( 120 -584 308 ) common/caulk 64 128 0 0.25 0.25 0 0 0
-( 120 -536 320 ) ( 120 -536 304 ) ( 128 -528 320 ) common/caulk 64 128 0 0.25 0.25 0 0 0
-( 128 -592 312 ) ( 128 -528 312 ) ( 128 -528 304 ) common/caulk 64 128 0 0.25 0.25 0 0 0
-( 128 -528 312 ) ( 128 -592 312 ) ( 120 -584 312 ) common/caulk 32 192 0 0.25 0.25 0 0 0
-( 120 -536 308 ) ( 120 -584 308 ) ( 128 -528 304 ) exx/wall-metal01b 320 64 90 0.25 0.25 0 0 0
+( 120 -568 304 ) ( 120 -568 320 ) ( 128 -576 320 ) common/caulk 0 128 0 0.25 0.25 0 0 0
+( 120 -520 312 ) ( 120 -568 312 ) ( 120 -568 308 ) common/caulk 0 128 0 0.25 0.25 0 0 0
+( 120 -520 320 ) ( 120 -520 304 ) ( 128 -512 320 ) common/caulk 0 128 0 0.25 0.25 0 0 0
+( 128 -576 312 ) ( 128 -512 312 ) ( 128 -512 304 ) common/caulk 0 128 0 0.25 0.25 0 0 0
+( 128 -512 312 ) ( 128 -576 312 ) ( 120 -568 312 ) common/caulk 32 0 0 0.25 0.25 0 0 0
+( 120 -520 308 ) ( 120 -568 308 ) ( 128 -512 304 ) exx/wall-metal01b 256 64 90 0.25 0.25 0 0 0
 }
 {
-( 120 -536 312 ) ( 120 -584 312 ) ( 72 -536 312 ) common/caulk 32 192 0 0.25 0.25 0 0 0
-( 120 -536 316 ) ( 72 -536 316 ) ( 120 -536 300 ) common/caulk 32 128 0 0.25 0.25 0 0 0
-( 120 -536 316 ) ( 120 -536 300 ) ( 120 -584 316 ) common/caulk 64 128 0 0.25 0.25 0 0 0
-( 72 -584 308 ) ( 120 -584 308 ) ( 72 -536 308 ) trak5x/light-light2a 64 106 0 0.375 0.375 0 0 0
-( 72 -584 300 ) ( 72 -584 316 ) ( 120 -584 300 ) common/caulk 32 128 0 0.25 0.25 0 0 0
-( 72 -584 300 ) ( 72 -536 300 ) ( 72 -584 316 ) common/caulk 64 128 0 0.25 0.25 0 0 0
+( 120 -520 312 ) ( 120 -568 312 ) ( 72 -520 312 ) common/caulk 32 0 0 0.25 0.25 0 0 0
+( 120 -520 316 ) ( 72 -520 316 ) ( 120 -520 300 ) common/caulk 32 128 0 0.25 0.25 0 0 0
+( 120 -520 316 ) ( 120 -520 300 ) ( 120 -568 316 ) common/caulk 0 128 0 0.25 0.25 0 0 0
+( 72 -568 308 ) ( 120 -568 308 ) ( 72 -520 308 ) trak5x/light-light2a 64 20.6666717529 0 0.375 0.375 0 0 0
+( 72 -568 300 ) ( 72 -568 316 ) ( 120 -568 300 ) common/caulk 32 128 0 0.25 0.25 0 0 0
+( 72 -568 300 ) ( 72 -520 300 ) ( 72 -568 316 ) common/caulk 0 128 0 0.25 0.25 0 0 0
 }
 {
-( 120 -536 304 ) ( 120 -536 320 ) ( 128 -528 320 ) common/caulk 64 128 0 0.25 0.25 0 0 0
-( 72 -536 312 ) ( 120 -536 312 ) ( 120 -536 308 ) common/caulk 32 128 0 0.25 0.25 0 0 0
-( 72 -536 320 ) ( 72 -536 304 ) ( 64 -528 320 ) common/caulk 64 128 0 0.25 0.25 0 0 0
-( 128 -528 312 ) ( 64 -528 312 ) ( 64 -528 304 ) common/caulk 32 128 0 0.25 0.25 0 0 0
-( 120 -536 312 ) ( 72 -536 312 ) ( 64 -528 312 ) common/caulk 32 192 0 0.25 0.25 0 0 0
-( 72 -536 308 ) ( 120 -536 308 ) ( 64 -528 304 ) exx/wall-metal01b 480 128 180 0.25 0.25 0 0 0
+( 120 -520 304 ) ( 120 -520 320 ) ( 128 -512 320 ) common/caulk 0 128 0 0.25 0.25 0 0 0
+( 72 -520 312 ) ( 120 -520 312 ) ( 120 -520 308 ) common/caulk 32 128 0 0.25 0.25 0 0 0
+( 72 -520 320 ) ( 72 -520 304 ) ( 64 -512 320 ) common/caulk 0 128 0 0.25 0.25 0 0 0
+( 128 -512 312 ) ( 64 -512 312 ) ( 64 -512 304 ) common/caulk 32 128 0 0.25 0.25 0 0 0
+( 120 -520 312 ) ( 72 -520 312 ) ( 64 -512 312 ) common/caulk 32 0 0 0.25 0.25 0 0 0
+( 72 -520 308 ) ( 120 -520 308 ) ( 64 -512 304 ) exx/wall-metal01b 480 64 180 0.25 0.25 0 0 0
 }
 {
-( 72 -536 304 ) ( 72 -536 320 ) ( 64 -528 320 ) common/caulk 64 128 0 0.25 0.25 0 0 0
-( 72 -584 312 ) ( 72 -536 312 ) ( 72 -536 308 ) common/caulk 64 128 0 0.25 0.25 0 0 0
-( 72 -584 320 ) ( 72 -584 304 ) ( 64 -592 320 ) common/caulk 64 128 0 0.25 0.25 0 0 0
-( 64 -528 312 ) ( 64 -592 312 ) ( 64 -592 304 ) common/caulk 64 128 0 0.25 0.25 0 0 0
-( 64 -592 312 ) ( 64 -528 312 ) ( 72 -536 312 ) common/caulk 32 192 0 0.25 0.25 0 0 0
-( 72 -584 308 ) ( 72 -536 308 ) ( 64 -592 304 ) exx/wall-metal01b 320 288 90 0.25 0.25 0 0 0
+( 72 -520 304 ) ( 72 -520 320 ) ( 64 -512 320 ) common/caulk 0 128 0 0.25 0.25 0 0 0
+( 72 -568 312 ) ( 72 -520 312 ) ( 72 -520 308 ) common/caulk 0 128 0 0.25 0.25 0 0 0
+( 72 -568 320 ) ( 72 -568 304 ) ( 64 -576 320 ) common/caulk 0 128 0 0.25 0.25 0 0 0
+( 64 -512 312 ) ( 64 -576 312 ) ( 64 -576 304 ) common/caulk 0 128 0 0.25 0.25 0 0 0
+( 64 -576 312 ) ( 64 -512 312 ) ( 72 -520 312 ) common/caulk 32 0 0 0.25 0.25 0 0 0
+( 72 -568 308 ) ( 72 -520 308 ) ( 64 -576 304 ) exx/wall-metal01b 256 288 90 0.25 0.25 0 0 0
 }
 {
 ( 128 -480 312 ) ( 64 -480 312 ) ( 128 -416 296 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -18551,11 +18551,11 @@ exx/base-metal04
 ( 752 56 32 ) ( 752 40 32 ) ( 752 48 96 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 {
-( 752 112 112 ) ( 752 16 112 ) ( 736 112 112 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
-( 752 112 112 ) ( 736 112 112 ) ( 752 112 16 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
+( 752 96 128 ) ( 752 0 128 ) ( 736 96 128 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
+( 752 128 96 ) ( 736 128 96 ) ( 752 128 0 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
 ( 752 112 112 ) ( 752 112 16 ) ( 752 16 112 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
-( 736 16 16 ) ( 752 16 16 ) ( 736 112 16 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
-( 736 16 16 ) ( 736 16 112 ) ( 752 16 16 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
+( 736 32 0 ) ( 752 32 0 ) ( 736 128 0 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
+( 736 0 32 ) ( 736 0 128 ) ( 752 0 32 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
 ( 744 16 16 ) ( 744 112 16 ) ( 744 16 112 ) liquids_water/water0 0 0 0 0.25 0.25 134217728 0 0
 }
 {
@@ -20944,11 +20944,11 @@ exx/base-metal04
 ( 1008 56 352 ) ( 1008 40 352 ) ( 1008 48 416 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 {
-( 1008 112 432 ) ( 1008 16 432 ) ( 992 112 432 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
-( 1008 112 432 ) ( 992 112 432 ) ( 1008 112 336 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
+( 1008 96 448 ) ( 1008 0 448 ) ( 992 96 448 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
+( 1008 128 416 ) ( 992 128 416 ) ( 1008 128 320 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
 ( 1008 112 432 ) ( 1008 112 336 ) ( 1008 16 432 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
-( 992 16 336 ) ( 1008 16 336 ) ( 992 112 336 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
-( 992 16 336 ) ( 992 16 432 ) ( 1008 16 336 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
+( 992 32 320 ) ( 1008 32 320 ) ( 992 128 320 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
+( 992 0 352 ) ( 992 0 448 ) ( 1008 0 352 ) common/nodrawnonsolid 0 0 0 0.25 0.25 134217728 0 0
 ( 1000 16 336 ) ( 1000 112 336 ) ( 1000 16 432 ) liquids_water/water0 0 0 0 0.25 0.25 134217728 0 0
 }
 {
@@ -30994,14 +30994,14 @@ exx/base-metal05rust
 }
 {
 "classname" "light"
-"origin" "96.000000 -560.000000 304.000000"
+"origin" "96.000000 -544.000000 304.000000"
 "light" "150"
 "_color" "1 0.8 0.5"
 "target" "l_17"
 }
 {
 "classname" "target_position"
-"origin" "96.000000 -560.000000 256.000000"
+"origin" "96.000000 -544.000000 256.000000"
 "targetname" "l_17"
 }
 {
@@ -31385,13 +31385,13 @@ exx/base-metal05rust
 {
 "classname" "target_speaker"
 "origin" "648.000000 -544.000000 216.000000"
-"noise" "sound/ambient/machine3.ogg"
+"noise" "sound/ambient/machine3.wav"
 "spawnflags" "1"
 }
 {
 "classname" "target_speaker"
 "origin" "1144.000000 672.000000 216.000000"
-"noise" "sound/ambient/machine3.ogg"
+"noise" "sound/ambient/machine3.wav"
 "spawnflags" "1"
 }
 {
@@ -31606,8 +31606,8 @@ exx/base-metal05rust
 "lip" "2"
 "wait" "3"
 "targetname" "elevator"
-"noise1" "sound/map_warfare/elevator_stop.ogg"
-"noise2" "sound/map_warfare/elevator_move.ogg"
+"noise1" "sound/map_warfare/elevator_stop.wav"
+"noise2" "sound/map_warfare/elevator_move.wav"
 {
 ( -624 432 144 ) ( -808 432 144 ) ( -808 264 144 ) exx/base-metal04 0 0 0 0.25 0.25 0 0 0
 ( -792 264 160 ) ( -792 432 160 ) ( -608 432 160 ) exx/base-metal04 0 0 0 0.25 0.25 0 0 0
@@ -32060,7 +32060,7 @@ exx/base-metal05rust
 {
 "classname" "info_autoscreenshot"
 "origin" "-352.795746 436.263397 546.231445"
-"angles" "13.5955811 -42.791748 0"
+"angles" "14 -43 0"
 }
 {
 "classname" "info_location"
@@ -32365,12 +32365,7 @@ exx/base-metal05rust
 {
 "classname" "info_autoscreenshot"
 "origin" "76.4626083 -1187.55554 541.621399"
-"angles" "4.22424316 45.2526855 0"
-}
-{
-"classname" "info_autoscreenshot"
-"origin" "561.64978 153.942505 247.010666"
-"angles" "13.9910889 -157.664795 0"
+"angles" "4 45 0"
 }
 {
 "classname" "item_shells"
@@ -32383,6 +32378,7 @@ exx/base-metal05rust
 "modelscale" "1.700000"
 "angles" "-6.765636 118.298286 13.803299"
 "spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
 "classname" "misc_model"
@@ -32391,6 +32387,7 @@ exx/base-metal05rust
 "modelscale" "1.700000"
 "angles" "5.093612 -21.180624 1.177875"
 "spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
 "classname" "misc_model"
@@ -32399,6 +32396,7 @@ exx/base-metal05rust
 "modelscale" "1.700000"
 "angles" "-0.589641 14.992217 9.155036"
 "spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
 "classname" "misc_model"
@@ -32407,6 +32405,7 @@ exx/base-metal05rust
 "modelscale" "1.500000"
 "angles" "-6.289028 137.856934 1.316799"
 "spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
 "classname" "misc_model"
@@ -32415,6 +32414,7 @@ exx/base-metal05rust
 "modelscale" "1.800000"
 "angles" "-19.621141 -165.325974 -31.031652"
 "spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
 "classname" "misc_model"
@@ -32423,6 +32423,7 @@ exx/base-metal05rust
 "modelscale" "1.800000"
 "angles" "5.276835 47.410706 15.626326"
 "spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
 "classname" "misc_model"
@@ -32431,6 +32432,7 @@ exx/base-metal05rust
 "modelscale" "1.700000"
 "angles" "11.806162 119.315575 10.049067"
 "spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
 "classname" "misc_model"
@@ -32439,6 +32441,7 @@ exx/base-metal05rust
 "modelscale" "1.700000"
 "angles" "4.660039 50.702106 2.371722"
 "spawnflags" "4"
+"_receiveshadows" "0"
 }
 {
 "classname" "misc_model"
@@ -32447,6 +32450,7 @@ exx/base-metal05rust
 "spawnflags" "4"
 "angles" "12.074849 5.873147 -9.703994"
 "modelscale_vec" "1.000000 1.000000 1.300000"
+"_receiveshadows" "0"
 }
 {
 "classname" "misc_model"
@@ -32454,6 +32458,7 @@ exx/base-metal05rust
 "model" "models/map_warfare/cactus.obj"
 "spawnflags" "4"
 "angles" "2.804623 95.043098 -9.026549"
+"_receiveshadows" "0"
 }
 {
 "classname" "misc_model"
@@ -32476,3 +32481,8 @@ exx/base-metal05rust
 "modelscale" "7.000000"
 "spawnflags" "4"
 }
+{
+"classname" "info_autoscreenshot"
+"origin" "616.000000 168.000000 256.000000"
+"angles" "5 205 0"
+}