From: Rudolf Polzer <divVerent@xonotic.org>
Date: Fri, 26 Nov 2010 23:58:18 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/stormkeep'
X-Git-Tag: xonotic-v0.1.0preview~24
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=36a9f8f6f7435ad0a417a3b5af50c976ff91d402;hp=1844e22d4d312eb1e2897a6f2ad7841db9bf14e9

Merge remote branch 'origin/fruitiex/stormkeep'
---

diff --git a/maps/stormkeep.map b/maps/stormkeep.map
index cf8ffce1..f98be2ec 100644
--- a/maps/stormkeep.map
+++ b/maps/stormkeep.map
@@ -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 -168 ) ( 1280 -64 -168 ) ( 1792 -64 -168 ) 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
@@ -1308,11 +1308,11 @@ 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 ) )
+( ( 1376 -464 -192 0 0 ) ( 1376 -464 -208 0 -0.125 ) ( 1376 -464 -224 0 -0.25 ) )
+( ( 1376 -416 -192 0.25 0 ) ( 1376 -416 -208 0.25 -0.125 ) ( 1376 -416 -224 0.25 -0.25 ) )
+( ( 1440 -416 -192 0.625 0 ) ( 1440 -416 -208 0.625 -0.125 ) ( 1440 -416 -224 0.625 -0.25 ) )
+( ( 1504 -416 -192 1 0 ) ( 1504 -416 -208 1 -0.125 ) ( 1504 -416 -224 1 -0.25 ) )
+( ( 1504 -464 -192 1.25 0 ) ( 1504 -464 -208 1.25 -0.125 ) ( 1504 -464 -224 1.25 -0.25 ) )
 )
 }
 }
@@ -4336,7 +4336,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
@@ -9459,20 +9459,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 +10300,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
@@ -10914,12 +10906,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 +11637,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
@@ -12334,7 +12318,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 -36 ) ( -544 -64 -36 ) ( -1120 448 -36 ) 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,12 +12326,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
+( -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
 }
 {
 ( -576 1344 -32 ) ( -576 960 -32 ) ( -896 1344 -32 ) exx/floor-simple05 0 0 0 0.25 0.25 0 0 0
@@ -13419,6 +13403,70 @@ 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
+}
 }
 {
 "classname" "func_group"
@@ -14105,9 +14153,9 @@ 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 ) )
+( ( 1360 -464 -160 10.75 3.125 ) ( 1360 -352 -160 10.75 2.125 ) ( 1440 -352 -160 11.25 2.125 ) )
+( ( 1440 -464 -160 11.25 3.125 ) ( 1440 -352 -160 11.25 2.125 ) ( 1440 -352 -160 11.25 2.125 ) )
+( ( 1520 -464 -160 11.75 3.125 ) ( 1520 -352 -160 11.75 2.125 ) ( 1440 -352 -160 11.25 2.125 ) )
 )
 }
 }
@@ -14117,11 +14165,11 @@ 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 ) )
+( ( 1360 -464 -160 0 0 ) ( 1360 -464 -176 0 -0.125 ) ( 1376 -464 -192 0 -0.3017767072 ) )
+( ( 1360 -352 -160 1 0 ) ( 1360 -352 -176 1 -0.125 ) ( 1376 -416 -192 1 -0.3017767072 ) )
+( ( 1440 -352 -160 1.5 0 ) ( 1440 -352 -176 1.5 -0.125 ) ( 1440 -416 -192 1.5 -0.3017767072 ) )
+( ( 1520 -352 -160 2 0 ) ( 1520 -352 -176 2 -0.125 ) ( 1504 -416 -192 2 -0.3017767072 ) )
+( ( 1520 -464 -160 3 0 ) ( 1520 -464 -176 3 -0.125 ) ( 1504 -464 -192 3 -0.3017767072 ) )
 )
 }
 }
@@ -22121,12 +22169,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 +22183,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 +22199,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 +22526,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
 }
 }
 {