X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=maps%2Fwarfare.map;h=8931609251644dda04240432de5fd854ceda07a7;hb=d87bbbb9ca3d1505c08cf3375df16774813f6648;hp=16a4cbe368653f63a9e0f5c4b4b1fc37564fdb1b;hpb=abd4094ae5936b42160b23a6655c2d40af186c3b;p=xonotic%2Fxonotic-maps.pk3dir.git

diff --git a/maps/warfare.map b/maps/warfare.map
index 16a4cbe3..89316092 100644
--- a/maps/warfare.map
+++ b/maps/warfare.map
@@ -1,7 +1,10 @@
 {
 "classname" "worldspawn"
 "_floodlight" "178 209 255 1024 16"
-"fog" "1 0 0.5 0.8 0.06"
+"fog" "1 0 0.5 0.8 0.12"
+"_description" "Medium sized map with a central area. Well suited and optimized for duel matches."
+"message" "Warfare"
+"author" "Maddin, Tymo"
 {
 ( -192 -968 56 ) ( -192 -1144 64 ) ( -192 -968 64 ) common/caulk 0 192 0 0.25 0.25 0 0 0
 ( -192 -1144 64 ) ( -208 -1144 56 ) ( -208 -1144 64 ) common/caulk 192 192 0 0.25 0.25 0 0 0
@@ -2620,15 +2623,8 @@ exx/base-metal04
 ( 992 -1024 392 ) ( 992 -776 392 ) ( 992 -1024 656 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 832 -808 624 ) ( 992 -1024 592 ) ( 832 -1024 624 ) common/clip 32 0 0 0.25 0.25 0 0 0
-( 992 -808 592 ) ( 992 -1024 576 ) ( 992 -1024 592 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 992 -808 576 ) ( 832 -1024 608 ) ( 992 -1024 576 ) common/clip 32 0 0 0.25 0.25 0 0 0
-( 992 -1024 576 ) ( 832 -1024 624 ) ( 992 -1024 592 ) common/clip 32 0 0 0.25 0.25 0 0 0
-( 832 -1024 -64 ) ( 992 -808 -64 ) ( 832 -1024 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
-}
-{
 ( 672 -1120 656 ) ( 672 -1216 656 ) ( 456 -1120 656 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 672 -1080 656 ) ( 456 -1080 656 ) ( 672 -1080 640 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 672 -1024 656 ) ( 456 -1024 656 ) ( 672 -1024 640 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( 672 -1120 656 ) ( 672 -1120 640 ) ( 672 -1216 656 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( 456 -1216 640 ) ( 672 -1216 640 ) ( 456 -1120 640 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( 456 -1216 640 ) ( 456 -1216 656 ) ( 672 -1216 640 ) common/clip 0 0 0 0.25 0.25 0 0 0
@@ -2643,13 +2639,6 @@ exx/base-metal04
 ( 672 -1216 640 ) ( 672 -1120 640 ) ( 672 -1216 656 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 832 -1024 624 ) ( 832 -808 592 ) ( 992 -808 592 ) common/clip 32 0 0 0.25 0.25 0 0 0
-( 992 -808 576 ) ( 832 -808 592 ) ( 832 -808 576 ) common/clip 32 0 0 0.25 0.25 0 0 0
-( 992 -808 576 ) ( 832 -808 576 ) ( 832 -1024 608 ) common/clip 32 0 0 0.25 0.25 0 0 0
-( 832 -808 576 ) ( 832 -808 592 ) ( 832 -1024 608 ) common/clip 0 96 0 0.25 0.25 0 0 0
-( 832 -1024 64 ) ( 992 -808 -64 ) ( 832 -1024 -64 ) common/clip 0 0 0 0.25 0.25 0 0 0
-}
-{
 ( 1016 -768 384 ) ( 1016 -784 384 ) ( 1000 -768 384 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( 1016 -768 480 ) ( 1000 -768 480 ) ( 1016 -768 320 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( 1016 -768 480 ) ( 1016 -768 320 ) ( 1016 -784 480 ) common/clip 0 0 0 0.25 0.25 0 0 0
@@ -19545,7 +19534,7 @@ exx/base-metal04
 ( -624 176 640 ) ( -624 208 640 ) ( -560 208 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -676 136 512 ) ( -676 136 640 ) ( -672 128 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -384 128 520 ) ( -672 128 520 ) ( -672 128 640 ) exx/wall-panels08b 256 0 0 0.25 0.25 0 0 0
-( -992 128 520 ) ( -704 128 520 ) ( -712 136 512 ) exx/wall-panels08b -128 0 0 0.25 0.25 0 0 0
+( -992 128 520 ) ( -704 128 520 ) ( -712 136 512 ) exx/wall-panels08b 768 -32 180 0.25 0.25 0 0 0
 ( -576 128 512 ) ( -576 128 640 ) ( -584 136 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -676 136 640 ) ( -676 136 512 ) ( -584 136 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
@@ -29621,7 +29610,7 @@ exx/base-metal07rust
 ( -676 136 640 ) ( -676 128 640 ) ( -704 136 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -708 104 640 ) ( -708 104 512 ) ( -676 136 512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -672 128 512 ) ( -672 128 640 ) ( -676 136 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -736 64 520 ) ( -672 128 520 ) ( -740 72 512 ) exx/wall-panels08b -128 0 0 0.25 0.25 0 0 0
+( -736 64 520 ) ( -672 128 520 ) ( -740 72 512 ) exx/wall-panels08b -312 264 225 0.25 0.25 0 0 0
 ( -672 128 520 ) ( -736 64 520 ) ( -736 64 640 ) exx/wall-panels08b 256 0 0 0.25 0.25 0 0 0
 ( -740 72 512 ) ( -740 72 640 ) ( -736 64 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
@@ -29677,7 +29666,7 @@ exx/base-metal07rust
 ( -892 72 640 ) ( -892 64 640 ) ( -984 72 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -984 72 640 ) ( -984 72 512 ) ( -740 72 512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -736 64 512 ) ( -736 64 640 ) ( -740 72 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -832 64 520 ) ( -736 64 520 ) ( -740 72 512 ) exx/wall-panels08b -128 0 0 0.25 0.25 0 0 0
+( -832 64 520 ) ( -736 64 520 ) ( -740 72 512 ) exx/wall-panels08b 256 224 180 0.25 0.25 0 0 0
 ( -744 64 520 ) ( -840 64 520 ) ( -840 64 640 ) exx/wall-panels08b 256 0 0 0.25 0.25 0 0 0
 ( -984 72 512 ) ( -984 72 640 ) ( -992 64 640 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
@@ -30158,20 +30147,20 @@ exx/base-metal07rust
 ( -152 -16 64 ) ( -144 -16 -64 ) ( -152 -16 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 {
-( -64 183.9999847412 -32 ) ( 8 183.9999847412 -32 ) ( -64 256 -32 ) common/donotenter 0 0 0 0.5 0.5 0 0 0
-( -64 160 56 ) ( -64 160 -32 ) ( -64 256 -32 ) common/donotenter 0 0 0 0.5 0.5 0 0 0
-( 32 256 -32 ) ( 32 256 104 ) ( -64 256 80 ) common/donotenter 0 0 0 0.5 0.5 0 0 0
-( -64 184 56 ) ( -64 256 80 ) ( 8 256 104 ) common/donotenter 0 0 0 0.5 0.5 0 0 0
-( -64 160 -32 ) ( -64 160 56 ) ( 32 256 112 ) common/donotenter 0 0 0 0.5 0.5 0 0 0
+( -64 183.9999847412 -32 ) ( 8 183.9999847412 -32 ) ( -64 256 -32 ) common/botclip 0 0 0 0.5 0.5 0 0 0
+( -64 160 56 ) ( -64 160 -32 ) ( -64 256 -32 ) common/botclip 0 0 0 0.5 0.5 0 0 0
+( 32 256 -32 ) ( 32 256 104 ) ( -64 256 80 ) common/botclip 0 0 0 0.5 0.5 0 0 0
+( -64 184 56 ) ( -64 256 80 ) ( 8 256 104 ) common/botclip 0 0 0 0.5 0.5 0 0 0
+( -64 160 -32 ) ( -64 160 56 ) ( 32 256 112 ) common/botclip 0 0 0 0.5 0.5 0 0 0
 }
 {
-( -216 448 160 ) ( -216 408 160 ) ( -256 448 160 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
-( -216 448 160 ) ( -256 448 160 ) ( -216 448 80 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
-( -192 448 160 ) ( -192 448 80 ) ( -192 408 160 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
-( -256 408 80 ) ( -216 408 80 ) ( -256 448 80 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
-( -256 384 80 ) ( -256 384 160 ) ( -216 384 80 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
-( -256 408 80 ) ( -256 448 80 ) ( -256 408 160 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
-( -192 440 -64 ) ( -200 432 -64 ) ( -192 440 64 ) common/donotenter 0 0 0 0.25 0.25 0 0 0
+( -216 448 160 ) ( -216 408 160 ) ( -256 448 160 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -216 448 160 ) ( -256 448 160 ) ( -216 448 80 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -192 448 160 ) ( -192 448 80 ) ( -192 408 160 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -256 408 80 ) ( -216 408 80 ) ( -256 448 80 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -256 384 80 ) ( -256 384 160 ) ( -216 384 80 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -256 408 80 ) ( -256 448 80 ) ( -256 408 160 ) common/botclip 0 0 0 0.25 0.25 0 0 0
+( -192 440 -64 ) ( -200 432 -64 ) ( -192 440 64 ) common/botclip 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -272 128 320 ) ( -272 224 320 ) ( -240 224 320 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
@@ -30319,6 +30308,20 @@ exx/base-metal07rust
 ( -984 -576 736 ) ( -984 -576 832 ) ( -768 -576 736 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( -984 -616 736 ) ( -984 72 736 ) ( -984 -616 832 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
+{
+( 752 -1024 640 ) ( 752 -888 640 ) ( 992 -1024 592 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 992 -888 632 ) ( 992 -888 576 ) ( 992 -1024 632 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 752 -888 624 ) ( 752 -1024 624 ) ( 992 -1024 576 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 928 -1024 576 ) ( 928 -1024 632 ) ( 1016 -1024 576 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 752 -1024 -64 ) ( 992 -808 -64 ) ( 752 -1024 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 752 -1024 640 ) ( 752 -808 592 ) ( 992 -808 592 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 992 -808 576 ) ( 752 -808 592 ) ( 752 -808 576 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 992 -808 576 ) ( 752 -808 576 ) ( 752 -1024 624 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 752 -808 576 ) ( 752 -808 592 ) ( 752 -1024 624 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 752 -1024 64 ) ( 992 -808 -64 ) ( 752 -1024 -64 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "info_player_deathmatch"
@@ -30880,7 +30883,7 @@ exx/base-metal05rust
 {
 "classname" "target_speaker"
 "origin" "728.000000 64.000000 64.000000"
-"noise" "sound/machines/portal_idle.ogg"
+"noise" "sound/machines/portal_idle.wav"
 "spawnflags" "1"
 }
 {
@@ -31819,7 +31822,7 @@ exx/base-metal05rust
 {
 "classname" "target_speaker"
 "origin" "984.000000 64.000000 384.000000"
-"noise" "sound/machines/portal_idle.ogg"
+"noise" "sound/machines/portal_idle.wav"
 "spawnflags" "1"
 }
 {
@@ -31919,7 +31922,7 @@ exx/base-metal05rust
 }
 {
 "classname" "item_health_medium"
-"origin" "792.000000 672.000000 352.000000"
+"origin" "792.000000 704.000000 352.000000"
 }
 {
 "classname" "item_cells"
@@ -32056,8 +32059,8 @@ exx/base-metal05rust
 }
 {
 "classname" "info_autoscreenshot"
-"origin" "40.000000 -1152.000000 568.000000"
-"angles" "4 40 0"
+"origin" "-352.795746 436.263397 546.231445"
+"angles" "14 -43 0"
 }
 {
 "classname" "info_location"
@@ -32183,9 +32186,11 @@ exx/base-metal05rust
 }
 {
 "classname" "misc_model"
-"origin" "-26.000000 133.000000 -20.000000"
+"origin" "-507.999939 -1143.000000 57.999908"
 "model" "models/map_warfare/boulder_1.md3"
 "modelscale" "0.700000"
+"spawnflags" "4"
+"angles" "-5.922283 -8.308860 17.080246"
 }
 {
 "classname" "misc_model"
@@ -32243,10 +32248,11 @@ exx/base-metal05rust
 }
 {
 "classname" "misc_model"
-"origin" "-157.000000 -215.000000 -12.000000"
+"origin" "-315.000000 -1219.000122 76.000015"
 "model" "models/map_warfare/small_rocks.md3"
 "modelscale" "7.000000"
 "spawnflags" "4"
+"angles" "4.682997 0.236063 2.888983"
 }
 {
 "classname" "misc_model"
@@ -32287,13 +32293,6 @@ exx/base-metal05rust
 }
 {
 "classname" "misc_model"
-"origin" "-771.000000 -83.000000 479.000000"
-"model" "models/map_warfare/small_rocks.md3"
-"modelscale" "6.000000"
-"spawnflags" "4"
-}
-{
-"classname" "misc_model"
 "origin" "-835.000000 -212.000015 469.000000"
 "model" "models/map_warfare/small_rocks.md3"
 "modelscale" "6.000000"
@@ -32356,3 +32355,134 @@ exx/base-metal05rust
 "spawnflags" "4"
 "angle" "0.000010"
 }
+{
+"classname" "misc_model"
+"origin" "-771.000000 -83.000000 479.000000"
+"model" "models/map_warfare/small_rocks.md3"
+"modelscale" "6.000000"
+"spawnflags" "4"
+}
+{
+"classname" "info_autoscreenshot"
+"origin" "76.4626083 -1187.55554 541.621399"
+"angles" "4 45 0"
+}
+{
+"classname" "item_shells"
+"origin" "792.000000 632.000000 352.000000"
+}
+{
+"classname" "misc_model"
+"origin" "45.117275 203.765335 -15.592969"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.700000"
+"angles" "-6.765636 118.298286 13.803299"
+"spawnflags" "4"
+"_receiveshadows" "0"
+}
+{
+"classname" "misc_model"
+"origin" "-715.604431 -540.102966 477.999847"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.700000"
+"angles" "5.093612 -21.180624 1.177875"
+"spawnflags" "4"
+"_receiveshadows" "0"
+}
+{
+"classname" "misc_model"
+"origin" "-797.990234 -165.049042 476.308502"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.700000"
+"angles" "-0.589641 14.992217 9.155036"
+"spawnflags" "4"
+"_receiveshadows" "0"
+}
+{
+"classname" "misc_model"
+"origin" "-781.094238 13.795942 475.191956"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.500000"
+"angles" "-6.289028 137.856934 1.316799"
+"spawnflags" "4"
+"_receiveshadows" "0"
+}
+{
+"classname" "misc_model"
+"origin" "649.648193 -1338.152832 352.140930"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.800000"
+"angles" "-19.621141 -165.325974 -31.031652"
+"spawnflags" "4"
+"_receiveshadows" "0"
+}
+{
+"classname" "misc_model"
+"origin" "1180.248657 -817.675537 292.009247"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.800000"
+"angles" "5.276835 47.410706 15.626326"
+"spawnflags" "4"
+"_receiveshadows" "0"
+}
+{
+"classname" "misc_model"
+"origin" "435.049530 749.831360 122.260620"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.700000"
+"angles" "11.806162 119.315575 10.049067"
+"spawnflags" "4"
+"_receiveshadows" "0"
+}
+{
+"classname" "misc_model"
+"origin" "420.221466 -821.656311 472.003845"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.700000"
+"angles" "4.660039 50.702106 2.371722"
+"spawnflags" "4"
+"_receiveshadows" "0"
+}
+{
+"classname" "misc_model"
+"origin" "1423.000000 591.000061 130.000092"
+"model" "models/map_warfare/cactus.obj"
+"spawnflags" "4"
+"angles" "12.074849 5.873147 -9.703994"
+"modelscale_vec" "1.000000 1.000000 1.300000"
+"_receiveshadows" "0"
+}
+{
+"classname" "misc_model"
+"origin" "-432.000000 -1180.000122 75.000008"
+"model" "models/map_warfare/cactus.obj"
+"spawnflags" "4"
+"angles" "2.804623 95.043098 -9.026549"
+"_receiveshadows" "0"
+}
+{
+"classname" "misc_model"
+"origin" "-26.000000 133.000000 -20.000000"
+"model" "models/map_warfare/boulder_1.md3"
+"modelscale" "0.700000"
+"spawnflags" "4"
+}
+{
+"classname" "misc_model"
+"origin" "-585.000000 -950.000000 69.000000"
+"model" "models/map_warfare/boulder_1.md3"
+"modelscale" "0.700000"
+"spawnflags" "4"
+}
+{
+"classname" "misc_model"
+"origin" "-157.000000 -215.000000 -12.000000"
+"model" "models/map_warfare/small_rocks.md3"
+"modelscale" "7.000000"
+"spawnflags" "4"
+}
+{
+"classname" "info_autoscreenshot"
+"origin" "616.000000 168.000000 256.000000"
+"angles" "5 205 0"
+}