From 12ed0528141071fd7f717864fbbf1d23493c10f8 Mon Sep 17 00:00:00 2001 From: Matthew Date: Fri, 26 Jul 2024 22:23:10 -0700 Subject: [PATCH 1/2] sc2: Added Dark Archon war council upgrade -- Indomitable Will --- .../Base.SC2Data/GameData/ButtonData.xml | 6 ++++++ .../Base.SC2Data/GameData/EffectData.xml | 8 ++++++++ .../Base.SC2Data/GameData/RequirementData.xml | 4 ++++ .../Base.SC2Data/GameData/RequirementNodeData.xml | 4 ++++ .../Base.SC2Data/GameData/UnitData.xml | 7 ++++--- .../Base.SC2Data/GameData/UpgradeData.xml | 4 ++++ .../enUS.SC2Data/LocalizedData/GameStrings.txt | 4 ++++ 7 files changed, 34 insertions(+), 3 deletions(-) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml index 3c6e6d813..d3f93c243 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml @@ -2644,6 +2644,7 @@ + @@ -4886,6 +4887,11 @@ + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml index 50f852c3a..55a6293af 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml @@ -10824,7 +10824,15 @@ + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml index 144bd046d..8558cb825 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml @@ -3062,6 +3062,10 @@ + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml index 15d2c339b..73006b575 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml @@ -5458,6 +5458,10 @@ + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml index 843a479ec..1531860ac 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml @@ -15316,14 +15316,15 @@ - + - + + + - diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml index e06fd14c2..2b353ee7a 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml @@ -11606,6 +11606,10 @@ + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt index 351407adf..1d5daf857 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt +++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt @@ -947,6 +947,7 @@ Button/Name/AP_CycloneResearchLockOnDamageUpgrade=Research Mag-Field Accelerator Button/Name/AP_D8Charge=G-4 Cluster Bombs Button/Name/AP_DarkArchon=Warp in Dark Archon Button/Name/AP_DarkArchonConfusion=Confusion +Button/Name/AP_DarkArchonIndomitableWill=Indomitable Will Button/Name/AP_DarkArchonMeld=Dark Archon Meld Button/Name/AP_DarkArchonMindControl=Mind Control Button/Name/AP_DarkArchonSCBWMaelstrom=Maelstrom @@ -2021,8 +2022,10 @@ Button/Tooltip/AP_CycloneResearchLockOnDamageUpgrade=Increases C Button/Tooltip/AP_D8Charge=Timed explosive that does heavy area damage. Button/Tooltip/AP_DarkArchon=Nerazim FactionPotent psionic master. Can use Confuse and Mind Control.Can attack ground and air units. Button/Tooltip/AP_DarkArchonConfusion=Forces enemy units in the target area to attack each other for seconds.Heroic units are immune. +Button/Tooltip/AP_DarkArchonIndomitableWill=Mind Control no longer drains the Dark Archon's shields. Button/Tooltip/AP_DarkArchonMeld=Sacrifices 2 Dark Templar to create a Dark Archon.Potent psionic master. Can use Confuse and Mind Control.Can attack ground and air units. Button/Tooltip/AP_DarkArchonMindControl=Permanently takes control of a target enemy unit.Heroic units are immune. +Button/Tooltip/AP_DarkArchonMindControlShieldDrain=Permanently takes control of a target enemy unit, at the cost of all of the Dark Archon's shields.Heroic units are immune. Button/Tooltip/AP_DarkArchonSCBWMaelstrom=Creates a focused blast of psionic energy that stuns all biological targets in the target area for seconds. Button/Tooltip/AP_DarkShrine=Dark Templar tech structure. Button/Tooltip/AP_DarkShrineAssignRally=Sends recalled Avengers to the designated point. @@ -4644,6 +4647,7 @@ RequirementNode/Tooltip/AP_CountUnitNukeCompleteOnly=Build Nuke at the Shadow Op RequirementNode/Tooltip/AP_CountUpgradeAdeptDisruptiveTransferCompleteOnly=Find Disruptive Transfer (Adept) RequirementNode/Tooltip/AP_CountUpgradeAvengerCloakCompleteOnly=Find Kryhas Cloak (Avenger) RequirementNode/Tooltip/AP_CountUpgradeBloodHunterBrutalEfficiencyCompleteOnly=Find Brutal Efficiency (Blood Hunter) +RequirementNode/Tooltip/AP_CountUpgradeDarkArchonIndomitableWillCompleteOnly=Find Indomitable Will (Dark Archon) RequirementNode/Tooltip/AP_CountUpgradeDarkTemplarShadowFuryGreaterCompleteOnly=Find Greater Shadow Fury (Dark Templar) RequirementNode/Tooltip/AP_CountUpgradeDarkTemplarShadowFuryLesserCompleteOnly=Find Lesser Shadow Fury (Dark Templar) RequirementNode/Tooltip/AP_CountUpgradeDragoonPhalanxSuitCompleteOnly=Find Phalanx Suit (Dragoon) From e5fa7ad0584773bd7413bbe3b3ade741a821f5aa Mon Sep 17 00:00:00 2001 From: Matthew Date: Fri, 26 Jul 2024 22:32:43 -0700 Subject: [PATCH 2/2] sc2: Added unlock triggers for dark archon indomitable will --- .../Base.SC2Data/LibABFE498B.galaxy | 8 +++- .../Base.SC2Data/LibABFE498B_h.galaxy | 1 + Mods/ArchipelagoTriggers.SC2Mod/Triggers | 40 ++++++++++++++++++- .../LocalizedData/TriggerStrings.txt | 2 + 4 files changed, 49 insertions(+), 2 deletions(-) diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy index 0400fac28..7922c9c31 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy @@ -1560,7 +1560,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossWarCouncil (int lp_player, int lp_b libABFE498B_gf_AP_Triggers_Protoss_unlockHighTemplarPlasmaSurge, // 15 ap_triggers_PlayerConsumer_sig, // 16 ap_triggers_PlayerConsumer_sig, // 17 - ap_triggers_PlayerConsumer_sig, // 18 + libABFE498B_gf_AP_Triggers_Protoss_unlockDarkArchonIndomitableWill, // 18 ap_triggers_PlayerConsumer_sig, // 19 ap_triggers_PlayerConsumer_sig, // 20 ap_triggers_PlayerConsumer_sig, // 21 @@ -7303,6 +7303,12 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkArchonArgusTalisman (int lp_pl libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_ArgusTalisman", 1); } +void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkArchonIndomitableWill (int lp_player) { + // Automatic Variable Declarations + // Implementation + libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DarkArchonIndomitableWill", 1); +} + void libABFE498B_gf_AP_Triggers_Protoss_unlockAscendantPowerOverwhelming (int lp_player) { // Automatic Variable Declarations // Implementation diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy index 946c2c7cc..53112ed8a 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy @@ -753,6 +753,7 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockArchonHighArchon (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkArchonFeedback (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkArchonMaelstrom (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkArchonArgusTalisman (int lp_player); +void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkArchonIndomitableWill (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockAscendantPowerOverwhelming (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockAscendantPowerChaoticAttunement (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockAscendantBloodAmulet (int lp_player); diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers index 59694cb5f..7ac0a3ea3 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers +++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers @@ -4566,7 +4566,7 @@ libABFE498B_gf_AP_Triggers_Protoss_unlockHighTemplarPlasmaSurge, // 15 ap_triggers_PlayerConsumer_sig, // 16 ap_triggers_PlayerConsumer_sig, // 17 - ap_triggers_PlayerConsumer_sig, // 18 + libABFE498B_gf_AP_Triggers_Protoss_unlockDarkArchonIndomitableWill, // 18 ap_triggers_PlayerConsumer_sig, // 19 ap_triggers_PlayerConsumer_sig, // 20 ap_triggers_PlayerConsumer_sig, // 21 @@ -58416,6 +58416,7 @@ + @@ -61715,6 +61716,43 @@ + + AP_Triggers_Protoss_unlockDarkArchonIndomitableWill + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + AP_DarkArchonIndomitableWill + + + + + + 1 + + diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt index d87d29107..c1f274497 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -472,6 +472,7 @@ FunctionDef/Name/lib_ABFE498B_836F60F0=AP_Triggers_Terran_unlockMarauderKineticF FunctionDef/Name/lib_ABFE498B_83833BCC=AP_Triggers_Zerg_RavagerDeepTunnel FunctionDef/Name/lib_ABFE498B_844AC9AE=AP_Triggers_Terran_unlockCycloneResourceEfficiency FunctionDef/Name/lib_ABFE498B_848D560C=AP_Triggers_Zerg_CorruptorCausticSpray +FunctionDef/Name/lib_ABFE498B_8494B3E9=AP_Triggers_Protoss_unlockDarkArchonIndomitableWill FunctionDef/Name/lib_ABFE498B_85D3604E=AP_Triggers_Terran_unlockLiberatorCompressedRocketFuel FunctionDef/Name/lib_ABFE498B_85E3728C=AP_Triggers_Protoss_unlockAdeptDisruptiveTransfer FunctionDef/Name/lib_ABFE498B_862C698C=AP_Triggers_Zerg_HydraliskResourceEfficiency @@ -1168,6 +1169,7 @@ ParamDef/Name/lib_ABFE498B_6D39B4FE=player ParamDef/Name/lib_ABFE498B_6D98BBB4=player ParamDef/Name/lib_ABFE498B_6DB379AF=player ParamDef/Name/lib_ABFE498B_6DBC7C97=player +ParamDef/Name/lib_ABFE498B_6DE56CE3=player ParamDef/Name/lib_ABFE498B_6DFD13C5=player ParamDef/Name/lib_ABFE498B_6E1FF4D2=player ParamDef/Name/lib_ABFE498B_6E28AE9D=player