From 138b8c65306c237c96cb48c74749aba9280bd213 Mon Sep 17 00:00:00 2001 From: Ziktofel Date: Mon, 23 Dec 2024 22:30:57 +0100 Subject: [PATCH] Add safeguard for Stukov revival in Phantoms of the Void --- .../DocumentHeader | Bin 9693 -> 9693 bytes .../MapScript.galaxy | 29 +++++++ .../ap_phantoms_of_the_void.SC2Map/Triggers | 72 ++++++++++++++++++ .../Triggers.version | Bin 44 -> 44 bytes .../LocalizedData/TriggerStrings.txt | 1 + 5 files changed, 102 insertions(+) diff --git a/Maps/ArchipelagoCampaign/HotS/ap_phantoms_of_the_void.SC2Map/DocumentHeader b/Maps/ArchipelagoCampaign/HotS/ap_phantoms_of_the_void.SC2Map/DocumentHeader index 3ade6e83aa6bbdbad326e7111965350245d1e8a5..fc8bdb2203bdabf5a15754934691e988b776bddd 100644 GIT binary patch delta 45 tcmccXeb-yX!^k<9gMop;D42nPk(Gg0B9oB;ghAj(SiJ%WZ&cZ-3IOD!3bp_M delta 45 tcmccXeb-yX!^k<9gMop;D42nPk(GhxbuuFZ2!p`uS6i2Z@J5xLssJ1a4%Ywx diff --git a/Maps/ArchipelagoCampaign/HotS/ap_phantoms_of_the_void.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/HotS/ap_phantoms_of_the_void.SC2Map/MapScript.galaxy index 141c15f58..a3de70773 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_phantoms_of_the_void.SC2Map/MapScript.galaxy +++ b/Maps/ArchipelagoCampaign/HotS/ap_phantoms_of_the_void.SC2Map/MapScript.galaxy @@ -314,6 +314,7 @@ trigger gt_VictoryCinematic; trigger gt_VictoryCinematicEnd; trigger gt_VictoryCleanup; trigger gt_VictoryKillNarud; +trigger gt_Stukov_HeroReviveOnBehaviorExpiry; trigger gt_onDifficultyCasual; trigger gt_onDifficultyNormal; trigger gt_onDifficultyHard; @@ -5820,6 +5821,33 @@ void gt_VictoryKillNarud_Init () { gt_VictoryKillNarud = TriggerCreate("gt_VictoryKillNarud_Func"); } +//-------------------------------------------------------------------------------------------------- +// Trigger: Stukov_HeroReviveOnBehaviorExpiry +//-------------------------------------------------------------------------------------------------- +bool gt_Stukov_HeroReviveOnBehaviorExpiry_Func (bool testConds, bool runActions) { + // Automatic Variable Declarations + // Conditions + if (testConds) { + if (!((UnitGetType(EventUnit()) == "StukovReviveCocoon"))) { + return false; + } + } + + // Actions + if (!runActions) { + return true; + } + + libSwaC_gf_ReviveHeroInstantly(libSwaC_ge_HeroUnit_Stukov, false); + return true; +} + +//-------------------------------------------------------------------------------------------------- +void gt_Stukov_HeroReviveOnBehaviorExpiry_Init () { + gt_Stukov_HeroReviveOnBehaviorExpiry = TriggerCreate("gt_Stukov_HeroReviveOnBehaviorExpiry_Func"); + TriggerAddEventUnitBehaviorChange(gt_Stukov_HeroReviveOnBehaviorExpiry, null, "CocoonReviveTimer", c_unitBehaviorChangeDeactivate); +} + //-------------------------------------------------------------------------------------------------- // Trigger: onDifficultyCasual //-------------------------------------------------------------------------------------------------- @@ -6257,6 +6285,7 @@ void InitTriggers () { gt_VictoryCinematicEnd_Init(); gt_VictoryCleanup_Init(); gt_VictoryKillNarud_Init(); + gt_Stukov_HeroReviveOnBehaviorExpiry_Init(); gt_onDifficultyCasual_Init(); gt_onDifficultyNormal_Init(); gt_onDifficultyHard_Init(); diff --git a/Maps/ArchipelagoCampaign/HotS/ap_phantoms_of_the_void.SC2Map/Triggers b/Maps/ArchipelagoCampaign/HotS/ap_phantoms_of_the_void.SC2Map/Triggers index e2329ace2..8a9dcfaf9 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_phantoms_of_the_void.SC2Map/Triggers +++ b/Maps/ArchipelagoCampaign/HotS/ap_phantoms_of_the_void.SC2Map/Triggers @@ -50053,6 +50053,7 @@ + @@ -50608,6 +50609,77 @@ + + + + + + + + + + + + + + + + + + + CocoonReviveTimer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + StukovReviveCocoon + + + + + + + + + + + + + + + false + + diff --git a/Maps/ArchipelagoCampaign/HotS/ap_phantoms_of_the_void.SC2Map/Triggers.version b/Maps/ArchipelagoCampaign/HotS/ap_phantoms_of_the_void.SC2Map/Triggers.version index eb41db7a9b70226488ec7c44cf5883e18c2e3ec3..7287de5ebf9fb8719eb13e224ee1a24004d91976 100644 GIT binary patch literal 44 pcmYdJNi9y#EGl7QU|^8QWMp6k(jdSK#324bAf0$EGo2Ag0|2&-2R8r! literal 44 pcmYdJNi9y#EGl7QU|@Ki%*enBq(OiOh(Y|7Kw9+}Um7Ej1_0My2oL}O diff --git a/Maps/ArchipelagoCampaign/HotS/ap_phantoms_of_the_void.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Maps/ArchipelagoCampaign/HotS/ap_phantoms_of_the_void.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt index 8af799557..5e2fd4772 100644 --- a/Maps/ArchipelagoCampaign/HotS/ap_phantoms_of_the_void.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Maps/ArchipelagoCampaign/HotS/ap_phantoms_of_the_void.SC2Map/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -115,6 +115,7 @@ Trigger/Name/68C21321=Bully Deactivate 2 Trigger/Name/6DCBA3B6=Start Game Intro Q Trigger/Name/6FC134A5=Temple Channeling Trigger/Name/720CBE97=Defeat Duel Lose +Trigger/Name/745E065F=Stukov_HeroReviveOnBehaviorExpiry Trigger/Name/76AC9C23=Kerrigan Beam Region Sounds Trigger/Name/77E8ECFF=Victory Sequence Trigger/Name/78188234=Crystal Destroyed Northeast