Merge branch 'master' into fruitiex/runningmanctf

diff --git a/maps/g-23.mapinfo b/maps/g-23.mapinfo
index 9e43f359cd2ab3370b490605c37e80fc857650f3..b89a1f0775b929136496be37a83bf65e1f87c1c2 100644 (file)
--- a/maps/g-23.mapinfo
+++ b/maps/g-23.mapinfo
@@ -6,4 +6,6 @@ gametype dm
 gametype lms
 gametype arena
 gametype rune
-cdtrack 6
+gametype freezetag
+gametype keepaway
+cdtrack 2

diff --git a/maps/glowplant.mapinfo b/maps/glowplant.mapinfo
index 73100a20aeafdd69a361fe8e30c16a0d69753ec9..a64570135401e043fea642bebd9f02272b8f347a 100644 (file)
--- a/maps/glowplant.mapinfo
+++ b/maps/glowplant.mapinfo
@@ -11,6 +11,8 @@ gametype lms
 gametype arena
 gametype ca
 gametype kh
+gametype freezetag
+gametype keepaway
 // optional: fog density red green blue alpha mindist maxdist
 // optional: settemp_for_type (all|gametypename) cvarname value
 // optional: clientsettemp_for_type (all|gametypename) cvarname value

diff --git a/maps/red-planet.map b/maps/red-planet.map
index a129d4b4688b9d8175873a7ff26c8a536595530e..e77e60ee472dccdcc9d8362ba6082b8a7b03366f 100644 (file)
--- a/maps/red-planet.map
+++ b/maps/red-planet.map
@@ -11110,12 +11110,12 @@ exx/panel-metal01c
 ( -4560.2875976562 168.4975738525 136 ) ( -4560.2875976562 168.4975738525 200 ) ( -4564.2875976562 161.5693817139 200 ) common/caulk 126.6169586182 168 0 0.769800365 0.5 134217728 0 0
 }
 {
-( -4609.359375 67.5027313232 200 ) ( -4616.2875976562 71.5027313232 200 ) ( -4612.2875976562 78.4309387207 200 ) common/caulk 131.1476135254 227.5594024658 -30 0.5 0.5 134217728 0 0
-( -4605.359375 74.4309387207 136 ) ( -4612.2875976562 78.4309387207 200 ) ( -4612.2875976562 78.4309387207 136 ) exx/floor-simplines 300.3607788086 424 0 0.769800365 0.5 134217728 0 0
-( -4609.359375 67.5027313232 136 ) ( -4609.359375 67.5027313232 200 ) ( -4605.359375 74.4309387207 200 ) exx/base-metal01 253.2339172363 400 0 0.3849001825 0.25 134217728 0 0
-( -4609.359375 67.5027313232 136 ) ( -4612.2875976562 78.4309387207 136 ) ( -4616.2875976562 71.5027313232 136 ) common/caulk 131.1476135254 227.5594024658 -30 0.5 0.5 134217728 0 0
-( -4609.359375 67.5027313232 200 ) ( -4616.2875976562 71.5027313232 136 ) ( -4616.2875976562 71.5027313232 200 ) exx/base-metal01 88.7215499878 400 0 0.3849001825 0.25 134217728 0 0
-( -4612.2875976562 78.4309387207 136 ) ( -4612.2875976562 78.4309387207 200 ) ( -4616.2875976562 71.5027313232 200 ) common/caulk 126.6169586182 168 0 0.769800365 0.5 134217728 0 0
+( -4612.2875976562 -78.4309387207 200 ) ( -4616.2875976562 -71.5027313232 200 ) ( -4609.359375 -67.5027313232 200 ) common/clip 131.1476135254 227.559387207 30 0.5 -0.5 134217728 0 0
+( -4562.2875976562 -160.4309387207 136 ) ( -4562.2875976562 -160.4309387207 200 ) ( -4555.359375 -156.4309387207 136 ) common/clip 235.4088745117 168 0 0.769800365 0.5 134217728 0 0
+( -4605.359375 -74.4309387207 200 ) ( -4609.359375 -67.5027313232 200 ) ( -4609.359375 -67.5027313232 136 ) common/clip 253.2339477539 144 0 -0.3849001825 0.25 134217728 0 0
+( -4616.2875976562 -71.5027313232 136 ) ( -4612.2875976562 -78.4309387207 136 ) ( -4609.359375 -67.5027313232 136 ) common/clip 131.1476135254 227.559387207 30 0.5 -0.5 134217728 0 0
+( -4614.2875976562 -79.5027313232 200 ) ( -4614.2875976562 -79.5027313232 136 ) ( -4607.359375 -75.5027313232 200 ) common/clip 83.5253982544 144 0 0.3849001825 0.25 134217728 0 0
+( -4616.2875976562 -71.5027313232 200 ) ( -4612.2875976562 -78.4309387207 200 ) ( -4612.2875976562 -78.4309387207 136 ) common/clip 126.616973877 168 0 -0.769800365 0.5 134217728 0 0
 }
 {
 ( -4609.359375 67.5027313232 136 ) ( -4616.2875976562 71.5027313232 136 ) ( -4560.2875976562 168.4975738525 136 ) exx/floor-simplines 387.1476135254 227.5594024658 -30 0.5 0.5 134217728 0 0
@@ -36160,6 +36160,22 @@ trak5x/base-pipe1a
 ( -768 -64 320 ) ( -736 64 288 ) ( -768 64 320 ) exx/trim-steptop01 0 -0 90 0.5 0.5 0 0 0
 ( -632 192 64 ) ( -624 192 -64 ) ( -632 192 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
+{
+( -4609.359375 67.5027313232 200 ) ( -4616.2875976562 71.5027313232 200 ) ( -4612.2875976562 78.4309387207 200 ) common/caulk 131.1476135254 227.5594024658 -30 0.5 0.5 134217728 0 0
+( -4605.359375 74.4309387207 136 ) ( -4612.2875976562 78.4309387207 200 ) ( -4612.2875976562 78.4309387207 136 ) exx/floor-simplines 300.3607788086 424 0 0.769800365 0.5 134217728 0 0
+( -4609.359375 67.5027313232 136 ) ( -4609.359375 67.5027313232 200 ) ( -4605.359375 74.4309387207 200 ) exx/base-metal01 253.2339172363 400 0 0.3849001825 0.25 134217728 0 0
+( -4609.359375 67.5027313232 136 ) ( -4612.2875976562 78.4309387207 136 ) ( -4616.2875976562 71.5027313232 136 ) common/caulk 131.1476135254 227.5594024658 -30 0.5 0.5 134217728 0 0
+( -4609.359375 67.5027313232 200 ) ( -4616.2875976562 71.5027313232 136 ) ( -4616.2875976562 71.5027313232 200 ) exx/base-metal01 88.7215499878 400 0 0.3849001825 0.25 134217728 0 0
+( -4612.2875976562 78.4309387207 136 ) ( -4612.2875976562 78.4309387207 200 ) ( -4616.2875976562 71.5027313232 200 ) common/caulk 126.6169586182 168 0 0.769800365 0.5 134217728 0 0
+}
+{
+( -4609.359375 67.5027313232 200 ) ( -4616.2875976562 71.5027313232 200 ) ( -4612.2875976562 78.4309387207 200 ) common/clip 131.1476135254 227.5594024658 -30 0.5 0.5 134217728 0 0
+( -4555.359375 156.4309387207 136 ) ( -4562.2875976562 160.4309387207 200 ) ( -4562.2875976562 160.4309387207 136 ) common/clip 235.4088745117 424 0 0.769800365 0.5 134217728 0 0
+( -4609.359375 67.5027313232 136 ) ( -4609.359375 67.5027313232 200 ) ( -4605.359375 74.4309387207 200 ) common/clip 253.2339172363 400 0 0.3849001825 0.25 134217728 0 0
+( -4609.359375 67.5027313232 136 ) ( -4612.2875976562 78.4309387207 136 ) ( -4616.2875976562 71.5027313232 136 ) common/clip 131.1476135254 227.5594024658 -30 0.5 0.5 134217728 0 0
+( -4607.359375 75.5027313232 200 ) ( -4614.2875976562 79.5027313232 136 ) ( -4614.2875976562 79.5027313232 200 ) common/clip 83.5253982544 400 0 0.3849001825 0.25 134217728 0 0
+( -4612.2875976562 78.4309387207 136 ) ( -4612.2875976562 78.4309387207 200 ) ( -4616.2875976562 71.5027313232 200 ) common/clip 126.6169586182 168 0 0.769800365 0.5 134217728 0 0
+}
 }
 {
 "classname" "light"
@@ -36347,8 +36363,8 @@ trak5x/base-pipe1a
 "targetname" "door_a1"
 {
 ( -3608 336 184 ) ( -3608 320 184 ) ( -3616 336 184 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -3608 336 184 ) ( -3616 336 184 ) ( -3608 336 176 ) exx/base-metal03 0 128 0 0.125 0.125 134217728 0 0
-( -3616 320 176 ) ( -3616 320 184 ) ( -3608 320 176 ) exx/base-metal03 0 128 0 0.125 0.125 134217728 0 0
+( -3608 334 184 ) ( -3616 334 184 ) ( -3608 334 176 ) exx/base-metal03 0 128 0 0.125 0.125 134217728 0 0
+( -3616 322 176 ) ( -3616 322 184 ) ( -3608 322 176 ) exx/base-metal03 0 128 0 0.125 0.125 134217728 0 0
 ( -3616 320 176 ) ( -3616 336 176 ) ( -3616 320 184 ) common/caulk 0 32 0 0.5 0.5 134217728 0 0
 ( -3600 64 192 ) ( -3608 64 184 ) ( -3600 -64 192 ) trak5x/trim-basictrim1b 0 128 90 0.125 0.125 134217728 0 0
 }

diff --git a/maps/red-planet.mapinfo b/maps/red-planet.mapinfo
index 8a0d986f2be0b2a783753524b5c29da61a8585c9..b947d4d7e9e332c867a898201078f213a840845a 100644 (file)
--- a/maps/red-planet.mapinfo
+++ b/maps/red-planet.mapinfo
@@ -1,7 +1,7 @@
 title Red Planet
 description A large facility on a red dusty planet
 author Mircea Kitsune, Cuinnton, FruitieX
-cdtrack 1
+cdtrack 7
 has weapons
 gametype dm
 gametype tdm
@@ -11,3 +11,5 @@ gametype arena
 gametype ca
 gametype dom
 gametype kh
+gametype freezetag
+gametype keepaway

diff --git a/maps/stormkeep.map b/maps/stormkeep.map
index cf8ffce1dc6dec86901f66ba45c4317d21089e0e..da5f5ca42f0703f1f5f9c34be4698ef9e34bbfdc 100644 (file)
--- a/maps/stormkeep.map
+++ b/maps/stormkeep.map
@@ -495,7 +495,7 @@
 ( -584 432 -40 ) ( -896 432 -40 ) ( -896 432 -464 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( -576 192 -40 ) ( -576 432 -40 ) ( -576 432 -464 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( -904 -48 -40 ) ( -592 -48 -40 ) ( -592 -48 -464 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( -896 192 -96 ) ( -896 432 -96 ) ( -584 432 -96 ) map_stormkeep/rock 0 0 0 0.25 0.25 0 0 0
+( -896 192 -80 ) ( -896 432 -80 ) ( -584 432 -80 ) map_stormkeep/rock 0 0 0 0.25 0.25 0 0 0
 ( -576 433 -103 ) ( -888 433 -103 ) ( -888 193 -103 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 }
 {
@@ -644,7 +644,7 @@
 }
 {
 ( 1792 -64 -256 ) ( 1280 -512 -256 ) ( 1792 -512 -256 ) liquids_lava/lava0 0 0 0 0.5 0.5 0 288 0
-( 1792 -512 -192 ) ( 1280 -64 -192 ) ( 1792 -64 -192 ) liquids_lava/lava0 0 0 0 0.5 0.5 0 288 0
+( 1792 -512 -172 ) ( 1280 -64 -172 ) ( 1792 -64 -172 ) liquids_lava/lava0 0 0 0 0.5 0.5 0 288 0
 ( 1760 -608 -256 ) ( 1248 -608 -192 ) ( 1760 -608 -192 ) liquids_lava/lava0 0 0 0 0.5 0.5 0 288 0
 ( 1824 -32 -192 ) ( 1824 -480 -256 ) ( 1824 -480 -192 ) liquids_lava/lava0 0 0 0 0.5 0.5 0 288 0
 ( 1312 -32 -192 ) ( 1824 -32 -256 ) ( 1824 -32 -192 ) liquids_lava/lava0 0 0 0 0.5 0.5 0 288 0
@@ -732,7 +732,7 @@
 }
 {
 ( 1072 -928 288 ) ( -160 -1616 288 ) ( 1072 -1616 288 ) exx/base-metal03 0 0 0 0.5 0.5 0 4 0
-( 1072 -1616 320 ) ( -160 -928 320 ) ( 1072 -928 320 ) exx/base-metal03 0 0 0 0.5 0.5 0 4 0
+( 1072 -1616 320 ) ( -160 -928 320 ) ( 1072 -928 320 ) common/caulk 0 0 0 0.5 0.5 0 4 0
 ( 1088 -1152 288 ) ( -144 -1152 320 ) ( 1088 -1152 320 ) exx/base-metal03 0 0 0 0.5 0.5 0 4 0
 ( 1408 -464 320 ) ( 1408 -1152 288 ) ( 1408 -1152 320 ) exx/base-metal03 0 0 0 0.5 0.5 0 4 0
 ( 160 -928 320 ) ( 1392 -928 288 ) ( 1392 -928 320 ) exx/base-metal03 0 0 0 0.5 0.5 0 4 0
@@ -1144,42 +1144,22 @@ exx/base-metal03
 }
 {
 ( 1784 -240 -320 ) ( 1336 -240 -320 ) ( 1336 -640 -320 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( 1344 -640 -224 ) ( 1344 -240 -224 ) ( 1792 -240 -224 ) map_stormkeep/rock 0 0 0 0.25 0.25 0 0 0
+( 1344 -640 -208 ) ( 1344 -240 -208 ) ( 1792 -240 -208 ) map_stormkeep/rock 0 0 0 0.25 0.25 0 0 0
 ( 1344 -608 -40 ) ( 1792 -608 -40 ) ( 1792 -608 -296 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( 1792 -640 -56 ) ( 1792 -240 -56 ) ( 1792 -240 -312 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( 1792 -64 -40 ) ( 1344 -64 -40 ) ( 1344 -64 -296 ) common/caulk 0 0 0 0.25 0.25 0 4 0
+( 1792 -48 -40 ) ( 1344 -48 -40 ) ( 1344 -48 -296 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( 1280 -240 -40 ) ( 1280 -640 -40 ) ( 1280 -640 -296 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 }
 {
 ( 1792 -64 -224 ) ( 1792 192 -192 ) ( 1792 192 -224 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( 1392 -64 -224 ) ( 1392 192 -192 ) ( 1392 -64 -192 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( 1408 -64 -224 ) ( 1792 192 -224 ) ( 1408 192 -224 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( 1408 -64 -192 ) ( 1792 192 -192 ) ( 1792 -64 -192 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( 1792 192 -224 ) ( 1408 192 -192 ) ( 1408 192 -224 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( 1792 -64 -224 ) ( 1408 -64 -192 ) ( 1792 -64 -192 ) exx/base-metal03 0 0 0 0.25 0.25 0 4 0
-}
-{
-( 1552 -48 -192 ) ( 1576 -48 -192 ) ( 1552 -48 -160 ) common/caulk -0 0 0 0.25 0.25 0 4 0
-( 1536 -32 -192 ) ( 1536 0 -192 ) ( 1536 0 -160 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( 1544 -64 -168 ) ( 1744 -64 -168 ) ( 1744 -64 -176 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
-( 1744 -64 -160 ) ( 1544 -64 -160 ) ( 1544 0 -160 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
-( 1544 0 -192 ) ( 1544 -64 -192 ) ( 1744 -64 -192 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( 1792 -80 -168 ) ( 1792 -16 -168 ) ( 1792 -16 -176 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-}
-{
-patchDef2
-{
-exx/base-metal03
-( 3 3 0 0 0 )
-(
-( ( 1392 -176 -160 10.875 1.5 ) ( 1392 -48 -160 10.875 0.375 ) ( 1536 -48 -160 12 0.375 ) )
-( ( 1400 -176 -160 10.9375 1.5 ) ( 1400 -56 -160 10.9375 0.4375 ) ( 1536 -56 -160 12 0.4375 ) )
-( ( 1408 -176 -160 11 1.5 ) ( 1408 -64 -160 11 0.5 ) ( 1536 -64 -160 12 0.5 ) )
-)
-}
+( 1792 -48 -224 ) ( 1408 -48 -192 ) ( 1792 -48 -192 ) exx/base-metal03 0 0 0 0.25 0.25 0 4 0
+( 1472 -80 -64 ) ( 1472 -64 -64 ) ( 1472 -80 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 1408 -64 -224 ) ( 1264 -64 -192 ) ( 1264 -64 -224 ) map_stormkeep/largebrick1a 0 0 0 0.25 0.25 0 0 0
+( 1408 -48 -224 ) ( 1264 -48 -192 ) ( 1264 -48 -224 ) map_stormkeep/largebrick1a 0 0 0 0.25 0.25 0 0 0
 ( 1264 -176 -224 ) ( 1408 -192 -224 ) ( 1408 -176 -224 ) map_stormkeep/largebrick1a 0 0 0 0.25 0.25 0 0 0
 ( 1280 -192 -224 ) ( 1408 -192 -192 ) ( 1408 -192 -224 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( 1408 -192 -224 ) ( 1408 -176 -192 ) ( 1408 -176 -224 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
@@ -1303,20 +1283,6 @@ exx/base-metal03
 ( 432 -320 -64 ) ( 440 -320 -64 ) ( 432 -320 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 {
-patchDef2
-{
-exx/base-metal03
-( 5 3 0 0 0 )
-(
-( ( 1392 -464 -192 0 0 ) ( 1392 -464 -208 0 -0.125 ) ( 1392 -464 -224 0 -0.25 ) )
-( ( 1392 -432 -192 0.25 0 ) ( 1392 -432 -208 0.25 -0.125 ) ( 1392 -432 -224 0.25 -0.25 ) )
-( ( 1440 -432 -192 0.625 0 ) ( 1440 -432 -208 0.625 -0.125 ) ( 1440 -432 -224 0.625 -0.25 ) )
-( ( 1488 -432 -192 1 0 ) ( 1488 -432 -208 1 -0.125 ) ( 1488 -432 -224 1 -0.25 ) )
-( ( 1488 -464 -192 1.25 0 ) ( 1488 -464 -208 1.25 -0.125 ) ( 1488 -464 -224 1.25 -0.25 ) )
-)
-}
-}
-{
 ( -576 -928 72 ) ( -576 -944 72 ) ( -576 -928 256 ) common/caulk 32 0 0 0.25 0.25 0 4 0
 ( -960 -1040 256 ) ( -960 -936 256 ) ( -336 -936 256 ) common/caulk 0 32 0 0.25 0.25 0 4 0
 ( -336 -928 40 ) ( -960 -928 40 ) ( -960 -928 0 ) map_stormkeep/largebrick1a 0 0 0 0.25 0.25 0 0 0
@@ -2545,15 +2511,7 @@ map_stormkeep/largebrick1a
 ( 1744 -64 -160 ) ( 1544 -64 -160 ) ( 1544 0 -160 ) exx/floor-metal02 0 0 0 0.25 0.25 0 0 0
 ( 1544 0 -192 ) ( 1544 -64 -192 ) ( 1744 -64 -192 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( 1344 128 -192 ) ( 1344 152 -192 ) ( 1344 152 -160 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( 1544 -48 -168 ) ( 1744 -48 -168 ) ( 1744 -48 -176 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-}
-{
-( 1344 -64 -192 ) ( 1344 -48 -192 ) ( 1344 -48 -160 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( 1392 -168 -168 ) ( 1392 -40 -168 ) ( 1392 -40 -192 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( 1320 -176 -192 ) ( 1280 -176 -192 ) ( 1280 -176 -160 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( 1280 -48 -168 ) ( 1088 -48 -168 ) ( 1088 -48 -192 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( 1280 -176 -160 ) ( 1088 -176 -160 ) ( 1088 -48 -160 ) exx/floor-metal02 0 0 0 0.25 0.25 0 0 0
-( 1088 -64 -192 ) ( 1088 -192 -192 ) ( 1280 -192 -192 ) common/caulk 0 0 0 0.25 0.25 0 4 0
+( 1544 -48 -168 ) ( 1744 -48 -168 ) ( 1744 -48 -176 ) exx/base-metal03 0 0 0 0.25 0.25 0 4 0
 }
 {
 ( 1264 -176 -192 ) ( 1264 -176 -160 ) ( 1088 -176 -160 ) common/caulk 0 0 0 0.25 0.25 0 4 0
@@ -2932,7 +2890,7 @@ map_stormkeep/largebrick1a
 ( -1176 128 512 ) ( -1208 128 512 ) ( -1016 128 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
 ( -1224 112 512 ) ( -1224 80 512 ) ( -1032 80 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
 ( -1208 64 512 ) ( -1176 64 512 ) ( -984 64 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
-( -1160 80 512 ) ( -1160 112 512 ) ( -968 112 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 4 0
+( -1160 80 512 ) ( -1160 112 512 ) ( -968 112 320 ) common/caulk 0 0 0 0.5 0.5 134217728 4 0
 ( -1176 64 512 ) ( -1160 80 512 ) ( -968 80 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 4 0
 ( -1160 112 512 ) ( -1176 128 512 ) ( -984 128 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 4 0
 ( -1208 128 512 ) ( -1224 112 512 ) ( -1032 112 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
@@ -2957,7 +2915,7 @@ map_stormkeep/largebrick1a
 ( -1208 256 512 ) ( -1224 240 512 ) ( -1032 240 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
 ( -1160 240 512 ) ( -1176 256 512 ) ( -984 256 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 4 0
 ( -1176 192 512 ) ( -1160 208 512 ) ( -968 208 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 4 0
-( -1160 208 512 ) ( -1160 240 512 ) ( -968 240 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 4 0
+( -1160 208 512 ) ( -1160 240 512 ) ( -968 240 320 ) common/caulk 0 0 0 0.5 0.5 134217728 4 0
 ( -1208 192 512 ) ( -1176 192 512 ) ( -984 192 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
 ( -1224 240 512 ) ( -1224 208 512 ) ( -1032 208 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
 ( -1176 256 512 ) ( -1208 256 512 ) ( -1016 256 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
@@ -2980,7 +2938,7 @@ map_stormkeep/largebrick1a
 ( -1176 384 512 ) ( -1208 384 512 ) ( -1016 384 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
 ( -1224 368 512 ) ( -1224 336 512 ) ( -1032 336 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
 ( -1208 320 512 ) ( -1176 320 512 ) ( -984 320 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
-( -1160 336 512 ) ( -1160 368 512 ) ( -968 368 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 4 0
+( -1160 336 512 ) ( -1160 368 512 ) ( -968 368 320 ) common/caulk 0 0 0 0.5 0.5 134217728 4 0
 ( -1176 320 512 ) ( -1160 336 512 ) ( -968 336 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 4 0
 ( -1160 368 512 ) ( -1176 384 512 ) ( -984 384 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 4 0
 ( -1208 384 512 ) ( -1224 368 512 ) ( -1032 368 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
@@ -3005,7 +2963,7 @@ map_stormkeep/largebrick1a
 ( -1208 512 512 ) ( -1224 496 512 ) ( -1032 496 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
 ( -1160 496 512 ) ( -1176 512 512 ) ( -984 512 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 4 0
 ( -1176 448 512 ) ( -1160 464 512 ) ( -968 464 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 4 0
-( -1160 464 512 ) ( -1160 496 512 ) ( -968 496 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 4 0
+( -1160 464 512 ) ( -1160 496 512 ) ( -968 496 320 ) common/caulk 0 0 0 0.5 0.5 134217728 4 0
 ( -1208 448 512 ) ( -1176 448 512 ) ( -984 448 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
 ( -1224 496 512 ) ( -1224 464 512 ) ( -1032 464 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
 ( -1176 512 512 ) ( -1208 512 512 ) ( -1016 512 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
@@ -3028,7 +2986,7 @@ map_stormkeep/largebrick1a
 ( -1176 640 512 ) ( -1208 640 512 ) ( -1016 640 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
 ( -1224 624 512 ) ( -1224 592 512 ) ( -1032 592 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
 ( -1208 576 512 ) ( -1176 576 512 ) ( -984 576 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
-( -1160 592 512 ) ( -1160 624 512 ) ( -968 624 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 4 0
+( -1160 592 512 ) ( -1160 624 512 ) ( -968 624 320 ) common/caulk 0 0 0 0.5 0.5 134217728 4 0
 ( -1176 576 512 ) ( -1160 592 512 ) ( -968 592 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 4 0
 ( -1160 624 512 ) ( -1176 640 512 ) ( -984 640 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 4 0
 ( -1208 640 512 ) ( -1224 624 512 ) ( -1032 624 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
@@ -3053,7 +3011,7 @@ map_stormkeep/largebrick1a
 ( -1208 768 512 ) ( -1224 752 512 ) ( -1032 752 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
 ( -1160 752 512 ) ( -1176 768 512 ) ( -984 768 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 4 0
 ( -1176 704 512 ) ( -1160 720 512 ) ( -968 720 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 4 0
-( -1160 720 512 ) ( -1160 752 512 ) ( -968 752 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 4 0
+( -1160 720 512 ) ( -1160 752 512 ) ( -968 752 320 ) common/caulk 0 0 0 0.5 0.5 134217728 4 0
 ( -1208 704 512 ) ( -1176 704 512 ) ( -984 704 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
 ( -1224 752 512 ) ( -1224 720 512 ) ( -1032 720 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
 ( -1176 768 512 ) ( -1208 768 512 ) ( -1016 768 320 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
@@ -3063,7 +3021,7 @@ map_stormkeep/largebrick1a
 ( -1136 32 400 ) ( -1112 32 400 ) ( -1080 0 432 ) common/caulk 0 0 0 0.5 0.5 134217728 4 0
 ( -1080 -256 248 ) ( -1080 -280 272 ) ( -1080 -24 456 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
 ( -1168 -280 272 ) ( -1168 -256 248 ) ( -1168 0 432 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
-( -1080 -280 272 ) ( -1112 -312 304 ) ( -1112 -56 488 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 4 0
+( -1080 -280 272 ) ( -1112 -312 304 ) ( -1112 -56 488 ) common/caulk 0 0 0 0.5 0.5 134217728 4 0
 ( -1136 -312 304 ) ( -1168 -280 272 ) ( -1168 -24 456 ) common/caulk 0 0 0 0.5 0.5 134217728 4 0
 ( -1112 -312 304 ) ( -1136 -312 304 ) ( -1136 -56 488 ) common/caulk 0 0 0 0.5 0.5 134217728 4 0
 ( -1136 -224 216 ) ( -1112 -224 216 ) ( -1112 32 400 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
@@ -3077,7 +3035,7 @@ map_stormkeep/largebrick1a
 ( -1080 1064 248 ) ( -1112 1032 216 ) ( -1112 776 400 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
 ( -1112 1032 216 ) ( -1136 1032 216 ) ( -1136 776 400 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
 ( -1136 1120 304 ) ( -1112 1120 304 ) ( -1112 864 488 ) common/caulk 0 0 0 0.5 0.5 134217728 4 0
-( -1112 1120 304 ) ( -1080 1088 272 ) ( -1080 832 456 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 4 0
+( -1112 1120 304 ) ( -1080 1088 272 ) ( -1080 832 456 ) common/caulk 0 0 0 0.5 0.5 134217728 4 0
 ( -1168 1088 272 ) ( -1136 1120 304 ) ( -1136 864 488 ) common/caulk 0 0 0 0.5 0.5 134217728 4 0
 ( -1080 1088 272 ) ( -1080 1064 248 ) ( -1080 808 432 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
 ( -1168 1064 248 ) ( -1168 1088 272 ) ( -1168 832 456 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
@@ -3086,7 +3044,7 @@ map_stormkeep/largebrick1a
 {
 ( -1080 576 456 ) ( -1080 640 456 ) ( -1080 640 432 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
 ( -1168 640 456 ) ( -1168 576 456 ) ( -1168 576 432 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
-( -1112 576 488 ) ( -1112 640 488 ) ( -1104 640 480 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 4 0
+( -1112 576 488 ) ( -1112 640 488 ) ( -1104 640 480 ) common/caulk 0 0 0 0.5 0.5 134217728 4 0
 ( -1160 576 464 ) ( -1160 640 464 ) ( -1152 640 472 ) common/caulk 0 0 0 0.5 0.5 134217728 4 0
 ( -1168 576 488 ) ( -1168 640 488 ) ( -1080 640 488 ) common/caulk 0 0 0 0.5 0.5 134217728 4 0
 ( -1080 640 400 ) ( -1168 640 400 ) ( -1168 576 400 ) exx/base-metal03 0 0 0 0.5 0.5 134217728 0 0
@@ -4336,7 +4294,7 @@ map_stormkeep/largebrick1a
 ( 1120 128 128 ) ( 1312 128 0 ) ( 1312 128 128 ) exx/base-metal01 157.1399993896 260.8252563477 160 0.25 -0.25 0 0 0
 ( 1120 128 64 ) ( 1112 120 -64 ) ( 1120 128 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( -64 -608 0 ) ( -64 -544 0 ) ( 64 -608 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 1152 128 -64 ) ( 1152 96 -64 ) ( 1152 128 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 1152 128 -64 ) ( 1152 96 -64 ) ( 1152 128 64 ) exx/base-metal03 0 0 0 0.5 0.5 0 0 0
 }
 {
 ( -664 1472 96 ) ( -920 1472 96 ) ( -920 1472 64 ) common/caulk 0 0 0 0.25 0.25 0 4 0
@@ -7040,7 +6998,7 @@ exx/trim-vert01
 ( 1264 -176 -192 ) ( 1248 -192 -192 ) ( 1408 -192 -192 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( 1248 -192 -160 ) ( 1264 -176 -160 ) ( 1408 -192 -160 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( 1264 -176 -160 ) ( 1264 -176 -192 ) ( 1408 -176 -192 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( 1408 -192 -160 ) ( 1408 -176 -160 ) ( 1408 -176 -192 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1344 -192 -160 ) ( 1344 -176 -160 ) ( 1344 -176 -192 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( 1248 -192 -192 ) ( 1248 -192 -160 ) ( 1408 -192 -160 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( 1264 -176 -160 ) ( 1248 -192 -160 ) ( 1264 -176 -192 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 }
@@ -8568,12 +8526,12 @@ exx/trim-vert01
 ( 512 1456 -64 ) ( 528 1456 -64 ) ( 512 1456 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 }
 {
-( 640 1392 160 ) ( 640 1344 160 ) ( 512 1392 160 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
-( 640 1392 160 ) ( 640 1392 128 ) ( 640 1344 160 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 512 1344 128 ) ( 640 1344 128 ) ( 512 1392 128 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 512 1344 128 ) ( 512 1344 160 ) ( 640 1344 128 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
-( 512 1344 128 ) ( 512 1392 128 ) ( 512 1344 160 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 512 1360 -64 ) ( 544 1360 -64 ) ( 512 1360 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 640 1376 144 ) ( 640 1328 144 ) ( 512 1376 144 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
+( 640 1376 160 ) ( 640 1376 128 ) ( 640 1328 160 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 512 1328 128 ) ( 640 1328 128 ) ( 512 1376 128 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 512 1328 128 ) ( 512 1328 160 ) ( 640 1328 128 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
+( 512 1328 128 ) ( 512 1376 128 ) ( 512 1328 160 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 512 1344 -64 ) ( 544 1344 -64 ) ( 512 1344 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 }
 {
 ( 640 1424 160 ) ( 640 1392 160 ) ( 592 1424 160 ) exx/floor-crete01 0 0 0 0.125 0.125 0 0 0
@@ -8820,9 +8778,9 @@ patchDef2
 exx/base-metal01
 ( 3 3 0 0 0 )
 (
-( ( 448 1408 128 0 0 ) ( 448 1408 144 0 -0.125 ) ( 448 1408 160 0 -0.25 ) )
-( ( 448 1344 128 0.5 0 ) ( 448 1344 144 0.5 -0.125 ) ( 448 1344 160 0.5 -0.25 ) )
-( ( 512 1344 128 1 0 ) ( 512 1344 144 1 -0.125 ) ( 512 1344 160 1 -0.25 ) )
+( ( 720 1408 144 0 -0.125 ) ( 720 1408 136 0 -0.0625 ) ( 720 1408 128 0 0 ) )
+( ( 720 1328 144 0.625 -0.125 ) ( 720 1328 136 0.625 -0.0625 ) ( 720 1328 128 0.625 0 ) )
+( ( 640 1328 144 1.25 -0.125 ) ( 640 1328 136 1.25 -0.0625 ) ( 640 1328 128 1.25 0 ) )
 )
 }
 }
@@ -8832,9 +8790,9 @@ patchDef2
 exx/base-metal01
 ( 3 3 0 0 0 )
 (
-( ( 448 1408 160 7 -22 ) ( 456 1408 160 7.125 -22 ) ( 464 1408 160 7.25 -22 ) )
-( ( 448 1344 160 7 -21 ) ( 456 1352 160 7.125 -21.125 ) ( 464 1360 160 7.25 -21.25 ) )
-( ( 512 1344 160 8 -21 ) ( 512 1352 160 8 -21.125 ) ( 512 1360 160 8 -21.25 ) )
+( ( 704 1408 144 7.25 -22 ) ( 712 1408 144 7.125 -22 ) ( 720 1408 144 7 -22 ) )
+( ( 704 1344 144 7.25 -21.25 ) ( 712 1336 144 7.125 -21.125 ) ( 720 1328 144 7 -21 ) )
+( ( 640 1344 144 8 -21.25 ) ( 640 1336 144 8 -21.125 ) ( 640 1328 144 8 -21 ) )
 )
 }
 }
@@ -9459,20 +9417,12 @@ exx/panel-rs01
 ( 1824 -128 -96 ) ( 1824 -64 -224 ) ( 1824 -128 -224 ) common/caulk -0 0 0 -0.5 0.5 0 0 0
 }
 {
-( 1344 96 128 ) ( 1088 96 0 ) ( 1088 96 128 ) exx/light-u201-surfacelight 0 0 0 -0.25 0.25 0 0 0
-( 1088 96 -32 ) ( 1312 128 -32 ) ( 1088 104 -32 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( 1120 128 128 ) ( 1312 128 0 ) ( 1312 128 128 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
-( -64 -608 0 ) ( -64 -544 0 ) ( 64 -608 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 1152 128 64 ) ( 1152 96 -64 ) ( 1152 128 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 1280 128 -64 ) ( 1280 96 -64 ) ( 1280 128 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-}
-{
 ( 1344 96 128 ) ( 1088 96 0 ) ( 1088 96 128 ) exx/base-metal01 157.1399993896 260.8252563477 160 0.25 -0.25 0 0 0
 ( 1088 96 -32 ) ( 1312 128 -32 ) ( 1088 104 -32 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( 1120 128 128 ) ( 1312 128 0 ) ( 1312 128 128 ) exx/base-metal01 157.1399993896 260.8252563477 160 0.25 -0.25 0 0 0
 ( 1312 128 -64 ) ( 1320 120 -64 ) ( 1312 128 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( -64 -608 0 ) ( -64 -544 0 ) ( 64 -608 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 1280 128 64 ) ( 1280 96 -64 ) ( 1280 128 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 1280 128 64 ) ( 1280 96 -64 ) ( 1280 128 -64 ) exx/base-metal03 0 0 0 0.5 0.5 0 0 0
 }
 {
 ( 1432 -441 128 ) ( 1448 -441 128 ) ( 1448 -577 128 ) common/caulk 0 60 0 0.25 0.25 134217728 4 0
@@ -10308,20 +10258,20 @@ map_stormkeep/rock
 ( 1216 160 -64 ) ( 1232 160 -64 ) ( 1216 160 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -576 160 144 ) ( -544 160 144 ) ( -544 128 176 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( -544 160 144 ) ( -576 160 144 ) ( -544 160 16 ) exx/trim-psimple04 0 128 0 0.25 0.25 0 0 0
-( -544 160 160 ) ( -544 160 32 ) ( -544 128 160 ) exx/trim-psimple04 128 128 0 0.25 0.25 0 0 0
-( -576 128 16 ) ( -544 128 16 ) ( -576 160 16 ) exx/trim-psimple04 0 128 0 0.25 0.25 0 0 0
-( -576 128 32 ) ( -576 128 160 ) ( -544 128 32 ) exx/trim-psimple04 0 128 0 0.25 0.25 0 0 0
-( -576 128 32 ) ( -576 160 32 ) ( -576 128 160 ) exx/trim-psimple04 128 128 0 0.25 0.25 0 0 0
+( -560 160 144 ) ( -528 160 144 ) ( -528 128 176 ) exx/base-metal01 0 0 0 0.25 0.25 0 4 0
+( -528 160 144 ) ( -560 160 144 ) ( -528 160 16 ) exx/base-metal01 0 128 0 0.25 0.25 0 0 0
+( -528 160 160 ) ( -528 160 32 ) ( -528 128 160 ) exx/base-metal01 128 128 0 0.25 0.25 0 0 0
+( -576 128 16 ) ( -544 128 16 ) ( -576 160 16 ) exx/base-metal01 0 128 0 0.25 0.25 0 0 0
+( -576 128 32 ) ( -576 128 160 ) ( -544 128 32 ) exx/base-metal01 0 128 0 0.25 0.25 0 0 0
+( -576 128 32 ) ( -576 160 32 ) ( -576 128 160 ) exx/base-metal01 128 128 0 0.25 0.25 0 0 0
 }
 {
-( -544 288 144 ) ( -576 288 144 ) ( -576 320 176 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( -544 320 160 ) ( -576 320 160 ) ( -544 320 32 ) exx/trim-psimple04 0 128 0 0.25 0.25 0 0 0
-( -544 320 160 ) ( -544 320 32 ) ( -544 288 160 ) exx/trim-psimple04 0 128 0 0.25 0.25 0 0 0
-( -576 288 16 ) ( -544 288 16 ) ( -576 320 16 ) exx/trim-psimple04 0 0 0 0.25 0.25 0 0 0
-( -576 288 144 ) ( -544 288 144 ) ( -544 288 16 ) exx/trim-psimple04 0 128 0 0.25 0.25 0 0 0
-( -576 288 32 ) ( -576 320 32 ) ( -576 288 160 ) exx/trim-psimple04 0 128 0 0.25 0.25 0 0 0
+( -528 288 144 ) ( -560 288 144 ) ( -560 320 176 ) exx/base-metal01 0 0 0 0.25 0.25 0 4 0
+( -544 320 160 ) ( -576 320 160 ) ( -544 320 32 ) exx/base-metal01 0 128 0 0.25 0.25 0 0 0
+( -528 320 160 ) ( -528 320 32 ) ( -528 288 160 ) exx/base-metal01 0 128 0 0.25 0.25 0 0 0
+( -576 288 16 ) ( -544 288 16 ) ( -576 320 16 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
+( -560 288 144 ) ( -528 288 144 ) ( -528 288 16 ) exx/base-metal01 0 128 0 0.25 0.25 0 0 0
+( -576 288 32 ) ( -576 320 32 ) ( -576 288 160 ) exx/base-metal01 0 128 0 0.25 0.25 0 0 0
 }
 {
 ( 1344 384 -32 ) ( 1344 192 -32 ) ( 960 384 -32 ) exx/panel-rs01 0 0 0 0.25 0.25 0 0 0
@@ -10618,7 +10568,7 @@ exx/floor-metal02
 ( 1056 -1088 -320 ) ( 1056 -960 -320 ) ( 1056 -1088 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 2304 -64 320 ) ( 2304 -288 320 ) ( 1920 -64 320 ) exx/base-metal03 0 0 0 0.5 0.5 0 0 0
+( 2304 -64 320 ) ( 2304 -288 320 ) ( 1920 -64 320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 2304 -64 320 ) ( 1920 -64 320 ) ( 2304 -64 288 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1984 -64 320 ) ( 1984 -64 288 ) ( 1984 -288 320 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( 1920 -288 288 ) ( 2304 -288 288 ) ( 1920 -64 288 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
@@ -10778,7 +10728,7 @@ exx/floor-metal02
 ( 960 -1088 -64 ) ( 960 -1152 -64 ) ( 960 -1088 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 2816 -64 320 ) ( 2816 -288 320 ) ( 2432 -64 320 ) exx/base-metal03 0 0 0 0.5 0.5 0 0 0
+( 2816 -64 320 ) ( 2816 -288 320 ) ( 2432 -64 320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 2816 -576 320 ) ( 2432 -576 320 ) ( 2816 -576 288 ) exx/base-metal03 0 0 0 0.5 0.5 0 0 0
 ( 2432 -288 288 ) ( 2816 -288 288 ) ( 2432 -64 288 ) exx/base-metal03 0 0 0 0.5 0.5 0 0 0
 ( 2496 -1152 288 ) ( 2496 -1152 320 ) ( 2880 -1152 288 ) exx/base-metal03 0 0 0 0.5 0.5 0 0 0
@@ -10786,7 +10736,7 @@ exx/floor-metal02
 ( 2240 -1088 64 ) ( 2240 -1024 -64 ) ( 2240 -1088 -64 ) exx/base-metal03 0 0 0 0.5 0.5 0 0 0
 }
 {
-( 1088 -1088 320 ) ( 1088 -1152 320 ) ( 384 -1088 320 ) exx/base-metal03 0 0 0 0.5 0.5 0 0 0
+( 1088 -1088 320 ) ( 1088 -1152 320 ) ( 384 -1088 320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 1024 -1152 128 ) ( 320 -1152 128 ) ( 1024 -1152 0 ) exx/base-metal03 0 0 0 0.5 0.5 0 0 0
 ( 1152 -1152 128 ) ( 1152 -1152 0 ) ( 1152 -1216 128 ) exx/base-metal03 0 0 0 0.5 0.5 0 0 0
 ( 448 -1280 0 ) ( 448 -1280 128 ) ( 1152 -1280 0 ) exx/base-metal03 0 0 0 0.5 0.5 0 0 0
@@ -10794,7 +10744,7 @@ exx/floor-metal02
 ( 64 -1216 288 ) ( -64 -1120 288 ) ( -64 -1216 288 ) exx/base-metal03 0 0 0 0.5 0.5 0 0 0
 }
 {
-( 2304 -64 320 ) ( 2304 -288 320 ) ( 1920 -64 320 ) exx/base-metal03 0 0 0 0.5 0.5 0 0 0
+( 2304 -64 320 ) ( 2304 -288 320 ) ( 1920 -64 320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 2304 -64 320 ) ( 1920 -64 320 ) ( 2304 -64 288 ) exx/base-metal03 0 0 0 0.5 0.5 0 0 0
 ( 1920 -288 288 ) ( 2304 -288 288 ) ( 1920 -64 288 ) exx/base-metal03 0 0 0 0.5 0.5 0 0 0
 ( 1984 -1152 288 ) ( 1984 -1152 320 ) ( 2368 -1152 288 ) exx/base-metal03 0 0 0 0.5 0.5 0 0 0
@@ -10914,12 +10864,12 @@ exx/floor-metal02
 ( 1792 176 64 ) ( 1808 176 -64 ) ( 1792 176 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -576 320 176 ) ( -544 320 176 ) ( -544 128 176 ) exx/base-metal04 0 128 0 0.25 0.25 0 0 0
-( -544 320 176 ) ( -576 320 176 ) ( -544 288 144 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( -544 288 176 ) ( -544 288 144 ) ( -544 256 176 ) exx/base-metal04 128 0 0 0.25 0.25 0 0 0
-( -576 256 144 ) ( -544 256 144 ) ( -576 288 144 ) exx/base-metal04 0 128 0 0.25 0.25 0 0 0
-( -576 128 176 ) ( -544 128 176 ) ( -544 160 144 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( -576 256 144 ) ( -576 288 144 ) ( -576 256 176 ) exx/trim-psimple04 64 128 90 0.25 0.25 0 0 0
+( -576 320 176 ) ( -544 320 176 ) ( -544 128 176 ) exx/base-metal01 0 128 0 0.25 0.25 0 0 0
+( -528 320 176 ) ( -560 320 176 ) ( -528 288 144 ) exx/base-metal01 0 0 0 0.25 0.25 0 4 0
+( -528 288 176 ) ( -528 288 144 ) ( -528 256 176 ) exx/base-metal01 128 0 0 0.25 0.25 0 0 0
+( -576 256 144 ) ( -544 256 144 ) ( -576 288 144 ) exx/base-metal01 0 128 0 0.25 0.25 0 0 0
+( -560 128 176 ) ( -528 128 176 ) ( -528 160 144 ) exx/base-metal01 0 0 0 0.25 0.25 0 4 0
+( -576 256 144 ) ( -576 288 144 ) ( -576 256 176 ) exx/base-metal01 64 128 90 0.25 0.25 0 0 0
 }
 {
 ( 1536 -48 -160 ) ( 1792 -48 -192 ) ( 1536 -48 -192 ) common/caulk -0 0 0 0.25 0.25 0 4 0
@@ -11645,20 +11595,12 @@ exx/panel-rs01
 ( 832 -480 96 ) ( 832 96 96 ) ( 832 -480 128 ) exx/base-metal03 256 0 0 -0.25 0.25 0 0 0
 }
 {
-( 1344 96 128 ) ( 1088 96 0 ) ( 1088 96 128 ) map_stormkeep/largebrick1a 0 0 0 0.25 0.25 0 0 0
-( 1088 96 96 ) ( 1312 128 96 ) ( 1344 96 96 ) common/caulk 0 0 0 0.25 0.25 0 4 0
-( 1120 128 128 ) ( 1312 128 0 ) ( 1312 128 128 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
-( 1312 128 -64 ) ( 1320 120 -64 ) ( 1312 128 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 1120 128 64 ) ( 1112 120 -64 ) ( 1120 128 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 64 -608 0 ) ( -64 -544 0 ) ( -64 -608 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-}
-{
 ( 1344 96 160 ) ( 1088 96 32 ) ( 1088 96 160 ) exx/base-metal03 256 0 0 -0.25 0.25 0 0 0
 ( 1088 96 128 ) ( 1312 128 128 ) ( 1344 96 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1120 128 160 ) ( 1312 128 32 ) ( 1312 128 160 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1312 128 -32 ) ( 1320 120 -32 ) ( 1312 128 96 ) common/caulk 0 64 0 0.5 0.5 0 0 0
 ( 1120 128 96 ) ( 1112 120 -32 ) ( 1120 128 -32 ) common/caulk 0 64 0 0.5 0.5 0 0 0
-( 64 -608 96 ) ( -64 -544 96 ) ( -64 -608 96 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 64 -608 96 ) ( -64 -544 96 ) ( -64 -608 96 ) exx/base-metal03 0 0 0 0.5 0.5 0 0 0
 }
 {
 ( 1344 96 0 ) ( 1344 224 128 ) ( 1344 352 0 ) map_stormkeep/largebrick1a 0 0 0 0.25 0.25 0 0 0
@@ -12310,12 +12252,12 @@ effects_jumppad/jumppadfx1_b
 ( -384 1152 -96 ) ( -384 1472 -96 ) ( -384 1152 -48 ) common/caulk -0 0 0 0.25 0.25 134217728 0 0
 }
 {
-( -832 880 -96 ) ( -832 432 -96 ) ( -896 880 -96 ) map_stormkeep/rock 0 0 0 0.25 0.25 0 0 0
-( -832 1152 -96 ) ( -896 1152 -96 ) ( -832 1152 -144 ) common/caulk 0 64 0 0.25 0.25 0 0 0
-( -832 880 -96 ) ( -832 880 -144 ) ( -832 432 -96 ) common/caulk 0 320 0 0.25 0.25 0 0 0
+( -832 496 -96 ) ( -832 432 -80 ) ( -896 432 -80 ) map_stormkeep/rock 0 0 0 0.25 0.25 0 0 0
+( -832 496 -128 ) ( -832 432 -80 ) ( -832 496 -96 ) common/caulk 0 320 0 0.25 0.25 0 0 0
 ( -896 432 -128 ) ( -832 432 -128 ) ( -896 880 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -896 432 -144 ) ( -896 432 -96 ) ( -832 432 -144 ) common/caulk 0 320 0 0.25 0.25 0 0 0
-( -896 432 -144 ) ( -896 880 -144 ) ( -896 432 -96 ) common/caulk 0 320 0 0.25 0.25 0 0 0
+( -896 432 -128 ) ( -896 432 -80 ) ( -832 432 -80 ) common/caulk 0 320 0 0.25 0.25 0 0 0
+( -896 496 -96 ) ( -896 432 -80 ) ( -896 496 -128 ) common/caulk 0 320 0 0.25 0.25 0 0 0
+( -896 496 -64 ) ( -864 496 -64 ) ( -896 496 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -624 1152 -96 ) ( -624 1024 -96 ) ( -896 1152 -96 ) map_stormkeep/rock 0 0 0 0.25 0.25 0 0 0
@@ -12334,7 +12276,7 @@ effects_jumppad/jumppadfx1_b
 ( -416 1152 -144 ) ( -416 1472 -144 ) ( -416 1152 -96 ) common/caulk 0 64 0 0.25 0.25 0 0 0
 }
 {
-( -544 448 -48 ) ( -544 -64 -48 ) ( -1120 448 -48 ) liquids_lava/lava0 0 0 0 0.25 0.25 0 0 0
+( -544 448 -40 ) ( -544 -64 -40 ) ( -1120 448 -40 ) liquids_lava/lava0 0 0 0 0.25 0.25 0 0 0
 ( -544 432 -64 ) ( -1120 432 -64 ) ( -544 432 -96 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( -576 448 -64 ) ( -576 448 -96 ) ( -576 -64 -64 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 ( -1120 -64 -96 ) ( -544 -64 -96 ) ( -1120 448 -96 ) common/caulk 0 0 0 0.25 0.25 0 4 0
@@ -12342,20 +12284,12 @@ effects_jumppad/jumppadfx1_b
 ( -1088 -64 -96 ) ( -1088 448 -96 ) ( -1088 -64 -64 ) common/caulk 0 0 0 0.25 0.25 0 4 0
 }
 {
-( -832 880 -48 ) ( -832 432 -48 ) ( -896 880 -48 ) liquids_lava/lava0 0 0 0 0.25 0.25 134217728 0 0
-( -896 1088 -48 ) ( -896 1088 -96 ) ( -832 1024 -96 ) common/caulk 0 0 0 0.25 0.25 134217728 4 0
-( -832 880 -48 ) ( -832 880 -96 ) ( -832 432 -48 ) common/caulk 0 0 0 0.25 0.25 134217728 4 0
+( -832 496 -48 ) ( -832 432 -40 ) ( -896 432 -40 ) liquids_lava/lava0 0 0 0 0.25 0.25 134217728 0 0
+( -832 432 -96 ) ( -832 432 -40 ) ( -832 496 -96 ) common/caulk 0 0 0 0.25 0.25 134217728 4 0
 ( -896 432 -96 ) ( -832 432 -96 ) ( -896 880 -96 ) common/caulk 0 0 0 0.25 0.25 134217728 4 0
-( -896 432 -96 ) ( -896 432 -48 ) ( -832 432 -96 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -896 1088 -96 ) ( -896 1088 -48 ) ( -896 432 -48 ) common/caulk 0 0 0 0.25 0.25 134217728 4 0
-}
-{
-( -576 1344 -32 ) ( -576 960 -32 ) ( -896 1344 -32 ) exx/floor-simple05 0 0 0 0.25 0.25 0 0 0
-( -576 1512 0 ) ( -896 1512 0 ) ( -576 1512 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( -896 960 -64 ) ( -576 960 -64 ) ( -896 1344 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( -792 480 -64 ) ( -792 480 0 ) ( -472 480 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( -1280 960 -64 ) ( -1280 1344 -64 ) ( -1280 960 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( -896 640 -64 ) ( -896 576 -64 ) ( -896 640 64 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
+( -896 432 -96 ) ( -896 432 -40 ) ( -832 432 -40 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( -896 496 -96 ) ( -896 432 -40 ) ( -896 432 -96 ) common/caulk 0 0 0 0.25 0.25 134217728 4 0
+( -880 496 -64 ) ( -848 496 -64 ) ( -880 496 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 {
 ( 64 1152 -32 ) ( -256 1152 -32 ) ( -256 1408 -32 ) exx/floor-simple05 0 0 0 0.25 0.25 0 0 0
@@ -12398,14 +12332,6 @@ effects_jumppad/jumppadfx1_b
 ( -320 960 -64 ) ( -320 960 -32 ) ( -320 768 -32 ) common/caulk 192 0 0 0.25 0.25 0 0 0
 }
 {
-( -768 1008 -32 ) ( -768 656 -32 ) ( -832 1008 -32 ) exx/floor-simple05 0 0 0 0.25 0.25 0 0 0
-( -768 960 -64 ) ( -768 960 -32 ) ( -832 1024 -32 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -768 960 -32 ) ( -768 960 -64 ) ( -768 656 -64 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
-( -832 656 -64 ) ( -768 656 -64 ) ( -832 1008 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -832 448 -64 ) ( -832 448 -32 ) ( -768 448 -64 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
-( -832 1024 -64 ) ( -832 1024 -32 ) ( -832 656 -32 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
-}
-{
 ( -128 1152 -32 ) ( -128 720 -32 ) ( -256 1152 -32 ) exx/floor-simple05 0 0 0 0.25 0.25 0 0 0
 ( -128 1152 -32 ) ( -256 1152 -32 ) ( -128 1152 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -128 1152 -32 ) ( -128 1152 -64 ) ( -128 720 -32 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -12526,12 +12452,12 @@ effects_jumppad/jumppadfx1_b
 ( -832 1024 -58 ) ( -832 1152 -58 ) ( -832 1024 -26 ) common/caulk 0 24 0 0.25 0.25 134217728 0 0
 }
 {
-( -840 448 -32 ) ( -840 432 -32 ) ( -896 448 -32 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
-( -840 448 -32 ) ( -896 448 -32 ) ( -840 448 -64 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
-( -832 448 -32 ) ( -832 448 -64 ) ( -832 432 -32 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -896 432 -40 ) ( -840 432 -40 ) ( -896 448 -40 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
-( -896 432 -64 ) ( -896 432 -32 ) ( -840 432 -64 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
-( -896 432 -64 ) ( -896 448 -64 ) ( -896 432 -32 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1464 -432 -160 ) ( 1464 -448 -160 ) ( 1408 -432 -160 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1464 -432 -160 ) ( 1408 -432 -160 ) ( 1464 -432 -192 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1536 -432 -160 ) ( 1536 -432 -192 ) ( 1536 -448 -160 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1408 -448 -192 ) ( 1464 -448 -192 ) ( 1408 -432 -192 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1408 -480 -192 ) ( 1408 -480 -160 ) ( 1464 -480 -192 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1344 -448 -192 ) ( 1344 -432 -192 ) ( 1344 -448 -160 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -294 1524 -48 ) ( -291 1521 72 ) ( -291 1521 -48 ) liquids_lava/lava0_flow 352 0 0 -0.25 0.25 134217728 288 0
@@ -13000,14 +12926,6 @@ exx/base-metal03
 ( -256 1472 -96 ) ( -256 1504 -96 ) ( -256 1472 -56 ) map_stormkeep/largebrick1a 0 0 0 0.25 0.25 134217728 0 0
 }
 {
-( -320 1600 -34 ) ( -320 1472 -34 ) ( -592 1600 -34 ) exx/floor-grate01 0 0 90 0.25 0.25 134217728 0 0
-( -320 1152 -32 ) ( -592 1152 -32 ) ( -320 1152 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -832 1600 -26 ) ( -832 1600 -58 ) ( -832 1472 -26 ) common/caulk 0 24 0 0.25 0.25 134217728 0 0
-( -592 1472 -40 ) ( -320 1472 -40 ) ( -592 1600 -40 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -592 448 -64 ) ( -592 448 -32 ) ( -320 448 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -896 1472 -64 ) ( -896 1600 -64 ) ( -896 1472 -32 ) common/caulk -0 0 0 0.25 0.25 134217728 0 0
-}
-{
 ( -288 1664 160 ) ( -288 1600 160 ) ( -384 1664 160 ) map_stormkeep/rock 0 0 0 0.25 0.25 0 0 0
 ( -288 1696 160 ) ( -384 1696 160 ) ( -288 1696 128 ) common/caulk 128 0 0 0.25 0.25 0 0 0
 ( -256 1664 160 ) ( -256 1664 128 ) ( -256 1600 160 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -13147,12 +13065,12 @@ exx/base-metal03
 ( -1344 1216 -1024 ) ( -1344 1280 -1024 ) ( -1344 1216 1280 ) skies/extragalactic_asteroids 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -1152 -1008 -384 ) ( 1952 304 -384 ) ( 1760 -912 -384 ) common/caulk 0 448 0 0.25 0.25 134217728 0 0
-( -1152 560 -384 ) ( 1792 304 -1024 ) ( 1952 304 -384 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 1760 -912 -384 ) ( 1952 304 -384 ) ( 1792 304 -1024 ) map_stormkeep/rock 320 448 0 0.25 0.25 134217728 0 0
-( -544 -969.25 -1024 ) ( 1792 304 -1024 ) ( -544 560 -1024 ) common/caulk 0 448 0 0.25 0.25 134217728 0 0
-( 1600 -898.625 -1024 ) ( -1152 -1008 -384 ) ( 1760 -912 -384 ) map_stormkeep/rock 320 448 0 0.25 0.25 134217728 0 0
-( -544 560 -1024 ) ( -1152 -1008 -384 ) ( -544 -720 -1024 ) common/caulk 576 0 0 0.25 0.25 134217728 0 0
+( -1152 -1008 -384 ) ( 1952 304 -384 ) ( 1760 -912 -384 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( -1152 560 -384 ) ( 1792 304 -1024 ) ( 1952 304 -384 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( 1760 -912 -384 ) ( 1952 304 -384 ) ( 1792 304 -1024 ) map_stormkeep/rock 0 0 0 0.5 0.5 134217728 0 0
+( -544 -969.25 -1024 ) ( 1792 304 -1024 ) ( -544 560 -1024 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( 1600 -898.625 -1024 ) ( -1152 -1008 -384 ) ( 1760 -912 -384 ) map_stormkeep/rock 0 0 0 0.5 0.5 134217728 0 0
+( -544 560 -1024 ) ( -1152 -1008 -384 ) ( -544 -720 -1024 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 {
 ( -256 1424 -32 ) ( -256 1408 -32 ) ( -384 1424 -32 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
@@ -13419,6 +13337,222 @@ exx/base-metal03
 ( -384 1472 96 ) ( -384 1472 128 ) ( -256 1472 96 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( -416 1472 96 ) ( -416 1552 96 ) ( -416 1472 128 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
+{
+( 1344 96 128 ) ( 1088 96 0 ) ( 1088 96 128 ) map_stormkeep/largebrick1a 0 0 0 0.25 0.25 0 0 0
+( 1088 96 96 ) ( 1312 128 96 ) ( 1344 96 96 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1120 128 128 ) ( 1312 128 0 ) ( 1312 128 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1120 128 64 ) ( 1112 120 -64 ) ( 1120 128 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 64 -608 0 ) ( -64 -544 0 ) ( -64 -608 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 1152 128 -64 ) ( 1152 112 -64 ) ( 1152 128 64 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 1344 96 128 ) ( 1088 96 0 ) ( 1088 96 128 ) map_stormkeep/largebrick1a 0 0 0 0.25 0.25 0 0 0
+( 1088 96 96 ) ( 1312 128 96 ) ( 1344 96 96 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1120 128 128 ) ( 1312 128 0 ) ( 1312 128 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1312 128 -64 ) ( 1320 120 -64 ) ( 1312 128 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 64 -608 0 ) ( -64 -544 0 ) ( -64 -608 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 1280 128 64 ) ( 1280 112 -64 ) ( 1280 128 -64 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 1344 96 128 ) ( 1088 96 0 ) ( 1088 96 128 ) exx/light-u201-surfacelight 0 0 0 0.25 0.25 0 0 0
+( 1120 112 128 ) ( 1312 112 0 ) ( 1312 112 128 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
+( 1152 128 64 ) ( 1152 112 -64 ) ( 1152 128 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1280 128 -64 ) ( 1280 112 -64 ) ( 1280 128 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1088 96 -32 ) ( 1312 128 -32 ) ( 1088 104 -32 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -64 96 0 ) ( -64 128 0 ) ( 64 96 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 1344 96 128 ) ( 1088 96 0 ) ( 1088 96 128 ) map_stormkeep/largebrick1a 0 0 0 0.25 0.25 0 0 0
+( 1088 96 96 ) ( 1312 128 96 ) ( 1344 96 96 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1120 112 128 ) ( 1312 112 0 ) ( 1312 112 128 ) effects_warpzone/warpzone_backdrop 0 0 0 0.25 0.25 0 0 0
+( 1152 128 64 ) ( 1152 112 -64 ) ( 1152 128 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1280 128 -64 ) ( 1280 112 -64 ) ( 1280 128 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 64 96 0 ) ( -64 128 0 ) ( -64 96 0 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( -608 160 144 ) ( -576 160 144 ) ( -576 128 176 ) common/caulk 0 0 0 0.25 0.25 0 4 0
+( -576 160 144 ) ( -608 160 144 ) ( -576 160 16 ) exx/trim-psimple04 0 128 0 0.25 0.25 0 0 0
+( -576 160 160 ) ( -576 160 32 ) ( -576 128 160 ) common/caulk 128 128 0 0.25 0.25 0 0 0
+( -608 128 16 ) ( -576 128 16 ) ( -608 160 16 ) exx/trim-psimple04 0 128 0 0.25 0.25 0 0 0
+( -608 128 32 ) ( -608 128 160 ) ( -576 128 32 ) exx/trim-psimple04 0 128 0 0.25 0.25 0 0 0
+( -608 128 32 ) ( -608 160 32 ) ( -608 128 160 ) exx/trim-psimple04 128 128 0 0.25 0.25 0 0 0
+}
+{
+( -576 288 144 ) ( -608 288 144 ) ( -608 320 176 ) common/caulk 0 0 0 0.25 0.25 0 4 0
+( -576 320 160 ) ( -608 320 160 ) ( -576 320 32 ) exx/trim-psimple04 0 128 0 0.25 0.25 0 0 0
+( -576 320 160 ) ( -576 320 32 ) ( -576 288 160 ) common/caulk 0 128 0 0.25 0.25 0 0 0
+( -608 288 16 ) ( -576 288 16 ) ( -608 320 16 ) exx/trim-psimple04 0 0 0 0.25 0.25 0 0 0
+( -608 288 144 ) ( -576 288 144 ) ( -576 288 16 ) exx/trim-psimple04 0 128 0 0.25 0.25 0 0 0
+( -608 288 32 ) ( -608 320 32 ) ( -608 288 160 ) exx/trim-psimple04 0 128 0 0.25 0.25 0 0 0
+}
+{
+( -608 320 176 ) ( -576 320 176 ) ( -576 128 176 ) exx/trim-psimple04 0 128 0 0.25 0.25 0 0 0
+( -576 320 176 ) ( -608 320 176 ) ( -576 288 144 ) common/caulk 0 0 0 0.25 0.25 0 4 0
+( -576 288 176 ) ( -576 288 144 ) ( -576 256 176 ) common/caulk 128 0 0 0.25 0.25 0 0 0
+( -608 256 144 ) ( -576 256 144 ) ( -608 288 144 ) exx/trim-psimple04 0 128 0 0.25 0.25 0 0 0
+( -608 128 176 ) ( -576 128 176 ) ( -576 160 144 ) common/caulk 0 0 0 0.25 0.25 0 4 0
+( -608 256 144 ) ( -608 288 144 ) ( -608 256 176 ) exx/trim-psimple04 64 128 90 0.25 0.25 0 0 0
+}
+{
+( -832 880 -48 ) ( -832 432 -48 ) ( -896 880 -48 ) liquids_lava/lava0 0 0 0 0.25 0.25 134217728 0 0
+( -896 1088 -48 ) ( -896 1088 -96 ) ( -832 1024 -96 ) common/caulk 0 0 0 0.25 0.25 134217728 4 0
+( -832 880 -48 ) ( -832 880 -96 ) ( -832 432 -48 ) common/caulk 0 0 0 0.25 0.25 134217728 4 0
+( -896 432 -96 ) ( -832 432 -96 ) ( -896 880 -96 ) common/caulk 0 0 0 0.25 0.25 134217728 4 0
+( -896 1088 -96 ) ( -896 1088 -48 ) ( -896 432 -48 ) common/caulk 0 0 0 0.25 0.25 134217728 4 0
+( -880 496 64 ) ( -848 496 -64 ) ( -880 496 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+}
+{
+( -576 1344 -32 ) ( -576 960 -32 ) ( -896 1344 -32 ) exx/floor-simple05 0 0 0 0.25 0.25 0 0 0
+( -576 1512 0 ) ( -896 1512 0 ) ( -576 1512 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -896 960 -64 ) ( -576 960 -64 ) ( -896 1344 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -792 480 -64 ) ( -792 480 0 ) ( -472 480 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -1280 960 -64 ) ( -1280 1344 -64 ) ( -1280 960 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( -896 640 -64 ) ( -896 576 -64 ) ( -896 640 64 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
+}
+{
+( -768 1008 -32 ) ( -768 656 -32 ) ( -832 1008 -32 ) exx/floor-simple05 0 0 0 0.25 0.25 0 0 0
+( -768 960 -64 ) ( -768 960 -32 ) ( -832 1024 -32 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -768 960 -32 ) ( -768 960 -64 ) ( -768 656 -64 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
+( -832 656 -64 ) ( -768 656 -64 ) ( -832 1008 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -832 448 -64 ) ( -832 448 -32 ) ( -768 448 -64 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
+( -832 1024 -64 ) ( -832 1024 -32 ) ( -832 656 -32 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
+}
+{
+( -840 448 -32 ) ( -840 432 -32 ) ( -896 448 -32 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
+( -840 448 -32 ) ( -896 448 -32 ) ( -840 448 -64 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
+( -832 448 -32 ) ( -832 448 -64 ) ( -832 432 -32 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -896 432 -40 ) ( -840 432 -40 ) ( -896 448 -40 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
+( -896 432 -64 ) ( -896 432 -32 ) ( -840 432 -64 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
+( -896 432 -64 ) ( -896 448 -64 ) ( -896 432 -32 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( -320 1600 -34 ) ( -320 1472 -34 ) ( -592 1600 -34 ) exx/floor-grate01 0 0 90 0.25 0.25 134217728 0 0
+( -320 1152 -32 ) ( -592 1152 -32 ) ( -320 1152 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( -832 1600 -26 ) ( -832 1600 -58 ) ( -832 1472 -26 ) common/caulk 0 24 0 0.25 0.25 134217728 0 0
+( -592 1472 -40 ) ( -320 1472 -40 ) ( -592 1600 -40 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( -592 448 -64 ) ( -592 448 -32 ) ( -320 448 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( -896 1472 -64 ) ( -896 1600 -64 ) ( -896 1472 -32 ) common/caulk -0 0 0 0.25 0.25 134217728 0 0
+}
+{
+( 1552 -48 -192 ) ( 1576 -48 -192 ) ( 1552 -48 -160 ) common/caulk -0 0 0 0.25 0.25 0 4 0
+( 1344 -16 -192 ) ( 1344 16 -192 ) ( 1344 16 -160 ) exx/base-metal03 0 0 0 0.25 0.25 0 4 0
+( 1744 -64 -160 ) ( 1544 -64 -160 ) ( 1544 0 -160 ) exx/floor-simple05 0 64 0 0.25 0.25 0 0 0
+( 1544 0 -192 ) ( 1544 -64 -192 ) ( 1744 -64 -192 ) exx/base-metal03 0 0 0 0.25 0.25 0 4 0
+( 1408 -64 -64 ) ( 1408 -80 -64 ) ( 1408 -64 64 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1512 -432 -192 ) ( 1512 -432 -128 ) ( 1832 -432 -192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+{
+( 1552 -48 -192 ) ( 1576 -48 -192 ) ( 1552 -48 -160 ) common/caulk 0 0 0 0.25 0.25 0 4 0
+( 1544 -64 -168 ) ( 1744 -64 -168 ) ( 1744 -64 -176 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1744 -64 -160 ) ( 1544 -64 -160 ) ( 1544 0 -160 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1544 0 -192 ) ( 1544 -64 -192 ) ( 1744 -64 -192 ) exx/base-metal03 0 0 0 0.25 0.25 0 4 0
+( 1792 -80 -168 ) ( 1792 -16 -168 ) ( 1792 -16 -176 ) common/caulk 0 0 0 0.25 0.25 0 4 0
+( 1536 -48 64 ) ( 1536 -80 -64 ) ( 1536 -48 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 1536 144 -160 ) ( 1536 -208 -160 ) ( 1472 144 -160 ) exx/floor-simple05 0 64 0 0.25 0.25 0 0 0
+( 1536 96 -160 ) ( 1536 96 -192 ) ( 1536 -208 -192 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
+( 1472 -208 -192 ) ( 1536 -208 -192 ) ( 1472 144 -192 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1472 -432 -192 ) ( 1472 -432 -160 ) ( 1536 -432 -192 ) exx/base-metal03 128 192 0 0.25 0.25 0 0 0
+( 1472 224 -192 ) ( 1472 224 -160 ) ( 1472 -144 -160 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1552 -48 -192 ) ( 1576 -48 -192 ) ( 1552 -48 -160 ) common/caulk -0 0 0 0.25 0.25 0 4 0
+}
+{
+( 1984 736 -162 ) ( 1984 608 -162 ) ( 1712 736 -162 ) exx/floor-grate01 -64 0 90 0.25 0.25 134217728 0 0
+( 1472 800 -154 ) ( 1472 800 -186 ) ( 1472 672 -154 ) common/caulk 0 24 0 0.25 0.25 134217728 0 0
+( 1712 608 -168 ) ( 1984 608 -168 ) ( 1712 736 -168 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 1712 -432 -192 ) ( 1712 -432 -160 ) ( 1984 -432 -192 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 1408 672 -192 ) ( 1408 800 -192 ) ( 1408 672 -160 ) common/caulk -0 0 0 0.25 0.25 134217728 0 0
+( 1344 -48 -64 ) ( 1440 -48 -64 ) ( 1344 -48 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+}
+{
+( 1392 -64 -224 ) ( 1392 192 -192 ) ( 1392 -64 -192 ) common/caulk 0 0 0 0.25 0.25 0 4 0
+( 1408 -64 -224 ) ( 1792 192 -224 ) ( 1408 192 -224 ) common/caulk 0 0 0 0.25 0.25 0 4 0
+( 1408 -64 -192 ) ( 1792 192 -192 ) ( 1792 -64 -192 ) common/caulk 0 0 0 0.25 0.25 0 4 0
+( 1792 192 -224 ) ( 1408 192 -192 ) ( 1408 192 -224 ) common/caulk 0 0 0 0.25 0.25 0 4 0
+( 1792 -48 -224 ) ( 1408 -48 -192 ) ( 1792 -48 -192 ) exx/base-metal03 0 0 0 0.25 0.25 0 4 0
+( 1472 -80 64 ) ( 1472 -64 -64 ) ( 1472 -80 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( -832 880 -96 ) ( -832 432 -96 ) ( -896 880 -96 ) map_stormkeep/rock 0 0 0 0.25 0.25 0 0 0
+( -832 1152 -96 ) ( -896 1152 -96 ) ( -832 1152 -144 ) common/caulk 0 64 0 0.25 0.25 0 0 0
+( -832 880 -96 ) ( -832 880 -144 ) ( -832 432 -96 ) common/caulk 0 320 0 0.25 0.25 0 0 0
+( -896 432 -128 ) ( -832 432 -128 ) ( -896 880 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -896 432 -144 ) ( -896 880 -144 ) ( -896 432 -96 ) common/caulk 0 320 0 0.25 0.25 0 0 0
+( -896 496 64 ) ( -864 496 -64 ) ( -896 496 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 1552 -192 -160 ) ( 1552 -224 -160 ) ( 1536 -192 -160 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1552 -64 -160 ) ( 1536 -64 -160 ) ( 1552 -64 -192 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1552 -192 -160 ) ( 1552 -192 -192 ) ( 1552 -224 -160 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1536 -224 -192 ) ( 1552 -224 -192 ) ( 1536 -192 -192 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1536 -480 -192 ) ( 1536 -480 -160 ) ( 1552 -480 -192 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1536 -224 -192 ) ( 1536 -192 -192 ) ( 1536 -224 -160 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 1344 -192 -160 ) ( 1344 -224 -160 ) ( 1328 -192 -160 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1344 -192 -160 ) ( 1328 -192 -160 ) ( 1344 -192 -192 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1344 -192 -160 ) ( 1344 -192 -192 ) ( 1344 -224 -160 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1328 -224 -192 ) ( 1344 -224 -192 ) ( 1328 -192 -192 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1328 -480 -192 ) ( 1328 -480 -160 ) ( 1344 -480 -192 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1328 -224 -192 ) ( 1328 -192 -192 ) ( 1328 -224 -160 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+}
+{
+patchDef2
+{
+exx/base-metal01
+( 3 3 0 0 0 )
+(
+( ( 448 1408 128 0 0 ) ( 448 1408 144 0 -0.125 ) ( 448 1408 160 0 -0.25 ) )
+( ( 448 1344 128 0.5 0 ) ( 448 1344 144 0.5 -0.125 ) ( 448 1344 160 0.5 -0.25 ) )
+( ( 512 1344 128 1 0 ) ( 512 1344 144 1 -0.125 ) ( 512 1344 160 1 -0.25 ) )
+)
+}
+}
+{
+patchDef2
+{
+exx/base-metal01
+( 3 3 0 0 0 )
+(
+( ( 448 1408 160 7 -22 ) ( 456 1408 160 7.125 -22 ) ( 464 1408 160 7.25 -22 ) )
+( ( 448 1344 160 7 -21 ) ( 456 1352 160 7.125 -21.125 ) ( 464 1360 160 7.25 -21.25 ) )
+( ( 512 1344 160 8 -21 ) ( 512 1352 160 8 -21.125 ) ( 512 1360 160 8 -21.25 ) )
+)
+}
+}
+{
+( 640 1392 160 ) ( 640 1344 160 ) ( 512 1392 160 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
+( 640 1392 160 ) ( 640 1392 128 ) ( 640 1344 160 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 512 1344 128 ) ( 640 1344 128 ) ( 512 1392 128 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 512 1344 128 ) ( 512 1344 160 ) ( 640 1344 128 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
+( 512 1344 128 ) ( 512 1392 128 ) ( 512 1344 160 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 512 1360 -64 ) ( 544 1360 -64 ) ( 512 1360 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+{
+patchDef2
+{
+exx/base-metal01
+( 3 3 0 0 0 )
+(
+( ( 432 1408 128 0 0 ) ( 432 1408 136 0 -0.0625 ) ( 432 1408 144 0 -0.125 ) )
+( ( 432 1328 128 0.625 0 ) ( 432 1328 136 0.625 -0.0625 ) ( 432 1328 144 0.625 -0.125 ) )
+( ( 512 1328 128 1.25 0 ) ( 512 1328 136 1.25 -0.0625 ) ( 512 1328 144 1.25 -0.125 ) )
+)
+}
+}
+{
+patchDef2
+{
+exx/base-metal01
+( 3 3 0 0 0 )
+(
+( ( 432 1408 144 7 -22 ) ( 440 1408 144 7.125 -22 ) ( 448 1408 144 7.25 -22 ) )
+( ( 432 1328 144 7 -21 ) ( 440 1336 144 7.125 -21.125 ) ( 448 1344 144 7.25 -21.25 ) )
+( ( 512 1328 144 8 -21 ) ( 512 1336 144 8 -21.125 ) ( 512 1344 144 8 -21.25 ) )
+)
+}
+}
 }
 {
 "classname" "func_group"
@@ -13552,34 +13686,6 @@ map_stormkeep/largebrick1a
 {
 patchDef2
 {
-exx/floor-metal02
-( 3 3 0 0 0 )
-(
-( ( 1536 -48 -160 12 0.375 ) ( 1392 -48 -160 10.875 0.375 ) ( 1392 -176 -160 10.875 1.375 ) )
-( ( 1392 -48 -160 10.875 0.375 ) ( 1392 -48 -160 10.875 0.375 ) ( 1392 -48 -160 10.875 0.375 ) )
-( ( 1392 -48 -160 10.875 0.375 ) ( 1392 -48 -160 10.875 0.375 ) ( 1392 -48 -160 10.875 0.375 ) )
-)
-}
-}
-{
-patchDef2
-{
-exx/base-metal03
-( 3 3 0 0 0 )
-(
-( ( 1408 -176 -224 0 0 ) ( 1408 -176 -192 0 -0.25 ) ( 1408 -176 -160 0 -0.5 ) )
-( ( 1408 -64 -224 0.875 0 ) ( 1408 -64 -192 0.875 -0.25 ) ( 1408 -64 -160 0.875 -0.5 ) )
-( ( 1536 -64 -224 1.875 0 ) ( 1536 -64 -192 1.875 -0.25 ) ( 1536 -64 -160 1.875 -0.5 ) )
-)
-}
-}
-}
-{
-"classname" "func_group"
-"type" "patchCapped"
-{
-patchDef2
-{
 exx/base-metal01
 ( 5 3 0 0 0 )
 (
@@ -14098,36 +14204,6 @@ exx/base-metal03
 }
 {
 "classname" "func_group"
-"type" "patchCapped"
-{
-patchDef2
-{
-exx/base-metal03
-( 3 3 0 0 0 )
-(
-( ( 1376 -464 -160 10.75 3.125 ) ( 1376 -368 -160 10.75 2.125 ) ( 1440 -368 -160 11.25 2.125 ) )
-( ( 1440 -464 -160 11.25 3.125 ) ( 1440 -368 -160 11.25 2.125 ) ( 1440 -368 -160 11.25 2.125 ) )
-( ( 1504 -464 -160 11.75 3.125 ) ( 1504 -368 -160 11.75 2.125 ) ( 1440 -368 -160 11.25 2.125 ) )
-)
-}
-}
-{
-patchDef2
-{
-exx/base-metal03
-( 5 3 0 0 0 )
-(
-( ( 1376 -464 -160 0 0 ) ( 1376 -464 -176 0 -0.125 ) ( 1392 -464 -192 0 -0.3017767072 ) )
-( ( 1376 -368 -160 1 0 ) ( 1376 -368 -176 1 -0.125 ) ( 1392 -432 -192 1 -0.3017767072 ) )
-( ( 1440 -368 -160 1.5 0 ) ( 1440 -368 -176 1.5 -0.125 ) ( 1440 -432 -192 1.5 -0.3017767072 ) )
-( ( 1504 -368 -160 2 0 ) ( 1504 -368 -176 2 -0.125 ) ( 1488 -432 -192 2 -0.3017767072 ) )
-( ( 1504 -464 -160 3 0 ) ( 1504 -464 -176 3 -0.125 ) ( 1488 -464 -192 3 -0.3017767072 ) )
-)
-}
-}
-}
-{
-"classname" "func_group"
 "type" "patchThick"
 {
 patchDef2
@@ -22087,7 +22163,7 @@ exx/base-metal03
 }
 {
 "classname" "target_speaker"
-"origin" "1712.000000 -224.000000 -208.000000"
+"origin" "1712.000000 -224.000000 -200.000000"
 "noise" "sound/machines/Slime_Bubbling.wav"
 "volume" "0.5"
 "atten" "2"
@@ -22108,7 +22184,7 @@ exx/base-metal03
 }
 {
 "classname" "target_speaker"
-"origin" "1344.000000 -288.000000 -208.000000"
+"origin" "1344.000000 -288.000000 -200.000000"
 "noise" "sound/machines/Slime_Bubbling.wav"
 "volume" "0.5"
 "atten" "2"
@@ -22121,12 +22197,12 @@ exx/base-metal03
 "classname" "trigger_warpzone"
 "targetname" "warpzone1"
 {
-( 1312 176 96 ) ( 1312 144 96 ) ( 1120 176 96 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 1312 160 96 ) ( 1312 128 96 ) ( 1120 160 96 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( 1312 176 128 ) ( 1120 176 128 ) ( 1312 176 -32 ) effects_warpzone/wavy 0 0 0 0.25 0.25 0 0 0
-( 1280 176 128 ) ( 1280 176 -32 ) ( 1280 144 128 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 1120 144 -32 ) ( 1312 144 -32 ) ( 1120 176 -32 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 1120 128 -32 ) ( 1120 128 128 ) ( 1312 128 -32 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( 1152 144 -32 ) ( 1152 176 -32 ) ( 1152 144 128 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 1280 160 128 ) ( 1280 160 -32 ) ( 1280 128 128 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 1120 128 -32 ) ( 1312 128 -32 ) ( 1120 160 -32 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 1152 128 -32 ) ( 1152 160 -32 ) ( 1152 128 128 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 1312 112 128 ) ( 1312 112 0 ) ( 1120 112 128 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 }
 }
 {
@@ -22135,10 +22211,10 @@ exx/base-metal03
 "target2" "cp7"
 {
 ( -560 160 144 ) ( -528 288 144 ) ( -528 160 144 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -560 160 144 ) ( -560 288 16 ) ( -560 288 144 ) effects_warpzone/wavy 0 0 0 0.25 0.25 0 0 0
+( -592 160 144 ) ( -592 288 16 ) ( -592 288 144 ) effects_warpzone/wavy 0 0 0 0.25 0.25 0 0 0
 ( -560 288 144 ) ( -528 288 16 ) ( -528 288 144 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( -560 288 16 ) ( -528 160 16 ) ( -528 288 16 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -528 288 16 ) ( -528 160 144 ) ( -528 288 144 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -528 272 16 ) ( -528 144 144 ) ( -528 272 144 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( -528 160 144 ) ( -560 160 16 ) ( -560 160 144 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 }
 }
@@ -22151,7 +22227,7 @@ exx/base-metal03
 }
 {
 "classname" "misc_model"
-"origin" "-576.000000 224.000000 80.000000"
+"origin" "-608.000000 224.000000 80.000000"
 "model" "models/effects_warpzone/blueedge.md3"
 "modelscale" "4.000000"
 }
@@ -22478,12 +22554,12 @@ exx/base-metal03
 "targetname" "cp7"
 "spawnflags" "1"
 {
-( -576 288 148 ) ( -576 256 148 ) ( -608 288 148 ) common/trigger 128 128 0 0.25 0.25 0 0 0
-( -576 288 176 ) ( -608 288 176 ) ( -576 288 144 ) common/trigger 128 0 0 0.25 0.25 0 0 0
-( -576 288 176 ) ( -576 288 144 ) ( -576 256 176 ) common/trigger 128 0 0 0.25 0.25 0 0 0
-( -608 256 144 ) ( -576 256 144 ) ( -608 288 144 ) common/trigger 128 128 0 0.25 0.25 0 0 0
-( -592 160 144 ) ( -592 160 176 ) ( -560 160 144 ) common/trigger 64 0 0 0.25 0.25 0 0 0
-( -580 256 144 ) ( -580 288 144 ) ( -580 256 176 ) common/trigger 128 0 0 0.25 0.25 0 0 0
+( -608 288 148 ) ( -608 256 148 ) ( -640 288 148 ) common/trigger 128 128 0 0.25 0.25 0 0 0
+( -608 288 176 ) ( -640 288 176 ) ( -608 288 144 ) common/trigger 128 0 0 0.25 0.25 0 0 0
+( -608 288 176 ) ( -608 288 144 ) ( -608 256 176 ) common/trigger 128 0 0 0.25 0.25 0 0 0
+( -640 256 144 ) ( -608 256 144 ) ( -640 288 144 ) common/trigger 128 128 0 0.25 0.25 0 0 0
+( -624 160 144 ) ( -624 160 176 ) ( -592 160 144 ) common/trigger 64 0 0 0.25 0.25 0 0 0
+( -612 256 144 ) ( -612 288 144 ) ( -612 256 176 ) common/trigger 128 0 0 0.25 0.25 0 0 0
 }
 }
 {

diff --git a/maps/stormkeep.mapinfo b/maps/stormkeep.mapinfo
index 70a18670dd9f5522e03438ab9d166db94d29585f..8800827c7cdcd2231bcbcdb70c1e9f73831ad0aa 100644 (file)
--- a/maps/stormkeep.mapinfo
+++ b/maps/stormkeep.mapinfo
@@ -11,6 +11,8 @@ gametype arena
 gametype rc
 gametype kh
 gametype ca
+gametype freezetag
+gametype keepaway
 cdtrack 5
 // optional: fog density red green blue alpha mindist maxdist
 // optional: settemp_for_type (all|gametypename) cvarname value

diff --git a/scripts/effects_forcefield.shader b/scripts/effects_forcefield.shader
index 890d25cb30ceeb75c555c14ce96158813c41e4bf..7728ffc87f626d96414bdc1052252e7c5c3abe41 100644 (file)
--- a/scripts/effects_forcefield.shader
+++ b/scripts/effects_forcefield.shader
@@ -18,6 +18,30 @@ textures/effects_forcefield/forcefield1_a
                tcMod scroll -.5 -.3
        }
 }
+
+//Forcefield1 red glowy, less turb
+textures/effects_forcefield/forcefield1_a_surflight
+{
+       qer_editorimage textures/effects_forcefield/forcefield1_a.tga
+       nopicmip
+       surfaceparm nolightmap
+       surfaceparm trans
+       cull none
+       surfaceparm nomarks
+       q3map_surfacelight 250
+       qer_trans 0.8
+       
+       {
+               map textures/effects_forcefield/forcefield1_a.tga
+               tcGen environment
+               blendfunc GL_ONE GL_ONE
+               tcMod turb 0 0.25 0 0.25
+               tcMod scroll -.5 -.3
+       }
+}
+
+
+
 //Forcefield1 blue
 textures/effects_forcefield/forcefield1_b
 {
@@ -37,6 +61,28 @@ textures/effects_forcefield/forcefield1_b
                tcMod scroll -.5 -.3
        }
 }
+
+//Forcefield1 blue glowy, less turb
+textures/effects_forcefield/forcefield1_b_surflight
+{
+       qer_editorimage textures/effects_forcefield/forcefield1_b.tga
+       nopicmip
+       surfaceparm nolightmap
+       surfaceparm trans
+       cull none
+       surfaceparm nomarks
+       q3map_surfacelight 250
+       qer_trans 0.8
+       
+       {
+               map textures/effects_forcefield/forcefield1_b.tga
+               tcGen environment
+               blendfunc GL_ONE GL_ONE
+               tcMod turb 0 0.25 0 0.25
+               tcMod scroll -.5 -.3
+       }
+}
+
 //Forcefield1 yellow
 textures/effects_forcefield/forcefield1_c
 {
@@ -56,6 +102,29 @@ textures/effects_forcefield/forcefield1_c
                tcMod scroll -.5 -.3
        }
 }
+
+//Forcefield1 yellow less turb, glowy
+textures/effects_forcefield/forcefield1_c_surflight
+{
+       qer_editorimage textures/effects_forcefield/forcefield1_c.tga
+       nopicmip
+       surfaceparm nolightmap
+       surfaceparm trans
+       cull none
+       surfaceparm nomarks
+       q3map_surfacelight 250
+       qer_trans 0.8
+       
+       {
+               map textures/effects_forcefield/forcefield1_c.tga
+               tcGen environment
+               blendfunc GL_ONE GL_ONE
+               tcMod turb 0 0.25 0 0.25
+               tcMod scroll -.5 -.3
+       }
+}
+
+
 //Forcefield1 green
 textures/effects_forcefield/forcefield1_d
 {
@@ -75,3 +144,24 @@ textures/effects_forcefield/forcefield1_d
                tcMod scroll -.5 -.3
        }
 }
+
+//Forcefield1 green glowy, less turb
+textures/effects_forcefield/forcefield1_d_surflight
+{
+       qer_editorimage textures/effects_forcefield/forcefield1_d.tga
+       nopicmip
+       surfaceparm nolightmap
+       surfaceparm trans
+       cull none
+       surfaceparm nomarks
+       q3map_surfacelight 250
+       qer_trans 0.8
+       
+       {
+               map textures/effects_forcefield/forcefield1_d.tga
+               tcGen environment
+               blendfunc GL_ONE GL_ONE
+               tcMod turb 0 0.25 0 0.25
+               tcMod scroll -.5 -.3
+       }
+}
\ No newline at end of file

diff --git a/scripts/ex2x.shader b/scripts/ex2x.shader
index 9de868cd2eeb335f132d5aa82cb910de48ed54c7..0de893dad598b469048a44449e75d1237555c81c 100644 (file)
--- a/scripts/ex2x.shader
+++ b/scripts/ex2x.shader
@@ -299,50 +299,6 @@ textures/ex2x/floor-h4
                map textures/ex2x/floor/floor_h4.tga
                
 
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/ex2x/floor-metal1
-{
-       qer_editorimage textures/ex2x/floor/floor_metal1.tga
-       
-       q3map_bounceScale  0.5
-       dpoffsetmapping - 0.5
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-
-       {
-               map textures/ex2x/floor/floor_metal1.tga
-               
-
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/ex2x/floor-metal2
-{
-       qer_editorimage textures/ex2x/floor/floor_metal2.tga
-       
-       q3map_bounceScale  0.5
-       dpoffsetmapping - 0.5
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-
-       {
-               map textures/ex2x/floor/floor_metal2.tga
-               
-
        }
        {
                map $lightmap
@@ -365,28 +321,6 @@ textures/ex2x/floor-metal3
                map textures/ex2x/floor/floor_metal3.tga
                
 
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/ex2x/floor-p1
-{
-       qer_editorimage textures/ex2x/floor/floor_p1.tga
-       
-       q3map_bounceScale  0.5
-       dpoffsetmapping - 0.5
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-
-       {
-               map textures/ex2x/floor/floor_p1.tga
-               
-
        }
        {
                map $lightmap
@@ -439,51 +373,7 @@ textures/ex2x/floor-plate2
                blendfunc filter
        }
 }
-textures/ex2x/floor-r1
-{
-       qer_editorimage textures/ex2x/floor/floor_r1.tga
-       
-       q3map_bounceScale  0.5
-       dpoffsetmapping - 0.5
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-
-       {
-               map textures/ex2x/floor/floor_r1.tga
-               
-
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/ex2x/floor-rust1
-{
-       qer_editorimage textures/ex2x/floor/floor_rust1.tga
-       
-       q3map_bounceScale  0.5
-       dpoffsetmapping - 0.5
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-
-       {
-               map textures/ex2x/floor/floor_rust1.tga
-               
-
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/ex2x/light-1
+extures/ex2x/light-1
 {
        qer_editorimage textures/ex2x/light/light_1.tga
        
@@ -497,28 +387,6 @@ textures/ex2x/light-1
                map textures/ex2x/light/light_1.tga
                
 
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/ex2x/light-2
-{
-       qer_editorimage textures/ex2x/light/light_2.tga
-       
-       q3map_bounceScale  0.75
-       dpoffsetmapping - 0.5
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-
-       {
-               map textures/ex2x/light/light_2.tga
-               
-
        }
        {
                map $lightmap
@@ -609,50 +477,6 @@ textures/ex2x/trim-warn1
                map textures/ex2x/trim/trim_warn1.tga
                
 
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/ex2x/wall-green1
-{
-       qer_editorimage textures/ex2x/wall/wall_green1.tga
-       
-       q3map_bounceScale  0.5
-       dpoffsetmapping - 0.5
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-
-       {
-               map textures/ex2x/wall/wall_green1.tga
-               
-
-       }
-       {
-               map $lightmap
-               rgbGen identity
-               tcGen lightmap
-               blendfunc filter
-       }
-}
-textures/ex2x/wall-green1dirt
-{
-       qer_editorimage textures/ex2x/wall/wall_green1dirt.tga
-       
-       q3map_bounceScale  0.5
-       dpoffsetmapping - 0.5
-       dpglossintensitymod  3
-       dpglossexponentmod  4
-
-
-       {
-               map textures/ex2x/wall/wall_green1dirt.tga
-               
-
        }
        {
                map $lightmap

diff --git a/textures/ex2x/base/base_bluepaint_norm.tga b/textures/ex2x/base/base_bluepaint_norm.tga
index 1327878db686d26385800c85f6550d4c6ff35bbb..8b6458114833aa7d4b2aa1b5ee865717899f5fc0 100644 (file)
Binary files a/textures/ex2x/base/base_bluepaint_norm.tga and b/textures/ex2x/base/base_bluepaint_norm.tga differ

diff --git a/textures/ex2x/base/base_chainlink_norm.tga b/textures/ex2x/base/base_chainlink_norm.tga
index ee5d8aefe398f14f9e4e446ea9daadd9260b5af5..6d15a72315007b3790f8f5d65c6fc30826862f30 100644 (file)
Binary files a/textures/ex2x/base/base_chainlink_norm.tga and b/textures/ex2x/base/base_chainlink_norm.tga differ

diff --git a/textures/ex2x/base/base_metal1_norm.tga b/textures/ex2x/base/base_metal1_norm.tga
index 589e4543a2f4b7c71fb9eb1f543019874d9bd12d..e172b103bd42541534211771c266cbb16d1d3c27 100644 (file)
Binary files a/textures/ex2x/base/base_metal1_norm.tga and b/textures/ex2x/base/base_metal1_norm.tga differ

diff --git a/textures/ex2x/base/base_metal2_norm.tga b/textures/ex2x/base/base_metal2_norm.tga
index 8e37f9ab5747f3229b830978b9265d374f86b183..9d68a6241cef1c4e97159ee11d193a54f9b9b10f 100644 (file)
Binary files a/textures/ex2x/base/base_metal2_norm.tga and b/textures/ex2x/base/base_metal2_norm.tga differ

diff --git a/textures/ex2x/base/base_metal3_norm.tga b/textures/ex2x/base/base_metal3_norm.tga
index 11780e3cfe7f679045fe03d085c24dbc5740b1e6..144ed7d890b0b5fcab12f4e0b596ba237139c7e3 100644 (file)
Binary files a/textures/ex2x/base/base_metal3_norm.tga and b/textures/ex2x/base/base_metal3_norm.tga differ

diff --git a/textures/ex2x/base/base_metal4_norm.tga b/textures/ex2x/base/base_metal4_norm.tga
index f3f15a2b8f1f884c687e2c3c19790837df9adf1a..4835810e2a658ef1cc486901a30acfd99906dc8d 100644 (file)
Binary files a/textures/ex2x/base/base_metal4_norm.tga and b/textures/ex2x/base/base_metal4_norm.tga differ

diff --git a/textures/ex2x/base/base_metalmaterial1_norm.tga b/textures/ex2x/base/base_metalmaterial1_norm.tga
new file mode 100644 (file)
index 0000000..9cba270
Binary files /dev/null and b/textures/ex2x/base/base_metalmaterial1_norm.tga differ

diff --git a/textures/ex2x/base/base_stone_metal_norm.tga b/textures/ex2x/base/base_stone_metal_norm.tga
index 6524e1d5884fb3cd53d3d54b1704bea75f527c6b..8fdc356472939150737f7b24cb39259ff7a763fe 100644 (file)
Binary files a/textures/ex2x/base/base_stone_metal_norm.tga and b/textures/ex2x/base/base_stone_metal_norm.tga differ

diff --git a/textures/ex2x/base/base_yellowpaint_norm.tga b/textures/ex2x/base/base_yellowpaint_norm.tga
index 387378a8c4dd6d4b5fb5dbb2945bc98f2160cf1a..5d98ee5bd0bce3a328c05bc422d381070b8b0de7 100644 (file)
Binary files a/textures/ex2x/base/base_yellowpaint_norm.tga and b/textures/ex2x/base/base_yellowpaint_norm.tga differ

diff --git a/textures/ex2x/floor/floor_1_norm.tga b/textures/ex2x/floor/floor_1_norm.tga
index 4187af7c0894a7b15887f34bac01da9b6058f055..8d96634533e369a2d2eb034e319b48fceac97a16 100644 (file)
Binary files a/textures/ex2x/floor/floor_1_norm.tga and b/textures/ex2x/floor/floor_1_norm.tga differ

diff --git a/textures/ex2x/floor/floor_h1_norm.tga b/textures/ex2x/floor/floor_h1_norm.tga
index 155959ee92c3b1af27eec6c5a2d6bbccc2ef3f0d..b0f3fccc97262ce7185dc98c0ed68f6822cf27b2 100644 (file)
Binary files a/textures/ex2x/floor/floor_h1_norm.tga and b/textures/ex2x/floor/floor_h1_norm.tga differ

diff --git a/textures/ex2x/floor/floor_h2_norm.tga b/textures/ex2x/floor/floor_h2_norm.tga
index ce7e4e2aa4b5f5a9659985f0c9967d43ec283be5..0e590311103316720c31778124a4f8619cc0bc75 100644 (file)
Binary files a/textures/ex2x/floor/floor_h2_norm.tga and b/textures/ex2x/floor/floor_h2_norm.tga differ

diff --git a/textures/ex2x/floor/floor_h3_norm.tga b/textures/ex2x/floor/floor_h3_norm.tga
index e91e1ae4af84d1219c513bb429a0232f0da51eec..4cb90d98e2bd0962ed3b095d8cf02cd1c9fb684b 100644 (file)
Binary files a/textures/ex2x/floor/floor_h3_norm.tga and b/textures/ex2x/floor/floor_h3_norm.tga differ

diff --git a/textures/ex2x/floor/floor_h4_norm.tga b/textures/ex2x/floor/floor_h4_norm.tga
index 61d1f33fc25843515ed636bca4e493b62c6ba3e2..67a493be0253189a2531a9fbaaca54aeebdb0090 100644 (file)
Binary files a/textures/ex2x/floor/floor_h4_norm.tga and b/textures/ex2x/floor/floor_h4_norm.tga differ

diff --git a/textures/ex2x/floor/floor_metal1.tga b/textures/ex2x/floor/floor_metal1.tga
deleted file mode 100644 (file)
index efc01f0..0000000
Binary files a/textures/ex2x/floor/floor_metal1.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_metal1_gloss.tga b/textures/ex2x/floor/floor_metal1_gloss.tga
deleted file mode 100644 (file)
index f3cd3da..0000000
Binary files a/textures/ex2x/floor/floor_metal1_gloss.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_metal1_norm.tga b/textures/ex2x/floor/floor_metal1_norm.tga
deleted file mode 100644 (file)
index 0973a3c..0000000
Binary files a/textures/ex2x/floor/floor_metal1_norm.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_metal2.tga b/textures/ex2x/floor/floor_metal2.tga
deleted file mode 100644 (file)
index dc10d51..0000000
Binary files a/textures/ex2x/floor/floor_metal2.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_metal2_gloss.tga b/textures/ex2x/floor/floor_metal2_gloss.tga
deleted file mode 100644 (file)
index 1147b7b..0000000
Binary files a/textures/ex2x/floor/floor_metal2_gloss.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_metal2_norm.tga b/textures/ex2x/floor/floor_metal2_norm.tga
deleted file mode 100644 (file)
index 2c2c6fd..0000000
Binary files a/textures/ex2x/floor/floor_metal2_norm.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_metal3_norm.tga b/textures/ex2x/floor/floor_metal3_norm.tga
index 589e78d61261f64004a37d41749d98dafbf2134d..dc667ed4f89251b61de4b3cdc32dc358a767b918 100644 (file)
Binary files a/textures/ex2x/floor/floor_metal3_norm.tga and b/textures/ex2x/floor/floor_metal3_norm.tga differ

diff --git a/textures/ex2x/floor/floor_p1.tga b/textures/ex2x/floor/floor_p1.tga
deleted file mode 100644 (file)
index 775be14..0000000
Binary files a/textures/ex2x/floor/floor_p1.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_p1_gloss.tga b/textures/ex2x/floor/floor_p1_gloss.tga
deleted file mode 100644 (file)
index caf6e51..0000000
Binary files a/textures/ex2x/floor/floor_p1_gloss.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_p1_norm.tga b/textures/ex2x/floor/floor_p1_norm.tga
deleted file mode 100644 (file)
index 038e7f8..0000000
Binary files a/textures/ex2x/floor/floor_p1_norm.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_plate1_norm.tga b/textures/ex2x/floor/floor_plate1_norm.tga
index 6bc97084bf76feff7fe67b4c0267d9291f26d14e..83c42ae29b22cd400da29d806720c8e808bff557 100644 (file)
Binary files a/textures/ex2x/floor/floor_plate1_norm.tga and b/textures/ex2x/floor/floor_plate1_norm.tga differ

diff --git a/textures/ex2x/floor/floor_plate2_norm.tga b/textures/ex2x/floor/floor_plate2_norm.tga
index add111ece8cae0247669f124c51a5db784d49b04..8186ce0a35df7a6e2fc29726584a2663b6ade751 100644 (file)
Binary files a/textures/ex2x/floor/floor_plate2_norm.tga and b/textures/ex2x/floor/floor_plate2_norm.tga differ

diff --git a/textures/ex2x/floor/floor_r1.tga b/textures/ex2x/floor/floor_r1.tga
deleted file mode 100644 (file)
index 1d92227..0000000
Binary files a/textures/ex2x/floor/floor_r1.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_r1_gloss.tga b/textures/ex2x/floor/floor_r1_gloss.tga
deleted file mode 100644 (file)
index 57b2692..0000000
Binary files a/textures/ex2x/floor/floor_r1_gloss.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_r1_norm.tga b/textures/ex2x/floor/floor_r1_norm.tga
deleted file mode 100644 (file)
index 7ab0a31..0000000
Binary files a/textures/ex2x/floor/floor_r1_norm.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_rust1.tga b/textures/ex2x/floor/floor_rust1.tga
deleted file mode 100644 (file)
index 120cf66..0000000
Binary files a/textures/ex2x/floor/floor_rust1.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_rust1_gloss.tga b/textures/ex2x/floor/floor_rust1_gloss.tga
deleted file mode 100644 (file)
index 777547b..0000000
Binary files a/textures/ex2x/floor/floor_rust1_gloss.tga and /dev/null differ

diff --git a/textures/ex2x/floor/floor_rust1_norm.tga b/textures/ex2x/floor/floor_rust1_norm.tga
deleted file mode 100644 (file)
index 6ae99c1..0000000
Binary files a/textures/ex2x/floor/floor_rust1_norm.tga and /dev/null differ

diff --git a/textures/ex2x/light/light_1_norm.tga b/textures/ex2x/light/light_1_norm.tga
index c3ef0a74eb2bc2f33063f7792bc242a88ade1141..5083dda2dca7faa954b5055a73408c67302cded3 100644 (file)
Binary files a/textures/ex2x/light/light_1_norm.tga and b/textures/ex2x/light/light_1_norm.tga differ

diff --git a/textures/ex2x/light/light_2.tga b/textures/ex2x/light/light_2.tga
deleted file mode 100644 (file)
index 41e9379..0000000
Binary files a/textures/ex2x/light/light_2.tga and /dev/null differ

diff --git a/textures/ex2x/light/light_2_gloss.tga b/textures/ex2x/light/light_2_gloss.tga
deleted file mode 100644 (file)
index df3c4a8..0000000
Binary files a/textures/ex2x/light/light_2_gloss.tga and /dev/null differ

diff --git a/textures/ex2x/light/light_2_glow.tga b/textures/ex2x/light/light_2_glow.tga
deleted file mode 100644 (file)
index 7cedd91..0000000
Binary files a/textures/ex2x/light/light_2_glow.tga and /dev/null differ

diff --git a/textures/ex2x/light/light_2_norm.tga b/textures/ex2x/light/light_2_norm.tga
deleted file mode 100644 (file)
index 3b7b150..0000000
Binary files a/textures/ex2x/light/light_2_norm.tga and /dev/null differ

diff --git a/textures/ex2x/light/light_beam_blue_norm.tga b/textures/ex2x/light/light_beam_blue_norm.tga
index 17e0ad86ad514d4c827615e4b5c84887e93ba0dc..f179cb672c475fd8d0591b747f70650dbbef0179 100644 (file)
Binary files a/textures/ex2x/light/light_beam_blue_norm.tga and b/textures/ex2x/light/light_beam_blue_norm.tga differ

diff --git a/textures/ex2x/light/light_beam_red_norm.tga b/textures/ex2x/light/light_beam_red_norm.tga
index 17e0ad86ad514d4c827615e4b5c84887e93ba0dc..f179cb672c475fd8d0591b747f70650dbbef0179 100644 (file)
Binary files a/textures/ex2x/light/light_beam_red_norm.tga and b/textures/ex2x/light/light_beam_red_norm.tga differ

diff --git a/textures/ex2x/trim/trim_green2_norm.tga b/textures/ex2x/trim/trim_green2_norm.tga
index 39c3b07b9b70056308bdbe2c173138a8e69fd3a9..e290bedbc77dccee1c8299cea81aa4a1ff9789b7 100644 (file)
Binary files a/textures/ex2x/trim/trim_green2_norm.tga and b/textures/ex2x/trim/trim_green2_norm.tga differ

diff --git a/textures/ex2x/trim/trim_warn1_norm.tga b/textures/ex2x/trim/trim_warn1_norm.tga
index a6eaabc168c35467c28792780b9f0ae59b0dddfe..d5b75d069d98c74d2714998d87002cef9fffe9ec 100644 (file)
Binary files a/textures/ex2x/trim/trim_warn1_norm.tga and b/textures/ex2x/trim/trim_warn1_norm.tga differ

diff --git a/textures/ex2x/wall/wall_green1.tga b/textures/ex2x/wall/wall_green1.tga
deleted file mode 100644 (file)
index 0d1c9d8..0000000
Binary files a/textures/ex2x/wall/wall_green1.tga and /dev/null differ

diff --git a/textures/ex2x/wall/wall_green1_gloss.tga b/textures/ex2x/wall/wall_green1_gloss.tga
deleted file mode 100644 (file)
index a74323b..0000000
Binary files a/textures/ex2x/wall/wall_green1_gloss.tga and /dev/null differ

diff --git a/textures/ex2x/wall/wall_green1_norm.tga b/textures/ex2x/wall/wall_green1_norm.tga
deleted file mode 100644 (file)
index bf9f1da..0000000
Binary files a/textures/ex2x/wall/wall_green1_norm.tga and /dev/null differ

diff --git a/textures/ex2x/wall/wall_green1dirt.tga b/textures/ex2x/wall/wall_green1dirt.tga
deleted file mode 100644 (file)
index ab0df41..0000000
Binary files a/textures/ex2x/wall/wall_green1dirt.tga and /dev/null differ

diff --git a/textures/ex2x/wall/wall_green1dirt_gloss.tga b/textures/ex2x/wall/wall_green1dirt_gloss.tga
deleted file mode 100644 (file)
index a74323b..0000000
Binary files a/textures/ex2x/wall/wall_green1dirt_gloss.tga and /dev/null differ

diff --git a/textures/ex2x/wall/wall_green1dirt_norm.tga b/textures/ex2x/wall/wall_green1dirt_norm.tga
deleted file mode 100644 (file)
index 694ba6e..0000000
Binary files a/textures/ex2x/wall/wall_green1dirt_norm.tga and /dev/null differ

diff --git a/textures/ex2x/wall/wall_purple1_norm.tga b/textures/ex2x/wall/wall_purple1_norm.tga
index ac7c276dc6276bcfdfd28d0c8db2949fc44bca1e..abee33e5d2355f63cc15369d183aa2bfd99c2dd7 100644 (file)
Binary files a/textures/ex2x/wall/wall_purple1_norm.tga and b/textures/ex2x/wall/wall_purple1_norm.tga differ