diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/CellAttribute_Pgr b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/CellAttribute_Pgr new file mode 100644 index 000000000..5e015aab7 Binary files /dev/null and b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/CellAttribute_Pgr differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/CellAttribute_Pnb b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/CellAttribute_Pnb new file mode 100644 index 000000000..f609a48f3 Binary files /dev/null and b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/CellAttribute_Pnb differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/CellAttribute_Pnp b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/CellAttribute_Pnp new file mode 100644 index 000000000..90cf268c7 Binary files /dev/null and b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/CellAttribute_Pnp differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/DocumentHeader index ecc2e7798..1305245da 100644 Binary files a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/DocumentHeader and b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/DocumentHeader differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/DocumentInfo b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/DocumentInfo index 689882eed..2bf014585 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/DocumentInfo +++ b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/DocumentInfo @@ -2,6 +2,7 @@ bnet:Swarm Story (Campaign)/0.0/999,file:Campaigns/SwarmStory.SC2Campaign - file:Mods\ArchipelagoHotS.SC2Mod + file:Mods\ArchipelagoPlayerHotS.SC2Mod + file:Mods\ArchipelagoTriggers.SC2Mod diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/MapScript.galaxy index 09b9478b1..b1e2a704e 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/MapScript.galaxy @@ -9,7 +9,9 @@ include "TriggerLibs/NativeLib" include "TriggerLibs/LibertyLib" include "TriggerLibs/SwarmLib" include "TriggerLibs/SwarmCampaignLib" -include "LibC6542F50" +include "Lib15EF4C78" +include "Lib5BD4895D" +include "LibABFE498B" include "aiEC423AC6" include "ai17BA421C" include "ai7AC59A6F" @@ -25,7 +27,9 @@ void InitLibs () { libLbty_InitLib(); libHots_InitLib(); libSwaC_InitLib(); - libC6542F50_InitLib(); + lib15EF4C78_InitLib(); + lib5BD4895D_InitLib(); + libABFE498B_InitLib(); } //-------------------------------------------------------------------------------------------------- @@ -106,6 +110,7 @@ unit gv_victoryKerrigan; sound gv_victoryZergSound1; sound gv_victoryZergSound2; sound gv_victoryZergSound3; +point gv_cCLocation; void InitGlobals () { int init_i; @@ -262,7 +267,11 @@ trigger gt_VictoryCinematic; trigger gt_VictoryCinematicEnd; trigger gt_VictoryCleanup; trigger gt_VictoryZerg; -trigger gt_ArchipelagoInitialization; +trigger gt_onDifficultyCasual; +trigger gt_onDifficultyNormal; +trigger gt_onDifficultyHard; +trigger gt_onDifficultyBrutal; +trigger gt_CreateRaynorBaseForPlayer; trigger gt_ArchInit; trigger gt_SetMineralCount; @@ -711,34 +720,56 @@ bool auto_gf_IntroMoveUnits_TriggerFunc (bool testConds, bool runActions) { void gf_HideKerrigan () { // Automatic Variable Declarations // Implementation - if ((libC6542F50_gv_aPKerriganless == true)) { + if ((libABFE498B_gv_aP_Triggers_Option_KerriganPresence == 0)) { libNtve_gf_PauseUnit(gv_kerrigan, true); libNtve_gf_ShowHideUnit(gv_kerrigan, false); } - else { - libC6542F50_gf_APResetKerriganAbilities(); - } + } //-------------------------------------------------------------------------------------------------- // Trigger: Initialization //-------------------------------------------------------------------------------------------------- bool gt_Initialization_Func (bool testConds, bool runActions) { + // Variable Declarations + unit lv_currentUnit; + // Automatic Variable Declarations + unitgroup autoF101194D_g; + int autoF101194D_u; + + // Variable Initialization + // Actions if (!runActions) { return true; } - libSwaC_gf_ULoadCampaignData("ZKorhal3"); TriggerExecute(gt_Init01Technology, true, true); - libSwaC_gf_PurchaseStorymodeTech(); TriggerExecute(gt_Init04MusicSound, true, true); TriggerExecute(gt_Init05Environment, true, true); TriggerExecute(gt_Init06Difficulties, true, true); TriggerExecute(gt_Init07Help, true, true); + gv_cCLocation = UnitGetPosition(UnitFromId(32)); + if ((libABFE498B_gv_aP_Triggers_Option_takeOverAIAllies == true)) { + TriggerEnable(gt_HyperionSCVRespawn, false); + } + else { + autoF101194D_g = UnitGroupFromId(5); + autoF101194D_u = UnitGroupCount(autoF101194D_g, c_unitCountAll); + for (;; autoF101194D_u -= 1) { + lv_currentUnit = UnitGroupUnitFromEnd(autoF101194D_g, autoF101194D_u); + if (lv_currentUnit == null) { break; } + UnitRemove(lv_currentUnit); + } + } TriggerExecute(gt_IntroQ, true, true); TriggerExecute(gt_StartGameQ, true, false); + gf_HideKerrigan(); + if ((libABFE498B_gv_aP_Triggers_Option_KerriganPresence > 0)) { + lib15EF4C78_gf_SetHeroPanelUnit(1, gv_kerrigan, gv_PLAYER_01_USER); + } + return true; } @@ -757,7 +788,6 @@ bool gt_Init01Technology_Func (bool testConds, bool runActions) { return true; } - libSwaC_gf_SetTechRestrictionsCallback(TriggerGetCurrent()); libNtve_gf_SetUpgradeLevelForPlayer(gv_PLAYER_07_DOMINION_GREEN22, "ShieldWall", 1); libNtve_gf_SetUpgradeLevelForPlayer(gv_PLAYER_07_DOMINION_GREEN22, "AuxiliaryMedBots", 1); libNtve_gf_SetUpgradeLevelForPlayer(gv_PLAYER_07_DOMINION_GREEN22, "AresClassWeaponsSystem", 1); @@ -766,6 +796,7 @@ bool gt_Init01Technology_Func (bool testConds, bool runActions) { libNtve_gf_SetUpgradeLevelForPlayer(gv_PLAYER_07_DOMINION_GREEN22, "YamatoCannon", 1); libNtve_gf_SetUpgradeLevelForPlayer(gv_PLAYER_07_DOMINION_GREEN22, "FireSuppressionSystems", 1); libNtve_gf_SetUpgradeLevelForPlayer(gv_PLAYER_07_DOMINION_GREEN22, "NeosteelFrame", 1); + libNtve_gf_SetUpgradeLevelForPlayer(gv_PLAYER_07_DOMINION_GREEN22, "AP_TerranBuildingArmor", 1); return true; } @@ -855,9 +886,9 @@ bool gt_Init03Units_Func (bool testConds, bool runActions) { return true; } - libSwaC_gf_CreateHero2(PointFromId(1077), gv_PLAYER_01_USER, libSwaC_ge_HeroUnit_Kerrigan, 45.0, 0, libSwaC_ge_KerriganCreatePurpose_GamePlay); + libNtve_gf_CreateUnitsAtPoint2(1, "AP_K5Kerrigan", 0, 1, PointFromId(1077)); gv_kerrigan = UnitLastCreated(); - libSwaC_gf_SetHeroPanelUnit(1, UnitLastCreated()); + libSwaC_gf_RegisterCampaignKerrigan(gv_kerrigan); libSwaC_gf_SetHatcheryRallyPoint(UnitFromId(2150), PointFromId(495)); autoBCF04D8F_g = UnitGroup(null, gv_PLAYER_01_USER, RegionPlayableMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); autoBCF04D8F_u = UnitGroupCount(autoBCF04D8F_g, c_unitCountAll); @@ -1655,7 +1686,7 @@ bool gt_Lane1_Func (bool testConds, bool runActions) { while (!((gv_gameOver == false) && (UnitGroupCount(UnitGroupAlliance(gv_PLAYER_01_USER, c_unitAllianceEnemy, RegionFromId(16), UnitFilter((1 << c_targetFilterStructure), 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) == 0))) { Wait(1.0, c_timeAI); } - libC6542F50_gf_APArchipelagoSendData(2); + lib5BD4895D_gf_AP_Core_sendLocationLocal(1); libNtve_gf_PauseUnit(UnitFromId(2667), false); libNtve_gf_ShowHideUnit(UnitFromId(2667), true); auto15D222B5_ae = gv_numberOfRepairSCVs; @@ -1673,7 +1704,7 @@ bool gt_Lane1_Func (bool testConds, bool runActions) { TriggerExecute(gt_ObjectiveClearOuterLanesUpdate, true, false); lv_i = 1; for ( ; ( (auto5C2AC2E4_ai >= 0 && lv_i <= auto5C2AC2E4_ae) || (auto5C2AC2E4_ai < 0 && lv_i >= auto5C2AC2E4_ae) ) ; lv_i += auto5C2AC2E4_ai ) { - libNtve_gf_CreateUnitsWithDefaultFacing(1, "Baneling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(6))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Baneling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(6))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); gf_UnloadNydusAnim(UnitFromId(2667)); @@ -1681,7 +1712,7 @@ bool gt_Lane1_Func (bool testConds, bool runActions) { } lv_i = 1; for ( ; ( (auto751BB1CF_ai >= 0 && lv_i <= auto751BB1CF_ae) || (auto751BB1CF_ai < 0 && lv_i >= auto751BB1CF_ae) ) ; lv_i += auto751BB1CF_ai ) { - libNtve_gf_CreateUnitsWithDefaultFacing(1, "Zergling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(6))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Zergling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(6))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); gf_UnloadNydusAnim(UnitFromId(2667)); @@ -1689,7 +1720,7 @@ bool gt_Lane1_Func (bool testConds, bool runActions) { } lv_i = 1; for ( ; ( (auto1583CBDC_ai >= 0 && lv_i <= auto1583CBDC_ae) || (auto1583CBDC_ai < 0 && lv_i >= auto1583CBDC_ae) ) ; lv_i += auto1583CBDC_ai ) { - libNtve_gf_CreateUnitsWithDefaultFacing(1, "Hydralisk", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(6))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Hydralisk", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(6))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); gf_UnloadNydusAnim(UnitFromId(2667)); @@ -1700,19 +1731,19 @@ bool gt_Lane1_Func (bool testConds, bool runActions) { while (!((UnitGroupCount(gv_zagaraReinforcements, c_unitCountAlive) < 100))) { Wait(1.0, c_timeAI); } - libNtve_gf_CreateUnitsWithDefaultFacing(1, "Baneling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(6))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Baneling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(6))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); gf_UnloadNydusAnim(UnitFromId(2667)); Wait(0.1, c_timeAI); - libNtve_gf_CreateUnitsWithDefaultFacing(1, "Hydralisk", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(6))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Hydralisk", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(6))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); gf_UnloadNydusAnim(UnitFromId(2667)); Wait(0.1, c_timeAI); lv_i = 1; for ( ; ( (auto0B76062F_ai >= 0 && lv_i <= auto0B76062F_ae) || (auto0B76062F_ai < 0 && lv_i >= auto0B76062F_ae) ) ; lv_i += auto0B76062F_ai ) { - libNtve_gf_CreateUnitsWithDefaultFacing(1, "Zergling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(6))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Zergling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(6))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); gf_UnloadNydusAnim(UnitFromId(2667)); @@ -1761,19 +1792,19 @@ bool gt_Lane1SpawnLoop_Func (bool testConds, bool runActions) { libNtve_gf_PauseUnit(UnitFromId(2667), false); libNtve_gf_ShowHideUnit(UnitFromId(2667), true); gf_UnloadNydusAnim(UnitFromId(2667)); - libNtve_gf_CreateUnitsWithDefaultFacing(1, "Baneling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(6))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Baneling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(6))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); Wait(0.1, c_timeAI); gf_UnloadNydusAnim(UnitFromId(2667)); - libNtve_gf_CreateUnitsWithDefaultFacing(1, "Hydralisk", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(6))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Hydralisk", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(6))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); Wait(0.1, c_timeAI); lv_i = 1; for ( ; ( (auto09B2BEF0_ai >= 0 && lv_i <= auto09B2BEF0_ae) || (auto09B2BEF0_ai < 0 && lv_i >= auto09B2BEF0_ae) ) ; lv_i += auto09B2BEF0_ai ) { gf_UnloadNydusAnim(UnitFromId(2667)); - libNtve_gf_CreateUnitsWithDefaultFacing(1, "Zergling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(6))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Zergling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(6))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); Wait(0.1, c_timeAI); @@ -1782,7 +1813,7 @@ bool gt_Lane1SpawnLoop_Func (bool testConds, bool runActions) { lv_i = 1; for ( ; ( (auto2288E6C3_ai >= 0 && lv_i <= auto2288E6C3_ae) || (auto2288E6C3_ai < 0 && lv_i >= auto2288E6C3_ae) ) ; lv_i += auto2288E6C3_ai ) { gf_UnloadNydusAnim(UnitFromId(2667)); - libNtve_gf_CreateUnitsWithDefaultFacing(1, "Zergling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(6))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Zergling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(6))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); Wait(0.1, c_timeAI); @@ -1791,7 +1822,7 @@ bool gt_Lane1SpawnLoop_Func (bool testConds, bool runActions) { lv_i = 1; for ( ; ( (auto31035550_ai >= 0 && lv_i <= auto31035550_ae) || (auto31035550_ai < 0 && lv_i >= auto31035550_ae) ) ; lv_i += auto31035550_ai ) { gf_UnloadNydusAnim(UnitFromId(2667)); - libNtve_gf_CreateUnitsWithDefaultFacing(1, "Zergling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(6))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_Zergling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(6))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); Wait(0.1, c_timeAI); @@ -1844,7 +1875,7 @@ bool gt_Lane2_Func (bool testConds, bool runActions) { while (!((gv_gameOver == false) && (UnitGroupCount(UnitGroupAlliance(gv_PLAYER_01_USER, c_unitAllianceEnemy, RegionFromId(8), UnitFilter((1 << c_targetFilterStructure), 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) == 0))) { Wait(1.0, c_timeAI); } - libC6542F50_gf_APArchipelagoSendData(3); + lib5BD4895D_gf_AP_Core_sendLocationLocal(2); auto06D8CCC3_ae = gv_numberOfRepairSCVs; lv_i = 1; for ( ; ( (auto06D8CCC3_ai >= 0 && lv_i <= auto06D8CCC3_ae) || (auto06D8CCC3_ai < 0 && lv_i >= auto06D8CCC3_ae) ) ; lv_i += auto06D8CCC3_ai ) { @@ -1876,7 +1907,7 @@ bool gt_Lane2_Func (bool testConds, bool runActions) { } lv_i = 1; for ( ; ( (auto19296274_ai >= 0 && lv_i <= auto19296274_ae) || (auto19296274_ai < 0 && lv_i >= auto19296274_ae) ) ; lv_i += auto19296274_ai ) { - libNtve_gf_CreateUnitsWithDefaultFacing(1, "InfestedAbomination", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(7))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_InfestedAbomination", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(7))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); gf_UnloadNydusAnim(UnitFromId(2666)); @@ -1887,7 +1918,7 @@ bool gt_Lane2_Func (bool testConds, bool runActions) { while (!((UnitGroupCount(gv_zagaraReinforcements, c_unitCountAlive) < 100))) { Wait(1.0, c_timeAI); } - libNtve_gf_CreateUnitsWithDefaultFacing(1, "InfestedAbomination", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(5))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_InfestedAbomination", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(5))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); gf_UnloadNydusAnim(UnitFromId(2666)); @@ -1945,7 +1976,7 @@ bool gt_Lane2SpawnLoop_Func (bool testConds, bool runActions) { libNtve_gf_PauseUnit(UnitFromId(2666), false); libNtve_gf_ShowHideUnit(UnitFromId(2666), true); gf_UnloadNydusAnim(UnitFromId(2666)); - libNtve_gf_CreateUnitsWithDefaultFacing(1, "InfestedAbomination", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(5))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_InfestedAbomination", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(5))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); Wait(0.1, c_timeAI); @@ -2039,7 +2070,7 @@ bool gt_Lane3_Func (bool testConds, bool runActions) { while (!((gv_gameOver == false) && (UnitGroupCount(UnitGroupAlliance(gv_PLAYER_01_USER, c_unitAllianceEnemy, RegionFromId(18), UnitFilter((1 << c_targetFilterStructure), 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0), c_unitCountAlive) == 0))) { Wait(1.0, c_timeAI); } - libC6542F50_gf_APArchipelagoSendData(4); + lib5BD4895D_gf_AP_Core_sendLocationLocal(3); auto8A1A87E8_ae = gv_numberOfRepairSCVs; lv_i = 1; for ( ; ( (auto8A1A87E8_ai >= 0 && lv_i <= auto8A1A87E8_ae) || (auto8A1A87E8_ai < 0 && lv_i >= auto8A1A87E8_ae) ) ; lv_i += auto8A1A87E8_ai ) { @@ -2055,7 +2086,7 @@ bool gt_Lane3_Func (bool testConds, bool runActions) { TriggerExecute(gt_ObjectiveClearOuterLanesUpdate, true, false); lv_i = 1; for ( ; ( (auto01746541_ai >= 0 && lv_i <= auto01746541_ae) || (auto01746541_ai < 0 && lv_i >= auto01746541_ae) ) ; lv_i += auto01746541_ai ) { - libNtve_gf_CreateUnitsWithDefaultFacing(1, "PrimalZergling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(4))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_PrimalZergling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(4))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); gf_UnloadNydusAnim(UnitFromId(2665)); @@ -2063,7 +2094,7 @@ bool gt_Lane3_Func (bool testConds, bool runActions) { } lv_i = 1; for ( ; ( (autoF08A8335_ai >= 0 && lv_i <= autoF08A8335_ae) || (autoF08A8335_ai < 0 && lv_i >= autoF08A8335_ae) ) ; lv_i += autoF08A8335_ai ) { - libNtve_gf_CreateUnitsWithDefaultFacing(1, "PrimalHydralisk", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(4))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_PrimalHydralisk", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(4))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); gf_UnloadNydusAnim(UnitFromId(2665)); @@ -2071,7 +2102,7 @@ bool gt_Lane3_Func (bool testConds, bool runActions) { } lv_i = 1; for ( ; ( (auto2AE184A4_ai >= 0 && lv_i <= auto2AE184A4_ae) || (auto2AE184A4_ai < 0 && lv_i >= auto2AE184A4_ae) ) ; lv_i += auto2AE184A4_ai ) { - libNtve_gf_CreateUnitsWithDefaultFacing(1, "PrimalUltralisk", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(4))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_PrimalUltralisk", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(4))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); gf_UnloadNydusAnim(UnitFromId(2665)); @@ -2090,14 +2121,14 @@ bool gt_Lane3_Func (bool testConds, bool runActions) { while (!((UnitGroupCount(gv_zagaraReinforcements, c_unitCountAlive) < 100))) { Wait(1.0, c_timeAI); } - libNtve_gf_CreateUnitsWithDefaultFacing(1, "PrimalHydralisk", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(4))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_PrimalHydralisk", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(4))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); gf_UnloadNydusAnim(UnitFromId(2665)); Wait(0.1, c_timeAI); lv_i = 1; for ( ; ( (auto09AC3B32_ai >= 0 && lv_i <= auto09AC3B32_ae) || (auto09AC3B32_ai < 0 && lv_i >= auto09AC3B32_ae) ) ; lv_i += auto09AC3B32_ai ) { - libNtve_gf_CreateUnitsWithDefaultFacing(1, "PrimalZergling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(4))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_PrimalZergling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(4))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); gf_UnloadNydusAnim(UnitFromId(2665)); @@ -2146,14 +2177,14 @@ bool gt_Lane3SpawnLoop_Func (bool testConds, bool runActions) { libNtve_gf_PauseUnit(UnitFromId(2665), false); libNtve_gf_ShowHideUnit(UnitFromId(2665), true); gf_UnloadNydusAnim(UnitFromId(2665)); - libNtve_gf_CreateUnitsWithDefaultFacing(1, "PrimalHydralisk", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(4))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_PrimalHydralisk", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(4))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); Wait(0.1, c_timeAI); lv_i = 1; for ( ; ( (autoD065E013_ai >= 0 && lv_i <= autoD065E013_ae) || (autoD065E013_ai < 0 && lv_i >= autoD065E013_ae) ) ; lv_i += autoD065E013_ai ) { gf_UnloadNydusAnim(UnitFromId(2665)); - libNtve_gf_CreateUnitsWithDefaultFacing(1, "PrimalZergling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(4))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_PrimalZergling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(4))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); Wait(0.1, c_timeAI); @@ -2162,7 +2193,7 @@ bool gt_Lane3SpawnLoop_Func (bool testConds, bool runActions) { lv_i = 1; for ( ; ( (auto0EF9C00E_ai >= 0 && lv_i <= auto0EF9C00E_ae) || (auto0EF9C00E_ai < 0 && lv_i >= auto0EF9C00E_ae) ) ; lv_i += auto0EF9C00E_ai ) { gf_UnloadNydusAnim(UnitFromId(2665)); - libNtve_gf_CreateUnitsWithDefaultFacing(1, "PrimalZergling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(4))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_PrimalZergling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(4))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); Wait(0.1, c_timeAI); @@ -2171,7 +2202,7 @@ bool gt_Lane3SpawnLoop_Func (bool testConds, bool runActions) { lv_i = 1; for ( ; ( (autoF0746625_ai >= 0 && lv_i <= autoF0746625_ae) || (autoF0746625_ai < 0 && lv_i >= autoF0746625_ae) ) ; lv_i += autoF0746625_ai ) { gf_UnloadNydusAnim(UnitFromId(2665)); - libNtve_gf_CreateUnitsWithDefaultFacing(1, "PrimalZergling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(4))); + libNtve_gf_CreateUnitsWithDefaultFacing(1, "AP_PrimalZergling", 0, gv_pLAYER_08_IZSHA, RegionRandomPoint(RegionFromId(4))); UnitGroupAdd(gv_zagaraReinforcements, UnitLastCreated()); AISetUnitSuicide(UnitLastCreated(), true); Wait(0.1, c_timeAI); @@ -2605,16 +2636,25 @@ bool gt_ZagaraUpgrades_Func (bool testConds, bool runActions) { TechTreeUpgradeAddLevel(gv_pLAYER_08_IZSHA, "ZergGroundArmorsLevel1", 1); TechTreeUpgradeAddLevel(gv_pLAYER_08_IZSHA, "ZergMeleeWeaponsLevel1", 1); TechTreeUpgradeAddLevel(gv_pLAYER_08_IZSHA, "ZergMissileWeaponsLevel1", 1); + libNtve_gf_SetUpgradeLevelForPlayer(gv_pLAYER_08_IZSHA, "AP_ZergGroundArmorsLevel1", 1); + libNtve_gf_SetUpgradeLevelForPlayer(gv_pLAYER_08_IZSHA, "AP_ZergMeleeWeaponsLevel1", 1); + libNtve_gf_SetUpgradeLevelForPlayer(gv_pLAYER_08_IZSHA, "AP_ZergMissileWeaponsLevel1", 1); } else if (auto5DB3DC2E_val == 2) { TechTreeUpgradeAddLevel(gv_pLAYER_08_IZSHA, "ZergGroundArmorsLevel2", 1); TechTreeUpgradeAddLevel(gv_pLAYER_08_IZSHA, "ZergMeleeWeaponsLevel2", 1); TechTreeUpgradeAddLevel(gv_pLAYER_08_IZSHA, "ZergMissileWeaponsLevel2", 1); + libNtve_gf_SetUpgradeLevelForPlayer(gv_pLAYER_08_IZSHA, "AP_ZergGroundArmorsLevel2", 1); + libNtve_gf_SetUpgradeLevelForPlayer(gv_pLAYER_08_IZSHA, "AP_ZergMeleeWeaponsLevel2", 1); + libNtve_gf_SetUpgradeLevelForPlayer(gv_pLAYER_08_IZSHA, "AP_ZergMissileWeaponsLevel2", 1); } else if (auto5DB3DC2E_val == 3) { TechTreeUpgradeAddLevel(gv_pLAYER_08_IZSHA, "ZergGroundArmorsLevel3", 1); TechTreeUpgradeAddLevel(gv_pLAYER_08_IZSHA, "ZergMeleeWeaponsLevel3", 1); TechTreeUpgradeAddLevel(gv_pLAYER_08_IZSHA, "ZergMissileWeaponsLevel3", 1); + libNtve_gf_SetUpgradeLevelForPlayer(gv_pLAYER_08_IZSHA, "AP_ZergGroundArmorsLevel3", 1); + libNtve_gf_SetUpgradeLevelForPlayer(gv_pLAYER_08_IZSHA, "AP_ZergMeleeWeaponsLevel3", 1); + libNtve_gf_SetUpgradeLevelForPlayer(gv_pLAYER_08_IZSHA, "AP_ZergMissileWeaponsLevel3", 1); } else { } @@ -3348,7 +3388,10 @@ bool gt_HyperionIntroQ_Func (bool testConds, bool runActions) { TriggerQueueEnter(); Wait(3.0, c_timeReal); - TriggerExecute(gt_ObjectiveHyperionMustSurviveCreate, true, true); + if ((libABFE498B_gv_aP_Triggers_Option_takeOverAIAllies == false)) { + TriggerExecute(gt_ObjectiveHyperionMustSurviveCreate, true, true); + } + Wait(6.0, c_timeReal); libSwaC_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Speech); libSwaC_gf_SendTransmissionCampaign(gv_kerrigan, "zMission_Korhal03|Line00115", c_transmissionDurationAdd, 0.0, true, libSwaC_ge_CampaignTransmissionPortraitOptioins_HidePortraitAfter, libSwaC_ge_CampaignTransmissionCueSoundOptions_DefaultCueSoundBehavior); @@ -4173,7 +4216,7 @@ bool gt_VictoryDestroyPalaceGateCompleted_Func (bool testConds, bool runActions) } TriggerEnable(TriggerGetCurrent(), false); - libC6542F50_gf_APArchipelagoSendData(1); + lib5BD4895D_gf_AP_Core_sendLocationLocal(lib5BD4895D_gv_aP_Core_locationVictory); TriggerExecute(gt_VictorySequence, true, false); return true; } @@ -4831,6 +4874,7 @@ bool gt_ObjectiveDestroyPalaceGateComplete_Func (bool testConds, bool runActions TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveDestroyPalaceGateCreate, true, false); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveDestroyDominionBase); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -4859,7 +4903,7 @@ bool gt_ObjectiveDestroyPalaceGateFailed_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveDestroyPalaceGateCreate, true, false); - libSwaC_gf_ZS_SetMissionObjectiveState("ZKorhal03Objective01", libSwaC_ge_MissionObjectiveState_Failed); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveDestroyDominionBase); return true; } @@ -4921,6 +4965,7 @@ bool gt_ObjectiveHyperionMustSurviveComplete_Func (bool testConds, bool runActio TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveHyperionMustSurviveCreate, true, false); PingDestroy(gv_hyperionPing); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveRescueBrood223); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -4949,7 +4994,7 @@ bool gt_ObjectiveHyperionMustSurviveFailed_Func (bool testConds, bool runActions TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveHyperionMustSurviveCreate, true, false); - libSwaC_gf_ZS_SetMissionObjectiveState("ZKorhal03Objective03", libSwaC_ge_MissionObjectiveState_Failed); + lib5BD4895D_gf_AP_Core_setObjectiveFailed(gv_objectiveRescueBrood223); return true; } @@ -4978,6 +5023,7 @@ bool gt_ObjectiveClearOuterLanesCreate_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); libSwaC_gf_CreateObjectiveCampaign("ZKorhal03Objective02"); gv_objectiveRescueBrood222 = ObjectiveLastCreated(); + libSwaC_gf_SetMissionObjectiveProgress2("ZKorhal03Objective02", gv_objectiveRescueBrood2222, true, null, true); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -5004,7 +5050,9 @@ bool gt_ObjectiveClearOuterLanesUpdate_Func (bool testConds, bool runActions) { TriggerExecute(gt_ObjectiveClearOuterLanesComplete, true, false); TriggerStop(gt_SCVRepairScript); } - + else { + libSwaC_gf_SetMissionObjectiveProgress2("ZKorhal03Objective02", gv_objectiveRescueBrood2222, true, null, true); + } if ((gv_objectiveRescueBrood2222 == 3) && (libHots_gf_DifficultyValueInt2(0, 1, 1) == 1) && (GameGetMissionTime() <= 1080.0)) { libSwaC_gf_CampaignAwardAchievement("Anniversary_ZKorhal03", gv_PLAYER_01_USER); } @@ -5036,6 +5084,7 @@ bool gt_ObjectiveClearOuterLanesComplete_Func (bool testConds, bool runActions) TriggerEnable(TriggerGetCurrent(), false); TriggerExecute(gt_ObjectiveClearOuterLanesCreate, true, false); + lib5BD4895D_gf_AP_Core_setObjectiveCompleted(gv_objectiveRescueBrood222); Wait(libSwaC_gv_campaignObjectiveDelay, c_timeReal); return true; } @@ -5064,11 +5113,9 @@ bool gt_IntroQ_Func (bool testConds, bool runActions) { TriggerEnable(TriggerGetCurrent(), false); TriggerQueueEnter(); - libC6542F50_gv_aPDelayUpdate = true; TriggerExecute(gt_IntroSetup, true, true); TriggerExecute(gt_IntroCinematic, true, true); TriggerExecute(gt_IntroCinematicEnd, true, true); - libC6542F50_gv_aPDelayUpdate = false; TriggerQueueExit(); return true; } @@ -5412,12 +5459,10 @@ bool gt_MidQ_Func (bool testConds, bool runActions) { SoundChannelSetVolume(PlayerGroupAll(), c_soundCategorySpell, 20.0, 0.2); libSwaC_gf_SendTransmissionCampaign(gv_kerrigan, "zMission_Korhal03|Line00103", c_transmissionDurationAdd, 0.0, true, libSwaC_ge_CampaignTransmissionPortraitOptioins_HidePortraitAfter, libSwaC_ge_CampaignTransmissionCueSoundOptions_DefaultCueSoundBehavior); libSwaC_gf_SetAllSoundChannelVolumesCampaign(libNtve_ge_VolumeChannelMode_Game); - libC6542F50_gv_aPDelayUpdate = true; TriggerExecute(gt_MidSetup, true, true); TriggerExecute(gt_MidCinematic, true, true); TriggerExecute(gt_MidCinematicEnd, true, true); TriggerExecute(gt_MidCleanup, true, true); - libC6542F50_gv_aPDelayUpdate = false; TriggerQueueExit(); return true; } @@ -5575,9 +5620,16 @@ bool gt_MidCleanup_Func (bool testConds, bool runActions) { unitgroup auto5B15553C_g; int auto5B15553C_u; unit auto5B15553C_var; + unitgroup auto40DACF34_g; + int auto40DACF34_u; + unit auto40DACF34_var; unitgroup autoF9859346_g; int autoF9859346_u; unit autoF9859346_var; + const int autoC92179E9_n = 6; + int autoC92179E9_i; + const int auto238EB284_n = 2; + int auto238EB284_i; const int auto28258970_n = 6; int auto28258970_i; @@ -5631,29 +5683,61 @@ bool gt_MidCleanup_Func (bool testConds, bool runActions) { if (auto5B15553C_var == null) { break; } libNtve_gf_ShowHideUnit(auto5B15553C_var, true); } - autoF9859346_g = UnitGroup(null, gv_PLAYER_07_DOMINION_GREEN22, null, UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32))), 0); - autoF9859346_u = UnitGroupCount(autoF9859346_g, c_unitCountAll); - for (;; autoF9859346_u -= 1) { - autoF9859346_var = UnitGroupUnitFromEnd(autoF9859346_g, autoF9859346_u); - if (autoF9859346_var == null) { break; } - libNtve_gf_ShowHideUnit(autoF9859346_var, true); - AISetUnitScriptControlled(autoF9859346_var, false); + if ((libABFE498B_gv_aP_Triggers_Option_takeOverAIAllies == true)) { + TriggerEnable(gt_DefeatHyperionDies, false); + auto40DACF34_g = UnitGroup(null, gv_PLAYER_07_DOMINION_GREEN22, null, UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32))), 0); + auto40DACF34_u = UnitGroupCount(auto40DACF34_g, c_unitCountAll); + for (;; auto40DACF34_u -= 1) { + auto40DACF34_var = UnitGroupUnitFromEnd(auto40DACF34_g, auto40DACF34_u); + if (auto40DACF34_var == null) { break; } + UnitRemove(auto40DACF34_var); + } + } + else { + autoF9859346_g = UnitGroup(null, gv_PLAYER_07_DOMINION_GREEN22, null, UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32))), 0); + autoF9859346_u = UnitGroupCount(autoF9859346_g, c_unitCountAll); + for (;; autoF9859346_u -= 1) { + autoF9859346_var = UnitGroupUnitFromEnd(autoF9859346_g, autoF9859346_u); + if (autoF9859346_var == null) { break; } + libNtve_gf_ShowHideUnit(autoF9859346_var, true); + AISetUnitScriptControlled(autoF9859346_var, false); + } } UnitPauseAll(false); TriggerExecute(gt_PauseUnitsAgain, true, false); - libNtve_gf_ShowHideUnit(gv_hYPERION, true); - UnitIssueOrder(gv_hYPERION, Order(AbilityCommand("move", 2)), c_orderQueueReplace); - libNtve_gf_PlayAnimation(libNtve_gf_MainActorofUnit(gv_midHyperion), c_animNameDefault, "Spell E", c_animFlagPlayForever, c_animTimeDefault); - for (auto28258970_i = 1; auto28258970_i <= auto28258970_n; auto28258970_i += 1) { - UnitCreate(1, "WarPig", 0, gv_PLAYER_07_DOMINION_GREEN22, RegionRandomPoint(RegionFromId(26)), 315.0); + if ((libABFE498B_gv_aP_Triggers_Option_takeOverAIAllies == true)) { + TriggerExecute(gt_CreateRaynorBaseForPlayer, true, false); + for (autoC92179E9_i = 1; autoC92179E9_i <= autoC92179E9_n; autoC92179E9_i += 1) { + UnitCreate(1, "AP_WarPig", 0, gv_PLAYER_01_USER, RegionRandomPoint(RegionFromId(26)), 315.0); + } + for (auto238EB284_i = 1; auto238EB284_i <= auto238EB284_n; auto238EB284_i += 1) { + UnitCreate(1, "AP_SiegeBreaker", 0, gv_PLAYER_01_USER, RegionRandomPoint(RegionFromId(26)), 315.0); + UnitCreate(1, "AP_BrynhildAssault", 0, gv_PLAYER_01_USER, RegionRandomPoint(RegionFromId(26)), 315.0); + } + } + else { + libNtve_gf_CreateUnitsAtPoint2(1, "PathingBlocker4x4Diagonal", 0, 0, gv_cCLocation); + libNtve_gf_ShowHideUnit(gv_hYPERION, true); + UnitIssueOrder(gv_hYPERION, Order(AbilityCommand("move", 2)), c_orderQueueReplace); + libNtve_gf_PlayAnimation(libNtve_gf_MainActorofUnit(gv_midHyperion), c_animNameDefault, "Spell E", c_animFlagPlayForever, c_animTimeDefault); + for (auto28258970_i = 1; auto28258970_i <= auto28258970_n; auto28258970_i += 1) { + UnitCreate(1, "WarPig", 0, gv_PLAYER_07_DOMINION_GREEN22, RegionRandomPoint(RegionFromId(26)), 315.0); + } } libSwaC_gf_ReviveHeroInstantly(libSwaC_ge_HeroUnit_Kerrigan, false); libSwaC_gf_ResetHeroAbilityCooldowns(libSwaC_ge_HeroUnit_Kerrigan); UnitSetPropertyFixed(gv_kerrigan, c_unitPropLifePercent, 100.0); UnitSetPropertyFixed(gv_kerrigan, c_unitPropEnergyPercent, 100.0); Wait(0.1, c_timeGame); - UnitCreate(1, "SCV", 0, gv_PLAYER_07_DOMINION_GREEN22, PointFromId(881), 135.0); - UnitCreate(1, "SCV", 0, gv_PLAYER_07_DOMINION_GREEN22, PointFromId(882), 135.0); + if ((libABFE498B_gv_aP_Triggers_Option_takeOverAIAllies == true)) { + UnitCreate(1, "AP_SCV", 0, gv_PLAYER_01_USER, PointFromId(881), 135.0); + UnitCreate(1, "AP_SCV", 0, gv_PLAYER_01_USER, PointFromId(882), 135.0); + } + else { + UnitCreate(1, "SCV", 0, gv_PLAYER_07_DOMINION_GREEN22, PointFromId(881), 135.0); + UnitCreate(1, "SCV", 0, gv_PLAYER_07_DOMINION_GREEN22, PointFromId(882), 135.0); + libLbty_gf_OrderWorkerstoGatherNearbyResources(RegionFromId(60), 1); + } GameTimeOfDayPause(false); PlayerSetState(gv_PLAYER_01_USER, c_playerStateXPGain, true); libNtve_gf_SetAllianceOneWay(gv_PLAYER_07_DOMINION_GREEN22, gv_PLAYER_03_DOMINION_BLUE, libNtve_ge_AllianceSetting_Enemy); @@ -6084,75 +6168,200 @@ void gt_VictoryZerg_Init () { } //-------------------------------------------------------------------------------------------------- -// Trigger: Archipelago Initialization +// Trigger: onDifficultyCasual //-------------------------------------------------------------------------------------------------- -bool gt_ArchipelagoInitialization_Func (bool testConds, bool runActions) { +bool gt_onDifficultyCasual_Func (bool testConds, bool runActions) { // Variable Declarations - unitgroup lv_noRemoval; - int lv_difficulty; + unit lv_currentUnit; // Automatic Variable Declarations - playergroup autoC731CD27_g; - int autoC731CD27_var; + unitgroup auto39989533_g; + int auto39989533_u; // Variable Initialization - lv_noRemoval = UnitGroupEmpty(); - lv_difficulty = 2; // Actions if (!runActions) { return true; } - lv_difficulty = libC6542F50_gf_APSetDifficulty(StringWord(EventChatMessage(false), 2), UnitGroupFromId(1), UnitGroupFromId(2), UnitGroupFromId(4), UnitGroupFromId(3)); - autoC731CD27_g = PlayerGroupAll(); - autoC731CD27_var = -1; - while (true) { - autoC731CD27_var = PlayerGroupNextPlayer(autoC731CD27_g, autoC731CD27_var); - if (autoC731CD27_var < 0) { break; } - PlayerSetDifficulty(autoC731CD27_var, lv_difficulty); - } - TriggerExecute(libC6542F50_gt_APPreInitMap, true, true); - TriggerExecute(gt_Initialization, true, true); - libC6542F50_gf_initchatbox(c_anchorTopRight, 500, 350, 0, 50); - libC6542F50_gf_showhidechatbox(1, true); - TechTreeRestrictionsEnable(1, true); - TriggerExecute(libC6542F50_gt_APClearTech, true, false); - libC6542F50_gf_APOptions(StringWord(EventChatMessage(false), 12)); - libC6542F50_gf_APUnlockUnits(StringWord(EventChatMessage(false), 3), ""); - libC6542F50_gf_APUnlockMutations(StringWord(EventChatMessage(false), 5), ""); - libC6542F50_gf_APUnlockStrains(StringWord(EventChatMessage(false), 6), ""); - libC6542F50_gf_APUnlockUpgrades(StringWord(EventChatMessage(false), 4), ""); - libC6542F50_gv_aPSkipKerriganActives = false; - libC6542F50_gf_APSetColors(StringWord(EventChatMessage(false), 13), StringWord(EventChatMessage(false), 14)); - libC6542F50_gf_APPrimalKerriganTech(true); - libC6542F50_gf_APSetKerriganLevel("0", ""); - libC6542F50_gv_aPKerriganBaseLevel = UnitGetPropertyInt(gv_kerrigan, c_unitPropXP, c_unitPropCurrent); - libNtve_gf_SetUpgradeLevelForPlayer(1, "KerriganPostZerusSounds", 1); - libNtve_gf_SetUpgradeLevelForPlayer(1, "KerriganInfestedCosmetic", 1); - libC6542F50_gf_APSetKerriganLevel(StringWord(EventChatMessage(false), 8), ""); - libC6542F50_gf_APUnlockKerriganAbilities(StringWord(EventChatMessage(false), 7), libC6542F50_gv_aPSkipKerriganActives, ""); - libSwaC_gf_StartingWorkersAutoHarvest(RegionFromId(51), RegionFromId(52)); - gf_HideKerrigan(); - libC6542F50_gf_GiveMineralsAndVespene(StringToInt(StringWord(EventChatMessage(false), 9)), StringToInt(StringWord(EventChatMessage(false), 10)), ""); - libC6542F50_gf_APBonusSupply(StringToInt(StringWord(EventChatMessage(false), 11))); - TriggerExecute(libC6542F50_gt_APSetInitFinished, true, true); - libC6542F50_gf_APArchipelagoSendData(0); + auto39989533_g = UnitGroupFromId(1); + auto39989533_u = UnitGroupCount(auto39989533_g, c_unitCountAll); + for (;; auto39989533_u -= 1) { + lv_currentUnit = UnitGroupUnitFromEnd(auto39989533_g, auto39989533_u); + if (lv_currentUnit == null) { break; } + UnitRemove(lv_currentUnit); + } + return true; +} + +//-------------------------------------------------------------------------------------------------- +void gt_onDifficultyCasual_Init () { + gt_onDifficultyCasual = TriggerCreate("gt_onDifficultyCasual_Func"); +} + +//-------------------------------------------------------------------------------------------------- +// Trigger: onDifficultyNormal +//-------------------------------------------------------------------------------------------------- +bool gt_onDifficultyNormal_Func (bool testConds, bool runActions) { + // Variable Declarations + unit lv_currentUnit; + + // Automatic Variable Declarations + unitgroup auto764F39B9_g; + int auto764F39B9_u; + + // Variable Initialization + + // Actions + if (!runActions) { + return true; + } + + auto764F39B9_g = UnitGroupFromId(2); + auto764F39B9_u = UnitGroupCount(auto764F39B9_g, c_unitCountAll); + for (;; auto764F39B9_u -= 1) { + lv_currentUnit = UnitGroupUnitFromEnd(auto764F39B9_g, auto764F39B9_u); + if (lv_currentUnit == null) { break; } + UnitRemove(lv_currentUnit); + } + return true; +} + +//-------------------------------------------------------------------------------------------------- +void gt_onDifficultyNormal_Init () { + gt_onDifficultyNormal = TriggerCreate("gt_onDifficultyNormal_Func"); +} + +//-------------------------------------------------------------------------------------------------- +// Trigger: onDifficultyHard +//-------------------------------------------------------------------------------------------------- +bool gt_onDifficultyHard_Func (bool testConds, bool runActions) { + // Variable Declarations + unit lv_currentUnit; + + // Automatic Variable Declarations + unitgroup auto02831F91_g; + int auto02831F91_u; + + // Variable Initialization + + // Actions + if (!runActions) { + return true; + } + + auto02831F91_g = UnitGroupFromId(4); + auto02831F91_u = UnitGroupCount(auto02831F91_g, c_unitCountAll); + for (;; auto02831F91_u -= 1) { + lv_currentUnit = UnitGroupUnitFromEnd(auto02831F91_g, auto02831F91_u); + if (lv_currentUnit == null) { break; } + UnitRemove(lv_currentUnit); + } + return true; +} + +//-------------------------------------------------------------------------------------------------- +void gt_onDifficultyHard_Init () { + gt_onDifficultyHard = TriggerCreate("gt_onDifficultyHard_Func"); +} + +//-------------------------------------------------------------------------------------------------- +// Trigger: onDifficultyBrutal +//-------------------------------------------------------------------------------------------------- +bool gt_onDifficultyBrutal_Func (bool testConds, bool runActions) { + // Variable Declarations + unit lv_currentUnit; + + // Automatic Variable Declarations + unitgroup autoC76A8875_g; + int autoC76A8875_u; + + // Variable Initialization + + // Actions + if (!runActions) { + return true; + } + + autoC76A8875_g = UnitGroupFromId(3); + autoC76A8875_u = UnitGroupCount(autoC76A8875_g, c_unitCountAll); + for (;; autoC76A8875_u -= 1) { + lv_currentUnit = UnitGroupUnitFromEnd(autoC76A8875_g, autoC76A8875_u); + if (lv_currentUnit == null) { break; } + UnitRemove(lv_currentUnit); + } + return true; +} + +//-------------------------------------------------------------------------------------------------- +void gt_onDifficultyBrutal_Init () { + gt_onDifficultyBrutal = TriggerCreate("gt_onDifficultyBrutal_Func"); +} + +//-------------------------------------------------------------------------------------------------- +// Trigger: CreateRaynorBaseForPlayer +//-------------------------------------------------------------------------------------------------- +bool gt_CreateRaynorBaseForPlayer_Func (bool testConds, bool runActions) { + // Variable Declarations + unit lv_commandCenter; + unitgroup lv_sCVs; + + // Automatic Variable Declarations + // Variable Initialization + lv_sCVs = UnitGroupEmpty(); + + // Conditions + if (testConds) { + if (!((TriggerIsEnabled(TriggerGetCurrent()) == true))) { + return false; + } + + if (!((libABFE498B_gv_aP_Triggers_Option_takeOverAIAllies == true))) { + return false; + } + } + + // Actions + if (!runActions) { + return true; + } + TriggerEnable(TriggerGetCurrent(), false); + libNtve_gf_CreateUnitsAtPoint2(1, "AP_PlanetaryFortress", 0, gv_PLAYER_07_DOMINION_GREEN22, gv_cCLocation); + lv_commandCenter = UnitLastCreated(); + UnitCargoCreate(lv_commandCenter, "AP_SCV", 10); + lv_sCVs = UnitCargoLastCreatedGroup(); + UnitIssueOrder(lv_commandCenter, Order(AbilityCommand("AP_CommandCenterTransport", 1)), c_orderQueueReplace); + libNtve_gf_RescueUnit(lv_commandCenter, gv_PLAYER_01_USER, true); + libNtve_gf_RescueUnit2(lv_sCVs, gv_PLAYER_01_USER, true); + PlayerModifyPropertyInt(gv_PLAYER_01_USER, c_playerPropSuppliesLimit, c_playerPropOperAdd, 200); + libNtve_gf_CreateUnitsAtPoint2(1, "AP_BarracksFlying", 0, gv_PLAYER_01_USER, PointFromId(207816135)); + libNtve_gf_CreateUnitsAtPoint2(1, "AP_FactoryFlying", 0, gv_PLAYER_01_USER, PointFromId(1796169913)); + libNtve_gf_CreateUnitsAtPoint2(1, "AP_StarportFlying", 0, gv_PLAYER_01_USER, PointFromId(534906268)); + libNtve_gf_CreateUnitsAtPoint2(3, "AP_Overlord", 0, gv_PLAYER_01_USER, UnitGetPosition(UnitFromId(445))); return true; } //-------------------------------------------------------------------------------------------------- -void gt_ArchipelagoInitialization_Init () { - gt_ArchipelagoInitialization = TriggerCreate("gt_ArchipelagoInitialization_Func"); - TriggerAddEventChatMessage(gt_ArchipelagoInitialization, c_playerAny, "ArchipelagoLoad", false); +void gt_CreateRaynorBaseForPlayer_Init () { + gt_CreateRaynorBaseForPlayer = TriggerCreate("gt_CreateRaynorBaseForPlayer_Func"); } //-------------------------------------------------------------------------------------------------- // Trigger: Arch Init //-------------------------------------------------------------------------------------------------- bool gt_ArchInit_Func (bool testConds, bool runActions) { + // Variable Declarations + int lv_currentPlayer; + playergroup lv_playerGroup; + // Automatic Variable Declarations + playergroup autoF0006EED_g; + + // Variable Initialization + lv_playerGroup = PlayerGroupEmpty(); + // Actions if (!runActions) { return true; @@ -6160,6 +6369,21 @@ bool gt_ArchInit_Func (bool testConds, bool runActions) { TriggerExecute(gt_Init02Players, true, false); TriggerExecute(gt_Init03Units, true, false); + libABFE498B_gf_AP_Triggers_MapConfig_setKerriganOptions(true, true); + libABFE498B_gf_AP_Triggers_MapConfig_setDifficultySetup(gt_onDifficultyCasual, gt_onDifficultyNormal, gt_onDifficultyHard, gt_onDifficultyBrutal); + lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_PLAYER_01_USER, lib5BD4895D_gv_aP_Core_Faction_KERRIGAN_SWARM_SWITCHABLE_TO_PRIMAL_ZERG); + lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(gv_PLAYER_07_DOMINION_GREEN22, lib5BD4895D_gv_aP_Core_Faction_RAYNORS_RAIDERS); + autoF0006EED_g = gv_dominionPlayerGroup; + lv_currentPlayer = -1; + while (true) { + lv_currentPlayer = PlayerGroupNextPlayer(autoF0006EED_g, lv_currentPlayer); + if (lv_currentPlayer < 0) { break; } + lib5BD4895D_gf_AP_Core_MapConfig_setPlayerFaction(lv_currentPlayer, lib5BD4895D_gv_aP_Core_Faction_TERRAN_DOMINION); + } + lv_playerGroup = PlayerGroupSingle(gv_PLAYER_01_USER); + PlayerGroupAdd(lv_playerGroup, gv_pLAYER_08_IZSHA); + lib5BD4895D_gf_AP_Core_MapConfig_setAffectedPlayers(lv_playerGroup); + lib5BD4895D_gf_AP_Core_MapConfig_setMapInit(gt_Initialization); return true; } @@ -6305,7 +6529,11 @@ void InitTriggers () { gt_VictoryCinematicEnd_Init(); gt_VictoryCleanup_Init(); gt_VictoryZerg_Init(); - gt_ArchipelagoInitialization_Init(); + gt_onDifficultyCasual_Init(); + gt_onDifficultyNormal_Init(); + gt_onDifficultyHard_Init(); + gt_onDifficultyBrutal_Init(); + gt_CreateRaynorBaseForPlayer_Init(); gt_ArchInit_Init(); gt_SetMineralCount_Init(); } diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Objects b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Objects index b8b8f1fb1..d18150be2 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Objects +++ b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Objects @@ -7913,23 +7913,23 @@ - + - + + - - + @@ -7947,22 +7947,22 @@ - + + - - - + + @@ -7977,16 +7977,16 @@ - + - + @@ -7994,9 +7994,9 @@ - - + + @@ -8008,12 +8008,12 @@ - - + - + + @@ -8024,23 +8024,23 @@ - + - + - + + - @@ -8051,8 +8051,8 @@ - + @@ -8069,18 +8069,19 @@ - - + + - + + @@ -8088,8 +8089,8 @@ - + @@ -8107,6 +8108,7 @@ + @@ -8118,29 +8120,30 @@ - - - + + + + - - + - + + @@ -8156,12 +8159,12 @@ - + - + @@ -8175,36 +8178,36 @@ - + - + - + - + - + - + @@ -8212,10 +8215,10 @@ - + @@ -8255,19 +8258,6 @@ - - - - - - - - - - - - - @@ -8281,6 +8271,19 @@ + + + + + + + + + + + + + @@ -8334,29 +8337,29 @@ - + - + - + - + - + - + - + - + @@ -8386,13 +8389,13 @@ - + @@ -8407,6 +8410,7 @@ + @@ -8414,7 +8418,7 @@ - + @@ -8431,6 +8435,9 @@ + + + @@ -8441,18 +8448,18 @@ - - - - - - + + + + + + @@ -8475,6 +8482,12 @@ + + + + + + @@ -8482,12 +8495,6 @@ - - - - - - @@ -8524,7 +8531,6 @@ - @@ -8533,8 +8539,9 @@ - - + + + @@ -8570,6 +8577,9 @@ + + + @@ -8577,9 +8587,6 @@ - - - @@ -8602,6 +8609,7 @@ + @@ -8611,7 +8619,7 @@ - + @@ -8620,14 +8628,15 @@ - + - + + @@ -8636,12 +8645,18 @@ - + + + + + + + @@ -8649,12 +8664,6 @@ - - - - - - @@ -8678,15 +8687,15 @@ - + + - - + @@ -8696,6 +8705,7 @@ + @@ -8703,15 +8713,14 @@ - + - @@ -8746,18 +8755,18 @@ - - - - - - + + + + + + @@ -8780,6 +8789,12 @@ + + + + + + @@ -8787,27 +8802,21 @@ - + + + + - - + + - - - - - - - - - @@ -8823,13 +8832,6 @@ - - - - - - - @@ -8837,6 +8839,13 @@ + + + + + + + @@ -8933,7 +8942,6 @@ - @@ -8941,6 +8949,7 @@ + @@ -8970,21 +8979,14 @@ - + - - - - - - - @@ -8993,9 +8995,16 @@ - + + + + + + + - + + @@ -9004,30 +9013,24 @@ - - - - - + + - + + + + - - - - - - @@ -9035,6 +9038,12 @@ + + + + + + @@ -9055,19 +9064,19 @@ - - - - - - - + + + + + + + @@ -9097,12 +9106,6 @@ - - - - - - @@ -9110,16 +9113,16 @@ + + + + + + - - - - - - @@ -9127,13 +9130,19 @@ + + + + + + - + @@ -9141,7 +9150,7 @@ - + @@ -9149,7 +9158,8 @@ - + + @@ -9157,6 +9167,12 @@ + + + + + + @@ -9164,12 +9180,6 @@ - - - - - - @@ -9206,15 +9216,15 @@ - + - + - + - + @@ -9230,13 +9240,7 @@ - - - - - - - + @@ -9244,8 +9248,7 @@ - - + @@ -9261,13 +9264,21 @@ - + + + + + + + + + - + @@ -9288,20 +9299,14 @@ - - + - - - - - - + @@ -9309,6 +9314,12 @@ + + + + + + @@ -9349,25 +9360,25 @@ - - - - - - - + + + + + + + @@ -9376,7 +9387,7 @@ - + @@ -9389,13 +9400,13 @@ + - @@ -9403,6 +9414,15 @@ + + + + + + + + + @@ -9410,14 +9430,11 @@ - - - + - @@ -9426,12 +9443,6 @@ - - - - - - @@ -9464,13 +9475,6 @@ - - - - - - - @@ -9478,7 +9482,14 @@ - + + + + + + + + @@ -9509,12 +9520,12 @@ - + - + @@ -9535,13 +9546,13 @@ - + @@ -9549,7 +9560,6 @@ - @@ -9557,6 +9567,7 @@ + @@ -9573,6 +9584,7 @@ + @@ -9597,7 +9609,7 @@ - + @@ -9605,7 +9617,6 @@ - @@ -9614,6 +9625,7 @@ + @@ -9623,6 +9635,7 @@ + @@ -9630,11 +9643,9 @@ - - + - @@ -9643,23 +9654,24 @@ - + + - - - - - - - + + + + + + + @@ -9673,7 +9685,6 @@ - @@ -9682,6 +9693,7 @@ + @@ -9719,15 +9731,15 @@ - + + - @@ -9750,11 +9762,11 @@ - + + - @@ -9780,6 +9792,12 @@ + + + + + + @@ -9787,36 +9805,30 @@ - - - - - - - + - + - - - - - - + + + + + + @@ -9825,13 +9837,13 @@ - + @@ -9868,8 +9880,7 @@ - - + @@ -9880,7 +9891,8 @@ - + + @@ -9937,18 +9949,19 @@ - - - - - - + + + + + + + @@ -9962,14 +9975,14 @@ - - + + @@ -9978,13 +9991,13 @@ - + @@ -9994,9 +10007,9 @@ - - + + @@ -10007,9 +10020,10 @@ - + + @@ -10017,7 +10031,6 @@ - @@ -10040,9 +10053,6 @@ - - - @@ -10050,26 +10060,30 @@ + + + - - - - - - - + + + + + + + + @@ -10106,6 +10120,12 @@ + + + + + + @@ -10113,25 +10133,19 @@ - - - - - - + + + - - - @@ -10139,7 +10153,7 @@ - + @@ -10148,13 +10162,13 @@ - + @@ -10188,7 +10202,6 @@ - @@ -10196,7 +10209,8 @@ - + + @@ -10254,7 +10268,7 @@ - + @@ -10262,6 +10276,7 @@ + @@ -10275,11 +10290,12 @@ - - - - - + + + + + + @@ -10287,17 +10303,23 @@ - - - - - - + + + + + + + + + + + + @@ -10305,12 +10327,6 @@ - - - - - - @@ -10329,14 +10345,14 @@ - + - + @@ -10355,24 +10371,18 @@ - - - - - - - - - - + + + + @@ -10380,7 +10390,14 @@ - + + + + + + + + @@ -10406,6 +10423,7 @@ + @@ -10413,7 +10431,6 @@ - @@ -10421,12 +10438,12 @@ + + - - @@ -10434,6 +10451,7 @@ + @@ -10441,7 +10459,7 @@ - + @@ -10462,7 +10480,7 @@ - + @@ -10494,6 +10512,12 @@ + + + + + + @@ -10501,21 +10525,15 @@ - - - - - - - - + + @@ -10533,6 +10551,12 @@ + + + + + + @@ -10540,11 +10564,11 @@ - + - - + + @@ -10552,12 +10576,6 @@ - - - - - - @@ -10567,14 +10585,15 @@ + + - - + @@ -10582,7 +10601,6 @@ - @@ -10604,15 +10622,8 @@ - - - - - - - - + @@ -10620,16 +10631,24 @@ - + + + + + + + + - + + + - @@ -10643,7 +10662,7 @@ - + @@ -10651,8 +10670,8 @@ - + @@ -10689,6 +10708,7 @@ + @@ -10696,26 +10716,22 @@ - - - - - - + + + + + + - - - - @@ -10725,6 +10741,10 @@ + + + + @@ -10739,14 +10759,14 @@ - - + + @@ -10779,6 +10799,7 @@ + @@ -10786,7 +10807,6 @@ - @@ -10806,10 +10826,10 @@ - + + - @@ -10858,6 +10878,7 @@ + @@ -10892,18 +10913,18 @@ - + - - + + - + - - + + @@ -10933,25 +10954,27 @@ + - + + @@ -10970,6 +10993,7 @@ + @@ -10977,10 +11001,6 @@ - - - - @@ -10988,6 +11008,9 @@ + + + @@ -11002,12 +11025,6 @@ - - - - - - @@ -11017,6 +11034,13 @@ + + + + + + + @@ -11095,6 +11119,7 @@ + @@ -11115,21 +11140,15 @@ - - - - - - - - + + @@ -11137,6 +11156,12 @@ + + + + + + @@ -11151,8 +11176,8 @@ - + @@ -11321,4 +11346,26 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Objects.version b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Objects.version index 7cce1f38b..ffaf250d5 100644 Binary files a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Objects.version and b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Objects.version differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/PaintedPathingLayer b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/PaintedPathingLayer deleted file mode 100644 index bff91c1ce..000000000 Binary files a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/PaintedPathingLayer and /dev/null differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Preload.xml b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Preload.xml index 3aec83838..27d6a9e0d 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Preload.xml +++ b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Preload.xml @@ -174,7 +174,6 @@ - @@ -193,22 +192,14 @@ - - - - - - - - - - + + @@ -220,7 +211,6 @@ - @@ -234,9 +224,6 @@ - - - @@ -253,10 +240,38 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Regions b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Regions index 96581f83a..06d888ece 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Regions +++ b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Regions @@ -637,4 +637,11 @@ + + + +
+ + + \ No newline at end of file diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Regions.version b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Regions.version index 9330e8b94..8658b3176 100644 Binary files a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Regions.version and b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Regions.version differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Triggers b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Triggers index 504d938f7..ff6805693 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Triggers @@ -214,6 +214,7 @@ + @@ -228,9 +229,22 @@ + + + + + + + + + + + + + @@ -257,6 +271,7 @@ + @@ -287,6 +302,7 @@ + @@ -405,6 +421,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + Start Intro @@ -448,6 +552,54 @@ + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + @@ -461,6 +613,7 @@ + @@ -469,6 +622,7 @@ + @@ -657,6 +811,27 @@ + + + + + + + + + + + + + 1 + + + + + AP_TerranBuildingArmor + + + @@ -1174,7 +1349,9 @@ + + @@ -1212,6 +1389,7 @@ + @@ -1247,6 +1425,40 @@ + + + + + + + + + + + 1 + + + + + + + + + + 1 + + + + + AP_K5Kerrigan + + + + + + + + @@ -1263,7 +1475,16 @@ + + + + + + + + + @@ -9763,7 +9984,7 @@ - + @@ -9951,13 +10172,13 @@ 0 - - - + + + - - - 2 + + + 1 @@ -10212,7 +10433,7 @@ - Baneling + AP_Baneling @@ -10344,7 +10565,7 @@ - Zergling + AP_Zergling @@ -10476,7 +10697,7 @@ - Hydralisk + AP_Hydralisk @@ -10657,7 +10878,7 @@ - Baneling + AP_Baneling @@ -10758,7 +10979,7 @@ - Hydralisk + AP_Hydralisk @@ -10891,7 +11112,7 @@ - Zergling + AP_Zergling @@ -11206,7 +11427,7 @@ - Baneling + AP_Baneling @@ -11307,7 +11528,7 @@ - Hydralisk + AP_Hydralisk @@ -11440,7 +11661,7 @@ - Zergling + AP_Zergling @@ -11588,7 +11809,7 @@ - Zergling + AP_Zergling @@ -11736,7 +11957,7 @@ - Zergling + AP_Zergling @@ -11833,7 +12054,7 @@ - + @@ -12019,13 +12240,13 @@ 0 - - - + + + - - - 3 + + + 2 @@ -12516,7 +12737,7 @@ - InfestedAbomination + AP_InfestedAbomination @@ -12692,7 +12913,7 @@ - InfestedAbomination + AP_InfestedAbomination @@ -13138,7 +13359,7 @@ - InfestedAbomination + AP_InfestedAbomination @@ -13908,7 +14129,7 @@ - + @@ -14095,13 +14316,13 @@ 0 - - - + + + - - - 4 + + + 3 @@ -14328,7 +14549,7 @@ - PrimalZergling + AP_PrimalZergling @@ -14461,7 +14682,7 @@ - PrimalHydralisk + AP_PrimalHydralisk @@ -14594,7 +14815,7 @@ - PrimalUltralisk + AP_PrimalUltralisk @@ -14903,7 +15124,7 @@ - PrimalHydralisk + AP_PrimalHydralisk @@ -15037,7 +15258,7 @@ - PrimalZergling + AP_PrimalZergling @@ -15348,7 +15569,7 @@ - PrimalHydralisk + AP_PrimalHydralisk @@ -15482,7 +15703,7 @@ - PrimalZergling + AP_PrimalZergling @@ -15631,7 +15852,7 @@ - PrimalZergling + AP_PrimalZergling @@ -15780,7 +16001,7 @@ - PrimalZergling + AP_PrimalZergling @@ -18988,6 +19209,9 @@ + + + @@ -19060,6 +19284,72 @@ + + + + + + + + + + + + + + 1 + + + + + AP_ZergGroundArmorsLevel1 + + + + + + + + + + + + + + + + + 1 + + + + + AP_ZergMeleeWeaponsLevel1 + + + + + + + + + + + + + + + + + 1 + + + + + AP_ZergMissileWeaponsLevel1 + + + @@ -19067,6 +19357,9 @@ + + + @@ -19139,6 +19432,72 @@ + + + + + + + + + + + + + + 1 + + + + + AP_ZergGroundArmorsLevel2 + + + + + + + + + + + + + + + + + 1 + + + + + AP_ZergMeleeWeaponsLevel2 + + + + + + + + + + + + + + + + + 1 + + + + + AP_ZergMissileWeaponsLevel2 + + + @@ -19146,6 +19505,9 @@ + + + @@ -19218,6 +19580,72 @@ + + + + + + + + + + + + + + 1 + + + + + AP_ZergGroundArmorsLevel3 + + + + + + + + + + + + + + + + + 1 + + + + + AP_ZergMeleeWeaponsLevel3 + + + + + + + + + + + + + + + + + 1 + + + + + AP_ZergMissileWeaponsLevel3 + + + @@ -24130,7 +24558,7 @@ - + @@ -24153,9 +24581,15 @@ + + + + + + - + @@ -24173,6 +24607,26 @@ + + + + + + + + + + + + + + + + + + false + + @@ -30776,7 +31230,7 @@ - + @@ -30842,14 +31296,13 @@ - - - + + + - - - 1 - + + + @@ -34115,6 +34568,7 @@ + @@ -34245,6 +34699,14 @@ + + + + + + + + @@ -34264,7 +34726,7 @@ - + @@ -34341,20 +34803,13 @@ Update the objective - - - - - - - - + + + - - - ZKorhal03Objective01 - - + + + @@ -34572,6 +35027,7 @@ + @@ -34710,6 +35166,14 @@ + + + + + + + + @@ -34728,7 +35192,7 @@ - + @@ -34800,20 +35264,13 @@ - - - - - - - - + + + - - - ZKorhal03Objective03 - - + + + @@ -34918,7 +35375,6 @@ - @@ -34966,7 +35422,6 @@ - @@ -35033,9 +35488,16 @@ + + + + + + + - + @@ -35064,12 +35526,6 @@ - - - - - - @@ -35241,6 +35697,7 @@ + @@ -35370,6 +35827,14 @@ + + + + + + + + @@ -36504,26 +36969,9 @@ - - - - - - - - - - - - - - - - true - @@ -36585,21 +37033,6 @@ - - - - - - - - - - - - - false - - @@ -39954,12 +40387,10 @@ - - @@ -40107,21 +40538,6 @@ - - - - - - - - - - - - - true - - @@ -40202,21 +40618,6 @@ - - - - - - - - - - - - - false - - @@ -41456,21 +41857,17 @@ - + - - - - + - - + @@ -41800,8 +42197,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -;Missile,Dead + + + + + + + + + + + + + + + + + + + @@ -41873,6 +42344,26 @@ + + + + + + + + + + + + + + + + + + true + + @@ -41900,8 +42391,249 @@ + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + 0 + + + + + PathingBlocker4x4Diagonal + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 6 + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + 315.0 + + + + + AP_WarPig + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 + + + + + Additional troops to hold early attack waves + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + 315.0 + + + + + AP_SiegeBreaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + 315.0 + + + + + AP_BrynhildAssault + + + + + + + + + + + + + + + + + @@ -41915,6 +42647,7 @@ + @@ -41944,6 +42677,7 @@ + @@ -41983,6 +42717,7 @@ + @@ -42039,6 +42774,26 @@ + + + + + + + + + + + + + + + + + + true + + Enable XP gain, time of day, and abilities. @@ -42118,8 +42873,98 @@ + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + 135.0 + + + + + AP_SCV + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + 135.0 + + + + + AP_SCV + + + + + + + + + @@ -42159,6 +43004,7 @@ + @@ -42196,6 +43042,42 @@ + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + true + + @@ -46754,958 +47636,696 @@ + + + - - - - + + + + + - - - - - - - - - - + + + - - - - - - - - - - - - - + + + + + - - - - - + + - - - + + + + + - - - + + + - - - - - - + + + + - - - + + + + - - - + + + - - - true - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - + + - - + + + + + - - - - - + + + - - + + + - - - - - - - - - - - - - + + + + - - - ArchipelagoLoad - + + + - - - - + + + - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - + + - - - - + + + + + - - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 500 - - - - - 350 - - - - - 0 - - - - - 50 - - - - - - - - - - 1 - + + + + - - - + + + - - - - + + + - - - 1 - + + + + + - - - + + - - - - - + + + + + - - - + + + - - - + + + + - - - - + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - - - + + + + + - - - + + - - - + + - - - + + + + + - - - 12 - + + + - - - - + + + - - - + + + - - - - + + - - - + + + - - - + + + true + - - - + + + + + - - - 3 - + + + - - - + + + - - - - + + + true + - - - + + + + - - - - + + + - - - + + - - - + + + - - - + + + + + + + - - - 5 + + + 1 - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - + + + - - - 6 - + + + AP_PlanetaryFortress + + - - - + + + - - - - + + + + - - - + + + - - - - + + + - - - + + - - - + + + + + - - - + + + - - - 4 + + + 10 - - - + + + AP_SCV + + - + - - + + - + - + - + - false - - - - - - - - - - - - - - - - - - - - - - - + - - - + + - - - 13 - - - - - - - - - - + + + + + - - - + + + - - - + + + - - - + + + - - - 14 - + + + AP_CommandCenterTransport + + + - - - + + + - - - true - + + + + + - - - - + + + - - - 0 - + + + - - - + + + - - - - + + + + + - - - + + + - - - + + + - - - - - + + + - - - + + + + + + - - - + + + - - - + + + - - - - - + + + - - - 1 + + + 200 - - - KerriganPostZerusSounds - - + + + + + + + - - + + 1 - - - - - + + + + - - - 1 - + + + - - - KerriganInfestedCosmetic + + + AP_BarracksFlying - - - - - 1 - - - - - - - - - - - - - - - - - - - + - - - + + + + - - - + + + + + + + - - - 8 + + + 1 - - - - - - - - - - - - - + + + + - - - - + + + - - - + + + AP_FactoryFlying + + - - - + + + + - - - + + + + + + + - - - 7 + + + 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - + + + - - - - + + + AP_StarportFlying + + - - - + + + + - - - + + + Create some Overlords to compensate the supply + - - - + + + + + + + - - - 9 + + + 3 - - - - - - - - - - - - - - - - - - - - + + + + - - - + + + - - - + + + AP_Overlord + + - - - 10 - + + + - - - + + + - - - + + + + - - - + + + + + - - - + + - - - + + + - - - - + + + + + - - - + + + + + - - - + + + - - - + + + - - - 11 - + + + + + - - - - - + + + - - - + + + - - - + + + + + + - - - - + + + - - - + + + - - + + 0 - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + 0 + + + + + + + + + + + + + @@ -47748,6 +48368,153 @@ + + + + + + + + true + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Triggers.version index a5e70ae8e..4a6aa8e78 100644 Binary files a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Triggers.version and b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/Triggers.version differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index ab49c691a..49a7eaef4 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -9,6 +9,7 @@ Category/Name/22C8307E======== GAMEPLAY ======= Category/Name/2A881197=Main Objective - Destroy Palace Gate Category/Name/31271F14=Zerg Category/Name/33FB539C======== OBJECTIVES ======= +Category/Name/35115FD4=Difficulty Category/Name/3585DD2D=Variables Category/Name/4102B9ED=Achievements/Stats Category/Name/43FFA855=Performance @@ -88,6 +89,7 @@ Trigger/Name/36E6FAA6=Victory Q Trigger/Name/3A3A2F2B=Elite Force Intro Q Trigger/Name/46073A3C=Hyperion Big Attack 2 Q Trigger/Name/464A1841=Victory Zerg +Trigger/Name/4A8F3279=onDifficultyHard Trigger/Name/4D0BCD90=Create Augustgrad Gate Pings Trigger/Name/4FB8046F=Objective - Clear Outer Lanes - Create Trigger/Name/536B4E20=Init 05 Environment @@ -138,7 +140,7 @@ Trigger/Name/C16647C4=Tip Mission Help Q Trigger/Name/C17EBB3F=Mid Q Trigger/Name/C1D47DC5=Raynor Kills Trigger/Name/C4828344=Odin Dies Q -Trigger/Name/C5684955=Archipelago Initialization +Trigger/Name/C883FF8A=onDifficultyBrutal Trigger/Name/C902EDB6=Lane Pause Loop Trigger/Name/C9E9EE10=Lane 2 Spawn Loop Trigger/Name/CC636751=Victory Cinematic @@ -146,7 +148,9 @@ Trigger/Name/D026A3E7=Achievement: Destroy the Odin H Trigger/Name/D1790502=Lane 2 Cleared Q Trigger/Name/D2614D5A=Lane 2 Trigger/Name/D2A5EAE6=Lane 1 Cleared Q +Trigger/Name/D39D11C7=onDifficultyCasual Trigger/Name/D671C2A7=Mid Setup +Trigger/Name/D80D6457=onDifficultyNormal Trigger/Name/DA7F8847=Raynor Attack Prep Q Trigger/Name/DCF3DAF1=Victory Trigger/Name/E27FE8EA=Hyperion Attacked Q @@ -162,6 +166,7 @@ Trigger/Name/ED605C53=Lane 3 Spawn Loop Trigger/Name/EDD29BA4=Intro Setup Trigger/Name/F15F2AAD=Intro Q Trigger/Name/F253B06C=Create Dominion Patrol - Right Side +Trigger/Name/F5F121E3=CreateRaynorBaseForPlayer Trigger/Name/F97F5B41=Victory Setup Trigger/Name/FA5F2A05=Pause Units Again Trigger/Name/FB4BAB63=Defeat Cheat @@ -181,6 +186,7 @@ Variable/Name/1924E1F9=FadeDuration Variable/Name/1A738706=TempPoint Variable/Name/1C646281=KERRIGAN Variable/Name/1D7A16C7=CinematicTempUnits +Variable/Name/1D812D5F=SCVs Variable/Name/1E41AB1B=FadeDuration Variable/Name/20126896=IntroMusicCompleted Variable/Name/242A7731=IntroTerranAmb @@ -190,6 +196,7 @@ Variable/Name/26872465=i Variable/Name/28F5DD42=Soundtrack Variable/Name/2F2E36CC=PLAYER_14_ZAGARA Variable/Name/30601208=YellowEnd +Variable/Name/3D7F9D3D=currentUnit Variable/Name/3F62F8D4=BlueEnd Variable/Name/440AB586=Soundtrack Variable/Name/4652EE01=Enemies @@ -200,6 +207,7 @@ Variable/Name/49D20C46=ObjectiveHyperionMustSurvive Variable/Name/4A3F85FB=AchievementTimedRunTimer Variable/Name/4C1AFCC0=Zagara Reinforcements Variable/Name/4E5B83CC=CinematicCompleted +Variable/Name/526CD6DF=currentUnit Variable/Name/52C77A5C=CinematicHiddenUnits Variable/Name/5441B0C2=LargestZergForce Variable/Name/583FA154=i @@ -211,6 +219,7 @@ Variable/Name/5F845368=MapMusicTrack Variable/Name/609D9DE0=RaynorKills Variable/Name/6134D9CF=SCV Variable/Name/61F2403C=i +Variable/Name/6450F50E=commandCenter Variable/Name/6CCA3E48=VictoryZergSound3 Variable/Name/702761DE=TotalHyperionDamage Variable/Name/7199542A=HyperionVictims @@ -220,10 +229,10 @@ Variable/Name/75B5F8A2=Patrollers Variable/Name/776DDDF8=CurrentForce Variable/Name/77EB9BE9=MoveToB Variable/Name/78CE54FE=PerfPausedCount -Variable/Name/78E8C6E3=No Removal Variable/Name/79F39258=PerfRevealRegions Variable/Name/7BE666D7=Lane1Paused Variable/Name/7C325357=DominionPatrolRightGroup +Variable/Name/7CFD47B4=CCLocation Variable/Name/7FEA5402=IntroTerranSound Variable/Name/801BBC3E=HyperionFirstAttackTransmision Variable/Name/801E4AFA=ObjectiveDestroyPalaceGate @@ -255,12 +264,14 @@ Variable/Name/AC936921=FadeDuration Variable/Name/B05E9A85=OdinPing Variable/Name/B0EFA322=PatrollerPointsA Variable/Name/B2171D1E=HomePoint +Variable/Name/B2375FDD=currentPlayer +Variable/Name/B36EE879=currentUnit Variable/Name/B56CDD88=VictoryKerrigan Variable/Name/C00E2963=LanePing Variable/Name/C709835E=DominionPlayerGroup -Variable/Name/C79C9336=Difficulty Variable/Name/C8931965=PatrollerPointsB Variable/Name/CC4353FA=PalaceTurrets +Variable/Name/CD5A0C76=playerGroup Variable/Name/CDE75B31=StartValue Variable/Name/CEA6A533=PatrollerPointsB Variable/Name/D1B49D5C=ObjectiveClearOuterLanes @@ -268,6 +279,8 @@ Variable/Name/D465A500=i Variable/Name/D7012AC7=HyperionPing Variable/Name/DC3730F7=GameOver Variable/Name/DEEFDB94=CinematicHyperion +Variable/Name/E10A3497=currentUnit +Variable/Name/E6DEFCDA=currentUnit Variable/Name/E81B6940=HYPERION Variable/Name/EDEBF587=FadeDuration Variable/Name/F0ACE0B1=PLAYER_02_DOMINION_RED diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3HeightMap b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3HeightMap index e3be8e27d..f8d0a84fb 100644 Binary files a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3HeightMap and b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3HeightMap differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3SyncHeightMap b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3SyncHeightMap index cede5be75..3e47768e8 100644 Binary files a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3SyncHeightMap and b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3SyncHeightMap differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3SyncTextureInfo b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3SyncTextureInfo index 8e1f693f8..7f18f538d 100644 Binary files a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3SyncTextureInfo and b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3SyncTextureInfo differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3Terrain.version b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3Terrain.version index 0b8d461d5..a9b1d1ad4 100644 Binary files a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3Terrain.version and b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3Terrain.version differ diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3Terrain.xml b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3Terrain.xml index 169c463dc..f472abbc7 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3Terrain.xml +++ b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3Terrain.xml @@ -1,21 +1,31 @@ - - - + + + - - - - - - - + + + + + + + - + - + + + + + + + + + + + @@ -24,7 +34,794 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3VertCol b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3VertCol index a7c143689..ec39dcd9c 100644 Binary files a/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3VertCol and b/Maps/ArchipelagoCampaign/HotS/ap_the_reckoning.SC2Map/t3VertCol differ diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy index e7620f51c..13de9a6d5 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy @@ -4804,6 +4804,7 @@ bool libABFE498B_gt_AP_Triggers_setOptions_Func (bool testConds, bool runActions string lv_allInVariant; string lv_kerriganOptions; string lv_storyTech; + string lv_takeOverAIAllies; // Automatic Variable Declarations // Variable Initialization @@ -4815,6 +4816,7 @@ bool libABFE498B_gt_AP_Triggers_setOptions_Func (bool testConds, bool runActions lv_allInVariant = ""; lv_kerriganOptions = ""; lv_storyTech = ""; + lv_takeOverAIAllies = ""; // Actions if (!runActions) { @@ -4830,6 +4832,7 @@ bool libABFE498B_gt_AP_Triggers_setOptions_Func (bool testConds, bool runActions lv_skipCutscenes = StringWord(EventChatMessage(false), 7); lv_kerriganOptions = StringWord(EventChatMessage(false), 8); lv_storyTech = StringWord(EventChatMessage(false), 9); + lv_takeOverAIAllies = StringWord(EventChatMessage(false), 10); libABFE498B_gf_AP_Triggers_setDifficulty(lv_difficulty); libABFE498B_gf_AP_Triggers_setGameSpeed(lv_gameSpeed); libABFE498B_gv_aP_Triggers_Option_genericUpgradeResearch = StringToInt(lv_genericUpgradeResearch); @@ -4838,6 +4841,7 @@ bool libABFE498B_gt_AP_Triggers_setOptions_Func (bool testConds, bool runActions libABFE498B_gv_aP_Triggers_skipCutscenes = StringEqual(lv_skipCutscenes, "1", c_stringCase); libABFE498B_gf_AP_Triggers_setKerriganOptions(StringToInt(lv_kerriganOptions)); libABFE498B_gv_aP_Triggers_Option_grantStoryTech = StringEqual(lv_storyTech, "1", c_stringCase); + libABFE498B_gv_aP_Triggers_Option_takeOverAIAllies = StringEqual(lv_takeOverAIAllies, "1", c_stringCase); return true; } diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy index cef9ec2cc..09a812441 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy @@ -12,6 +12,7 @@ int libABFE498B_gv_aP_Triggers_Option_allInMissionVariant; bool libABFE498B_gv_aP_Triggers_skipCutscenes; bool libABFE498B_gv_aP_Triggers_disableForcedCamera; bool libABFE498B_gv_aP_Triggers_Option_grantStoryTech; +bool libABFE498B_gv_aP_Triggers_Option_takeOverAIAllies; int libABFE498B_gv_aP_Triggers_Option_KerriganPresence; bool libABFE498B_gv_aP_Triggers_Option_KerriganPrimalStatusByMap; bool libABFE498B_gv_aP_Triggers_isBuild; diff --git a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader index 773630f14..f5706732d 100644 Binary files a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader and b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader differ diff --git a/Mods/ArchipelagoTriggers.SC2Mod/GameText.version b/Mods/ArchipelagoTriggers.SC2Mod/GameText.version index bb06cda93..40b5c96e4 100644 Binary files a/Mods/ArchipelagoTriggers.SC2Mod/GameText.version and b/Mods/ArchipelagoTriggers.SC2Mod/GameText.version differ diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers index bd41839f4..554cf5b65 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers +++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers @@ -25,6 +25,8 @@ + + @@ -104,6 +106,21 @@ false + + + Take over AI allies + + + + + + + + + + false + + @@ -2464,6 +2481,7 @@ + @@ -2474,6 +2492,7 @@ + @@ -2482,6 +2501,7 @@ + skipCutscenes @@ -2558,6 +2578,15 @@ + + + + + + + + + @@ -2876,6 +2905,41 @@ 9 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 10 + + @@ -3046,6 +3110,38 @@ 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version b/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version index 6a7de3d4d..3e0617fd2 100644 Binary files a/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version and b/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version differ diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt index a79794938..c62c73884 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -10,8 +10,8 @@ Category/Name/lib_ABFE498B_27FD0FD1=Upgrade Category/Name/lib_ABFE498B_323FB199=Options Category/Name/lib_ABFE498B_363787DA=Buildings Category/Name/lib_ABFE498B_3EFF5915=Unlocks -Category/Name/lib_ABFE498B_41F36C26=Unlocks Category/Name/lib_ABFE498B_3F2AA74F=Events +Category/Name/lib_ABFE498B_41F36C26=Unlocks Category/Name/lib_ABFE498B_50A7FFA8=WeaponArmorUpgrades Category/Name/lib_ABFE498B_529DA935=Mercs Category/Name/lib_ABFE498B_5C4EBED0=UnitMorphs @@ -999,10 +999,12 @@ Variable/Name/lib_ABFE498B_9311AF5B=unit Variable/Name/lib_ABFE498B_93E8CB68=upgradeValue Variable/Name/lib_ABFE498B_947D84E8=AP_Triggers_Terran_terranShipWeaponLevel Variable/Name/lib_ABFE498B_958CAA6F=AP_Triggers_Terran_hasShrikeTurret +Variable/Name/lib_ABFE498B_959EFEA6=AP_Triggers_Option_takeOverAIAllies Variable/Name/lib_ABFE498B_96AED9CA=AP_Triggers_Option_grantStoryTech Variable/Name/lib_ABFE498B_9904111B=mercenaryValue Variable/Name/lib_ABFE498B_9961EA4F=AP_Triggers_Terran_terranVehicleWeaponLevel Variable/Name/lib_ABFE498B_9987AD2A=AP_Triggers_Terran_hasFortifiedBunker +Variable/Name/lib_ABFE498B_A4077B3C=takeOverAIAllies Variable/Name/lib_ABFE498B_A4361B8E=armory6Value Variable/Name/lib_ABFE498B_A53FE9F9=armory6Value Variable/Name/lib_ABFE498B_A54B32FA=abilityValue