fixing rescue delay bug

Ziktofel · Oct 20, 2024 · b7108f4 · b7108f4
1 parent 802d3d7
commit b7108f4
Show file tree

Hide file tree

Showing 4 changed files with 310 additions and 155 deletions.
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/DocumentHeader
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/MapScript.galaxy
@@ -2408,13 +2408,17 @@ bool gt_ReapersReinforcements01_Func (bool testConds, bool runActions) {
             if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) {
                 UnitIssueOrder(autoC03B76C5_var, OrderTargetingPoint(AbilityCommand("AP_BlinkMultiple", 0), PointFromId(1927)), c_orderQueueReplace);
                 UnitIssueOrder(autoC03B76C5_var, OrderTargetingPoint(AbilityCommand("attack", 0), PointFromId(1927)), c_orderQueueAddToEnd);
-                Wait(0.5, c_timeGame);
             }
             else {
                 UnitIssueOrder(autoC03B76C5_var, OrderTargetingPoint(AbilityCommand("attack", 0), PointFromId(1927)), c_orderQueueReplace);
-                Wait(2.5, c_timeGame);
             }
         }
+        if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) {
+            Wait(0.5, c_timeGame);
+        }
+        else {
+            Wait(2.5, c_timeGame);
+        }
         autoDB292AD8_g = lv_reaperGroup;
         autoDB292AD8_u = UnitGroupCount(autoDB292AD8_g, c_unitCountAll);
         for (;; autoDB292AD8_u -= 1) {
@@ -2512,13 +2516,17 @@ bool gt_ReapersReinforcements02_Func (bool testConds, bool runActions) {
             if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) {
                 UnitIssueOrder(auto20B79E52_var, OrderTargetingPoint(AbilityCommand("AP_BlinkMultiple", 0), PointFromId(1925)), c_orderQueueReplace);
                 UnitIssueOrder(auto20B79E52_var, OrderTargetingPoint(AbilityCommand("attack", 0), PointFromId(1925)), c_orderQueueAddToEnd);
-                Wait(0.5, c_timeGame);
             }
             else {
                 UnitIssueOrder(auto20B79E52_var, OrderTargetingPoint(AbilityCommand("attack", 0), PointFromId(1925)), c_orderQueueReplace);
-                Wait(2.5, c_timeGame);
             }
         }
+        if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) {
+            Wait(0.5, c_timeGame);
+        }
+        else {
+            Wait(2.5, c_timeGame);
+        }
         auto1D10E944_g = lv_reaperGroup;
         auto1D10E944_u = UnitGroupCount(auto1D10E944_g, c_unitCountAll);
         for (;; auto1D10E944_u -= 1) {
@@ -2616,13 +2624,17 @@ bool gt_ReapersReinforcements03_Func (bool testConds, bool runActions) {
             if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) {
                 UnitIssueOrder(autoE81781EA_var, OrderTargetingPoint(AbilityCommand("AP_BlinkMultiple", 0), PointFromId(1912)), c_orderQueueReplace);
                 UnitIssueOrder(autoE81781EA_var, OrderTargetingPoint(AbilityCommand("attack", 0), PointFromId(1912)), c_orderQueueAddToEnd);
-                Wait(0.5, c_timeGame);
             }
             else {
                 UnitIssueOrder(autoE81781EA_var, OrderTargetingPoint(AbilityCommand("attack", 0), PointFromId(1912)), c_orderQueueReplace);
-                Wait(2.5, c_timeGame);
             }
         }
+        if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) {
+            Wait(0.5, c_timeGame);
+        }
+        else {
+            Wait(2.5, c_timeGame);
+        }
         auto59045EC4_g = lv_reaperGroup;
         auto59045EC4_u = UnitGroupCount(auto59045EC4_g, c_unitCountAll);
         for (;; auto59045EC4_u -= 1) {
@@ -2721,13 +2733,17 @@ bool gt_ReapersReinforcements04_Func (bool testConds, bool runActions) {
             if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) {
                 UnitIssueOrder(autoFD3BFCD1_var, OrderTargetingPoint(AbilityCommand("AP_BlinkMultiple", 0), PointFromId(1917)), c_orderQueueReplace);
                 UnitIssueOrder(autoFD3BFCD1_var, OrderTargetingPoint(AbilityCommand("attack", 0), PointFromId(1917)), c_orderQueueAddToEnd);
-                Wait(0.5, c_timeGame);
             }
             else {
                 UnitIssueOrder(autoFD3BFCD1_var, OrderTargetingPoint(AbilityCommand("attack", 0), PointFromId(1917)), c_orderQueueReplace);
-                Wait(2.5, c_timeGame);
             }
         }
+        if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) {
+            Wait(0.5, c_timeGame);
+        }
+        else {
+            Wait(2.5, c_timeGame);
+        }
         autoFF38DCB0_g = lv_reaperGroup;
         autoFF38DCB0_u = UnitGroupCount(autoFF38DCB0_g, c_unitCountAll);
         for (;; autoFF38DCB0_u -= 1) {
@@ -2825,13 +2841,17 @@ bool gt_ReapersReinforcements05_Func (bool testConds, bool runActions) {
             if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) {
                 UnitIssueOrder(autoC926F1D5_var, OrderTargetingPoint(AbilityCommand("AP_BlinkMultiple", 0), PointFromId(1926)), c_orderQueueReplace);
                 UnitIssueOrder(autoC926F1D5_var, OrderTargetingPoint(AbilityCommand("attack", 0), PointFromId(1926)), c_orderQueueAddToEnd);
-                Wait(0.5, c_timeGame);
             }
             else {
                 UnitIssueOrder(autoC926F1D5_var, OrderTargetingPoint(AbilityCommand("attack", 0), PointFromId(1926)), c_orderQueueReplace);
-                Wait(2.5, c_timeGame);
             }
         }
+        if ((libABFE498B_gv_aP_Triggers_Option_overridePlayerRace == "Prot")) {
+            Wait(0.5, c_timeGame);
+        }
+        else {
+            Wait(2.5, c_timeGame);
+        }
         autoF7D09147_g = lv_reaperGroup;
         autoF7D09147_u = UnitGroupCount(autoF7D09147_g, c_unitCountAll);
         for (;; autoF7D09147_u -= 1) {