X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=blobdiff_plain;f=maps%2Fwarfare.map;h=4160a97f7e8d069f93653528a4f5b7ec5c3169e3;hp=89f84560d058009734957ef0eef4f47e0ba47e86;hb=25e5f26a6a85f30f383659e2a5f0ea77bcd4aa42;hpb=60078c4e316512929f4f7d04d59a4ba10725415a

diff --git a/maps/warfare.map b/maps/warfare.map
index 89f84560..4160a97f 100644
--- a/maps/warfare.map
+++ b/maps/warfare.map
@@ -2568,18 +2568,18 @@ exx/base-metal04
 }
 {
 ( 792 -624 448 ) ( 792 -704 448 ) ( 736 -624 448 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 792 -680 320 ) ( 792 -680 448 ) ( 736 -624 448 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 800 -672 320 ) ( 800 -672 448 ) ( 744 -616 448 ) common/clip 224 0 0 0.25 0.25 0 0 0
 ( 736 -704 320 ) ( 792 -704 320 ) ( 736 -624 320 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 792 -680 -64 ) ( 776 -688 -64 ) ( 792 -680 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 776 -688 -64 ) ( 768 -680 -64 ) ( 776 -688 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 808 -680 -64 ) ( 792 -688 -64 ) ( 808 -680 64 ) common/clip 192 0 0 0.25 0.25 0 0 0
+( 784 -696 -64 ) ( 776 -688 -64 ) ( 784 -696 64 ) common/clip 32 0 0 0.25 0.25 0 0 0
 ( 728 -640 -64 ) ( 736 -640 -64 ) ( 728 -640 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 792 -624 448 ) ( 792 -704 448 ) ( 736 -624 448 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 792 -680 448 ) ( 792 -680 320 ) ( 792 -704 320 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 808 -680 448 ) ( 808 -680 320 ) ( 808 -704 320 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( 736 -704 320 ) ( 792 -704 320 ) ( 736 -624 320 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 736 -704 320 ) ( 736 -704 448 ) ( 792 -704 320 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 792 -680 64 ) ( 776 -688 -64 ) ( 792 -680 -64 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 752 -704 320 ) ( 752 -704 448 ) ( 808 -704 320 ) common/clip 192 0 0 0.25 0.25 0 0 0
+( 808 -680 64 ) ( 792 -688 -64 ) ( 808 -680 -64 ) common/clip 192 0 0 0.25 0.25 0 0 0
 ( 776 -704 -64 ) ( 776 -688 -64 ) ( 776 -704 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -9353,21 +9353,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
@@ -20232,7 +20232,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
 }
@@ -20296,7 +20296,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
 }
@@ -30730,6 +30730,22 @@ exx/base-metal07rust
 ( -64 48 -16 ) ( -64 48 -8 ) ( 328 48 -16 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( -64 256 0 ) ( -64 48 0 ) ( -64 256 -16 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
+{
+( 784 -744 320 ) ( 784 -712 320 ) ( 768 -712 320 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 768 -712 576 ) ( 784 -712 576 ) ( 784 -744 576 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 768 -712 392 ) ( 768 -744 392 ) ( 768 -744 328 ) common/clip 0 32 0 0.25 0.25 0 0 0
+( 808 -744 384 ) ( 808 -712 384 ) ( 808 -712 320 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 800 -704 384 ) ( 784 -704 384 ) ( 784 -704 320 ) common/clip 0 64 90 0.25 0.25 0 0 0
+( 752 -1000 64 ) ( 792 -976 -64 ) ( 752 -1000 -64 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 296 -952 640 ) ( 296 -1016 640 ) ( 232 -952 640 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 632 -992 544 ) ( 568 -992 544 ) ( 632 -992 480 ) common/clip 256 64 90 0.25 0.25 0 0 0
+( 232 -1016 384 ) ( 296 -1016 384 ) ( 232 -952 384 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 232 -1032 480 ) ( 232 -1032 544 ) ( 296 -1032 480 ) common/clip 224 0 0 0.25 0.25 0 0 0
+( 232 -1016 480 ) ( 232 -952 480 ) ( 232 -1016 544 ) common/clip -32 0 0 0.25 0.25 0 0 0
+( 752 -1000 64 ) ( 792 -976 -64 ) ( 752 -1000 -64 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "info_player_deathmatch"
@@ -32423,7 +32439,7 @@ exx/base-metal05rust
 "origin" "528.000000 320.000000 496.000000"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "-384.000000 -1024.000000 104.000000"
 }
 {