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

diff --git a/maps/warfare.map b/maps/warfare.map
index 16a4cbe3..d65b5c6a 100644
--- a/maps/warfare.map
+++ b/maps/warfare.map
@@ -1,7 +1,7 @@
 {
 "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.1"
 {
 ( -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 +2620,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 +2636,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
@@ -9364,21 +9350,21 @@ trak5x/base-pipe1b
 }
 {
 ( -376 -1128 200 ) ( -376 -1128 88 ) ( -364 -1140 88 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
-( -376 -1128 200 ) ( -400 -1152 200 ) ( -388 -1164 168 ) exx/trim-psimple04 39.3872070312 169.7788085938 -20 0.1787843555 0.1780000031 134217728 0 0
+( -376 -1128 200 ) ( -400 -1152 200 ) ( -388 -1164 168 ) exx/trim-psimple04 39.3872070313 169.7788085938 -20 0.1787843555 0.1780000031 134217728 0 0
 ( -400 -1152 200 ) ( -376 -1128 200 ) ( -388 -1164 200 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -400 -1152 88 ) ( -400 -1152 200 ) ( -388 -1164 88 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -388 -1164 352 ) ( -364 -1140 352 ) ( -388 -1164 224 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 {
 ( -364 -1140 200 ) ( -376 -1128 200 ) ( -376 -1128 88 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
-( -388 -1164 120 ) ( -400 -1152 88 ) ( -376 -1128 88 ) exx/trim-psimple04 0.4609375 27.5434570312 20 0.1787835211 0.1787800044 134217728 0 0
+( -388 -1164 120 ) ( -400 -1152 88 ) ( -376 -1128 88 ) exx/trim-psimple04 0.4609375 27.5434570313 20 0.1787835211 0.1787800044 134217728 0 0
 ( -388 -1164 88 ) ( -376 -1128 88 ) ( -400 -1152 88 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -388 -1164 200 ) ( -400 -1152 88 ) ( -400 -1152 200 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -388 -1164 64 ) ( -364 -1140 -64 ) ( -388 -1164 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 {
 ( -500 -1004 88 ) ( -488 -1016 88 ) ( -488 -1016 200 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
-( -524 -1028 168 ) ( -512 -1040 200 ) ( -488 -1016 200 ) exx/trim-psimple04 91.650390625 423.3559570312 19.9999980927 0.1787841767 0.1780000031 134217728 0 0
+( -524 -1028 168 ) ( -512 -1040 200 ) ( -488 -1016 200 ) exx/trim-psimple04 91.650390625 423.3559570313 19.9999980927 0.1787841767 0.1780000031 134217728 0 0
 ( -524 -1028 200 ) ( -488 -1016 200 ) ( -512 -1040 200 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -524 -1028 88 ) ( -512 -1040 200 ) ( -512 -1040 88 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -524 -1028 224 ) ( -500 -1004 352 ) ( -524 -1028 352 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
@@ -19545,7 +19531,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
 }
@@ -20243,7 +20229,7 @@ exx/base-metal04
 ( -680 200 360 ) ( -728 200 360 ) ( -680 200 408 ) common/caulk 32 128 -90 0.25 0.25 0 0 0
 ( -680 204 408 ) ( -680 204 360 ) ( -680 192 360 ) common/caulk 32 256 -90 0.25 -0.25 0 0 0
 ( -680 200 360 ) ( -680 216 360 ) ( -728 200 360 ) common/caulk 128 0 -0 0.25 -0.25 0 0 0
-( -680 204 360 ) ( -680 204 408 ) ( -728 204 408 ) trak5x/light-light2a 64 105.6665039062 -90 0.375 0.375 0 0 0
+( -680 204 360 ) ( -680 204 408 ) ( -728 204 408 ) trak5x/light-light2a 64 105.6665039063 -90 0.375 0.375 0 0 0
 ( -728 204 360 ) ( -728 204 408 ) ( -728 192 408 ) common/caulk 32 256 -90 0.25 -0.25 0 0 0
 ( -728 216 408 ) ( -680 216 408 ) ( -728 200 408 ) common/caulk 128 0 -0 0.25 -0.25 0 0 0
 }
@@ -20307,7 +20293,7 @@ exx/base-metal04
 ( -680 200 520 ) ( -728 200 520 ) ( -680 200 568 ) common/caulk 160 128 -90 0.25 0.25 0 0 0
 ( -680 204 568 ) ( -680 204 520 ) ( -680 192 520 ) common/caulk 160 0 -90 0.25 -0.25 0 0 0
 ( -680 200 520 ) ( -680 216 520 ) ( -728 200 520 ) common/caulk 128 0 0 0.25 -0.25 0 0 0
-( -680 204 520 ) ( -680 204 568 ) ( -728 204 568 ) trak5x/light-light2a 106.6666870117 105.6665039062 -90 0.375 0.375 0 0 0
+( -680 204 520 ) ( -680 204 568 ) ( -728 204 568 ) trak5x/light-light2a 106.6666870117 105.6665039063 -90 0.375 0.375 0 0 0
 ( -728 204 520 ) ( -728 204 568 ) ( -728 192 568 ) common/caulk 160 0 -90 0.25 -0.25 0 0 0
 ( -728 216 568 ) ( -680 216 568 ) ( -728 200 568 ) common/caulk 128 0 0 0.25 -0.25 0 0 0
 }
@@ -29621,7 +29607,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 +29663,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
 }
@@ -30319,6 +30305,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"
@@ -32056,8 +32056,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" "13.5955811 -42.791748 0"
 }
 {
 "classname" "info_location"
@@ -32287,13 +32287,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 +32349,76 @@ 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" "misc_gamemodel"
+"origin" "45.117275 203.765335 -15.592969"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.700000"
+"angles" "-6.765636 118.298286 13.803299"
+}
+{
+"classname" "misc_gamemodel"
+"origin" "435.049530 749.831360 122.260620"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.700000"
+"angles" "11.806162 119.315575 10.049067"
+}
+{
+"classname" "misc_gamemodel"
+"origin" "-715.604431 -540.102966 477.999847"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.700000"
+"angles" "5.093612 -21.180624 1.177875"
+}
+{
+"classname" "misc_gamemodel"
+"origin" "-797.990234 -165.049042 476.308502"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.700000"
+"angles" "-0.589641 14.992217 9.155036"
+}
+{
+"classname" "misc_gamemodel"
+"origin" "-781.094238 13.795942 475.191956"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.500000"
+"angles" "-6.289028 137.856934 1.316799"
+}
+{
+"classname" "misc_gamemodel"
+"origin" "420.221466 -821.656311 472.003845"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.700000"
+"angles" "4.660039 50.702106 2.371722"
+}
+{
+"classname" "misc_gamemodel"
+"origin" "649.648193 -1338.152832 352.140930"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.800000"
+"angles" "-19.621141 -165.325974 -31.031652"
+}
+{
+"classname" "misc_gamemodel"
+"origin" "1180.248657 -817.675537 292.009247"
+"model" "models/map_warfare/cactus.obj"
+"modelscale" "1.800000"
+"angles" "5.276835 47.410706 15.626326"
+}
+{
+"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"
+}