Samual, all the things pointed out should be fixed now :)

diff --git a/maps/abyss.map b/maps/abyss.map
index 3011ef1277f52aa597c2d04bf7f312d55eba6139..111fc3a6982f409acd3f36360fc57622edcca3d6 100644 (file)
--- a/maps/abyss.map
+++ b/maps/abyss.map
@@ -12353,7 +12353,7 @@ brushDef
 ( -656 -1344 280 ) ( -656 -1344 -8 ) ( -656 -1232 280 ) ( ( 0.0078125 0 502.5 ) ( 0 0.0078125 0.4375 ) ) exx/base-crete01 0 0 0
 ( -640 -1232 -8 ) ( -656 -1232 -8 ) ( -640 -1344 -8 ) ( ( -0.015625 0 237 ) ( 0 -0.015625 243 ) ) common/caulk 0 0 0
 ( -648 -1088 -24 ) ( -648 -1088 264 ) ( -664 -1088 -24 ) ( ( 0.015625 0 12.875 ) ( 0 0.015625 0.625 ) ) common/caulk 0 0 0
-( -640 -1232 216 ) ( -640 -1344 216 ) ( -640 -1232 504 ) ( ( 0.03125 0 38 ) ( 0 0.0078125 2.1875 ) ) exx/trim-psimple04 0 0 0
+( -640 -1232 216 ) ( -640 -1344 216 ) ( -640 -1232 504 ) ( ( 0.0078125 0 9.5 ) ( 0 0.0078125 2.1875 ) ) effects_warpzone/warpzone_backdrop 0 0 0
 ( -640 -1168 -368 ) ( -648 -1168 -368 ) ( -640 -1168 -240 ) ( ( 0.015625 0 0 ) ( 0 0.015625 251.25 ) ) common/caulk 0 0 0
 }
 }
@@ -20798,7 +20798,7 @@ brushDef
 ( -832 -592 680 ) ( -1088 -592 680 ) ( -832 -592 704 ) ( ( 0.015625 0 252 ) ( 0 0.015625 1 ) ) common/caulk 0 0 0
 ( -832 -592 680 ) ( -832 -592 704 ) ( -832 -576 680 ) ( ( 0 -0.015625 255 ) ( 0.015625 0 254 ) ) common/caulk 0 0 0
 ( -848 -592 512 ) ( -848 -576 512 ) ( -1104 -592 512 ) ( ( 0 -0.015625 252.25 ) ( 0.015625 0 254 ) ) common/caulk 0 0 0
-( -1088 -576 704 ) ( -1088 -576 680 ) ( -832 -576 704 ) ( ( -0.0078125 0 510 ) ( 0 -0.0078125 511.5 ) ) exx/base-crete01 0 0 0
+( -1088 -576 704 ) ( -1088 -576 680 ) ( -832 -576 704 ) ( ( -0.0078125 0 510 ) ( 0 -0.0078125 511.5 ) ) effects_warpzone/warpzone_backdrop 0 0 0
 ( -1088 -576 704 ) ( -1088 -592 704 ) ( -1088 -576 680 ) ( ( 0 0.015625 1 ) ( -0.015625 0 254 ) ) common/caulk 0 0 0
 ( -1088 -576 704 ) ( -832 -576 704 ) ( -1088 -592 704 ) ( ( 0 -0.015625 4 ) ( 0.015625 0 254 ) ) common/caulk 0 0 0
 }
@@ -26838,7 +26838,7 @@ brushDef
 ( -656 -1344 208 ) ( -656 -1232 208 ) ( -640 -1344 208 ) ( ( -0.015625 0 237 ) ( 0 -0.015625 13 ) ) common/caulk 0 0 0
 ( -656 -1344 280 ) ( -656 -1344 -8 ) ( -656 -1232 280 ) ( ( 0.0078125 0 502.5 ) ( 0 0.0078125 0.4375 ) ) exx/base-crete01 0 0 0
 ( -640 -1232 -8 ) ( -656 -1232 -8 ) ( -640 -1344 -8 ) ( ( -0.015625 0 237 ) ( 0 -0.015625 243 ) ) common/caulk 0 0 0
-( -640 -1232 216 ) ( -640 -1344 216 ) ( -640 -1232 504 ) ( ( 0.0078125 0 9.5 ) ( 0 0.0078125 2.1875 ) ) exx/floor-clang01 0 0 0
+( -640 -1232 216 ) ( -640 -1344 216 ) ( -640 -1232 504 ) ( ( 0.0078125 0 9.5 ) ( 0 0.0078125 2.1875 ) ) effects_warpzone/warpzone_backdrop 0 0 0
 ( -640 -1168 -240 ) ( -648 -1168 -368 ) ( -640 -1168 -368 ) ( ( 0.015625 0 0 ) ( 0 0.015625 251.25 ) ) common/caulk 0 0 0
 ( -640 -1264 -368 ) ( -656 -1264 -368 ) ( -640 -1264 -240 ) ( ( 0.015625 0 0 ) ( 0 0.015625 251.25 ) ) common/caulk 0 0 0
 }
@@ -26850,7 +26850,7 @@ brushDef
 ( -656 -1344 264 ) ( -640 -1344 264 ) ( -656 -1344 -24 ) ( ( 0.015625 0 243 ) ( 0 0.015625 0.625 ) ) common/caulk 0 0 0
 ( -656 -1344 280 ) ( -656 -1344 -8 ) ( -656 -1232 280 ) ( ( 0.0078125 0 502.5 ) ( 0 0.0078125 0.4375 ) ) exx/base-crete01 0 0 0
 ( -640 -1232 -8 ) ( -656 -1232 -8 ) ( -640 -1344 -8 ) ( ( -0.015625 0 237 ) ( 0 -0.015625 243 ) ) common/caulk 0 0 0
-( -640 -1232 216 ) ( -640 -1344 216 ) ( -640 -1232 504 ) ( ( 0.03125 0 38 ) ( 0 0.0078125 2.1875 ) ) exx/trim-psimple04 0 0 0
+( -640 -1232 216 ) ( -640 -1344 216 ) ( -640 -1232 504 ) ( ( 0.0078125 0 9.5 ) ( 0 0.0078125 2.1875 ) ) effects_warpzone/warpzone_backdrop 0 0 0
 ( -640 -1264 -240 ) ( -656 -1264 -368 ) ( -640 -1264 -368 ) ( ( 0.015625 0 0 ) ( 0 0.015625 251.25 ) ) common/caulk 0 0 0
 }
 }
@@ -55788,7 +55788,7 @@ brushDef
 ( 5904 832 304 ) ( 5904 832 16 ) ( 5904 720 304 ) ( ( 0.0078125 0 506.5 ) ( 0 0.0078125 0.625 ) ) exx/base-crete01 0 0 0
 ( 5888 720 16 ) ( 5904 720 16 ) ( 5888 832 16 ) ( ( 0.015625 0 245 ) ( 0 0.015625 69 ) ) common/caulk 0 0 0
 ( 5896 576 0 ) ( 5896 576 288 ) ( 5912 576 0 ) ( ( 0.015625 0 186.875 ) ( 0 0.015625 1 ) ) common/caulk 0 0 0
-( 5888 720 240 ) ( 5888 832 240 ) ( 5888 720 528 ) ( ( 0.03125 0 22 ) ( 0 0.0078125 2.375 ) ) exx/trim-psimple04 0 0 0
+( 5888 720 240 ) ( 5888 832 240 ) ( 5888 720 528 ) ( ( 0.0078125 0 5.5 ) ( 0 0.0078125 2.375 ) ) effects_warpzone/warpzone_backdrop 0 0 0
 ( 5888 656 -64 ) ( 5896 656 -64 ) ( 5888 656 64 ) ( ( 0.015625 0 82 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 }
 }
@@ -64378,7 +64378,7 @@ brushDef
 ( 6080 80 680 ) ( 6336 80 680 ) ( 6080 80 704 ) ( ( 0.015625 0 78 ) ( 0 0.015625 1 ) ) common/caulk 0 0 0
 ( 6080 80 680 ) ( 6080 80 704 ) ( 6080 64 680 ) ( ( 0 -0.015625 255 ) ( 0.015625 0 246 ) ) common/caulk 0 0 0
 ( 6096 80 512 ) ( 6096 64 512 ) ( 6352 80 512 ) ( ( 0 0.015625 78.25 ) ( -0.015625 0 246 ) ) common/caulk 0 0 0
-( 6336 64 704 ) ( 6336 64 680 ) ( 6080 64 704 ) ( ( -0.0078125 0 39 ) ( 0 -0.0078125 511.5 ) ) exx/base-crete01 0 0 0
+( 6336 64 704 ) ( 6336 64 680 ) ( 6080 64 704 ) ( ( -0.0078125 0 39 ) ( 0 -0.0078125 511.5 ) ) effects_warpzone/warpzone_backdrop 0 0 0
 ( 6336 64 704 ) ( 6336 80 704 ) ( 6336 64 680 ) ( ( 0 0.015625 1 ) ( -0.015625 0 246 ) ) common/caulk 0 0 0
 ( 6336 64 704 ) ( 6080 64 704 ) ( 6336 80 704 ) ( ( 0 0.015625 178 ) ( -0.015625 0 246 ) ) common/caulk 0 0 0
 }
@@ -70420,7 +70420,7 @@ brushDef
 ( 5912 832 208 ) ( 5912 720 208 ) ( 5896 832 208 ) ( ( 0.015625 0 245 ) ( 0 0.015625 186.875 ) ) common/caulk 0 0 0
 ( 5904 832 304 ) ( 5904 832 16 ) ( 5904 720 304 ) ( ( 0.0078125 0 506.5 ) ( 0 0.0078125 0.625 ) ) exx/base-crete01 0 0 0
 ( 5888 720 16 ) ( 5904 720 16 ) ( 5888 832 16 ) ( ( 0.015625 0 245 ) ( 0 0.015625 69 ) ) common/caulk 0 0 0
-( 5888 720 240 ) ( 5888 832 240 ) ( 5888 720 528 ) ( ( 0.0078125 0 5.5 ) ( 0 0.0078125 2.375 ) ) exx/floor-clang01 0 0 0
+( 5888 720 240 ) ( 5888 832 240 ) ( 5888 720 528 ) ( ( 0.0078125 0 5.5 ) ( 0 0.0078125 2.375 ) ) effects_warpzone/warpzone_backdrop 0 0 0
 ( 5888 656 64 ) ( 5896 656 -64 ) ( 5888 656 -64 ) ( ( 0.015625 0 174 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 ( 5888 752 -64 ) ( 5904 752 -64 ) ( 5888 752 64 ) ( ( 0.015625 0 82 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 }
@@ -70432,7 +70432,7 @@ brushDef
 ( 5904 832 288 ) ( 5888 832 288 ) ( 5904 832 0 ) ( ( 0.015625 0 69 ) ( 0 0.015625 1 ) ) common/caulk 0 0 0
 ( 5904 832 304 ) ( 5904 832 16 ) ( 5904 720 304 ) ( ( 0.0078125 0 506.5 ) ( 0 0.0078125 0.625 ) ) exx/base-crete01 0 0 0
 ( 5888 720 16 ) ( 5904 720 16 ) ( 5888 832 16 ) ( ( 0.015625 0 245 ) ( 0 0.015625 69 ) ) common/caulk 0 0 0
-( 5888 720 240 ) ( 5888 832 240 ) ( 5888 720 528 ) ( ( 0.03125 0 22 ) ( 0 0.0078125 2.375 ) ) exx/trim-psimple04 0 0 0
+( 5888 720 240 ) ( 5888 832 240 ) ( 5888 720 528 ) ( ( 0.0078125 0 5.5 ) ( 0 0.0078125 2.375 ) ) effects_warpzone/warpzone_backdrop 0 0 0
 ( 5888 752 64 ) ( 5904 752 -64 ) ( 5888 752 -64 ) ( ( 0.015625 0 174 ) ( 0 0.015625 0 ) ) common/caulk 0 0 0
 }
 }
@@ -104897,6 +104897,8 @@ brushDef
 {
 "classname" "trigger_warpzone"
 "target" "trigger_warpzone1"
+"warpzone_fadestart" "600"
+"warpzone_fadeend" "900"
 {
 brushDef
 {
@@ -104912,6 +104914,8 @@ brushDef
 {
 "classname" "trigger_warpzone"
 "targetname" "trigger_warpzone1"
+"warpzone_fadeend" "900"
+"warpzone_fadestart" "600"
 {
 brushDef
 {
@@ -109351,6 +109355,8 @@ brushDef
 {
 "classname" "trigger_warpzone"
 "targetname" "trigger_warpzone7"
+"warpzone_fadestart" "600"
+"warpzone_fadeend" "900"
 {
 brushDef
 {
@@ -109366,6 +109372,8 @@ brushDef
 {
 "classname" "trigger_warpzone"
 "target" "trigger_warpzone7"
+"warpzone_fadeend" "900"
+"warpzone_fadestart" "600"
 {
 brushDef
 {

diff --git a/maps/abyss.map.options b/maps/abyss.map.options
index f80fce69f10881a0e2b79363c0f455353752715d..92ba840b75d5d2fdb869524136d1bbc53c96e865 100644 (file)
--- a/maps/abyss.map.options
+++ b/maps/abyss.map.options
@@ -2,5 +2,5 @@
 -light + -bounce 8 -dirtscale 2
 -vis +
 -minimap +
-Version: 10
+Version: 11