From 47f7cca0dc3e1f8d6039c8e4c63cd5469b8ce97e Mon Sep 17 00:00:00 2001 From: Ziktofel Date: Tue, 26 Nov 2024 19:06:10 +0100 Subject: [PATCH] Add Infested Liberator Defender Mode --- .../Base.SC2Data/GameData/AbilData.xml | 66 +++++++ .../Base.SC2Data/GameData/ActorData.xml | 181 ++++++++++++++++++ .../Base.SC2Data/GameData/ButtonData.xml | 8 + .../Base.SC2Data/GameData/EffectData.xml | 72 +++++++ .../Base.SC2Data/GameData/RequirementData.xml | 14 ++ .../GameData/RequirementNodeData.xml | 4 + .../Base.SC2Data/GameData/UnitData.xml | 73 ++++++- .../Base.SC2Data/GameData/UpgradeData.xml | 17 ++ .../Base.SC2Data/GameData/WeaponData.xml | 5 + .../LocalizedData/GameHotkeys.txt | 2 + .../Base.SC2Data/LibABFE498B.galaxy | 8 +- .../Base.SC2Data/LibABFE498B_h.galaxy | 1 + .../ArchipelagoTriggers.SC2Mod/DocumentHeader | Bin 161 -> 161 bytes .../GameText.version | Bin 44 -> 44 bytes Mods/ArchipelagoTriggers.SC2Mod/Triggers | 40 +++- .../Triggers.version | Bin 44 -> 44 bytes .../LocalizedData/TriggerStrings.txt | 2 + 17 files changed, 489 insertions(+), 4 deletions(-) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml index 9c4540a80..899c1f426 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml @@ -1820,6 +1820,14 @@ + + + + + + + + @@ -1846,6 +1854,16 @@ + + + + + + + + + + @@ -1891,6 +1909,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1965,6 +2008,29 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml index 5a8cc1d01..5568e8ed8 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml @@ -26672,6 +26672,7 @@ + @@ -26811,6 +26812,13 @@ + + + + + + + @@ -26829,6 +26837,7 @@ + @@ -26963,6 +26972,9 @@ + + + @@ -26972,12 +26984,16 @@ + + + + @@ -26985,6 +27001,10 @@ + + + + @@ -26995,6 +27015,9 @@ + + + @@ -27022,6 +27045,9 @@ + + + @@ -37639,6 +37665,14 @@ + + + + + + + + @@ -37650,6 +37684,7 @@ + @@ -37659,6 +37694,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml index ebbc2c21f..d0a74e6f3 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml @@ -6945,4 +6945,12 @@ + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml index f533fc8da..c9c62b46c 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml @@ -2249,6 +2249,14 @@ + + + + + + + + @@ -2274,6 +2282,11 @@ + + + + + @@ -2284,6 +2297,11 @@ + + + + + @@ -2307,6 +2325,12 @@ + + + + + + @@ -2499,6 +2523,12 @@ + + + + + + @@ -2511,6 +2541,12 @@ + + + + + + @@ -2533,6 +2569,13 @@ + + + + + + + @@ -2547,6 +2590,13 @@ + + + + + + + @@ -2561,6 +2611,13 @@ + + + + + + + @@ -2577,6 +2634,15 @@ + + + + + + + + + @@ -2595,6 +2661,11 @@ + + + + + @@ -14957,6 +15028,7 @@ + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml index 2fdbbc602..ba83a2e08 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml @@ -3906,6 +3906,16 @@ + + + + + + + + + + @@ -4271,4 +4281,8 @@ + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml index 6755d9c5e..ac028e274 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml @@ -6976,4 +6976,8 @@ + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml index ba6fc1dbf..7179d532a 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml @@ -10942,6 +10942,7 @@ + @@ -11025,6 +11026,7 @@ + @@ -27481,6 +27483,7 @@ + @@ -27498,6 +27501,8 @@ + + @@ -27506,6 +27511,7 @@ + @@ -27513,7 +27519,7 @@ - + @@ -27529,6 +27535,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml index b15aa3af8..3710a7752 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml @@ -1945,6 +1945,8 @@ + + @@ -2005,6 +2007,8 @@ + + @@ -11699,6 +11703,7 @@ + @@ -11727,6 +11732,7 @@ + @@ -11755,6 +11761,7 @@ + @@ -11783,6 +11790,7 @@ + @@ -11811,6 +11819,7 @@ + @@ -11832,6 +11841,7 @@ + @@ -11853,6 +11863,7 @@ + @@ -11874,6 +11885,7 @@ + @@ -11895,6 +11907,7 @@ + @@ -11916,6 +11929,7 @@ + @@ -16652,8 +16666,10 @@ + + @@ -16714,4 +16730,5 @@ + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml index 3b447a98a..58496c7da 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml @@ -4173,4 +4173,9 @@ + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt index 61aae2158..5eb8a2dd8 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt +++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt @@ -596,3 +596,5 @@ Button/Hotkey/AP_KerriganVoidCoopEconDrop=A Button/Hotkey/AP_KerriganVoidCoopCrushingGripWave=Z Button/Hotkey/AP_SummonYggdrasil=O Button/Hotkey/AP_YggdrasilAssimilate=T +Button/Hotkey/AP_SILiberatorAAMode=D +Button/Hotkey/AP_SILiberatorAGMode=E diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy index a9900ea76..77ff18fc4 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy @@ -1041,7 +1041,7 @@ void libABFE498B_gf_AP_Triggers_unlockZergMutation5 (int lp_player, int lp_bitAr libABFE498B_gf_AP_Triggers_Zerg_InfestedLiberatorFrightfulFleshwelder, // 5 libABFE498B_gf_AP_Triggers_Zerg_BioelectricPayload, // 6 libABFE498B_gf_AP_Triggers_Zerg_AcidSporeVents, // 7 - ap_triggers_PlayerConsumer_sig, // 8 + libABFE498B_gf_AP_Triggers_Zerg_InfestedLiberatorDefenderMode, // 8 ap_triggers_PlayerConsumer_sig, // 9 ap_triggers_PlayerConsumer_sig, // 10 ap_triggers_PlayerConsumer_sig, // 11 @@ -6306,6 +6306,12 @@ void libABFE498B_gf_AP_Triggers_Zerg_InfestedLiberatorFrightfulFleshwelder (int libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_FrightfulFleshwelderInfestedLiberator", 1); } +void libABFE498B_gf_AP_Triggers_Zerg_InfestedLiberatorDefenderMode (int lp_player) { + // Automatic Variable Declarations + // Implementation + libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_SILiberatorDefenderMode", 1); +} + void libABFE498B_gf_AP_Triggers_Zerg_unlockTyrannozor (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 603cc4924..104144f52 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy @@ -667,6 +667,7 @@ void libABFE498B_gf_AP_Triggers_Zerg_InfestedBansheeFrightfulFleshwelder (int lp void libABFE498B_gf_AP_Triggers_Zerg_Cloud_Dispersal (int lp_player); void libABFE498B_gf_AP_Triggers_Zerg_Viral_Contamination (int lp_player); void libABFE498B_gf_AP_Triggers_Zerg_InfestedLiberatorFrightfulFleshwelder (int lp_player); +void libABFE498B_gf_AP_Triggers_Zerg_InfestedLiberatorDefenderMode (int lp_player); void libABFE498B_gf_AP_Triggers_Zerg_unlockTyrannozor (int lp_player); void libABFE498B_gf_AP_Triggers_Zerg_unlockBaneling (int lp_player); void libABFE498B_gf_AP_Triggers_Zerg_unlockLurker (int lp_player); diff --git a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader index 1875a0ce053db2c0c683d7b41c4aa1c7e8cd24bc..88bee823103fe9db9e1b9076d9fc28c59cecd814 100644 GIT binary patch delta 32 gcmZ3;xR7yzjPQYiwKGAO0ScHI7$ydYO>~U`0ImoL8~^|S delta 32 gcmZ3;xR7yzjPU6fJsUun0ScHI7$ydYO>~U`0K(7;4gdfE diff --git a/Mods/ArchipelagoTriggers.SC2Mod/GameText.version b/Mods/ArchipelagoTriggers.SC2Mod/GameText.version index ea679589df37798c758fa6f13d8594ace28e0d95..cc92085430206df2c2fbf9b13616e61b0b2bcb76 100644 GIT binary patch delta 17 YcmdPVnV`TE%*?=G&FhxV$iTn=02*upVE_OC delta 17 YcmdPVnV`TE#LU3ZGfyp@k%55$03aU&A^-pY diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers index b1bccc48a..2c981dd72 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers +++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers @@ -3806,7 +3806,7 @@ libABFE498B_gf_AP_Triggers_Zerg_InfestedLiberatorFrightfulFleshwelder, // 5 libABFE498B_gf_AP_Triggers_Zerg_BioelectricPayload, // 6 libABFE498B_gf_AP_Triggers_Zerg_AcidSporeVents, // 7 - ap_triggers_PlayerConsumer_sig, // 8 + libABFE498B_gf_AP_Triggers_Zerg_InfestedLiberatorDefenderMode, // 8 ap_triggers_PlayerConsumer_sig, // 9 ap_triggers_PlayerConsumer_sig, // 10 ap_triggers_PlayerConsumer_sig, // 11 @@ -50125,6 +50125,7 @@ + @@ -50199,7 +50200,6 @@ - AP_Triggers_Zerg_InfestedLiberatorFrightfulFleshwelder @@ -50235,6 +50235,42 @@ + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + 1 + + + + + AP_SILiberatorDefenderMode + + + diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version b/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version index 8983ac8d77cef76ec3d3bb7a9dd2a521ce542927..2eadb7fc165851839043279793f938e976699117 100644 GIT binary patch delta 17 YcmdPVnV`Tkm4kud2(Mc@BLf2i03rheF#rGn delta 17 YcmdPVnV`Tkk%NJuGE6I-k%55$03gx>4*&oF diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt index 6cbf2c8d4..c501a3319 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -830,6 +830,7 @@ FunctionDef/Name/lib_ABFE498B_DA09A2B4=AP_Triggers_Terran_unlockAutomatedRefiner FunctionDef/Name/lib_ABFE498B_DA25FF22=AP_Triggers_Terran_unlockBansheeInternalTechModule FunctionDef/Name/lib_ABFE498B_DA66DCED=AP_Triggers_Zerg_unlockHydralisk FunctionDef/Name/lib_ABFE498B_DAFAD881=AP_Triggers_Zerg_HydraliskAncillaryCarapace +FunctionDef/Name/lib_ABFE498B_DB337F35=AP_Triggers_Zerg_InfestedLiberatorDefenderMode FunctionDef/Name/lib_ABFE498B_DB9CA11F=AP_Triggers_Zerg_SwarmQueenResourceEfficiency FunctionDef/Name/lib_ABFE498B_DBDF9EAF=AP_Triggers_Terran_unlockBattlecruiserProgressiveMissilePods FunctionDef/Name/lib_ABFE498B_DBECB8EC=AP_Triggers_Zerg_unlockInfestedMarine @@ -1026,6 +1027,7 @@ ParamDef/Name/lib_ABFE498B_168C2F04=player ParamDef/Name/lib_ABFE498B_16E2B062=player ParamDef/Name/lib_ABFE498B_170BAC8C=player ParamDef/Name/lib_ABFE498B_17120B49=player +ParamDef/Name/lib_ABFE498B_17735CF8=player ParamDef/Name/lib_ABFE498B_17C9563D=player ParamDef/Name/lib_ABFE498B_17FF7EA9=player ParamDef/Name/lib_ABFE498B_1828C086=player