Trying to get the warpzones right.

diff --git a/maps/8bit_arena.map b/maps/8bit_arena.map
index 5e7272354bd624663e6dc89ea9e80556b24f54e0..1d5cd20323704d70f25eeaa50c65d7f40cac6aa9 100644 (file)
--- a/maps/8bit_arena.map
+++ b/maps/8bit_arena.map
@@ -72972,6 +72972,7 @@ effects_jumppad/jumppadfx1_a
 "gametypefilter" "teamspawns"
 "warpzone_fadestart" "-32770"
 "warpzone_fadeend" "-32769"
+"targetname" "trigger_warpzone24"
 {
 ( -14784 -704 48 ) ( -14784 -576 48 ) ( -14656 -704 48 ) map_arena/warpzone_red 153.5972900391 153.6003417969 180 0.3124999702 0.3124999702 0 0 0
 ( -14784 -688 112 ) ( -14656 -688 112 ) ( -14784 -688 -16 ) common/trigger 76.8007507324 128 0 -0.625 0.375 0 0 0
@@ -74990,68 +74991,68 @@ effects_jumppad/jumppadfx1_a
 ( -3584 512 64 ) ( -3584 704 32 ) ( -3584 512 32 ) common/caulk 128 192 0 -0.25 0.25 0 0 0
 }
 {
-( -3584 576 80 ) ( -3600 688 64 ) ( -3584 704 80 ) ex2x/light-beam_blue 0 0 -90 0.125 0.25 0 0 0
-( -3584 512 64 ) ( -3600 528 48 ) ( -3600 528 64 ) common/caulk 128 0 0 -0.25 0.25 0 0 0
-( -3600 592 64 ) ( -3600 688 48 ) ( -3600 688 64 ) facility114invx/trim-trim01inv 230.3996582031 0 0 -0.2083333284 0.125 0 0 0
-( -3584 576 64 ) ( -3600 688 48 ) ( -3600 592 48 ) common/caulk 128 128 180 0.25 0.25 0 0 0
-( -3584 704 80 ) ( -3600 688 64 ) ( -3600 688 48 ) common/caulk 128 0 0 -0.25 0.25 0 0 0
-( -3584 704 64 ) ( -3584 576 64 ) ( -3584 704 80 ) common/caulk 128 0 0 -0.25 0.25 0 0 0
-}
-{
-( -3584 576 81 ) ( -3600 688 65 ) ( -3584 704 81 ) map_arena/light_beam_anim 341.333190918 0 -90 0.375 0.25 134217728 0 0
-( -3584 512 80 ) ( -3600 528 64 ) ( -3600 528 65 ) common/nodrawnonsolid 128 0 0 -0.25 0.25 134217728 0 0
+( -3584 704 81 ) ( -3584 512 81 ) ( -3600 688 65 ) map_arena/light_beam_anim 341.333190918 0 -90 0.375 0.25 134217728 0 0
 ( -3600 592 65 ) ( -3600 688 64 ) ( -3600 688 65 ) common/nodrawnonsolid 128 0 0 -0.25 0.25 134217728 0 0
-( -3584 576 80 ) ( -3600 688 64 ) ( -3600 592 64 ) common/nodrawnonsolid 128 128 180 0.25 0.25 134217728 0 0
-( -3584 704 81 ) ( -3600 688 65 ) ( -3600 688 64 ) common/nodrawnonsolid 128 0 0 -0.25 0.25 134217728 0 0
-( -3584 704 80 ) ( -3584 576 80 ) ( -3584 704 81 ) common/nodrawnonsolid 128 0 0 -0.25 0.25 134217728 0 0
+( -3600 688 64 ) ( -3584 512 80 ) ( -3584 704 80 ) common/nodrawnonsolid 128 128 180 0.25 0.25 134217728 0 0
+( -3584 704 81 ) ( -3584 512 80 ) ( -3584 512 81 ) common/nodrawnonsolid 128 0 0 -0.25 0.25 134217728 0 0
+( -3600 688 65 ) ( -3584 704 80 ) ( -3584 704 81 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( -3600 528 64 ) ( -3584 512 81 ) ( -3584 512 80 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 {
-( -3712 512 80 ) ( -3600 528 64 ) ( -3584 512 80 ) ex2x/light-beam_blue 512 -0 180 0.125 0.25 0 0 0
-( -3776 512 64 ) ( -3760 528 48 ) ( -3760 528 64 ) common/caulk 128 0 0 -0.25 0.25 0 0 0
-( -3696 528 64 ) ( -3600 528 48 ) ( -3600 528 64 ) facility114invx/trim-trim01inv 127.9984130859 0 0 -0.2083333284 0.125 0 0 0
-( -3712 512 64 ) ( -3600 528 48 ) ( -3696 528 48 ) common/caulk 128 128 90 0.25 0.25 0 0 0
-( -3584 512 80 ) ( -3600 528 64 ) ( -3600 528 48 ) common/caulk 128 0 0 0.25 0.25 0 0 0
-( -3584 512 64 ) ( -3712 512 64 ) ( -3584 512 80 ) common/caulk 128 0 0 -0.25 0.25 0 0 0
-}
-{
-( -3712 512 81 ) ( -3600 528 65 ) ( -3584 512 81 ) map_arena/light_beam_anim 170.6666564941 -0 180 0.375 0.25 134217728 0 0
-( -3776 512 80 ) ( -3760 528 64 ) ( -3760 528 65 ) common/nodrawnonsolid 128 0 0 -0.25 0.25 134217728 0 0
+( -3584 512 81 ) ( -3776 512 81 ) ( -3600 528 65 ) map_arena/light_beam_anim 170.6666564941 -0 180 0.375 0.25 134217728 0 0
 ( -3696 528 65 ) ( -3600 528 64 ) ( -3600 528 65 ) common/nodrawnonsolid 128 0 0 -0.25 0.25 134217728 0 0
-( -3712 512 80 ) ( -3600 528 64 ) ( -3696 528 64 ) common/nodrawnonsolid 128 128 90 0.25 0.25 134217728 0 0
-( -3584 512 81 ) ( -3600 528 65 ) ( -3600 528 64 ) common/nodrawnonsolid 128 0 0 0.25 0.25 134217728 0 0
-( -3584 512 80 ) ( -3712 512 80 ) ( -3584 512 81 ) common/nodrawnonsolid 128 0 0 -0.25 0.25 134217728 0 0
+( -3600 528 64 ) ( -3776 512 80 ) ( -3584 512 80 ) common/nodrawnonsolid 128 128 90 0.25 0.25 134217728 0 0
+( -3584 512 81 ) ( -3776 512 80 ) ( -3776 512 81 ) common/nodrawnonsolid 128 0 0 -0.25 0.25 134217728 0 0
+( -3760 528 64 ) ( -3776 512 81 ) ( -3776 512 80 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( -3600 528 65 ) ( -3584 512 80 ) ( -3584 512 81 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 {
-( -3648 704 81 ) ( -3760 688 65 ) ( -3776 704 81 ) map_arena/light_beam_anim 341.3333435059 0 0 0.375 0.25 134217728 0 0
-( -3584 704 80 ) ( -3600 688 64 ) ( -3600 688 65 ) common/nodrawnonsolid 128 0 0 0.25 0.25 134217728 0 0
+( -3776 704 81 ) ( -3584 704 81 ) ( -3760 688 65 ) map_arena/light_beam_anim 341.3333435059 0 0 0.375 0.25 134217728 0 0
 ( -3664 688 65 ) ( -3760 688 64 ) ( -3760 688 65 ) common/nodrawnonsolid 128 0 0 0.25 0.25 134217728 0 0
-( -3648 704 80 ) ( -3760 688 64 ) ( -3664 688 64 ) common/nodrawnonsolid 128 128 -90 0.25 0.25 134217728 0 0
-( -3776 704 81 ) ( -3760 688 65 ) ( -3760 688 64 ) common/nodrawnonsolid 128 0 0 -0.25 0.25 134217728 0 0
-( -3776 704 80 ) ( -3648 704 80 ) ( -3776 704 81 ) common/nodrawnonsolid 128 0 0 0.25 0.25 134217728 0 0
+( -3760 688 64 ) ( -3584 704 80 ) ( -3776 704 80 ) common/nodrawnonsolid 128 128 -90 0.25 0.25 134217728 0 0
+( -3776 704 81 ) ( -3584 704 80 ) ( -3584 704 81 ) common/nodrawnonsolid 128 0 0 0.25 0.25 134217728 0 0
+( -3760 688 65 ) ( -3776 704 80 ) ( -3776 704 81 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( -3600 688 64 ) ( -3584 704 81 ) ( -3584 704 80 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 {
-( -3648 704 80 ) ( -3760 688 64 ) ( -3776 704 80 ) ex2x/light-beam_blue 0 0 0 0.125 0.25 0 0 0
-( -3584 704 64 ) ( -3600 688 48 ) ( -3600 688 64 ) common/caulk 128 0 0 0.25 0.25 0 0 0
-( -3664 688 64 ) ( -3760 688 48 ) ( -3760 688 64 ) facility114invx/trim-trim01inv 128.0015869141 0 0 0.2083333284 0.125 0 0 0
-( -3648 704 64 ) ( -3760 688 48 ) ( -3664 688 48 ) common/caulk 128 128 -90 0.25 0.25 0 0 0
-( -3776 704 80 ) ( -3760 688 64 ) ( -3760 688 48 ) common/caulk 128 0 0 -0.25 0.25 0 0 0
-( -3776 704 64 ) ( -3648 704 64 ) ( -3776 704 80 ) common/caulk 128 0 0 0.25 0.25 0 0 0
+( -3600 528 64 ) ( -3584 512 80 ) ( -3760 528 64 ) ex2x/light-beam_blue 0 0 180 0.125 0.25 0 0 0
+( -3696 528 64 ) ( -3600 528 48 ) ( -3600 528 64 ) facility114invx/trim-trim01inv 128.0011749268 0 0 -0.2083333284 0.125 0 0 0
+( -3776 512 64 ) ( -3584 512 64 ) ( -3760 528 48 ) common/caulk 128 128 90 0.25 0.25 0 0 0
+( -3776 512 80 ) ( -3584 512 80 ) ( -3584 512 64 ) common/caulk 128 0 0 -0.25 0.25 0 0 0
+( -3600 528 64 ) ( -3584 512 64 ) ( -3584 512 80 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( -3760 528 48 ) ( -3776 512 80 ) ( -3776 512 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 }
 {
-( -3776 640 80 ) ( -3760 528 64 ) ( -3776 512 80 ) ex2x/light-beam_blue -0 0 90 0.125 0.25 0 0 0
-( -3776 704 64 ) ( -3760 688 48 ) ( -3760 688 64 ) common/caulk 128 0 0 0.25 0.25 0 0 0
-( -3760 624 64 ) ( -3760 528 48 ) ( -3760 528 64 ) facility114invx/trim-trim01inv 25.5993652344 0 0 0.2083333284 0.125 0 0 0
-( -3776 640 64 ) ( -3760 528 48 ) ( -3760 624 48 ) common/caulk 128 128 0 0.25 0.25 0 0 0
-( -3776 512 80 ) ( -3760 528 64 ) ( -3760 528 48 ) common/caulk 128 0 0 0.25 0.25 0 0 0
-( -3776 512 64 ) ( -3776 640 64 ) ( -3776 512 80 ) common/caulk 128 0 0 0.25 0.25 0 0 0
+( -3600 528 64 ) ( -3584 704 80 ) ( -3584 512 80 ) ex2x/light-beam_blue 512 0 -90 0.125 0.25 0 0 0
+( -3600 592 64 ) ( -3600 688 48 ) ( -3600 688 64 ) facility114invx/trim-trim01inv 230.4001922607 0 0 -0.2083333284 0.125 0 0 0
+( -3584 512 64 ) ( -3584 704 64 ) ( -3600 528 48 ) common/caulk 128 128 180 0.25 0.25 0 0 0
+( -3584 512 64 ) ( -3584 704 80 ) ( -3584 704 64 ) common/caulk 128 0 0 -0.25 0.25 0 0 0
+( -3600 528 48 ) ( -3584 512 80 ) ( -3584 512 64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( -3600 688 64 ) ( -3584 704 64 ) ( -3584 704 80 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 }
 {
-( -3776 640 81 ) ( -3760 528 65 ) ( -3776 512 81 ) map_arena/light_beam_anim 170.6663208008 0 90 0.375 0.25 134217728 0 0
-( -3776 704 80 ) ( -3760 688 64 ) ( -3760 688 65 ) common/nodrawnonsolid 128 0 0 0.25 0.25 134217728 0 0
+( -3776 512 81 ) ( -3776 704 81 ) ( -3760 528 65 ) map_arena/light_beam_anim 170.6663208008 0 90 0.375 0.25 134217728 0 0
 ( -3760 624 65 ) ( -3760 528 64 ) ( -3760 528 65 ) common/nodrawnonsolid 128 0 0 0.25 0.25 134217728 0 0
-( -3776 640 80 ) ( -3760 528 64 ) ( -3760 624 64 ) common/nodrawnonsolid 128 128 0 0.25 0.25 134217728 0 0
-( -3776 512 81 ) ( -3760 528 65 ) ( -3760 528 64 ) common/nodrawnonsolid 128 0 0 0.25 0.25 134217728 0 0
-( -3776 512 80 ) ( -3776 640 80 ) ( -3776 512 81 ) common/nodrawnonsolid 128 0 0 0.25 0.25 134217728 0 0
+( -3760 528 64 ) ( -3776 704 80 ) ( -3776 512 80 ) common/nodrawnonsolid 128 128 0 0.25 0.25 134217728 0 0
+( -3776 512 81 ) ( -3776 704 80 ) ( -3776 704 81 ) common/nodrawnonsolid 128 0 0 0.25 0.25 134217728 0 0
+( -3760 688 64 ) ( -3776 704 81 ) ( -3776 704 80 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( -3760 528 65 ) ( -3776 512 80 ) ( -3776 512 81 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+}
+{
+( -3760 688 64 ) ( -3776 704 80 ) ( -3600 688 64 ) ex2x/light-beam_blue 0 0 0 0.125 0.25 0 0 0
+( -3664 688 64 ) ( -3760 688 48 ) ( -3760 688 64 ) facility114invx/trim-trim01inv 128.0015869141 0 0 0.2083333284 0.125 0 0 0
+( -3584 704 64 ) ( -3776 704 64 ) ( -3600 688 48 ) common/caulk 128 128 -90 0.25 0.25 0 0 0
+( -3584 704 80 ) ( -3776 704 80 ) ( -3776 704 64 ) common/caulk 128 0 0 0.25 0.25 0 0 0
+( -3760 688 64 ) ( -3776 704 64 ) ( -3776 704 80 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -3600 688 48 ) ( -3584 704 80 ) ( -3584 704 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( -3760 688 64 ) ( -3776 512 80 ) ( -3776 704 80 ) ex2x/light-beam_blue -0 0 90 0.125 0.25 0 0 0
+( -3760 624 64 ) ( -3760 528 48 ) ( -3760 528 64 ) facility114invx/trim-trim01inv 25.5993652344 0 0 0.2083333284 0.125 0 0 0
+( -3776 704 64 ) ( -3776 512 64 ) ( -3760 688 48 ) common/caulk 128 128 0 0.25 0.25 0 0 0
+( -3776 704 64 ) ( -3776 512 80 ) ( -3776 512 64 ) common/caulk 128 0 0 0.25 0.25 0 0 0
+( -3760 688 48 ) ( -3776 704 80 ) ( -3776 704 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -3760 528 64 ) ( -3776 512 64 ) ( -3776 512 80 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 }
 {
@@ -75286,6 +75287,7 @@ effects_jumppad/jumppadfx1_a
 "gametypefilter" "teamspawns"
 "warpzone_fadestart" "-32770"
 "warpzone_fadeend" "-32769"
+"targetname" "trigger_warpzone23"
 {
 ( -15104 -384 48 ) ( -15104 -256 48 ) ( -14976 -384 48 ) map_arena/warpzone_red 153.5972900391 153.6003417969 180 0.3124999702 0.3124999702 0 0 0
 ( -15104 -368 112 ) ( -14976 -368 112 ) ( -15104 -368 -16 ) common/trigger 76.8007507324 128 0 -0.625 0.375 0 0 0
@@ -75316,6 +75318,7 @@ effects_jumppad/jumppadfx1_a
 "gametypefilter" "teamspawns"
 "warpzone_fadestart" "-32770"
 "warpzone_fadeend" "-32769"
+"targetname" "trigger_warpzone22"
 {
 ( -15104 192 48 ) ( -15104 320 48 ) ( -14976 192 48 ) map_arena/warpzone_red 153.5972900391 358.3991699219 180 0.3124999702 0.3124999702 0 0 0
 ( -15104 208 112 ) ( -14976 208 112 ) ( -15104 208 -16 ) common/trigger 76.8007507324 128 0 -0.625 0.375 0 0 0
@@ -75346,6 +75349,7 @@ effects_jumppad/jumppadfx1_a
 "gametypefilter" "teamspawns"
 "warpzone_fadestart" "-32770"
 "warpzone_fadeend" "-32769"
+"targetname" "trigger_warpzone21"
 {
 ( -14784 512 48 ) ( -14784 640 48 ) ( -14656 512 48 ) map_arena/warpzone_red 153.5972900391 358.3991699219 180 0.3124999702 0.3124999702 0 0 0
 ( -14784 528 112 ) ( -14656 528 112 ) ( -14784 528 -16 ) common/trigger 76.7997741699 128 0 -0.625 0.375 0 0 0
@@ -158766,6 +158770,7 @@ effects_forcefield/forcefield1_a_surflight
 "gametypefilter" "teamspawns"
 "warpzone_fadestart" "-32770"
 "warpzone_fadeend" "-32769"
+"targetname" "trigger_warpzone26"
 {
 ( -3328 384 48 ) ( -3328 256 48 ) ( -3456 384 48 ) map_arena/warpzone_blue 256.0014038086 153.6004638672 0 0.3124999702 0.3124999702 0 0 0
 ( -3328 368 112 ) ( -3456 368 112 ) ( -3328 368 -16 ) common/trigger 128.0001831055 128 0 0.625 0.375 0 0 0
@@ -158796,6 +158801,7 @@ effects_forcefield/forcefield1_a_surflight
 "gametypefilter" "teamspawns"
 "warpzone_fadestart" "-32770"
 "warpzone_fadeend" "-32769"
+"targetname" "trigger_warpzone27"
 {
 ( -3648 704 48 ) ( -3648 576 48 ) ( -3776 704 48 ) map_arena/warpzone_blue 256.0014038086 153.6004638672 0 0.3124999702 0.3124999702 0 0 0
 ( -3648 688 112 ) ( -3776 688 112 ) ( -3648 688 -16 ) common/trigger 128.0001831055 128 0 0.625 0.375 0 0 0
@@ -158826,6 +158832,7 @@ effects_forcefield/forcefield1_a_surflight
 "gametypefilter" "teamspawns"
 "warpzone_fadestart" "-32770"
 "warpzone_fadeend" "-32769"
+"targetname" "trigger_warpzone25"
 {
 ( -3328 -192 48 ) ( -3328 -320 48 ) ( -3456 -192 48 ) map_arena/warpzone_blue 256.0014038086 358.3997802734 0 0.3124999702 0.3124999702 0 0 0
 ( -3328 -208 112 ) ( -3456 -208 112 ) ( -3328 -208 -16 ) common/trigger 128.0001831055 128 0 0.625 0.375 0 0 0
@@ -158856,6 +158863,7 @@ effects_forcefield/forcefield1_a_surflight
 "gametypefilter" "teamspawns"
 "warpzone_fadestart" "-32770"
 "warpzone_fadeend" "-32769"
+"targetname" "trigger_warpzone28"
 {
 ( -3648 -512 48 ) ( -3648 -640 48 ) ( -3776 -512 48 ) map_arena/warpzone_blue 256.0014038086 358.3992919922 0 0.3124999702 0.3124999702 0 0 0
 ( -3648 -528 112 ) ( -3776 -528 112 ) ( -3648 -528 -16 ) common/trigger 127.9996948242 128 0 0.625 0.375 0 0 0
@@ -198286,3 +198294,57 @@ effects_forcefield/forcefield1_b_surflight
 ( -10016 800 -130 ) ( -10016 864 -130 ) ( -10016 800 -129 ) common/nodrawnonsolid 64 248 0 0.5 0.25 134217728 0 0
 }
 }
+{
+"classname" "misc_warpzone_position"
+"origin" "-17664.000000 832.000000 48.000000"
+"angles" "-35.000011 -45.000008 45.000000"
+"target" "trigger_warpzone5"
+"gametypefilter" "teamspawns"
+}
+{
+"classname" "misc_warpzone_position"
+"origin" "-19200.000000 832.000000 48.000000"
+"angles" "-35.000011 -135.000000 -45.000008"
+"target" "trigger_warpzone6"
+"gametypefilter" "teamspawns"
+}
+{
+"classname" "misc_warpzone_position"
+"origin" "-17664.000000 -832.000000 48.000000"
+"angles" "-35.000011 45.000000 -45.000008"
+"target" "trigger_warpzone3"
+"gametypefilter" "teamspawns"
+}
+{
+"classname" "misc_warpzone_position"
+"origin" "-19200.000000 -832.000000 48.000000"
+"angles" "-35.000011 135.000000 45.000000"
+"target" "trigger_warpzone4"
+"gametypefilter" "teamspawns"
+}
+{
+"classname" "misc_warpzone_position"
+"origin" "-14752.000000 -608.000000 48.000000"
+"angles" "-35 45 -45"
+"target" "trigger_warpzone24"
+"gametypefilter" "teamspawns"
+}
+{
+"classname" "misc_warpzone_position"
+"origin" "-14752.000000 608.000000 48.000000"
+"angles" "-35.000011 -45.000008 45.000000"
+"target" "trigger_warpzone21"
+"gametypefilter" "teamspawns"
+}
+{
+"classname" "misc_warpzone_position"
+"origin" "-15072.000000 288.000000 48.000000"
+"target" "trigger_warpzone22"
+"gametypefilter" "teamspawns"
+}
+{
+"classname" "misc_warpzone_position"
+"origin" "-15072.000000 -288.000000 48.000000"
+"target" "trigger_warpzone23"
+"gametypefilter" "teamspawns"
+}