Fix Brutal Last stand

Ziktofel · Nov 28, 2024 · 347e0e7 · 347e0e7
1 parent 6598787
commit 347e0e7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 128 deletions.
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_last_stand.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/LotV/ap_last_stand.SC2Map/DocumentHeader
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_last_stand.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/LotV/ap_last_stand.SC2Map/MapScript.galaxy
@@ -877,6 +877,7 @@ bool gt_FactionSwapInit_Func (bool testConds, bool runActions) {
 //--------------------------------------------------------------------------------------------------
 void gt_FactionSwapInit_Init () {
     gt_FactionSwapInit = TriggerCreate("gt_FactionSwapInit_Func");
+    TriggerAddEventGeneric(gt_FactionSwapInit, lib5BD4895D_gv_aP_Core_LOAD_FINISHED_EVENT);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -985,28 +986,7 @@ void gt_onDifficultyHard_Init () {
 // Trigger: onDifficultyBrutal
 //--------------------------------------------------------------------------------------------------
 bool gt_onDifficultyBrutal_Func (bool testConds, bool runActions) {
-    // Variable Declarations
-    unit lv_currentUnit;
-
     // Automatic Variable Declarations
-    unitgroup auto80A49F70_g;
-    int auto80A49F70_u;
-
-    // Variable Initialization
-
-    // Actions
-    if (!runActions) {
-        return true;
-    }
-
-    auto80A49F70_g = UnitGroupFromId(4);
-    auto80A49F70_u = UnitGroupCount(auto80A49F70_g, c_unitCountAll);
-    for (;; auto80A49F70_u -= 1) {
-        lv_currentUnit = UnitGroupUnitFromEnd(auto80A49F70_g, auto80A49F70_u);
-        if (lv_currentUnit == null) { break; }
-        AIToggleBulliesInRegion(UnitGetOwner(lv_currentUnit), RegionCircle(UnitGetPosition(lv_currentUnit), 0.5), false);
-        UnitRemove(lv_currentUnit);
-    }
     return true;
 }
 
@@ -1057,7 +1037,6 @@ bool gt_Initialization_Func (bool testConds, bool runActions) {
     TriggerExecute(gt_Init04MusicSound, true, false);
     TriggerExecute(gt_Init05Environment, true, false);
     TriggerExecute(gt_Init06Difficulties, true, false);
-    TriggerExecute(gt_FactionSwapInit, true, true);
     TriggerExecute(gt_IntroQ, true, true);
     TriggerExecute(gt_StartGameQ, true, false);
     return true;

diff --git a/Maps/ArchipelagoCampaign/LotV/ap_last_stand.SC2Map/Triggers b/Maps/ArchipelagoCampaign/LotV/ap_last_stand.SC2Map/Triggers
@@ -14,8 +14,17 @@
         <Item Type="Trigger" Id="3F780B4F"/>
     </Element>
     <Element Type="Trigger" Id="7FEA3B33">
+        <Event Type="FunctionCall" Id="BBC67D74"/>
         <Action Type="FunctionCall" Id="24D1E79D"/>
     </Element>
+    <Element Type="FunctionCall" Id="BBC67D74">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="B1A02C2E"/>
+        <Parameter Type="Param" Id="10629A5A"/>
+    </Element>
+    <Element Type="Param" Id="10629A5A">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="177B3837"/>
+        <Variable Type="Variable" Library="5BD4895D" Id="14B28730"/>
+    </Element>
     <Element Type="FunctionCall" Id="24D1E79D">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
         <FunctionCall Type="FunctionCall" Id="A5B95939"/>
@@ -584,91 +593,6 @@
         <Variable Type="Variable" Id="3406863E"/>
     </Element>
     <Element Type="Trigger" Id="30EE81F5">
-        <Variable Type="Variable" Id="F44CDE0D"/>
-        <Action Type="FunctionCall" Id="80A49F70"/>
-    </Element>
-    <Element Type="Variable" Id="F44CDE0D">
-        <VariableType>
-            <Type Value="unit"/>
-        </VariableType>
-        <Value Type="Param" Id="093F7B09"/>
-    </Element>
-    <Element Type="Param" Id="093F7B09">
-        <Preset Type="PresetValue" Library="Ntve" Id="D6EA4D09"/>
-    </Element>
-    <Element Type="FunctionCall" Id="80A49F70">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000327"/>
-        <Parameter Type="Param" Id="DA98051A"/>
-        <Parameter Type="Param" Id="5285F41C"/>
-        <FunctionCall Type="FunctionCall" Id="0870B981"/>
-        <FunctionCall Type="FunctionCall" Id="153C763C"/>
-    </Element>
-    <Element Type="Param" Id="DA98051A">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000618"/>
-        <ValueType Type="unitgroup"/>
-        <ValueId Id="4"/>
-    </Element>
-    <Element Type="Param" Id="5285F41C">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000617"/>
-        <Variable Type="Variable" Id="F44CDE0D"/>
-    </Element>
-    <Element Type="FunctionCall" Id="0870B981">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="5FF15420"/>
-        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000007"/>
-        <Parameter Type="Param" Id="181F620C"/>
-        <Parameter Type="Param" Id="04D22BCD"/>
-        <Parameter Type="Param" Id="58F668EF"/>
-    </Element>
-    <Element Type="Param" Id="181F620C">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="6B513986"/>
-        <FunctionCall Type="FunctionCall" Id="17AE3DC9"/>
-    </Element>
-    <Element Type="FunctionCall" Id="17AE3DC9">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000081"/>
-        <Parameter Type="Param" Id="696752C2"/>
-    </Element>
-    <Element Type="Param" Id="696752C2">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000140"/>
-        <Variable Type="Variable" Id="F44CDE0D"/>
-    </Element>
-    <Element Type="Param" Id="04D22BCD">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="1F28C6FB"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="FE00AD71"/>
-    </Element>
-    <Element Type="Param" Id="58F668EF">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="03495D2E"/>
-        <FunctionCall Type="FunctionCall" Id="71DB37D3"/>
-    </Element>
-    <Element Type="FunctionCall" Id="71DB37D3">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000030"/>
-        <Parameter Type="Param" Id="EEF154BB"/>
-        <Parameter Type="Param" Id="30066748"/>
-    </Element>
-    <Element Type="Param" Id="EEF154BB">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000049"/>
-        <FunctionCall Type="FunctionCall" Id="15F33522"/>
-    </Element>
-    <Element Type="FunctionCall" Id="15F33522">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000083"/>
-        <Parameter Type="Param" Id="9D61F774"/>
-    </Element>
-    <Element Type="Param" Id="9D61F774">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000144"/>
-        <Variable Type="Variable" Id="F44CDE0D"/>
-    </Element>
-    <Element Type="Param" Id="30066748">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000050"/>
-        <Value>0.5</Value>
-        <ValueType Type="fixed"/>
-    </Element>
-    <Element Type="FunctionCall" Id="153C763C">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000078"/>
-        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000007"/>
-        <Parameter Type="Param" Id="DCD76A8B"/>
-    </Element>
-    <Element Type="Param" Id="DCD76A8B">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000137"/>
-        <Variable Type="Variable" Id="F44CDE0D"/>
     </Element>
     <Element Type="Trigger" Id="3F780B4F">
         <Identifier>Archinit</Identifier>
@@ -948,7 +872,6 @@
         <Action Type="FunctionCall" Id="5ED2B9A7"/>
         <Action Type="FunctionCall" Id="5E2C7DBC"/>
         <Action Type="FunctionCall" Id="EE1A9DA7"/>
-        <Action Type="FunctionCall" Id="F3AF8439"/>
         <Action Type="FunctionCall" Id="AE4035D7"/>
         <Action Type="Comment" Id="12FBD054"/>
         <Action Type="FunctionCall" Id="4D4EF3A5"/>
@@ -1094,25 +1017,6 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000184"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000068"/>
     </Element>
-    <Element Type="FunctionCall" Id="F3AF8439">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000116"/>
-        <Parameter Type="Param" Id="D2042ED6"/>
-        <Parameter Type="Param" Id="9819C98A"/>
-        <Parameter Type="Param" Id="623D05E9"/>
-    </Element>
-    <Element Type="Param" Id="D2042ED6">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000182"/>
-        <ValueType Type="trigger"/>
-        <ValueElement Type="Trigger" Id="7FEA3B33"/>
-    </Element>
-    <Element Type="Param" Id="9819C98A">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000183"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000065"/>
-    </Element>
-    <Element Type="Param" Id="623D05E9">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000184"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000067"/>
-    </Element>
     <Element Type="FunctionCall" Id="AE4035D7">
         <Disabled/>
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000116"/>

diff --git a/Maps/ArchipelagoCampaign/LotV/ap_last_stand.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/LotV/ap_last_stand.SC2Map/Triggers.version
diff --git a/...chipelagoCampaign/LotV/ap_last_stand.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/...chipelagoCampaign/LotV/ap_last_stand.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -274,7 +274,6 @@ Variable/Name/EAF8F9AC=QueenCounts
 Variable/Name/ED35DC17=CameraDuration
 Variable/Name/F00EAA76=ZergRespawnTimers
 Variable/Name/F07108AD=Location
-Variable/Name/F44CDE0D=currentUnit
 Variable/Name/F4AAC214=Objective_OverloadTemple
 Variable/Name/F4F3FEDE=Index
 Variable/Name/F7AC5F4A=ZenithStonesTotal