From a5a72a3a5bba47732e8f72e14d8d94fcafd5d719 Mon Sep 17 00:00:00 2001
From: xen <xen@airmail.cc>
Date: Mon, 4 Nov 2019 04:56:50 +0200
Subject: [PATCH] Update with yesterday's fixes

---
 ze_ffvii_mako_reactor_v5_3.cfg   | 144 +++++++++++++++++++++++++++++++
 ze_minecraft_adventure_v1_2c.cfg |  20 ++++-
 ze_predator_ultimate_v3.cfg      |  18 +++-
 3 files changed, 180 insertions(+), 2 deletions(-)

diff --git a/ze_ffvii_mako_reactor_v5_3.cfg b/ze_ffvii_mako_reactor_v5_3.cfg
index f71a403..5d57638 100644
--- a/ze_ffvii_mako_reactor_v5_3.cfg
+++ b/ze_ffvii_mako_reactor_v5_3.cfg
@@ -8878,6 +8878,150 @@ add:
 	"OnUser1" "!self,FireUser1,,0.15,-1"
 }
 
+;=======================================================
+;  Add ksf-style beams to show triggers in core descent
+;=======================================================
+add:
+{
+	"origin" "-9976 9216 -2944"
+	"targetname" "tele1_beam_target1"
+	"spawnflags" "0"
+	"angles" "0 0 0"
+	"classname" "info_target"
+}
+add:
+{
+	"origin" "-10104 9216 -2944"
+	"TouchType" "0"
+	"TextureScroll" "35"
+	"texture" "sprites/laserbeam.spr"
+	"targetname" "tele1_beam1"
+	"StrikeTime" "1"
+	"spawnflags" "1"
+	"renderfx" "0"
+	"rendercolor" "128 0 255"
+	"renderamt" "200"
+	"Radius" "256"
+	"NoiseAmplitude" "0"
+	"LightningStart" "tele1_beam1"
+	"LightningEnd" "tele1_beam_target1"
+	"life" "0"
+	"HDRColorScale" "1.0"
+	"framestart" "0"
+	"framerate" "0"
+	"decalname" "Bigshot"
+	"damage" "0"
+	"BoltWidth" "2"
+	"classname" "env_beam"
+}
+add:
+{
+	"origin" "-9976 9432 -2944"
+	"TouchType" "0"
+	"TextureScroll" "35"
+	"texture" "sprites/laserbeam.spr"
+	"targetname" "tele1_beam2"
+	"StrikeTime" "1"
+	"spawnflags" "1"
+	"renderfx" "0"
+	"rendercolor" "128 0 255"
+	"renderamt" "200"
+	"Radius" "256"
+	"NoiseAmplitude" "0"
+	"LightningStart" "tele1_beam2"
+	"LightningEnd" "tele1_beam_target1"
+	"life" "0"
+	"HDRColorScale" "1.0"
+	"framestart" "0"
+	"framerate" "0"
+	"decalname" "Bigshot"
+	"damage" "0"
+	"BoltWidth" "2"
+	"classname" "env_beam"
+}
+add:
+{
+	"origin" "-9736 9003 -4080"
+	"targetname" "tele1_beam_target2"
+	"spawnflags" "0"
+	"angles" "0 0 0"
+	"classname" "info_target"
+}
+add:
+{
+	"origin" "-10112 9003 -4080"
+	"TouchType" "0"
+	"TextureScroll" "35"
+	"texture" "sprites/laserbeam.spr"
+	"targetname" "tele1_beam3"
+	"StrikeTime" "1"
+	"spawnflags" "1"
+	"renderfx" "0"
+	"rendercolor" "128 0 255"
+	"renderamt" "200"
+	"Radius" "256"
+	"NoiseAmplitude" "0"
+	"LightningStart" "tele1_beam3"
+	"LightningEnd" "tele1_beam_target2"
+	"life" "0"
+	"HDRColorScale" "1.0"
+	"framestart" "0"
+	"framerate" "0"
+	"decalname" "Bigshot"
+	"damage" "0"
+	"BoltWidth" "2"
+	"classname" "env_beam"
+}
+add:
+{
+	"origin" "-9736 8804 -4080"
+	"TouchType" "0"
+	"TextureScroll" "35"
+	"texture" "sprites/laserbeam.spr"
+	"targetname" "tele1_beam4"
+	"StrikeTime" "1"
+	"spawnflags" "1"
+	"renderfx" "0"
+	"rendercolor" "128 0 255"
+	"renderamt" "200"
+	"Radius" "256"
+	"NoiseAmplitude" "0"
+	"LightningStart" "tele1_beam4"
+	"LightningEnd" "tele1_beam_target2"
+	"life" "0"
+	"HDRColorScale" "1.0"
+	"framestart" "0"
+	"framerate" "0"
+	"decalname" "Bigshot"
+	"damage" "0"
+	"BoltWidth" "2"
+	"classname" "env_beam"
+}
+modify:
+{
+	match:
+	{
+		"classname" "trigger_once"
+		"origin" "-9864 9008 -4244"
+	}
+	insert:
+	{
+		"OnStartTouch" "tele1_beam*,TurnOff,,0,-1"
+	}
+}
+modify:
+{
+	match:
+	{
+		"classname" "trigger_once"
+		"origin" "-7584 9056 -4624"
+	}
+	insert:
+	{
+		"OnStartTouch" "tele1_beam*,TurnOff,,10,-1"
+	}
+} 
+
 ;=========================
 ;       ENTITY SAVINGS
 ;=========================
diff --git a/ze_minecraft_adventure_v1_2c.cfg b/ze_minecraft_adventure_v1_2c.cfg
index cecfec5..e82ea52 100644
--- a/ze_minecraft_adventure_v1_2c.cfg
+++ b/ze_minecraft_adventure_v1_2c.cfg
@@ -86,4 +86,22 @@ modify:
 		"OnTrigger" "jungletemp_levers_torch9_off,Disable,,0,-1"
 		"OnTrigger" "jungletemp_levers_torch9_on,Enable,,0,-1"
 	}
-}
\ No newline at end of file
+}
+
+;-------------------------
+;HEAL: FILTER TO CT ONLY
+;-------------------------
+
+modify:
+{
+	match:
+	{
+		"targetname" "heal1_trigger"
+		"classname" "trigger_hurt"
+		"hammerid" "184435"
+	}
+	insert:
+	{
+		"filtername" "ct_filter"
+	}
+}
diff --git a/ze_predator_ultimate_v3.cfg b/ze_predator_ultimate_v3.cfg
index f7dcd01..192ebb4 100644
--- a/ze_predator_ultimate_v3.cfg
+++ b/ze_predator_ultimate_v3.cfg
@@ -24,7 +24,7 @@ add:
 	"targetname" "stripper_fix_lagevator_move"
 	"OnFullyOpen" "!self,Close,,10,1"
 	"OnFullyOpen" "server,Command,say ***ELEVATOR'S HERE***,0,1"
-	"OnFullyOpen" "mine_elevator_break,Break,,25,1"
+	"OnFullyClosed" "mine_elevator_break,Break,,3.5,1"
 }
 modify:
 {
@@ -92,6 +92,22 @@ filter:
 	"origin" "-11008 4112 1768"
 	"classname" "func_tracktrain"
 }
+;------------------------------------------------
+;ZOMBIE LADDER OPENS AFTER ELEVATOR REACHES TOP
+;------------------------------------------------
+modify:
+{
+	match:
+	{
+		"origin" "-8944 6504 1136"
+		"targetname" "cboss_elevator"
+		"classname" "func_door"
+	}
+	replace:
+	{
+		"OnFullyOpen" "break_ladder_1,Break,,3,-1"
+	}
+}
 ;-----------------------
 ;FIX INFINITE NUKE FADE
 ;-----------------------