From 3ff6a534a9d227eac17569d8a232ceb70fe3ca91 Mon Sep 17 00:00:00 2001
From: stevenhowes <38082088+stevenhowes@users.noreply.github.com>
Date: Wed, 1 Sep 2021 19:47:15 +0100
Subject: [PATCH] Allow dis-arming of events. Red-alert soundnow stops once out
 in corridor.

---
 !TheEsc/!RunImage,ff8 | Bin 26732 -> 26764 bytes
 !TheEsc/c/Mission2    |   2 ++
 !TheEsc/compile.php   |  22 ++++++++++++++++++++++
 !TheEsc/m2_evact,ffd  | Bin 1224 -> 1260 bytes
 !TheEsc/m2_evt,ffd    | Bin 672 -> 728 bytes
 !TheEsc/m2_map,ffd    | Bin 20000 -> 20000 bytes
 !TheEsc/m2_smart,ffd  | Bin 2400 -> 2400 bytes
 !TheEsc/m2_txt        |  22 ++++++++++++++--------
 8 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8
index 05fcaea0bc873edd576a34a352e120266e9dc222..194f213483161ab7a8a435f9493c494078cab980 100644
GIT binary patch
delta 3214
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
K>FZkdo$CJqET|9w

delta 3274
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
B!HEC>

diff --git a/!TheEsc/c/Mission2 b/!TheEsc/c/Mission2
index 0e7c628..834ae10 100644
--- a/!TheEsc/c/Mission2
+++ b/!TheEsc/c/Mission2
@@ -676,6 +676,8 @@ void game2_triggerevent(int id)
       }
       else if(EventActions[i].Action == 5)         // Change overlay tile sprite
         fullmap[EventActions[i].ActionTarget + 10000] = EventActions[i].ActionValue;
+      else if(EventActions[i].Action == 6)    // Dis-arm
+        Events[EventActions[i].ActionTarget].Triggered = 1;
     }
   }
 }
diff --git a/!TheEsc/compile.php b/!TheEsc/compile.php
index 234a0a2..d9c2b11 100644
--- a/!TheEsc/compile.php
+++ b/!TheEsc/compile.php
@@ -142,6 +142,28 @@
             $eventactions[] = array("Event"=>$inevent,"Action"=>3,"ActionValue"=>255,"ActionTarget"=>$target);
         }
         break;
+      case "DisArm":
+        if($inevent < 0)
+        {
+          echo "  Invalid outside event\n";
+        }
+        else
+        {
+          $csv = str_getcsv($split[1]);
+
+          $target = -1;
+          foreach($events as $eventid=>$event)
+          {
+            if($event['Name'] == $csv[0])
+              $target = $eventid;
+          }
+
+          if($target < 0)
+            echo "  Unknown target: " . $csv[0] . "\n";
+          else
+            $eventactions[] = array("Event"=>$inevent,"Action"=>6,"ActionValue"=>255,"ActionTarget"=>$target);
+        }
+        break;
       case "Schedule":
         if($inevent < 0)
         {
diff --git a/!TheEsc/m2_evact,ffd b/!TheEsc/m2_evact,ffd
index 747fd266fc10f0c8050dd9cc02f516ed602d18d2..82ca35d47584fc53df2579c97f9a86a1d57473dd 100644
GIT binary patch
literal 1260
zcmXw(F;i1P6opS--bRCpsEANFKnH`dPGRGWR%w{g2=-9g+t^75wG9Og|G<`BdjE(s
z_He%4ciznAetUBE-n*O4lcdo|y7OaHzr|;J`VDD4{7TvjTYnd}ei*iX61M(5Z2dfJ
z{VHtzcX(6!6JC>kgx$a*JeB^tR|j>yG;#D)Wm~%K8h6F>K_7cZmg^|5o2SkP4~&N#
ztE{oWIl$;On#%|2#`VVVM`_pV;nafh+fqk4XnyA9P4mO?!}wXZ;*s-*(TVJVy4Mc}
zcHOBrj-EU)e$IhGUHp|@7e5?7jGuLnJVtJS{le(P2OiYDcs#J{{u?-X@Zfi;I;e}E
zIs3&A#}DIYoxjq^2S8mIo%jUZ106;uK1Fu|bQqoJE292cyC-n@ES>uI3(vf_@K@Ih
zpLz4)_s$#s=Cca#yP@#XO~CyNfB1pvf#~w;4ct|@d}=*}=^;!HVR{JDLzo`I^bn>8
zn7Tw->HK4It}r_BxyNK+{<r<h_TPcaO#16s`K>hfVMm`kQS{5O{X6a<`p<!>h33@i
z4U2)xvgJoFUt0dk*2y28{L#rDo%}HQiGDSx98164CyY+?>qF(J=`cFcuaA1K@$(An
LeA&3?FdpJP>*i#E

delta 461
zcmYL`Jr06E5QQJOtCCn4{Gm0mvB8?c8`#+Ra{v!vV`z*vb`~}k#v7P;2oB&eyo0_6
zOq>Ao?YGMgJA9%d%E1T%;L8xZM9(T*AK+Dn8vqky%9%0!!kB(*OusXxKO58Ejr$nm
zWrHD57<Ylaar}H7LmxJQ_9bnc@|Y8@2h5qpJ_X*!Qy}AM%xCSI>2JndKkEGbq2>n9
zulKk$96|ew{j%D><Q4L=fK8}CJy8}guL9;(K&%4F><0V>xbj2A^2+QC{JQdDd1W>R
Rp10N~8ilP&=vQfx@(;}eBjo@9

diff --git a/!TheEsc/m2_evt,ffd b/!TheEsc/m2_evt,ffd
index 715ed7f0560c481207ba8f7fb8d0f113a312a34f..0524cf863983b07364481b5a3f397b60f2729762 100644
GIT binary patch
delta 30
mcmZ3$dV_Vt55~y{7&%yiL;M3KZ(x*Q4fYT9bD8{-aXSF4WD4*A

delta 11
Scmcb?x`1`V55~y`Oe+8#dIXsO

diff --git a/!TheEsc/m2_map,ffd b/!TheEsc/m2_map,ffd
index ceadf5fabe5eaf1c73d48adf235c4d9001b3ba65..9553b7b8226bb6b0c571b1d7a04e517e81e9070b 100644
GIT binary patch
delta 140
zcmZ25hjGCi#tnB^C+DzhPLAc^o6OFkJJEobaq470wlEk&X7V{UD+I@g9f@;}jd${N
zPTkEH*#9ZAX)*wT+T<&mhuAbgO!diuTCtOVYNbMDCMxPpo}@j69U{rFSy!i%aq<E_
Ki_PzJjT8W!ASfyT

delta 145
zcmZ25hjGCi#tnB^Cns?7PQJ(~JUM}lb8;*P-(+?Uy~%$$c%Wh~Nb+2h&#_sd@Qv85
zCf{MzoP3szZ}N0b-OU%+|0zy1;GR6efNSz&&CQb)jFKn+)JmObU^01<_7rwa1~mpC
Z-mI(B$;ht3pw0lq6BP|Nztc5R000kRFF^nR

diff --git a/!TheEsc/m2_smart,ffd b/!TheEsc/m2_smart,ffd
index 3a91ee2e904234e21d20398f8739065d29a67333..b0cb7606eef9e2e5a5ddc7e3668eb55ff6fbe703 100644
GIT binary patch
delta 180
zcmaDL^gw9C3g&tz4hDw*K)@vQ|9=BFl+FA9zcZ3}Ba*lal6Vu6ILHhT0GR^=C~QHP
UD2f{O|4i5=(8M=?WENrt0G(BOy#N3J

delta 87
zcmaDL^gw9C3TC(eP{73e|9=BF0|SW5#0wJzvVr1_IK-Ra;+q3m_*o|>up|Qj&)zkz

diff --git a/!TheEsc/m2_txt b/!TheEsc/m2_txt
index 4b8cc11..bdb04c9 100644
--- a/!TheEsc/m2_txt
+++ b/!TheEsc/m2_txt
@@ -43,20 +43,21 @@ AddEvent(15,"MESS-AREA",0,-1,-1)
 ###########################################
 AddEvent(16,"REDALERTON",0,-1,-1)
 AddEvent(17,"REDALERTOFF",0,-1,-1)
-
+AddEvent(18,"REDALERTSTOP",0,-1,-1)
+AddEvent(19,"REDALERTSOUND",0,-1,-1)
 
 # Console animation
 ###########################################
-AddEvent(18,"CONSOLE1",0,-1,-1)
-AddEvent(19,"CONSOLE2",0,-1,-1)
+AddEvent(20,"CONSOLE1",0,-1,-1)
+AddEvent(21,"CONSOLE2",0,-1,-1)
 
 
 # Tractor beam events
 ###########################################
-AddEvent(20,"TRAC1",0,-1,-1)
-AddEvent(21,"TRAC2",0,-1,-1)
-AddEvent(22,"TRACOFF",0,-1,-1)
-AddEvent(23,"TRACSOUND",0,-1,-1)
+AddEvent(22,"TRAC1",0,-1,-1)
+AddEvent(23,"TRAC2",0,-1,-1)
+AddEvent(24,"TRACOFF",0,-1,-1)
+AddEvent(25,"TRACSOUND",0,-1,-1)
 
 
 ###############################################################################
@@ -193,7 +194,7 @@ Event("REDALERTON")
  SetOverlayTile(2413,84)
  SetOverlayTile(3113,84)  # Cargo bay two
  SetOverlayTile(3413,84)
- Sound(PCMSAMPLE_ALERT, PCMCHANNEL_AMBIENT)
+ Schedule("REDALERTSOUND",0)
  ReArm("REDALERTON")
 Event("REDALERTOFF")
  Schedule("REDALERTON",125)
@@ -206,6 +207,11 @@ Event("REDALERTOFF")
  SetOverlayTile(3113,83)  # Cargo bay two
  SetOverlayTile(3413,83)
  ReArm("REDALERTOFF")
+Event("REDALERTSOUND")
+ Sound(PCMSAMPLE_ALERT, PCMCHANNEL_AMBIENT)
+ ReArm("REDALERTSOUND")
+Event("REDALERTSTOP")
+ DisArm("REDALERTSOUND")
 
 ###########################################
 # Console animations