Skip to content

Commit

Permalink
Merge pull request #167 from Gemster312/sc2-next
Browse files Browse the repository at this point in the history 
Objective Categorization Update for the WoL Final Storyline
  • Loading branch information
@Ziktofel
Ziktofel authored Jul 6, 2024
2 parents cee49c2 + b2b6e89 commit c5fd24a
Show file tree
Hide file tree
Showing 19 changed files with 1,277 additions and 611 deletions.
1 change: 1 addition & 0 deletions Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/ComponentList.SC2Components
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Components>
<Optimized/>
<DataComponent Type="gada">GameData</DataComponent>
<DataComponent Type="info">DocumentInfo</DataComponent>
<DataComponent Type="mapi">MapInfo</DataComponent>
Expand Down
Binary file modified Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/DocumentHeader
View file
Binary file not shown.
30 changes: 21 additions & 9 deletions Maps/ArchipelagoCampaign/WoL/ap_all_in.SC2Map/MapScript.galaxy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ void InitLibs () {
//--------------------------------------------------------------------------------------------------
// Constants
//--------------------------------------------------------------------------------------------------
const int gv_LOCATION_ID_FIRST_KERRIGAN_ATTACK = 1;
const int gv_LOCATION_ID_SECOND_KERRIGAN_ATTACK = 2;
const int gv_LOCATION_ID_THIRD_KERRIGAN_ATTACK = 3;
const int gv_LOCATION_ID_FOURTH_KERRIGAN_ATTACK = 4;
const int gv_LOCATION_ID_FIFTH_KERRIGAN_ATTACK = 5;
const int gv_pLAYER_USER = 1;
const int gv_pLAYER_ZERG_MAIN = 2;
const int gv_pLAYER_ZERG_SPECIAL = 3;
Expand Down Expand Up @@ -3889,7 +3894,7 @@ bool gt_KerriganDeepTunnelQ_Func (bool testConds, bool runActions) {
libLbty_gf_PlayTransmissionCueSound(PlayerGroupAll());
auto5D28AA2D_val = gv_kerriganAttackCount;
if (auto5D28AA2D_val == 1) {
lib5BD4895D_gf_AP_Core_sendLocationLocal(1);
lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FIRST_KERRIGAN_ATTACK);
// Transmission - SoundLink("TValerian03Kerrigan00058", -1)
libCamp_gf_SendTransmissionCampaign(null, SoundLink("TValerian03Kerrigan00058", -1), c_transmissionDurationAdd, 0.0, true);
// Transmission - SoundLink("TValerian03Raynor00020", -1)
Expand All @@ -3898,28 +3903,28 @@ bool gt_KerriganDeepTunnelQ_Func (bool testConds, bool runActions) {
libCamp_gf_CreateMissionAutosavePoint((StringExternal("Param/Value/001EB8FC") + FixedToText(gf_ArtifactChargePercent(), 1) + StringExternal("Param/Value/40499C88")));
}
else if (auto5D28AA2D_val == 2) {
lib5BD4895D_gf_AP_Core_sendLocationLocal(2);
lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_SECOND_KERRIGAN_ATTACK);
// Transmission - SoundLink("TValerian03Warfield00025", -1)
libCamp_gf_SendTransmissionCampaign(null, SoundLink("TValerian03Warfield00025", -1), c_transmissionDurationAdd, 0.0, true);
Wait(2.0, c_timeReal);
libCamp_gf_CreateMissionAutosavePoint((StringExternal("Param/Value/EAB5D976") + FixedToText(gf_ArtifactChargePercent(), 1) + StringExternal("Param/Value/8F6AFC37")));
}
else if (auto5D28AA2D_val == 3) {
lib5BD4895D_gf_AP_Core_sendLocationLocal(3);
lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_THIRD_KERRIGAN_ATTACK);
// Transmission - SoundLink("TValerian03Raynor00028", -1)
libCamp_gf_SendTransmissionCampaign(null, SoundLink("TValerian03Raynor00028", -1), c_transmissionDurationAdd, 0.0, true);
Wait(2.0, c_timeReal);
libCamp_gf_CreateMissionAutosavePoint((StringExternal("Param/Value/E75186CD") + FixedToText(gf_ArtifactChargePercent(), 1) + StringExternal("Param/Value/CDE6292E")));
}
else if (auto5D28AA2D_val == 4) {
lib5BD4895D_gf_AP_Core_sendLocationLocal(4);
lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FOURTH_KERRIGAN_ATTACK);
// Transmission - SoundLink("TValerian03Tychus00032", -1)
libCamp_gf_SendTransmissionCampaign(null, SoundLink("TValerian03Tychus00032", -1), c_transmissionDurationAdd, 0.0, true);
Wait(2.0, c_timeReal);
libCamp_gf_CreateMissionAutosavePoint((StringExternal("Param/Value/1AD4E910") + FixedToText(gf_ArtifactChargePercent(), 1) + StringExternal("Param/Value/A6904814")));
}
else if (auto5D28AA2D_val == 5) {
lib5BD4895D_gf_AP_Core_sendLocationLocal(5);
lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(gv_LOCATION_ID_FIFTH_KERRIGAN_ATTACK);
// Transmission - SoundLink("TValerian03Queen00033", -1)
libCamp_gf_SendTransmissionCampaign(null, SoundLink("TValerian03Queen00033", -1), c_transmissionDurationAdd, 0.0, true);
// Transmission - SoundLink("TValerian03Sarah00034", -1)
Expand Down Expand Up @@ -4633,11 +4638,11 @@ bool gt_VictoryArtifactCharged_Func (bool testConds, bool runActions) {
lv_location = 1;
for ( ; ( (auto9F5F09C8_ai >= 0 && lv_location <= auto9F5F09C8_ae) || (auto9F5F09C8_ai < 0 && lv_location >= auto9F5F09C8_ae) ) ; lv_location += auto9F5F09C8_ai ) {
if ((lib5BD4895D_gf_AP_Core_isLocationSent(lv_location) == false)) {
lib5BD4895D_gf_AP_Core_sendLocationLocal(lv_location);
lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lv_location);
}

}
lib5BD4895D_gf_AP_Core_sendLocationLocal(lib5BD4895D_gv_aP_Core_locationVictory);
lib5BD4895D_gf_AP_Core_collectLocationUpdateObjective(lib5BD4895D_gv_aP_Core_locationVictory);
libNtve_gf_ChangeUnitDamage(gv_artifact, libNtve_ge_UnitDamageTakenDealt_Damage_Take, libNtve_ge_UnitDamageChangeOption_No);
TriggerQueueClear(c_triggerQueueRetain);
TriggerExecute(gt_ObjectiveArtifactComplete, true, false);
Expand Down Expand Up @@ -4867,9 +4872,16 @@ bool gt_ObjectiveArtifactCreateQ_Func (bool testConds, bool runActions) {

TriggerEnable(TriggerGetCurrent(), false);
TriggerQueueEnter();
ObjectiveCreate(StringExternal("Param/Value/CA604703"), StringExternal("Param/Value/BFB1AA45"), c_objectiveStateActive, true);
lib5BD4895D_gf_AP_Core_addObjectiveSimple(ObjectiveLastCreated());
ObjectiveCreate(StringExternal("Param/Value/CA604703"), StringExternal("Param/Value/BFB1AA45"), c_objectiveStateHidden, true);
gv_objective_Artifact = ObjectiveLastCreated();
lib5BD4895D_gf_AP_Core_addCategoryObjectiveSimple(gv_objective_Artifact, lib5BD4895D_ge_APObjectiveCategory_Primary, false);
lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, gv_LOCATION_ID_FIRST_KERRIGAN_ATTACK);
lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, gv_LOCATION_ID_SECOND_KERRIGAN_ATTACK);
lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, gv_LOCATION_ID_THIRD_KERRIGAN_ATTACK);
lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, gv_LOCATION_ID_FOURTH_KERRIGAN_ATTACK);
lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, gv_LOCATION_ID_FIFTH_KERRIGAN_ATTACK);
lib5BD4895D_gf_AP_Core_associateObjectiveWithLocation(gv_objective_Artifact, lib5BD4895D_gv_aP_Core_locationVictory);
lib5BD4895D_gf_AP_Core_setObjectiveVisibility(gv_objective_Artifact, true);
libCamp_gf_RegisterMissionObjective(libCamp_ge_MissionObjective_TValerian03Objective1, ObjectiveLastCreated(), StringExternal("Param/Value/BCFF1976"));
libNtve_gf_CreatePingFacingAngle(PlayerGroupSingle(gv_pLAYER_USER), "PingObjective", UnitGetPosition(gv_artifact), ColorWithAlpha(0.00, 100.00, 100.00, 0.00), 0.0, 135.0);
PingSetTooltip(PingLastCreated(), StringExternal("Param/Value/0140CB99"));
Expand Down
Loading

0 comments on commit c5fd24a

Please sign in to comment.