set a fade distance on the warpzones, replace a texture in a detail

diff --git a/maps/runningmanctf.map b/maps/runningmanctf.map
index 5737df1435f98b686fa84190f098273565b6d567..7fc060d1e35133b8b0ab7b16a9ed32ab27e726f5 100644 (file)
--- a/maps/runningmanctf.map
+++ b/maps/runningmanctf.map
@@ -1349,7 +1349,7 @@
 }
 {
 ( -2368 1664 0 ) ( -2368 1664 -96 ) ( -2384 1664 -96 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -2480 2096 -96 ) ( -2480 2096 0 ) ( -2480 1856 0 ) narmorx/base-concrete05_red 0 0 0 0.25 0.25 134217728 0 0
+( -2480 2096 -96 ) ( -2480 2096 0 ) ( -2480 1856 0 ) exx/floor-wrn01-red 0 0 0 0.25 0.25 134217728 0 0
 ( -2464 2256 0 ) ( -2464 2256 -96 ) ( -2464 2232 -96 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -2464 2096 0 ) ( -2496 2096 -96 ) ( -2464 2096 -96 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -2496 1856 -32 ) ( -2464 1856 -32 ) ( -2464 1824 -32 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
@@ -4208,7 +4208,7 @@ trak5x/light-light3a-surfacelight
 ( -2592 1696 -240 ) ( -2592 1696 -208 ) ( -2576 1696 -208 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -2592 2144 -240 ) ( -2576 2144 -208 ) ( -2592 2144 -208 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -2592 1696 -240 ) ( -2592 2144 -208 ) ( -2592 1696 -208 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -2576 1696 -240 ) ( -2576 1696 -208 ) ( -2576 2144 -208 ) narmorx/base-concrete05_red 0 0 0 0.25 0.25 134217728 0 0
+( -2576 1696 -240 ) ( -2576 1696 -208 ) ( -2576 2144 -208 ) exx/floor-wrn01-red 0 0 0 0.25 0.25 134217728 0 0
 }
 {
 ( -2464 1920 -64 ) ( -2352 1888 -64 ) ( -2352 1920 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -14154,7 +14154,7 @@ decals/scorch02
 }
 {
 ( 0 -720 -96 ) ( 0 -704 -96 ) ( 0 -704 0 ) common/caulk -0 0 0 0.25 0.25 134217728 0 0
-( 192 -816 0 ) ( 432 -816 0 ) ( 432 -816 -96 ) narmorx/base-concrete05_blue 512 0 0 0.25 0.25 134217728 0 0
+( 192 -816 0 ) ( 432 -816 0 ) ( 432 -816 -96 ) exx/floor-wrn01-blue 512 0 0 0.25 0.25 134217728 0 0
 ( 568 -800 -96 ) ( 592 -800 -96 ) ( 592 -800 0 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( 432 -800 -96 ) ( 432 -832 -96 ) ( 432 -800 0 ) common/caulk -0 0 0 0.25 0.25 134217728 0 0
 ( 160 -800 -32 ) ( 192 -800 -32 ) ( 192 -832 -32 ) common/caulk -0 0 90 0.25 -0.25 134217728 0 0
@@ -17015,7 +17015,7 @@ trak5x/light-light3a-surfacelight
 ( 32 -912 -208 ) ( 32 -928 -208 ) ( 32 -928 -240 ) common/caulk -0 0 0 0.25 0.25 134217728 0 0
 ( 480 -928 -208 ) ( 480 -912 -208 ) ( 480 -928 -240 ) common/caulk -0 0 0 0.25 0.25 134217728 0 0
 ( 32 -928 -208 ) ( 480 -928 -208 ) ( 32 -928 -240 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 480 -912 -208 ) ( 32 -912 -208 ) ( 32 -912 -240 ) narmorx/base-concrete05_blue 512 0 0 0.25 0.25 134217728 0 0
+( 480 -912 -208 ) ( 32 -912 -208 ) ( 32 -912 -240 ) exx/floor-wrn01-blue 512 0 0 0.25 0.25 134217728 0 0
 }
 {
 ( 256 -688 -64 ) ( 224 -688 -64 ) ( 256 -800 -64 ) common/caulk -0 0 90 0.25 -0.25 0 0 0
@@ -30891,6 +30891,8 @@ effects_healpod/healpod1_d
 {
 "classname" "trigger_warpzone"
 "targetname" "trigger_warpzone1"
+"warpzone_fadestart" "600"
+"warpzone_fadeend" "800"
 {
 ( -928 -704 320 ) ( -928 -768 320 ) ( -1056 -704 320 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( -928 -704 320 ) ( -1056 -704 320 ) ( -928 -704 176 ) common/warpzone 0 0 0 0.25 0.25 0 0 0
@@ -30903,6 +30905,8 @@ effects_healpod/healpod1_d
 {
 "classname" "trigger_warpzone"
 "target" "trigger_warpzone1"
+"warpzone_fadeend" "800"
+"warpzone_fadestart" "600"
 {
 ( -64 -1088 -32 ) ( -128 -1088 -32 ) ( -64 -960 -32 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( -64 -1088 -32 ) ( -64 -960 -32 ) ( -64 -1088 -176 ) common/warpzone 0 0 0 0.25 0.25 0 0 0
@@ -30915,6 +30919,8 @@ effects_healpod/healpod1_d
 {
 "classname" "trigger_warpzone"
 "targetname" "trigger_warpzone2"
+"warpzone_fadestart" "600"
+"warpzone_fadeend" "800"
 {
 ( -2368 608 320 ) ( -2432 736 320 ) ( -2368 736 320 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( -2368 736 176 ) ( -2368 608 320 ) ( -2368 736 320 ) common/warpzone 0 0 0 0.25 0.25 0 0 0
@@ -30927,6 +30933,8 @@ effects_healpod/healpod1_d
 {
 "classname" "trigger_warpzone"
 "target" "trigger_warpzone2"
+"warpzone_fadeend" "800"
+"warpzone_fadestart" "600"
 {
 ( -2624 1600 -32 ) ( -2752 1536 -32 ) ( -2752 1600 -32 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( -2752 1600 -176 ) ( -2624 1600 -32 ) ( -2752 1600 -32 ) common/warpzone 0 0 0 0.25 0.25 0 0 0