Merge pull request #168 from EnvyDragon/mediocre-joh

Fixing Steps of the Rite easter egg bug
Ziktofel · Jul 6, 2024 · 569ec4f · 569ec4f
2 parents 23debd1 + fc116f0
commit 569ec4f
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_steps_of_the_rite.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/LotV/ap_steps_of_the_rite.SC2Map/DocumentHeader
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_steps_of_the_rite.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/LotV/ap_steps_of_the_rite.SC2Map/MapScript.galaxy
@@ -1559,6 +1559,10 @@ bool gt_ImmortalJohFoundQ_Func (bool testConds, bool runActions) {
     // Automatic Variable Declarations
     // Conditions
     if (testConds) {
+        if (!((GameGetMissionTime() > 30.0))) {
+            return false;
+        }
+
         if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) {
             return false;
         }
@@ -1571,7 +1575,7 @@ bool gt_ImmortalJohFoundQ_Func (bool testConds, bool runActions) {
             return false;
         }
 
-        if (!((UnitGroupCount(UnitGroup(null, gv_pLAYER_01_USER, RegionFromId(27), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) > 0))) {
+        if (!((UnitGroupCount(UnitGroup(null, gv_pLAYER_01_USER, RegionFromId(27), UnitFilter(0, 0, (1 << c_targetFilterMissile) | (1 << c_targetFilterUncommandable), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32)) | (1 << (c_targetFilterInvulnerable - 32))), 0), c_unitCountAlive) > 0))) {
             return false;
         }
     }

diff --git a/Maps/ArchipelagoCampaign/LotV/ap_steps_of_the_rite.SC2Map/Triggers b/Maps/ArchipelagoCampaign/LotV/ap_steps_of_the_rite.SC2Map/Triggers
@@ -6848,6 +6848,7 @@
     </Element>
     <Element Type="Trigger" Id="5D8095BE">
         <Event Type="FunctionCall" Id="182EBAA4"/>
+        <Condition Type="FunctionCall" Id="357E38F3"/>
         <Condition Type="FunctionCall" Id="3BC7B627"/>
         <Condition Type="FunctionCall" Id="31476327"/>
         <Condition Type="FunctionCall" Id="C0FBB1C4"/>
@@ -6869,6 +6870,28 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="3E8E573F"/>
         <Preset Type="PresetValue" Library="Ntve" Id="EC544EA4"/>
     </Element>
+    <Element Type="FunctionCall" Id="357E38F3">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
+        <Parameter Type="Param" Id="AE1C0B0E"/>
+        <Parameter Type="Param" Id="997436F3"/>
+        <Parameter Type="Param" Id="6286D25B"/>
+    </Element>
+    <Element Type="Param" Id="AE1C0B0E">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
+        <FunctionCall Type="FunctionCall" Id="56634970"/>
+    </Element>
+    <Element Type="FunctionCall" Id="56634970">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="5A832F2D"/>
+    </Element>
+    <Element Type="Param" Id="997436F3">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="40567BEE"/>
+    </Element>
+    <Element Type="Param" Id="6286D25B">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
+        <Value>30.0</Value>
+        <ValueType Type="fixed"/>
+    </Element>
     <Element Type="FunctionCall" Id="3BC7B627">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
         <Parameter Type="Param" Id="7FDB75E0"/>
@@ -6989,7 +7012,7 @@
     </Element>
     <Element Type="Param" Id="A4AC6D4B">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000695"/>
-        <Value>-;Missile,Dead,Hidden</Value>
+        <Value>-;Missile,Uncommandable,Dead,Hidden,Invulnerable</Value>
         <ValueType Type="unitfilter"/>
     </Element>
     <Element Type="Param" Id="5F05A96A">

diff --git a/Maps/ArchipelagoCampaign/LotV/ap_steps_of_the_rite.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/LotV/ap_steps_of_the_rite.SC2Map/Triggers.version