From b7108f48601c54b1e777fe725b1f75b4e908a001 Mon Sep 17 00:00:00 2001
From: EnvyDragon <138727357+EnvyDragon@users.noreply.github.com>
Date: Sun, 20 Oct 2024 00:49:51 -0400
Subject: [PATCH] fixing rescue delay bug
---
.../DocumentHeader | Bin 5126 -> 5126 bytes
.../MapScript.galaxy | 40 +-
.../WoL/ap_devils_playground.SC2Map/Triggers | 425 ++++++++++++------
.../Triggers.version | Bin 44 -> 44 bytes
4 files changed, 310 insertions(+), 155 deletions(-)
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/DocumentHeader
index cce33d45f3fe5f625db43ba048a73bffd980fa05..d041b9f4959e9f24172a8a89f47f49fb444d2642 100644
GIT binary patch
delta 19
YcmZqEXw#S=!*T1@v^yZYQRR^^09|GZCjbBd
delta 19
YcmZqEXw#S=!?Av<+aVC%sPae{08YdRa{vGU
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/MapScript.galaxy
index 94d3eac10..8c121d0b7 100644
--- 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) {
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/Triggers b/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/Triggers
index fc519a1ad..05dbbbb41 100644
--- a/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/Triggers
+++ b/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/Triggers
@@ -21020,6 +21020,7 @@
+
@@ -21410,10 +21411,8 @@
-
-
@@ -21453,21 +21452,6 @@
-
-
-
-
-
-
-
-
- 2.5
-
-
-
-
-
-
@@ -21543,37 +21527,80 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Prot
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2.5
+
+
+
+
+
+
+
-
-
+
+
-
+
0.5
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
Prot
@@ -21977,6 +22004,7 @@
+
@@ -22367,10 +22395,8 @@
-
-
@@ -22410,21 +22436,6 @@
-
-
-
-
-
-
-
-
- 2.5
-
-
-
-
-
-
@@ -22500,37 +22511,80 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Prot
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2.5
+
+
+
+
+
+
+
-
-
+
+
-
+
0.5
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
Prot
@@ -22934,6 +22988,7 @@
+
@@ -23324,10 +23379,8 @@
-
-
@@ -23367,21 +23420,6 @@
-
-
-
-
-
-
-
-
- 2.5
-
-
-
-
-
-
@@ -23457,37 +23495,80 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Prot
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2.5
+
+
+
+
+
+
+
-
-
+
+
-
+
0.5
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
Prot
@@ -23891,6 +23972,7 @@
+
@@ -24299,10 +24381,8 @@
-
-
@@ -24342,21 +24422,6 @@
-
-
-
-
-
-
-
-
- 2.5
-
-
-
-
-
-
@@ -24432,37 +24497,80 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Prot
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2.5
+
+
+
+
+
+
+
-
-
+
+
-
+
0.5
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
Prot
@@ -24866,6 +24974,7 @@
+
@@ -25256,10 +25365,8 @@
-
-
@@ -25299,21 +25406,6 @@
-
-
-
-
-
-
-
-
- 2.5
-
-
-
-
-
-
@@ -25389,37 +25481,80 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Prot
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2.5
+
+
+
+
+
+
+
-
-
+
+
-
+
0.5
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
Prot
diff --git a/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/WoL/ap_devils_playground.SC2Map/Triggers.version
index 5139d4a00e5dbdc2845141d80a9d69a436680b1e..94a3eb3c2295f9d0d91ab716e6ea81baa2522514 100644
GIT binary patch
delta 17
YcmdPVnV`V4gNcEGxmzTik%55$03V|Q*#H0l
delta 17
YcmdPVnV`V4or!^gwN50Rk%55$03S>O%>V!Z