Merge pull request #190 from Gemster312/sc2-next

Objective Categorization Update for the Epilogue Storyline
Ziktofel · Jul 13, 2024 · e1ac781 · e1ac781
2 parents fa60453 + bb4c333
commit e1ac781
Show file tree

Hide file tree

Showing 21 changed files with 1,113 additions and 556 deletions.
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/ComponentList.SC2Components
@@ -1,5 +1,6 @@
 <?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_amon_s_fall.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/DocumentHeader
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/MapScript.galaxy
@@ -193,7 +193,7 @@ int gv_unitsDestroyedByKerrigan;
 int gv_unitsLostToTerrainDestruction;
 int gv_tripleTapCounter;
 bool gv_achievementConstructedSpire;
-int gv_objectiveDestroyZergBase;
+int gv_objective_DestroyCrystals;
 unitgroup gv_cinematicHiddenUnits;
 unitgroup gv_cinematicTempUnits;
 bool gv_cinematicCompleted;
@@ -265,7 +265,7 @@ void InitGlobals () {
     }
     gv_numberOfWorldCleaverBaseAreas = 9;
     gv_numberOfWorldCleaverFieldAreas = 6;
-    gv_objectiveDestroyZergBase = c_invalidObjectiveId;
+    gv_objective_DestroyCrystals = c_invalidObjectiveId;
     gv_cinematicHiddenUnits = UnitGroupEmpty();
     gv_cinematicTempUnits = UnitGroupEmpty();
     gv_cinematicPausedUnits = UnitGroupEmpty();
@@ -5668,7 +5668,7 @@ bool gt_VictorySequence_Func (bool testConds, bool runActions) {
     }
 
     TriggerEnable(TriggerGetCurrent(), false);
-    lib5BD4895D_gf_AP_Core_sendLocationLocal(lib5BD4895D_gv_aP_Core_locationVictory);
+    lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lib5BD4895D_gv_aP_Core_locationVictory);
     libVCMI_gf_GameOver(libVCMI_ge_CampaignMissionGameResultType_Victory);
     Wait(2.0, c_timeReal);
     libVoiC_gf_CampaignAwardAchievement("SC2Epilogue03_1", gv_pLAYER_01_USER);
@@ -5945,8 +5945,12 @@ bool gt_ObjectiveDestroyCrystalsCreate_Func (bool testConds, bool runActions) {
 
     TriggerEnable(TriggerGetCurrent(), false);
     libVCMI_gf_CreateObjectiveCampaign("SC2Epilogue03Primary01");
-    gv_objectiveDestroyZergBase = ObjectiveLastCreated();
-    lib5BD4895D_gf_AP_Core_addObjectiveFromData(ObjectiveLastCreated(), "SC2Epilogue03Primary01", "", gv_crystalsDestroyed);
+    gv_objective_DestroyCrystals = ObjectiveLastCreated();
+    ObjectiveSetName(gv_objective_DestroyCrystals, libVoiC_gf_MissionObjectiveName("SC2Epilogue03Primary01"));
+    ObjectiveShow(gv_objective_DestroyCrystals, PlayerGroupAll(), false);
+    lib5BD4895D_gf_AP_Core_addCategoryObjectiveWithCounter(gv_objective_DestroyCrystals, lib5BD4895D_ge_APObjectiveCategory_Primary, "", gv_crystalsDestroyed, libVoiC_gf_MissionObjectiveItemCount("SC2Epilogue03Primary01"), false);
+    lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_DestroyCrystals, lib5BD4895D_gv_aP_Core_locationVictory);
+    lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objective_DestroyCrystals, true);
     Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -5975,7 +5979,7 @@ bool gt_ObjectiveDestroyCrystalsComplete_Func (bool testConds, bool runActions)
 
     TriggerEnable(TriggerGetCurrent(), false);
     TriggerExecute(gt_ObjectiveDestroyCrystalsCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyZergBase);
+    lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objective_DestroyCrystals);
     Wait(libVCMI_gv_campaignObjectiveDelay, c_timeReal);
     return true;
 }
@@ -5996,7 +6000,7 @@ bool gt_ObjectiveDestroyCrystalsUpdate_Func (bool testConds, bool runActions) {
     }
 
     TriggerExecute(gt_ObjectiveDestroyCrystalsCreate, true, false);
-    lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objectiveDestroyZergBase, gv_crystalsDestroyed);
+    lib5BD4895D_gf_AP_Core_setObjectiveCounter(gv_objective_DestroyCrystals, gv_crystalsDestroyed);
     return true;
 }
 

diff --git a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/Preload.xml b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/Preload.xml
@@ -47,7 +47,6 @@
 <Model id="PingSimple"/>
 <Model id="CystalCatalystFloating_Dematerialize"/>
 <Model id="Void_Kerrigan_FinalCharge"/>
-<Objective id="SC2Epilogue03Primary01"/>
 <Sound id="UI_TerranPing"/>
 <Sound id="Zurvan_DeathThud"/>
 <Sound id="Amon_AmbienceLoop"/>

diff --git a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/Triggers b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/Triggers
@@ -8,11 +8,22 @@
         <Item Type="Category" Id="2442C6B2"/>
     </Root>
     <Element Type="Category" Id="03A646AD">
+        <Item Type="Category" Id="BDABF86E"/>
         <Item Type="Category" Id="4330F7EE"/>
         <Item Type="Trigger" Id="3B3D9166"/>
         <Item Type="Trigger" Id="A4EF66DC"/>
         <Item Type="Trigger" Id="55B4453D"/>
     </Element>
+    <Element Type="Category" Id="BDABF86E">
+        <Item Type="Comment" Id="00E5AEA4"/>
+    </Element>
+    <Element Type="Comment" Id="00E5AEA4">
+        <Comment>
+            Placeholder as this doesn&apos;t have any locations other than victory
+            Format: LOCATION_ID_NAME_OF_LOC
+            Value: Integer, Constant
+        </Comment>
+    </Element>
     <Element Type="Category" Id="4330F7EE">
         <Item Type="Comment" Id="4D350FF7"/>
         <Item Type="FunctionDef" Id="28AC0F1A"/>
@@ -74956,11 +74967,11 @@
         <Preset Type="PresetValue" Library="Ntve" Id="00000545"/>
     </Element>
     <Element Type="FunctionCall" Id="90B81E32">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="DFB3A235"/>
-        <Parameter Type="Param" Id="14427A6A"/>
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F5558DE8"/>
+        <Parameter Type="Param" Id="95CC3354"/>
     </Element>
-    <Element Type="Param" Id="14427A6A">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="3744452F"/>
+    <Element Type="Param" Id="95CC3354">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E9E09799"/>
         <Variable Type="Variable" Library="5BD4895D" Id="377FF870"/>
     </Element>
     <Element Type="FunctionCall" Id="20B06F54">
@@ -76488,7 +76499,6 @@
         <Item Type="Trigger" Id="7BD22C89"/>
     </Element>
     <Element Type="Variable" Id="098C6388">
-        <Identifier>objectiveDestroyZergBase</Identifier>
         <VariableType>
             <Type Value="objective"/>
         </VariableType>
@@ -76502,8 +76512,11 @@
         <Action Type="FunctionCall" Id="435C4600"/>
         <Action Type="FunctionCall" Id="C89C3F96"/>
         <Action Type="FunctionCall" Id="6D743B2F"/>
-        <Action Type="FunctionCall" Id="83E99A79"/>
-        <Action Type="FunctionCall" Id="3882BDE9"/>
+        <Action Type="FunctionCall" Id="A542DFAC"/>
+        <Action Type="FunctionCall" Id="D84CC7CB"/>
+        <Action Type="FunctionCall" Id="2089877F"/>
+        <Action Type="FunctionCall" Id="A39D348C"/>
+        <Action Type="FunctionCall" Id="957233E7"/>
         <Action Type="Comment" Id="BD24980F"/>
         <Action Type="FunctionCall" Id="2EF6FD80"/>
     </Element>
@@ -76579,53 +76592,119 @@
     <Element Type="FunctionCall" Id="5567D8CD">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
     </Element>
-    <Element Type="FunctionCall" Id="83E99A79">
-        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="F2A3904E"/>
-        <Parameter Type="Param" Id="E7D00B95"/>
-        <Parameter Type="Param" Id="1DD1D4CB"/>
-        <Parameter Type="Param" Id="7E38A598"/>
-        <Parameter Type="Param" Id="FDA93EB1"/>
+    <Element Type="FunctionCall" Id="A542DFAC">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000435"/>
+        <Parameter Type="Param" Id="A5524B1A"/>
+        <Parameter Type="Param" Id="5FD89BB6"/>
     </Element>
-    <Element Type="Param" Id="E7D00B95">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="245484E4"/>
-        <FunctionCall Type="FunctionCall" Id="2991A696"/>
+    <Element Type="Param" Id="A5524B1A">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000844"/>
+        <FunctionCall Type="FunctionCall" Id="B9E71623"/>
     </Element>
-    <Element Type="FunctionCall" Id="2991A696">
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000433"/>
+    <Element Type="FunctionCall" Id="B9E71623">
+        <FunctionDef Type="FunctionDef" Library="VoiC" Id="341DDAB4"/>
+        <Parameter Type="Param" Id="DBBB7CDF"/>
     </Element>
-    <Element Type="Param" Id="1DD1D4CB">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="765699E8"/>
+    <Element Type="Param" Id="DBBB7CDF">
+        <ParameterDef Type="ParamDef" Library="VoiC" Id="CC63BDB5"/>
         <Value>SC2Epilogue03Primary01</Value>
         <ValueType Type="gamelink"/>
         <ValueGameType Type="Objective"/>
     </Element>
-    <Element Type="Param" Id="7E38A598">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="066212BE"/>
+    <Element Type="Param" Id="5FD89BB6">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000843"/>
+        <Variable Type="Variable" Id="098C6388"/>
+    </Element>
+    <Element Type="FunctionCall" Id="D84CC7CB">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="19BA63F9"/>
+        <Parameter Type="Param" Id="F2A764F2"/>
+        <Parameter Type="Param" Id="0446D8DB"/>
+        <Parameter Type="Param" Id="1C39A37A"/>
+    </Element>
+    <Element Type="Param" Id="F2A764F2">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="306BC96B"/>
+        <FunctionCall Type="FunctionCall" Id="61C35F6D"/>
+    </Element>
+    <Element Type="FunctionCall" Id="61C35F6D">
+        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000192"/>
+    </Element>
+    <Element Type="Param" Id="0446D8DB">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="F4578ECB"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000121"/>
+    </Element>
+    <Element Type="Param" Id="1C39A37A">
+        <ParameterDef Type="ParamDef" Library="Ntve" Id="171BF7EF"/>
+        <Variable Type="Variable" Id="098C6388"/>
+    </Element>
+    <Element Type="FunctionCall" Id="2089877F">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="EEE6A271"/>
+        <Parameter Type="Param" Id="680DA3D1"/>
+        <Parameter Type="Param" Id="CAF63107"/>
+        <Parameter Type="Param" Id="0B851182"/>
+        <Parameter Type="Param" Id="2C0E2F1F"/>
+        <Parameter Type="Param" Id="62105E52"/>
+        <Parameter Type="Param" Id="44297346"/>
+    </Element>
+    <Element Type="Param" Id="680DA3D1">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1BE98276"/>
+        <Variable Type="Variable" Id="098C6388"/>
+    </Element>
+    <Element Type="Param" Id="CAF63107">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="E2DA7861"/>
         <ValueType Type="string"/>
     </Element>
-    <Element Type="Param" Id="FDA93EB1">
-        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="5907A79D"/>
+    <Element Type="Param" Id="0B851182">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2F1BAF7B"/>
         <Variable Type="Variable" Id="E129A48E"/>
     </Element>
-    <Element Type="FunctionCall" Id="3882BDE9">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000116"/>
-        <Parameter Type="Param" Id="73E5593A"/>
-        <Parameter Type="Param" Id="EA1C849D"/>
-        <Parameter Type="Param" Id="9218DA4E"/>
+    <Element Type="Param" Id="2C0E2F1F">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="8D43018E"/>
+        <FunctionCall Type="FunctionCall" Id="E055E423"/>
     </Element>
-    <Element Type="Param" Id="73E5593A">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000183"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000065"/>
+    <Element Type="FunctionCall" Id="E055E423">
+        <FunctionDef Type="FunctionDef" Library="VoiC" Id="FC758D58"/>
+        <Parameter Type="Param" Id="E07A39F1"/>
     </Element>
-    <Element Type="Param" Id="EA1C849D">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000184"/>
-        <Preset Type="PresetValue" Library="Ntve" Id="00000068"/>
+    <Element Type="Param" Id="E07A39F1">
+        <ParameterDef Type="ParamDef" Library="VoiC" Id="5CAF2363"/>
+        <Value>SC2Epilogue03Primary01</Value>
+        <ValueType Type="gamelink"/>
+        <ValueGameType Type="Objective"/>
     </Element>
-    <Element Type="Param" Id="9218DA4E">
-        <ParameterDef Type="ParamDef" Library="Ntve" Id="00000182"/>
-        <ValueType Type="trigger"/>
-        <ValueElement Type="Trigger" Id="7BD22C89"/>
+    <Element Type="Param" Id="62105E52">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="52CB19AC"/>
+        <Value>false</Value>
+        <ValueType Type="bool"/>
+    </Element>
+    <Element Type="Param" Id="44297346">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="FE028B89"/>
+        <Preset Type="PresetValue" Library="5BD4895D" Id="6EB19B89"/>
+    </Element>
+    <Element Type="FunctionCall" Id="A39D348C">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="41310285"/>
+        <Parameter Type="Param" Id="C613D4E7"/>
+        <Parameter Type="Param" Id="5A2F50E8"/>
+    </Element>
+    <Element Type="Param" Id="C613D4E7">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="6013F03F"/>
+        <Variable Type="Variable" Id="098C6388"/>
+    </Element>
+    <Element Type="Param" Id="5A2F50E8">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="1A6DD440"/>
+        <Variable Type="Variable" Library="5BD4895D" Id="377FF870"/>
+    </Element>
+    <Element Type="FunctionCall" Id="957233E7">
+        <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="573FC346"/>
+        <Parameter Type="Param" Id="FA3012DA"/>
+        <Parameter Type="Param" Id="444E01D2"/>
+    </Element>
+    <Element Type="Param" Id="FA3012DA">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="2E40A635"/>
+        <Variable Type="Variable" Id="098C6388"/>
+    </Element>
+    <Element Type="Param" Id="444E01D2">
+        <ParameterDef Type="ParamDef" Library="5BD4895D" Id="C94FC3B5"/>
+        <Preset Type="PresetValue" Library="Ntve" Id="00000120"/>
     </Element>
     <Element Type="Comment" Id="BD24980F">
         <Comment>
@@ -76760,7 +76839,6 @@
         <Action Type="Comment" Id="C41E07F4"/>
         <Action Type="FunctionCall" Id="5C1E56C4"/>
         <Action Type="Comment" Id="8805720B"/>
-        <Action Type="FunctionCall" Id="2D3FE096"/>
         <Action Type="FunctionCall" Id="2F5E31F9"/>
     </Element>
     <Element Type="Comment" Id="C41E07F4">
@@ -76792,22 +76870,6 @@
             Update the campaign progress for this objective.  This must be done whenever an objective&apos;s progress changes.
         </Comment>
     </Element>
-    <Element Type="FunctionCall" Id="2D3FE096">
-        <Disabled/>
-        <FunctionDef Type="FunctionDef" Library="VCMI" Id="1369DDBE"/>
-        <Parameter Type="Param" Id="6C9D415B"/>
-        <Parameter Type="Param" Id="93663D5F"/>
-    </Element>
-    <Element Type="Param" Id="6C9D415B">
-        <ParameterDef Type="ParamDef" Library="VCMI" Id="3DF5A2B0"/>
-        <Value>SC2Epilogue03Primary01</Value>
-        <ValueType Type="gamelink"/>
-        <ValueGameType Type="Objective"/>
-    </Element>
-    <Element Type="Param" Id="93663D5F">
-        <ParameterDef Type="ParamDef" Library="VCMI" Id="1BFE4FB0"/>
-        <Variable Type="Variable" Id="E129A48E"/>
-    </Element>
     <Element Type="FunctionCall" Id="2F5E31F9">
         <FunctionDef Type="FunctionDef" Library="5BD4895D" Id="018BFAA2"/>
         <Parameter Type="Param" Id="7504043E"/>

diff --git a/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/Triggers.version
diff --git a/...hipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/...hipelagoCampaign/LotV/ap_amon_s_fall.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt
@@ -14,6 +14,7 @@ Category/Name/A16CC4BB=Global Variables
 Category/Name/AB2872B7=World Cleavers
 Category/Name/ACE330BC======== MAIN =======
 Category/Name/B21359E5=Kerrigan
+Category/Name/BDABF86E=Location IDs
 Category/Name/CCF07DD9=Raynor
 Category/Name/CD00E451=AI
 Category/Name/CD165228=Constructs

diff --git a/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/ComponentList.SC2Components b/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/ComponentList.SC2Components
@@ -1,5 +1,6 @@
 <?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_into_the_void.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/LotV/ap_into_the_void.SC2Map/DocumentHeader