fixing broken rally/probe harvest triggers

EnvyDragon · Aug 4, 2024 · fa4cfc4 · fa4cfc4
1 parent d00595a
commit fa4cfc4
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 4 deletions.
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_dark_whispers.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/LotV/ap_dark_whispers.SC2Map/ComponentList.SC2Components
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Components>
-    <Optimized/>
     <DataComponent Type="gada">GameData</DataComponent>
     <DataComponent Type="text" Locale="enUS">GameText</DataComponent>
     <DataComponent Type="info">DocumentInfo</DataComponent>

diff --git a/Maps/ArchipelagoCampaign/LotV/ap_dark_whispers.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/LotV/ap_dark_whispers.SC2Map/DocumentHeader
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_dark_whispers.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/LotV/ap_dark_whispers.SC2Map/MapScript.galaxy
@@ -9,6 +9,7 @@ include "TriggerLibs/NativeLib"
 include "TriggerLibs/LibertyLib"
 include "TriggerLibs/SwarmLib"
 include "LibA3DDD02B"
+include "Lib15EF4C78"
 include "Lib2F7F8645"
 include "Lib5BD4895D"
 include "LibABFE498B"
@@ -27,6 +28,7 @@ void InitLibs () {
     libLbty_InitLib();
     libHots_InitLib();
     libA3DDD02B_InitLib();
+    lib15EF4C78_InitLib();
     lib2F7F8645_InitLib();
     lib5BD4895D_InitLib();
     libABFE498B_InitLib();
@@ -1412,7 +1414,8 @@ bool gt_StartGame_Func (bool testConds, bool runActions) {
         }
 
     }
-    UnitIssueOrder(UnitFromId(2), OrderTargetingUnit(AbilityCommand("RallyNexus", 0), UnitFromId(6)), c_orderQueueReplace);
+    lib15EF4C78_gf_AP_Player_UtilTownHallAutoRally(gv_pLAYER_01_USER);
+    libLbty_gf_OrderWorkerstoGatherNearbyResources(RegionEntireMap(), 1);
     TriggerExecute(gt_KerriganController, true, false);
     Wait(2.0, c_timeReal);
     TriggerExecute(gt_RevealObjectiveLocation01Q, true, true);

diff --git a/Maps/ArchipelagoCampaign/LotV/ap_dark_whispers.SC2Map/Triggers b/Maps/ArchipelagoCampaign/LotV/ap_dark_whispers.SC2Map/Triggers
@@ -7570,6 +7570,8 @@
         <Action Type="FunctionCall" Id="BFF199A9"/>
         <Action Type="Comment" Id="721D75FA"/>
         <Action Type="FunctionCall" Id="128200C9"/>
+        <Action Type="FunctionCall" Id="D48C576B"/>
+        <Action Type="FunctionCall" Id="5E0D5A1F"/>
         <Action Type="Comment" Id="CF37F3F6"/>
         <Action Type="FunctionCall" Id="C6859B49"/>
         <Action Type="Comment" Id="C54741CB"/>
@@ -7903,6 +7905,7 @@
         </Comment>
     </Element>
     <Element Type="FunctionCall" Id="128200C9">
+        <Disabled/>
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000089"/>
         <Parameter Type="Param" Id="E8240836"/>
         <Parameter Type="Param" Id="3E202FBD"/>
@@ -7937,6 +7940,31 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000158"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000039"/>
     </Element>
+    <Element Type="FunctionCall" Id="D48C576B">
+        <FunctionDef Type="FunctionDef" Library="15EF4C78" Id="84565F53"/>
+        <Parameter Type="Param" Id="EF9B3EEB"/>
+    </Element>
+    <Element Type="Param" Id="EF9B3EEB">
+        <ParameterDef Type="ParamDef" Library="15EF4C78" Id="CF70F2A6"/>
+        <Variable Type="Variable" Id="862D1E5F"/>
+    </Element>
+    <Element Type="FunctionCall" Id="5E0D5A1F">
+        <FunctionDef Type="FunctionDef" Library="Lbty" Id="05E197DE"/>
+        <Parameter Type="Param" Id="95660DC1"/>
+        <Parameter Type="Param" Id="52259745"/>
+    </Element>
+    <Element Type="Param" Id="95660DC1">
+        <ParameterDef Type="ParamDef" Library="Lbty" Id="97BDB33A"/>
+        <FunctionCall Type="FunctionCall" Id="C8F90A5B"/>
+    </Element>
+    <Element Type="FunctionCall" Id="C8F90A5B">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000356"/>
+    </Element>
+    <Element Type="Param" Id="52259745">
+        <ParameterDef Type="ParamDef" Library="Lbty" Id="3F42FBCD"/>
+        <Value>1</Value>
+        <ValueType Type="int"/>
+    </Element>
     <Element Type="Comment" Id="CF37F3F6">
         <Comment>
 

diff --git a/Maps/ArchipelagoCampaign/LotV/ap_dark_whispers.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/LotV/ap_dark_whispers.SC2Map/Triggers.version
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_temple_of_unification.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/LotV/ap_temple_of_unification.SC2Map/ComponentList.SC2Components
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Components>
-    <Optimized/>
     <DataComponent Type="gada">GameData</DataComponent>
     <DataComponent Type="text" Locale="enUS">GameText</DataComponent>
     <DataComponent Type="info">DocumentInfo</DataComponent>

diff --git a/Maps/ArchipelagoCampaign/LotV/ap_temple_of_unification.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/LotV/ap_temple_of_unification.SC2Map/DocumentHeader
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_temple_of_unification.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/LotV/ap_temple_of_unification.SC2Map/MapScript.galaxy
@@ -12,6 +12,7 @@ include "TriggerLibs/VoidLib"
 include "TriggerLibs/VoidCampaignLib"
 include "TriggerLibs/VoidCampaignMissionLib"
 include "TriggerLibs/VoidCampaignUILib"
+include "Lib15EF4C78"
 include "Lib30B9E51A"
 include "Lib5BD4895D"
 include "LibABFE498B"
@@ -27,6 +28,7 @@ void InitLibs () {
     libVoiC_InitLib();
     libVCMI_InitLib();
     libVCUI_InitLib();
+    lib15EF4C78_InitLib();
     lib30B9E51A_InitLib();
     lib5BD4895D_InitLib();
     libABFE498B_InitLib();
@@ -1124,7 +1126,7 @@ bool gt_Init03Units_Func (bool testConds, bool runActions) {
         return true;
     }
 
-    libVCMI_gf_SetWorkerRallyPointsPlayersNexuses(gv_pLAYER_01_USER);
+    lib15EF4C78_gf_AP_Player_UtilTownHallAutoRally(gv_pLAYER_01_USER);
     TriggerExecute(gt_CelestialLockInit, true, false);
     auto4198F952_g = UnitGroup("Bunker", gv_pLAYER_03_MOEBIUS, RegionPlayableMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0);
     auto4198F952_u = UnitGroupCount(auto4198F952_g, c_unitCountAll);

diff --git a/Maps/ArchipelagoCampaign/LotV/ap_temple_of_unification.SC2Map/Triggers b/Maps/ArchipelagoCampaign/LotV/ap_temple_of_unification.SC2Map/Triggers
@@ -1463,6 +1463,7 @@
         <Variable Type="Variable" Id="C35ED6D6"/>
         <Action Type="Comment" Id="CAF2B052"/>
         <Action Type="FunctionCall" Id="76603A5B"/>
+        <Action Type="FunctionCall" Id="A168C350"/>
         <Action Type="Comment" Id="3BBD73A6"/>
         <Action Type="FunctionCall" Id="347D61C3"/>
         <Action Type="Comment" Id="2ADA3088"/>
@@ -1484,13 +1485,22 @@
         </Comment>
     </Element>
     <Element Type="FunctionCall" Id="76603A5B">
+        <Disabled/>
         <FunctionDef Type="FunctionDef" Library="VCMI" Id="8C71FC49"/>
         <Parameter Type="Param" Id="ECA3C142"/>
     </Element>
     <Element Type="Param" Id="ECA3C142">
         <ParameterDef Type="ParamDef" Library="VCMI" Id="D793D12A"/>
         <Variable Type="Variable" Id="294B65C4"/>
     </Element>
+    <Element Type="FunctionCall" Id="A168C350">
+        <FunctionDef Type="FunctionDef" Library="15EF4C78" Id="84565F53"/>
+        <Parameter Type="Param" Id="C57AFFD8"/>
+    </Element>
+    <Element Type="Param" Id="C57AFFD8">
+        <ParameterDef Type="ParamDef" Library="15EF4C78" Id="CF70F2A6"/>
+        <Variable Type="Variable" Id="294B65C4"/>
+    </Element>
     <Element Type="Comment" Id="3BBD73A6">
         <Comment>
             Init Celestial Locks

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