X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=blobdiff_plain;f=maps%2Fdarkzone.map;h=26e88d2cb9c78f99380acc7aa95e43c087ddea77;hp=25f0bcb66615e859f9573dc3187057c6fd435080;hb=e8ba915db53e7f1876bd236f8431fe260e2842de;hpb=689828122745aa334af89ffc57f8136e9edcbf9e

diff --git a/maps/darkzone.map b/maps/darkzone.map
index 25f0bcb6..26e88d2c 100644
--- a/maps/darkzone.map
+++ b/maps/darkzone.map
@@ -1,7 +1,7 @@
 {
 "classname" "worldspawn"
 "gridsize" "64.000000 64.000000 128.000000"
-"author" "Cortez, CuBe0wL, SavageX"
+"author" "Cortez, CuBe0wL, SavageX, Mossepo"
 "_description" "Xonotic remake of a classic map from Quake1: Q1DM6. Recommended for cut-throat duels"
 "message" "Darkzone"
 {
@@ -952,7 +952,7 @@ exx/base-metal01
 ( 768 1232 224 ) ( 768 1216 384 ) ( 768 1232 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 768 1232 384 ) ( 640 1216 384 ) ( 640 1232 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 640 1232 224 ) ( 768 1216 224 ) ( 768 1232 224 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 640 1232 224 ) ( 768 1232 384 ) ( 640 1232 384 ) exx/base-metal01 0 0 0 0.5 0.5 0 0 0
+( 640 1280 224 ) ( 768 1280 384 ) ( 640 1280 384 ) exx/base-metal01 0 0 0 0.5 0.5 0 0 0
 ( 768 1216 224 ) ( 640 1216 384 ) ( 768 1216 384 ) exx/wall-metal01c 256 204.8000488281 0 0.5 0.3125 0 0 0
 ( 640 1232 224 ) ( 640 1232 384 ) ( 640 1216 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 }
@@ -1898,7 +1898,7 @@ trak5x/base-pipe1b
 }
 {
 ( 384 1224 200 ) ( 384 1632 184 ) ( 384 1632 200 ) common/caulk 240 240 0 0.5 0.5 0 0 0
-( 1232 1824 200 ) ( 640 1824 200 ) ( 640 1824 184 ) common/caulk 16 240 0 0.5 0.5 0 0 0
+( 1232 1944 200 ) ( 640 1944 200 ) ( 640 1944 184 ) common/caulk 16 240 0 0.5 0.5 0 0 0
 ( 1232 1232 200 ) ( 1232 1640 200 ) ( 1232 1640 184 ) common/caulk 224 240 0 0.5 0.5 0 0 0
 ( 1232 1232 200 ) ( 640 1232 184 ) ( 640 1232 200 ) common/caulk 16 240 0 0.5 0.5 0 0 0
 ( 1232 1640 200 ) ( 640 1232 200 ) ( 640 1640 200 ) common/caulk 16 32 0 0.5 0.5 0 0 0
@@ -4879,14 +4879,6 @@ trak5x/base-pipe1b
 ( -816 -848 64 ) ( -784 -752 64 ) ( -816 -752 64 ) exx/trim-psimple05 128 378 0 0.125 0.125 134217728 0 0
 }
 {
-( -808 -768 200 ) ( -808 -832 200 ) ( -808 -832 184 ) trak5x/misc-glass 192 80 0 0.5 0.5 134217728 274 0
-( -792 -768 200 ) ( -808 -768 200 ) ( -808 -768 184 ) common/caulk 224 80 0 0.5 0.5 134217728 274 0
-( -792 -832 200 ) ( -792 -768 200 ) ( -792 -768 184 ) trak5x/misc-glass 192 80 0 0.5 0.5 134217728 274 0
-( -808 -832 200 ) ( -792 -832 200 ) ( -792 -832 184 ) common/caulk 224 80 0 0.5 0.5 134217728 274 0
-( -808 -832 200 ) ( -808 -768 200 ) ( -792 -768 200 ) common/caulk 224 64 0 0.5 0.5 134217728 274 0
-( -776 -768 80 ) ( -792 -768 80 ) ( -792 -832 80 ) common/caulk 224 64 0 0.5 0.5 134217728 274 0
-}
-{
 ( -792 -824 240 ) ( -808 -824 240 ) ( -808 -776 240 ) trak5x/base-base1a 448 128 0 0.25 0.25 134217728 0 0
 ( -792 -776 216 ) ( -792 -776 240 ) ( -808 -776 240 ) trak5x/base-base1a 448 288 0 0.25 0.25 134217728 0 0
 ( -792 -824 216 ) ( -792 -824 240 ) ( -792 -776 240 ) trak5x/panel-vertpanel1d 30.4210510254 484.3683166504 90 0.0949999988 0.0949999988 134217728 0 0
@@ -6655,7 +6647,7 @@ exx/wall-metal01c
 ( 640 1232 448 ) ( 640 1216 384 ) ( 640 1232 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 640 1232 448 ) ( 768 1232 448 ) ( 768 1216 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 640 1216 448 ) ( 768 1216 384 ) ( 640 1216 384 ) exx/panel-metal04 -0 0 0 0.25 0.25 0 0 0
-( 768 1232 448 ) ( 640 1232 384 ) ( 768 1232 384 ) exx/base-metal01 0 0 0 0.5 0.5 0 0 0
+( 768 1232 448 ) ( 640 1232 448 ) ( 640 1280 384 ) exx/base-metal01 0 0 0 0.5 0.5 0 0 0
 ( 768 1216 384 ) ( 640 1232 384 ) ( 640 1216 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 768 1216 448 ) ( 768 1232 384 ) ( 768 1216 384 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 }
@@ -13984,26 +13976,26 @@ trak5x/base-pipe1b
 {
 ( 1248 832 200 ) ( 1248 704 200 ) ( 1248 704 184 ) common/caulk 144 240 0 0.5 0.5 0 0 0
 ( 1640 832 200 ) ( 1248 832 200 ) ( 1248 832 184 ) common/caulk 96 240 0 0.5 0.5 0 0 0
-( 1832 832 200 ) ( 1832 704 184 ) ( 1832 704 200 ) common/caulk 144 240 0 0.5 0.5 0 0 0
+( 1928 832 200 ) ( 1928 704 184 ) ( 1928 704 200 ) common/caulk 144 240 0 0.5 0.5 0 0 0
 ( 1640 704 200 ) ( 1248 704 184 ) ( 1248 704 200 ) common/caulk 112 240 0 0.5 0.5 0 0 0
 ( 1248 832 200 ) ( 1640 704 200 ) ( 1248 704 200 ) common/caulk 96 112 0 0.5 0.5 0 0 0
 ( 1640 832 184 ) ( 1248 704 184 ) ( 1640 704 184 ) common/caulk 96 112 0 0.5 0.5 0 0 0
 }
 {
 ( 1232 1640 200 ) ( 1232 832 200 ) ( 1232 832 184 ) common/caulk 144 240 0 0.5 0.5 0 0 0
-( 1232 1824 200 ) ( 1640 1824 184 ) ( 1640 1824 200 ) common/caulk 96 240 0 0.5 0.5 0 0 0
-( 1832 1640 200 ) ( 1832 832 184 ) ( 1832 832 200 ) common/caulk 144 240 0 0.5 0.5 0 0 0
+( 1232 1944 200 ) ( 1640 1944 184 ) ( 1640 1944 200 ) common/caulk 96 240 0 0.5 0.5 0 0 0
+( 1936 1640 200 ) ( 1936 832 184 ) ( 1936 832 200 ) common/caulk 144 240 0 0.5 0.5 0 0 0
 ( 1640 832 200 ) ( 1232 832 184 ) ( 1232 832 200 ) common/caulk 112 240 0 0.5 0.5 0 0 0
 ( 1232 1640 200 ) ( 1640 832 200 ) ( 1232 832 200 ) common/caulk 96 112 0 0.5 0.5 0 0 0
 ( 1640 1640 184 ) ( 1232 832 184 ) ( 1640 832 184 ) common/caulk 864 112 0 0.5 0.5 0 0 0
 }
 {
-( 1232 320 200 ) ( 1232 704 184 ) ( 1232 704 200 ) common/caulk 144 240 0 0.5 0.5 0 0 0
-( 1232 704 200 ) ( 1640 704 184 ) ( 1640 704 200 ) common/caulk 96 240 0 0.5 0.5 0 0 0
-( 1832 320 200 ) ( 1832 704 200 ) ( 1832 704 184 ) common/caulk 144 240 0 0.5 0.5 0 0 0
-( 1640 320 200 ) ( 1232 320 184 ) ( 1232 320 200 ) common/caulk 112 240 0 0.5 0.5 0 0 0
-( 1640 320 200 ) ( 1232 704 200 ) ( 1640 704 200 ) common/caulk 96 112 0 0.5 0.5 0 0 0
-( 1232 320 184 ) ( 1640 704 184 ) ( 1232 704 184 ) common/caulk 96 112 0 0.5 0.5 0 0 0
+( 1232 320 200 ) ( 1232 704 184 ) ( 1232 704 200 ) common/caulk 144 248 0 0.5 0.5 0 0 0
+( 1232 704 200 ) ( 1640 704 184 ) ( 1640 704 200 ) common/caulk 96 248 0 0.5 0.5 0 0 0
+( 1936 320 200 ) ( 1936 704 200 ) ( 1936 704 184 ) common/caulk 144 248 0 0.5 0.5 0 0 0
+( 1640 320 200 ) ( 1232 320 184 ) ( 1232 320 200 ) common/caulk 112 248 0 0.5 0.5 0 0 0
+( 1640 320 200 ) ( 1232 704 200 ) ( 1640 704 200 ) common/caulk 96 120 0 0.5 0.5 0 0 0
+( 1232 320 184 ) ( 1640 704 184 ) ( 1232 704 184 ) common/caulk 96 120 0 0.5 0.5 0 0 0
 }
 {
 ( 384 480 224 ) ( 384 1216 208 ) ( 384 1216 224 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -16556,12 +16548,12 @@ trak5x/base-pipe1b
 ( 1072 512 208 ) ( 1056 688 208 ) ( 1056 512 208 ) exx/floor-rnd01 256 184 180 0.25 0.25 0 0 0
 }
 {
-( 1072 512 224 ) ( 1072 672 208 ) ( 1072 672 224 ) common/clip 0 128 90 0.125 0.125 0 0 0
-( 1168 672 224 ) ( 1072 672 224 ) ( 1072 672 208 ) common/clip 192 0 0 0.25 0.25 0 0 0
-( 1168 512 224 ) ( 1168 672 224 ) ( 1168 672 208 ) common/clip 0 0 0 0.25 0.25 0 0 0
-( 1072 512 224 ) ( 1168 512 224 ) ( 1168 512 208 ) common/clip 192 0 0 0.25 0.25 0 0 0
-( 1168 512 224 ) ( 1072 672 224 ) ( 1168 672 224 ) common/clip 192 -0 0 0.25 0.25 0 0 0
-( 1072 512 208 ) ( 1168 672 208 ) ( 1072 672 208 ) common/clip 256 312 180 0.25 0.25 0 0 0
+( 1072 512 224 ) ( 1072 672 208 ) ( 1072 672 224 ) common/weapclip 0 128 90 0.125 0.125 0 0 0
+( 1168 672 224 ) ( 1072 672 224 ) ( 1072 672 208 ) common/weapclip 192 0 0 0.25 0.25 0 0 0
+( 1168 512 224 ) ( 1168 672 224 ) ( 1168 672 208 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 1072 512 224 ) ( 1168 512 224 ) ( 1168 512 208 ) common/weapclip 192 0 0 0.25 0.25 0 0 0
+( 1168 512 224 ) ( 1072 672 224 ) ( 1168 672 224 ) common/weapclip 192 -0 0 0.25 0.25 0 0 0
+( 1072 512 208 ) ( 1168 672 208 ) ( 1072 672 208 ) common/weapclip 256 312 180 0.25 0.25 0 0 0
 }
 {
 ( -32 -552 32 ) ( 0 -580 32 ) ( -32 -580 32 ) exx/floor-grate04-cull 0 27 0 0.25 0.2179999948 0 0 0
@@ -16940,14 +16932,6 @@ trak5x/base-pipe1b
 ( 48 -112 -32 ) ( 80 -16 -32 ) ( 48 -16 -32 ) exx/trim-psimple05 128 122 0 0.125 0.125 134217728 0 0
 }
 {
-( 56 -32 104 ) ( 56 -96 104 ) ( 56 -96 88 ) trak5x/misc-glass 0 144 0 0.5 0.5 134217728 274 0
-( 72 -32 104 ) ( 56 -32 104 ) ( 56 -32 88 ) common/caulk 32 144 0 0.5 0.5 134217728 274 0
-( 72 -96 104 ) ( 72 -32 104 ) ( 72 -32 88 ) trak5x/misc-glass 0 144 0 0.5 0.5 134217728 274 0
-( 56 -96 104 ) ( 72 -96 104 ) ( 72 -96 88 ) common/caulk 32 144 0 0.5 0.5 134217728 274 0
-( 56 -96 104 ) ( 56 -32 104 ) ( 72 -32 104 ) common/caulk 32 0 0 0.5 0.5 134217728 274 0
-( 88 -32 -16 ) ( 72 -32 -16 ) ( 72 -96 -16 ) common/caulk 32 0 0 0.5 0.5 134217728 274 0
-}
-{
 ( 72 -88 144 ) ( 56 -88 144 ) ( 56 -40 144 ) trak5x/base-base1a 64 0 0 0.25 0.25 134217728 0 0
 ( 72 -40 120 ) ( 72 -40 144 ) ( 56 -40 144 ) trak5x/base-base1a 64 416 0 0.25 0.25 134217728 0 0
 ( 72 -88 120 ) ( 72 -88 144 ) ( 72 -40 144 ) trak5x/panel-vertpanel1d 16.9473114014 417 90 0.0949999988 0.0949999988 134217728 0 0
@@ -20877,48 +20861,48 @@ terrain01x/ground-sand01
 }
 }
 {
-( 1840 304 592 ) ( 1840 1840 592 ) ( 1840 1840 184 ) common/caulk 592 0 0 -0.5 0.5 0 0 0
-( 1840 304 592 ) ( 1824 320 184 ) ( 1824 320 592 ) common/caulk 128 0 0 -0.5 0.5 0 0 0
-( 1824 320 592 ) ( 1824 1824 184 ) ( 1824 1824 592 ) skies/exosystem2 592 0 0 -0.5 0.5 0 0 0
-( 1840 1840 592 ) ( 1824 1824 592 ) ( 1824 1824 184 ) common/caulk 496 0 0 -0.5 0.5 0 0 0
-( 1840 304 592 ) ( 1824 1824 592 ) ( 1840 1840 592 ) common/caulk 496 176 180 0.5 0.5 0 0 0
-( 1840 304 184 ) ( 1840 1840 184 ) ( 1824 1824 184 ) common/caulk 496 176 180 0.5 0.5 0 0 0
+( 1944 304 592 ) ( 1944 1840 592 ) ( 1944 1840 184 ) common/caulk 80 0 0 -0.5 0.5 0 0 0
+( 1944 304 592 ) ( 1928 320 184 ) ( 1928 320 592 ) common/caulk 128 0 0 -0.5 0.5 0 0 0
+( 1928 320 592 ) ( 1928 1824 184 ) ( 1928 1824 592 ) skies/exosystem2 592 0 0 -0.5 0.5 0 0 0
+( 1944 1960 592 ) ( 1928 1944 592 ) ( 1928 1944 184 ) common/caulk 224 0 0 -0.5 0.5 0 0 0
+( 1944 304 592 ) ( 1928 1824 592 ) ( 1944 1840 592 ) common/caulk 192 176 180 0.5 0.5 0 0 0
+( 1944 304 184 ) ( 1944 1840 184 ) ( 1928 1824 184 ) common/caulk 192 176 180 0.5 0.5 0 0 0
 }
 {
-( 368 1840 592 ) ( 1840 1840 184 ) ( 1840 1840 592 ) common/caulk 176 0 0 0.5 0.5 0 0 0
-( 1840 1840 592 ) ( 1824 1824 184 ) ( 1824 1824 592 ) common/caulk 496 0 0 -0.5 0.5 0 0 0
-( 384 1824 592 ) ( 1824 1824 592 ) ( 1824 1824 184 ) skies/exosystem2 176 0 0 0.5 0.5 0 0 0
-( 368 1840 592 ) ( 384 1824 592 ) ( 384 1824 184 ) common/caulk 240 0 0 -0.5 0.5 0 0 0
-( 368 1840 592 ) ( 1840 1840 592 ) ( 1824 1824 592 ) common/caulk 496 80 -90 0.5 0.5 0 0 0
-( 368 1840 184 ) ( 1824 1824 184 ) ( 1840 1840 184 ) common/caulk 496 80 -90 0.5 0.5 0 0 0
+( 368 1952 592 ) ( 1840 1952 184 ) ( 1840 1952 592 ) common/caulk 176 8 0 0.5 0.5 0 0 0
+( 1944 1960 592 ) ( 1928 1944 184 ) ( 1928 1944 592 ) common/caulk 224 8 0 -0.5 0.5 0 0 0
+( 384 1944 592 ) ( 1824 1944 592 ) ( 1824 1944 184 ) skies/exosystem2 176 8 0 0.5 0.5 0 0 0
+( 368 1960 592 ) ( 384 1944 592 ) ( 384 1944 184 ) common/caulk 224 8 0 -0.5 0.5 0 0 0
+( 368 1960 592 ) ( 1840 1960 592 ) ( 1824 1944 592 ) common/caulk 224 88 -90 0.5 0.5 0 0 0
+( 368 1960 184 ) ( 1824 1944 184 ) ( 1840 1960 184 ) common/caulk 224 88 -90 0.5 0.5 0 0 0
 }
 {
-( 1248 304 592 ) ( 1840 304 592 ) ( 1840 304 184 ) common/caulk 80 0 0 -0.5 0.5 0 0 0
-( 1248 304 592 ) ( 1248 320 184 ) ( 1248 320 592 ) skies/exosystem2 896 0 0 -0.5 0.5 0 0 0
-( 1248 320 592 ) ( 1824 320 184 ) ( 1824 320 592 ) skies/exosystem2 592 0 0 -0.5 0.5 0 0 0
-( 1840 304 592 ) ( 1824 320 592 ) ( 1824 320 184 ) common/caulk 160 0 0 0.5 0.5 0 0 0
-( 1248 304 592 ) ( 1824 320 592 ) ( 1840 304 592 ) common/caulk 160 176 90 0.5 0.5 0 0 0
-( 1248 304 184 ) ( 1840 304 184 ) ( 1824 320 184 ) common/caulk 160 176 90 0.5 0.5 0 0 0
+( 1248 304 592 ) ( 1840 304 592 ) ( 1840 304 184 ) common/caulk 80 8 0 -0.5 0.5 0 0 0
+( 1248 304 592 ) ( 1248 320 184 ) ( 1248 320 592 ) skies/exosystem2 896 8 0 -0.5 0.5 0 0 0
+( 1352 320 592 ) ( 1928 320 184 ) ( 1928 320 592 ) skies/exosystem2 800 8 0 -0.5 0.5 0 0 0
+( 1944 304 592 ) ( 1928 320 592 ) ( 1928 320 184 ) common/caulk 160 8 0 0.5 0.5 0 0 0
+( 1248 304 592 ) ( 1824 320 592 ) ( 1840 304 592 ) common/caulk 160 184 90 0.5 0.5 0 0 0
+( 1248 304 184 ) ( 1840 304 184 ) ( 1824 320 184 ) common/caulk 160 184 90 0.5 0.5 0 0 0
 }
 {
 ( 368 1232 592 ) ( 368 1840 184 ) ( 368 1840 592 ) common/caulk 224 0 0 0.5 0.5 0 0 0
-( 368 1840 592 ) ( 384 1824 184 ) ( 384 1824 592 ) common/caulk 48 0 0 0.5 0.5 0 0 0
+( 368 1960 592 ) ( 384 1944 184 ) ( 384 1944 592 ) common/caulk 64 0 0 0.5 0.5 0 0 0
 ( 384 1232 592 ) ( 384 1824 592 ) ( 384 1824 184 ) skies/exosystem2 992 0 0 0.5 0.5 0 0 0
 ( 368 1232 592 ) ( 384 1232 184 ) ( 368 1232 184 ) skies/exosystem2 560 0 0 0.5 0.5 0 0 0
 ( 368 1232 592 ) ( 368 1840 592 ) ( 384 1824 592 ) common/caulk 48 32 0 0.5 0.5 0 0 0
 ( 368 1232 184 ) ( 384 1824 184 ) ( 368 1840 184 ) common/caulk 48 32 0 0.5 0.5 0 0 0
 }
 {
-( 1232 320 592 ) ( 1232 1824 576 ) ( 1232 1824 592 ) common/caulk 144 0 0 0.5 0.5 0 0 0
-( 1232 1824 592 ) ( 1824 1824 576 ) ( 1824 1824 592 ) common/caulk 864 0 0 0.5 0.5 0 0 0
-( 1824 320 592 ) ( 1824 1824 592 ) ( 1824 1824 576 ) skies/exosystem2 144 0 0 0.5 0.5 0 0 0
-( 1232 320 592 ) ( 1824 320 592 ) ( 1824 320 576 ) skies/exosystem2 880 0 0 0.5 0.5 0 0 0
-( 1232 1824 592 ) ( 1824 1824 592 ) ( 1824 320 592 ) common/caulk 864 112 0 0.5 0.5 0 0 0
-( 1232 320 576 ) ( 1824 320 576 ) ( 1824 1824 576 ) skies/exosystem2 864 112 0 0.5 0.5 0 0 0
+( 1232 320 592 ) ( 1232 1824 576 ) ( 1232 1824 592 ) common/caulk 144 8 0 0.5 0.5 0 0 0
+( 1232 1944 592 ) ( 1824 1944 576 ) ( 1824 1944 592 ) common/caulk 96 8 0 0.5 0.5 0 0 0
+( 1928 320 592 ) ( 1928 1824 592 ) ( 1928 1824 576 ) skies/exosystem2 144 8 0 0.5 0.5 0 0 0
+( 1232 320 592 ) ( 1824 320 592 ) ( 1824 320 576 ) skies/exosystem2 880 8 0 0.5 0.5 0 0 0
+( 1232 1824 592 ) ( 1824 1824 592 ) ( 1824 320 592 ) common/caulk 864 120 0 0.5 0.5 0 0 0
+( 1232 320 576 ) ( 1824 320 576 ) ( 1824 1824 576 ) skies/exosystem2 864 120 0 0.5 0.5 0 0 0
 }
 {
 ( 384 1232 592 ) ( 384 1824 576 ) ( 384 1824 592 ) skies/exosystem2 992 0 0 0.5 0.5 0 0 0
-( 384 1824 592 ) ( 1232 1824 576 ) ( 1232 1824 592 ) common/caulk 16 0 0 0.5 0.5 0 0 0
+( 384 1944 592 ) ( 1232 1944 576 ) ( 1232 1944 592 ) common/caulk 16 0 0 0.5 0.5 0 0 0
 ( 1232 1232 592 ) ( 1232 1824 592 ) ( 1232 1824 576 ) common/caulk 992 0 0 0.5 0.5 0 0 0
 ( 1232 1232 592 ) ( 640 1232 576 ) ( 640 1232 592 ) common/caulk 16 0 0 0.5 0.5 0 0 0
 ( 1232 1232 592 ) ( 384 1824 592 ) ( 1232 1824 592 ) common/caulk 16 32 0 0.5 0.5 0 0 0
@@ -25117,7 +25101,7 @@ trak5x/base-pipe1b
 ( 1616 1616 280 ) ( 1616 1520 280 ) ( 1520 1616 280 ) exx/floor-metal02 0 0 0 0.25 0.25 0 0 0
 ( 1616 1616 280 ) ( 1520 1616 280 ) ( 1616 1616 264 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1616 1616 280 ) ( 1616 1616 264 ) ( 1616 1520 280 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 1520 1520 264 ) ( 1616 1520 264 ) ( 1520 1616 264 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1520 1520 264 ) ( 1616 1520 264 ) ( 1520 1616 264 ) exx/floor-metal02 0 0 0 0.25 0.25 0 0 0
 ( 1520 1520 264 ) ( 1520 1520 280 ) ( 1616 1520 264 ) exx/trim-steptop01 128 32 0 0.25 0.25 0 0 0
 ( 1520 1520 264 ) ( 1520 1616 264 ) ( 1520 1520 280 ) exx/trim-steptop01 256 32 0 0.25 0.25 0 0 0
 }
@@ -25512,7 +25496,7 @@ trak5x/trim-trim1a
 "targetname" "t340"
 }
 {
-"classname" "item_armor_large"
+"classname" "item_armor_mega"
 "origin" "1120.000000 1024.000000 256.000000"
 }
 {
@@ -30167,7 +30151,7 @@ exx/base-metal04
 "_color" "1 0.879118 0.632197"
 }
 {
-"classname" "item_health_large"
+"classname" "item_health_big"
 "origin" "1248.000000 64.000000 256.000000"
 }
 {
@@ -32859,7 +32843,7 @@ exx/wall-metalrib01
 }
 {
 "classname" "trigger_teleport"
-"target" "teletarget3"
+"target" "teletarget1"
 {
 ( -1032 280 304 ) ( -1032 232 304 ) ( -1032 232 184 ) common/trigger 0 240 0 0.5 0.5 0 7 0
 ( -968 280 304 ) ( -1032 280 304 ) ( -1032 280 184 ) common/trigger 16 240 0 0.5 0.5 0 7 0
@@ -32879,7 +32863,7 @@ exx/wall-metalrib01
 "classname" "info_teleport_destination"
 "angle" "-90.000000"
 "origin" "-1000.000000 208.000000 200.000000"
-"targetname" "teletarget5"
+"targetname" "teletarget2"
 }
 {
 "classname" "weapon_rocketlauncher"
@@ -32943,17 +32927,6 @@ exx/wall-metalrib01
 "volume" "0.10"
 }
 {
-"classname" "func_illusionary"
-{
-( -968 264 304 ) ( -1032 264 304 ) ( -1032 264 288 ) trak5x/misc-glass 80 160 0 0.5 0.5 134217728 274 0
-( -968 248 304 ) ( -968 264 304 ) ( -968 264 288 ) common/caulk 160 160 0 -0.5 0.5 134217728 274 0
-( -1032 248 304 ) ( -968 248 304 ) ( -968 248 288 ) trak5x/misc-glass 80 160 0 0.5 0.5 134217728 274 0
-( -1032 264 304 ) ( -1032 248 304 ) ( -1032 248 288 ) common/caulk 160 160 0 -0.5 0.5 134217728 274 0
-( -1032 264 304 ) ( -968 264 304 ) ( -968 248 304 ) common/caulk 160 176 -90 0.5 0.5 134217728 274 0
-( -968 232 184 ) ( -968 248 184 ) ( -1032 248 184 ) common/caulk 160 176 -90 0.5 0.5 134217728 274 0
-}
-}
-{
 "classname" "light"
 "light" "25"
 "origin" "-1184.000000 128.000000 184.000000"
@@ -33024,72 +32997,12 @@ exx/wall-metalrib01
 "origin" "-84.000000 -572.000000 332.000000"
 }
 {
-"classname" "func_bobbing"
-{
-( -120 -456 312 ) ( -112 -464 312 ) ( -120 -456 376 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
-( -144 -464 312 ) ( -136 -456 312 ) ( -144 -464 376 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
-( -136 -480 312 ) ( -144 -472 312 ) ( -136 -480 376 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
-( -112 -472 312 ) ( -120 -480 312 ) ( -112 -472 376 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
-( -112 -464 312 ) ( -112 -456 320 ) ( -144 -464 312 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
-( -112 -480 320 ) ( -112 -472 312 ) ( -144 -480 320 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
-( -112 -472 376 ) ( -112 -480 368 ) ( -144 -472 376 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
-( -112 -456 368 ) ( -112 -464 376 ) ( -144 -456 368 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
-( -112 -456 472 ) ( -144 -456 472 ) ( -144 -456 240 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
-( -112 -480 472 ) ( -112 -456 472 ) ( -112 -456 240 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
-( -144 -480 472 ) ( -112 -480 472 ) ( -112 -480 240 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
-( -144 -456 472 ) ( -144 -480 472 ) ( -144 -480 240 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
-( -144 -464 376 ) ( -112 -464 376 ) ( -112 -488 376 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
-( -112 -480 312 ) ( -112 -456 312 ) ( -144 -456 312 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
-}
-}
-{
-"classname" "func_bobbing"
-{
-( -56 -456 328 ) ( -48 -464 328 ) ( -56 -456 392 ) exx/wall-metalrib01 48 112 0 -0.25 0.25 0 0 0
-( -80 -464 328 ) ( -72 -456 328 ) ( -80 -464 392 ) exx/wall-metalrib01 48 112 0 -0.25 0.25 0 0 0
-( -72 -480 328 ) ( -80 -472 328 ) ( -72 -480 392 ) exx/wall-metalrib01 48 112 0 -0.25 0.25 0 0 0
-( -48 -472 328 ) ( -56 -480 328 ) ( -48 -472 392 ) exx/wall-metalrib01 48 112 0 -0.25 0.25 0 0 0
-( -48 -464 328 ) ( -48 -456 336 ) ( -80 -464 328 ) exx/wall-metalrib01 304 48 0 -0.25 0.25 0 0 0
-( -48 -480 336 ) ( -48 -472 328 ) ( -80 -480 336 ) exx/wall-metalrib01 304 48 0 -0.25 0.25 0 0 0
-( -48 -472 392 ) ( -48 -480 384 ) ( -80 -472 392 ) exx/wall-metalrib01 304 48 0 -0.25 0.25 0 0 0
-( -48 -456 384 ) ( -48 -464 392 ) ( -80 -456 384 ) exx/wall-metalrib01 304 48 0 -0.25 0.25 0 0 0
-( -48 -456 488 ) ( -80 -456 488 ) ( -80 -456 256 ) exx/wall-metalrib01 304 112 0 -0.25 0.25 0 0 0
-( -48 -480 488 ) ( -48 -456 488 ) ( -48 -456 256 ) exx/wall-metalrib01 48 112 0 -0.25 0.25 0 0 0
-( -80 -480 488 ) ( -48 -480 488 ) ( -48 -480 256 ) exx/wall-metalrib01 304 112 0 -0.25 0.25 0 0 0
-( -80 -456 488 ) ( -80 -480 488 ) ( -80 -480 256 ) exx/wall-metalrib01 48 112 0 -0.25 0.25 0 0 0
-( -80 -464 392 ) ( -48 -464 392 ) ( -48 -488 392 ) exx/wall-metalrib01 304 48 0 -0.25 0.25 0 0 0
-( -48 -480 328 ) ( -48 -456 328 ) ( -80 -456 328 ) exx/wall-metalrib01 304 48 0 -0.25 0.25 0 0 0
-}
-}
-{
 "classname" "target_speaker"
 "origin" "-96.000000 -480.000000 352.000000"
 "noise" "sound/machines/pumps_looped.ogg"
 "volume" "0.5"
 }
 {
-"classname" "func_bobbing"
-{
-( -120 -464 384 ) ( -144 -464 384 ) ( -144 -464 312 ) common/origin 240 48 0 0.5 0.5 0 0 0
-( -120 -472 384 ) ( -120 -464 384 ) ( -120 -464 312 ) common/origin 208 48 0 -0.5 0.5 0 0 0
-( -144 -472 384 ) ( -120 -472 384 ) ( -120 -472 312 ) common/origin 240 48 0 0.5 0.5 0 0 0
-( -136 -464 384 ) ( -136 -472 384 ) ( -136 -472 312 ) common/origin 208 48 0 -0.5 0.5 0 0 0
-( -144 -464 384 ) ( -120 -464 384 ) ( -120 -472 384 ) common/origin 208 16 -90 0.5 0.5 0 0 0
-( -120 -472 304 ) ( -120 -464 304 ) ( -144 -464 304 ) common/origin 208 16 -90 0.5 0.5 0 0 0
-}
-}
-{
-"classname" "func_bobbing"
-{
-( -56 -464 384 ) ( -80 -464 384 ) ( -80 -464 312 ) common/origin 112 48 0 0.5 0.5 0 0 0
-( -56 -472 384 ) ( -56 -464 384 ) ( -56 -464 312 ) common/origin 208 48 0 -0.5 0.5 0 0 0
-( -80 -472 384 ) ( -56 -472 384 ) ( -56 -472 312 ) common/origin 112 48 0 0.5 0.5 0 0 0
-( -72 -464 384 ) ( -72 -472 384 ) ( -72 -472 312 ) common/origin 208 48 0 -0.5 0.5 0 0 0
-( -80 -464 384 ) ( -56 -464 384 ) ( -56 -472 384 ) common/origin 208 144 -90 0.5 0.5 0 0 0
-( -56 -472 304 ) ( -56 -464 304 ) ( -80 -464 304 ) common/origin 208 144 -90 0.5 0.5 0 0 0
-}
-}
-{
 "classname" "item_cells"
 "origin" "360.000000 -64.000000 272.000000"
 }
@@ -33156,49 +33069,6 @@ exx/base-metal06rust
 }
 }
 {
-"classname" "weapon_nex"
-"origin" "1560.000000 1560.000000 288.000000"
-}
-{
-"classname" "func_group"
-{
-patchDef2
-{
-trak5x/misc-glass
-( 9 3 0 0 0 )
-(
-( ( 1536 1548 256 0 0 ) ( 1536 1548 224 0 -0.5 ) ( 1536 1548 192 0 -1 ) )
-( ( 1548 1548 256 0.1875 0 ) ( 1548 1548 224 0.1875 -0.5 ) ( 1548 1548 192 0.1875 -1 ) )
-( ( 1548 1536 256 0.375 0 ) ( 1548 1536 224 0.375 -0.5 ) ( 1548 1536 192 0.375 -1 ) )
-( ( 1548 1524 256 0.5625 0 ) ( 1548 1524 224 0.5625 -0.5 ) ( 1548 1524 192 0.5625 -1 ) )
-( ( 1536 1524 256 0.75 0 ) ( 1536 1524 224 0.75 -0.5 ) ( 1536 1524 192 0.75 -1 ) )
-( ( 1524 1524 256 0.9375 0 ) ( 1524 1524 224 0.9375 -0.5 ) ( 1524 1524 192 0.9375 -1 ) )
-( ( 1524 1536 256 1.125 0 ) ( 1524 1536 224 1.125 -0.5 ) ( 1524 1536 192 1.125 -1 ) )
-( ( 1524 1548 256 1.3125 0 ) ( 1524 1548 224 1.3125 -0.5 ) ( 1524 1548 192 1.3125 -1 ) )
-( ( 1536 1548 256 1.5 0 ) ( 1536 1548 224 1.5 -0.5 ) ( 1536 1548 192 1.5 -1 ) )
-)
-}
-}
-{
-patchDef2
-{
-exx/trim-psimple04
-( 9 3 0 0 0 )
-(
-( ( 1536 1550 264 0 0 ) ( 1536 1550 256 0.4999999702 0 ) ( 1536 1550 248 0.9999999404 0 ) )
-( ( 1550 1550 264 0 0.21875 ) ( 1550 1550 256 0.5 0.2187499851 ) ( 1550 1550 248 0.9999998808 0.2187499851 ) )
-( ( 1550 1536 264 0 0.4375 ) ( 1550 1536 256 0.5000001788 0.4374999702 ) ( 1550 1536 248 1 0.4374999702 ) )
-( ( 1550 1522 264 0 0.65625 ) ( 1550 1522 256 0.499999851 0.65625 ) ( 1550 1522 248 1 0.65625 ) )
-( ( 1536 1522 264 0 0.875 ) ( 1536 1522 256 0.499999851 0.8749999404 ) ( 1536 1522 248 1.0000003576 0.8749999404 ) )
-( ( 1522 1522 264 0 1.09375 ) ( 1522 1522 256 0.499999851 1.0937498808 ) ( 1522 1522 248 0.999999702 1.09375 ) )
-( ( 1522 1536 264 0 1.3125 ) ( 1522 1536 256 0.5000005364 1.3125 ) ( 1522 1536 248 0.999999702 1.3125 ) )
-( ( 1522 1550 264 0 1.5312498808 ) ( 1522 1550 256 0.5000005364 1.5312498808 ) ( 1522 1550 248 1.0000010729 1.5312498808 ) )
-( ( 1536 1550 264 0 1.75 ) ( 1536 1550 256 0.4999991953 1.7499998808 ) ( 1536 1550 248 0.999999702 1.7499998808 ) )
-)
-}
-}
-}
-{
 "classname" "info_player_deathmatch"
 "angle" "270"
 "origin" "64.000000 -616.000000 64.000000"
@@ -33219,7 +33089,7 @@ exx/trim-psimple04
 }
 {
 "classname" "info_player_deathmatch"
-"origin" "-184.000000 -64.000000 -344.000000"
+"origin" "-184.000000 -64.000000 -280.000000"
 "angle" "-179.999985"
 }
 {
@@ -33260,3 +33130,79 @@ exx/trim-psimple04
 "origin" "368.595398 -378.493958 172.533508"
 "angles" "13.3319092 134.412231 0"
 }
+{
+"classname" "func_illusionary"
+{
+( 56 -32 104 ) ( 56 -96 104 ) ( 56 -96 88 ) trak5x/misc-glass 0 144 0 0.5 0.5 134217728 274 0
+( 72 -32 104 ) ( 56 -32 104 ) ( 56 -32 88 ) common/caulk 32 144 0 0.5 0.5 134217728 274 0
+( 72 -96 104 ) ( 72 -32 104 ) ( 72 -32 88 ) trak5x/misc-glass 0 144 0 0.5 0.5 134217728 274 0
+( 56 -96 104 ) ( 72 -96 104 ) ( 72 -96 88 ) common/caulk 32 144 0 0.5 0.5 134217728 274 0
+( 56 -96 104 ) ( 56 -32 104 ) ( 72 -32 104 ) common/caulk 32 0 0 0.5 0.5 134217728 274 0
+( 88 -32 -16 ) ( 72 -32 -16 ) ( 72 -96 -16 ) common/caulk 32 0 0 0.5 0.5 134217728 274 0
+}
+}
+{
+"classname" "func_illusionary"
+{
+( -808 -768 200 ) ( -808 -832 200 ) ( -808 -832 184 ) trak5x/misc-glass 192 80 0 0.5 0.5 134217728 274 0
+( -792 -768 200 ) ( -808 -768 200 ) ( -808 -768 184 ) common/caulk 224 80 0 0.5 0.5 134217728 274 0
+( -792 -832 200 ) ( -792 -768 200 ) ( -792 -768 184 ) trak5x/misc-glass 192 80 0 0.5 0.5 134217728 274 0
+( -808 -832 200 ) ( -792 -832 200 ) ( -792 -832 184 ) common/caulk 224 80 0 0.5 0.5 134217728 274 0
+( -808 -832 200 ) ( -808 -768 200 ) ( -792 -768 200 ) common/caulk 224 64 0 0.5 0.5 134217728 274 0
+( -776 -768 80 ) ( -792 -768 80 ) ( -792 -832 80 ) common/caulk 224 64 0 0.5 0.5 134217728 274 0
+}
+}
+{
+"classname" "func_bobbing"
+{
+( -120 -464 384 ) ( -144 -464 384 ) ( -144 -464 312 ) common/origin 240 48 0 0.5 0.5 0 0 0
+( -120 -472 384 ) ( -120 -464 384 ) ( -120 -464 312 ) common/origin 208 48 0 -0.5 0.5 0 0 0
+( -144 -472 384 ) ( -120 -472 384 ) ( -120 -472 312 ) common/origin 240 48 0 0.5 0.5 0 0 0
+( -136 -464 384 ) ( -136 -472 384 ) ( -136 -472 312 ) common/origin 208 48 0 -0.5 0.5 0 0 0
+( -144 -464 384 ) ( -120 -464 384 ) ( -120 -472 384 ) common/origin 208 16 -90 0.5 0.5 0 0 0
+( -120 -472 304 ) ( -120 -464 304 ) ( -144 -464 304 ) common/origin 208 16 -90 0.5 0.5 0 0 0
+}
+{
+( -120 -456 312 ) ( -112 -464 312 ) ( -120 -456 376 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
+( -144 -464 312 ) ( -136 -456 312 ) ( -144 -464 376 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
+( -136 -480 312 ) ( -144 -472 312 ) ( -136 -480 376 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
+( -112 -472 312 ) ( -120 -480 312 ) ( -112 -472 376 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
+( -112 -464 312 ) ( -112 -456 320 ) ( -144 -464 312 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
+( -112 -480 320 ) ( -112 -472 312 ) ( -144 -480 320 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
+( -112 -472 376 ) ( -112 -480 368 ) ( -144 -472 376 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
+( -112 -456 368 ) ( -112 -464 376 ) ( -144 -456 368 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
+( -112 -456 472 ) ( -144 -456 472 ) ( -144 -456 240 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
+( -112 -480 472 ) ( -112 -456 472 ) ( -112 -456 240 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
+( -144 -480 472 ) ( -112 -480 472 ) ( -112 -480 240 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
+( -144 -456 472 ) ( -144 -480 472 ) ( -144 -480 240 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
+( -144 -464 376 ) ( -112 -464 376 ) ( -112 -488 376 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
+( -112 -480 312 ) ( -112 -456 312 ) ( -144 -456 312 ) exx/wall-metalrib01 48 48 0 -0.25 0.25 0 0 0
+}
+}
+{
+"classname" "func_bobbing"
+{
+( -56 -464 384 ) ( -80 -464 384 ) ( -80 -464 312 ) common/origin 112 48 0 0.5 0.5 0 0 0
+( -56 -472 384 ) ( -56 -464 384 ) ( -56 -464 312 ) common/origin 208 48 0 -0.5 0.5 0 0 0
+( -80 -472 384 ) ( -56 -472 384 ) ( -56 -472 312 ) common/origin 112 48 0 0.5 0.5 0 0 0
+( -72 -464 384 ) ( -72 -472 384 ) ( -72 -472 312 ) common/origin 208 48 0 -0.5 0.5 0 0 0
+( -80 -464 384 ) ( -56 -464 384 ) ( -56 -472 384 ) common/origin 208 144 -90 0.5 0.5 0 0 0
+( -56 -472 304 ) ( -56 -464 304 ) ( -80 -464 304 ) common/origin 208 144 -90 0.5 0.5 0 0 0
+}
+{
+( -56 -456 328 ) ( -48 -464 328 ) ( -56 -456 392 ) exx/wall-metalrib01 48 112 0 -0.25 0.25 0 0 0
+( -80 -464 328 ) ( -72 -456 328 ) ( -80 -464 392 ) exx/wall-metalrib01 48 112 0 -0.25 0.25 0 0 0
+( -72 -480 328 ) ( -80 -472 328 ) ( -72 -480 392 ) exx/wall-metalrib01 48 112 0 -0.25 0.25 0 0 0
+( -48 -472 328 ) ( -56 -480 328 ) ( -48 -472 392 ) exx/wall-metalrib01 48 112 0 -0.25 0.25 0 0 0
+( -48 -464 328 ) ( -48 -456 336 ) ( -80 -464 328 ) exx/wall-metalrib01 304 48 0 -0.25 0.25 0 0 0
+( -48 -480 336 ) ( -48 -472 328 ) ( -80 -480 336 ) exx/wall-metalrib01 304 48 0 -0.25 0.25 0 0 0
+( -48 -472 392 ) ( -48 -480 384 ) ( -80 -472 392 ) exx/wall-metalrib01 304 48 0 -0.25 0.25 0 0 0
+( -48 -456 384 ) ( -48 -464 392 ) ( -80 -456 384 ) exx/wall-metalrib01 304 48 0 -0.25 0.25 0 0 0
+( -48 -456 488 ) ( -80 -456 488 ) ( -80 -456 256 ) exx/wall-metalrib01 304 112 0 -0.25 0.25 0 0 0
+( -48 -480 488 ) ( -48 -456 488 ) ( -48 -456 256 ) exx/wall-metalrib01 48 112 0 -0.25 0.25 0 0 0
+( -80 -480 488 ) ( -48 -480 488 ) ( -48 -480 256 ) exx/wall-metalrib01 304 112 0 -0.25 0.25 0 0 0
+( -80 -456 488 ) ( -80 -480 488 ) ( -80 -480 256 ) exx/wall-metalrib01 48 112 0 -0.25 0.25 0 0 0
+( -80 -464 392 ) ( -48 -464 392 ) ( -48 -488 392 ) exx/wall-metalrib01 304 48 0 -0.25 0.25 0 0 0
+( -48 -480 328 ) ( -48 -456 328 ) ( -80 -456 328 ) exx/wall-metalrib01 304 48 0 -0.25 0.25 0 0 0
+}
+}