From 1c956cd2ff7f4e6e528dfb6a261f1d26dedcf36f Mon Sep 17 00:00:00 2001 From: Snarky Date: Wed, 27 Nov 2024 02:56:08 +0100 Subject: [PATCH 01/26] Add Baneling Launch upgrade to Aberration --- .../Base.SC2Data/GameData/AbilData.xml | 43 ++++++ .../Base.SC2Data/GameData/ActorData.xml | 27 ++++ .../Base.SC2Data/GameData/BehaviorData.xml | 8 ++ .../Base.SC2Data/GameData/ButtonData.xml | 6 + .../Base.SC2Data/GameData/EffectData.xml | 86 ++++++++++++ .../Base.SC2Data/GameData/RequirementData.xml | 20 +++ .../GameData/RequirementNodeData.xml | 80 +++++++++++ .../Base.SC2Data/GameData/UnitData.xml | 41 +++++- .../Base.SC2Data/GameData/UpgradeData.xml | 12 ++ .../Base.SC2Data/GameData/ValidatorData.xml | 9 ++ .../LocalizedData/GameHotkeys.txt | 1 + .../LocalizedData/GameStrings.txt | 11 ++ .../LocalizedData/ObjectStrings.txt | 11 ++ .../Base.SC2Data/LibABFE498B.galaxy | 15 ++- .../Base.SC2Data/LibABFE498B_h.galaxy | 1 + Mods/ArchipelagoTriggers.SC2Mod/Triggers | 125 +++++++++++++++++- .../LocalizedData/TriggerStrings.txt | 3 + 17 files changed, 492 insertions(+), 7 deletions(-) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml index 899c1f426..0c179a999 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml @@ -14277,4 +14277,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml index 5568e8ed8..549d42742 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml @@ -9587,6 +9587,14 @@ + + + + + + + + @@ -42158,4 +42166,23 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml index 1636cfa73..82facee85 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml @@ -9994,4 +9994,12 @@ + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml index d0a74e6f3..e3709ac0e 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml @@ -6953,4 +6953,10 @@ + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml index c9c62b46c..fb26ebde9 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml @@ -22909,4 +22909,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml index ba83a2e08..9857da1d5 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml @@ -4285,4 +4285,24 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml index ac028e274..69b8cb4dc 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml @@ -6980,4 +6980,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml index 1a153e7a4..d6cd3553e 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml @@ -10554,6 +10554,10 @@ + + + + @@ -10565,11 +10569,21 @@ - - - - - + + + + + + + + + + + + + + + @@ -10624,6 +10638,8 @@ + + @@ -10631,6 +10647,7 @@ + @@ -29702,4 +29719,18 @@ + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml index 3710a7752..07b84d003 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml @@ -8758,6 +8758,8 @@ + + @@ -8784,6 +8786,8 @@ + + @@ -16731,4 +16735,12 @@ + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml index f285706e4..1286034e2 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml @@ -6989,4 +6989,13 @@ + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt index 5eb8a2dd8..8b06465b9 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt +++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameHotkeys.txt @@ -20,6 +20,7 @@ Button/Hotkey/AP_ArmorpiercingMode=E Button/Hotkey/AP_Armory=A Button/Hotkey/AP_AscendantSacrifice=R Button/Hotkey/AP_Assimilator=A +Button/Hotkey/AP_BanelingLaunch=Q Button/Hotkey/AP_BanelingNest=B Button/Hotkey/AP_Banshee=E Button/Hotkey/AP_Banshee_BlackOpsAirstrike=R diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt index f6d2f8c40..286fa46ce 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt +++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt @@ -19,6 +19,9 @@ Abil/Name/AP_AssimilatorPipesMorph=Assimilator Pipes Morph Abil/Name/AP_AssimilatorToAutomatedAssimilator=Assimilator To Automated Assimilator Abil/Name/AP_AttackRedirect=Attack Redirect Abil/Name/AP_AutomatedExtractorToExtractor=Automated Extractor To Extractor +Abil/Name/AP_BanelingLaunch=Baneling Launch +Abil/Name/AP_BanelingLaunchHangar=Baneling Launch Hangar +Abil/Name/AP_BanelingLaunchRefill=Baneling Launch Refill Abil/Name/AP_BansheeCloak=Cloaking Field Abil/Name/AP_BarracksAddOns=AddOns Abil/Name/AP_BarracksLand=Land @@ -978,6 +981,8 @@ Button/Name/AP_BanelingCorrosiveBile=Corrosive Acid Button/Name/AP_BanelingHeal=Regenerative Acid Button/Name/AP_BanelingHealSmall=Regenerative Acid Button/Name/AP_BanelingHunterPassive=Baneling +Button/Name/AP_BanelingLaunch=Baneling Launch +Button/Name/AP_BanelingLaunchTrain=Baneling Launch Train Button/Name/AP_BanelingNest=Mutate into Baneling Nest Button/Name/AP_BanelingPassive=Baneling Button/Name/AP_BanelingSplitterlingPassive=Baneling @@ -2240,6 +2245,9 @@ Button/Tooltip/AP_BanelingCorrosiveBile=Increases base attack damage against pri Button/Tooltip/AP_BanelingHeal=In addition to dealing normal damage, Baneling explosions also heal nearby friendly units and structures. Button/Tooltip/AP_BanelingHealSmall=In addition to dealing normal damage, Baneling explosions also heal nearby friendly units and structures. Button/Tooltip/AP_BanelingHunterPassive=Hunter StrainBaneling Nest enables you to morph Banelings from Zerglings. +Button/Tooltip/AP_BanelingLaunch=The Aberration stores and launches Banelings at air targets, dealing 30 damage in an area.Can attack air units. +Button/Tooltip/AP_BanelingLaunchLevel2=The Aberration stores and launches up to 3 Banelings at air targets, dealing 40 damage in an area. Can consume Banelings to restore faster. Benefits from Baneling upgrades.Can attack air units. +Button/Tooltip/AP_BanelingLaunchTrain=A Baneling to be thrown by an Aberration. Button/Tooltip/AP_BanelingNest=Enables:- Banelings from Zerglings Button/Tooltip/AP_BanelingPassive=Baneling Nest enables you to morph Banelings from Zerglings. Button/Tooltip/AP_BanelingSplitterlingPassive=Splitter StrainBaneling Nest enables you to morph Banelings from Zerglings. @@ -5275,6 +5283,7 @@ Error/AP_AlreadyChronoBoosted=Target is already accelerated Error/AP_ImpalerBurrowed=Must Burrow to attack. Error/AP_LeapAttackError=Too close to leap Error/AP_LurkerBurrowed=Must Burrow to attack. +Error/AP_NoBanelingsArmed=No Banelings available Error/AP_ShadowFuryCliffLevel=Cannot target different cliff levels Error/AP_SupplicantNotInRange=No Supplicant In Range Error/AP_SwarmHostBurrowed=Must Root to attack. @@ -5520,6 +5529,8 @@ Unit/Name/AP_AutomatedRefineryRich=Automated Refinery Unit/Name/AP_BacklashRocketsLMWeapon=Backlash Rockets Unit/Name/AP_Baneling=Baneling Unit/Name/AP_BanelingCocoon=Baneling Cocoon +Unit/Name/AP_BanelingLaunchAmmo=Baneling Launch Ammo +Unit/Name/AP_BanelingLaunchProjectile=Baneling Launch Projectile Unit/Name/AP_BanelingNest=Baneling Nest Unit/Name/AP_Banshee=Banshee Unit/Name/AP_BansheeMengsk=Night Wolf diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt index 7191c2dc4..012a3c1b3 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt +++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt @@ -16,6 +16,9 @@ Abil/EditorPrefix/AP_AssaultMode=AP - Viking - Abil/EditorPrefix/AP_AssimilatorPipesMorph=AP - Abil/EditorPrefix/AP_AssimilatorToAutomatedAssimilator=AP - Abil/EditorPrefix/AP_AttackRedirect=AP - +Abil/EditorPrefix/AP_BanelingLaunch=AP - +Abil/EditorPrefix/AP_BanelingLaunchHangar=AP - +Abil/EditorPrefix/AP_BanelingLaunchRefill=AP - Abil/EditorPrefix/AP_BansheeCloak=AP - Banshee - Abil/EditorPrefix/AP_BarracksAddOns=AP - Barracks - Abil/EditorPrefix/AP_BarracksLand=AP - Barracks - @@ -3156,6 +3159,8 @@ Button/EditorPrefix/AP_ApolloCloakOnNova=Nova - Button/EditorPrefix/AP_ArbiterCloakField=Arbiter - Button/EditorPrefix/AP_ArbiterMPStasisField=Arbiter - Button/EditorPrefix/AP_AscendantSacrifice=Ascendant - +Button/EditorPrefix/AP_BanelingLaunch=AP - +Button/EditorPrefix/AP_BanelingLaunchTrain=AP - Button/EditorPrefix/AP_BanelingPassive=Passive Production - Button/EditorPrefix/AP_BroodLordPassive=Passive Production - Button/EditorPrefix/AP_BurrowCharge= @@ -6677,6 +6682,8 @@ Unit/EditorPrefix/AP_BacklashRocketsLMWeapon=Weapon - Unit/EditorPrefix/AP_Baneling=AP - Unit/EditorPrefix/AP_BanelingBurrowed=AP - Unit/EditorPrefix/AP_BanelingCocoon=AP - +Unit/EditorPrefix/AP_BanelingLaunchAmmo=AP - +Unit/EditorPrefix/AP_BanelingLaunchProjectile=AP - Unit/EditorPrefix/AP_BanelingNest=AP - Unit/EditorPrefix/AP_Banshee=AP - Unit/EditorPrefix/AP_Barracks=AP - @@ -7832,6 +7839,8 @@ Upgrade/EditorSuffix/AP_TerranInfantryWeaponsPreplacedNoBuild=(Preplaced for no- Upgrade/EditorSuffix/AP_VoidCasualRallyBlock=(Rally only on resources) Validator/EditorPrefix/AP_AtLeastOneHealBeamBusy=Medivac - Validator/EditorPrefix/AP_AuxilaryMedBotsPurchased=Medivac - +Validator/EditorPrefix/AP_BanelingLaunchArmed=AP - +Validator/EditorPrefix/AP_BanelingLaunchNotFull=AP - Validator/EditorPrefix/AP_BearclawNozzlesPurchased=Firebat - Validator/EditorPrefix/AP_BurstCapacitorsPurchased=Diamondback - Validator/EditorPrefix/AP_CampaignNeoSteelFramePurchased=Bunker - Campaign @@ -7880,6 +7889,8 @@ Validator/EditorSuffix/AP_HaveHotSSwarmHostSplitB=(Creeper) Validator/EditorSuffix/AP_NotHaveHotSSwarmHostSplitA=(Carrion) Validator/Name/AP_AtLeastOneHealBeamBusy=At Least One Heal Beam Busy Validator/Name/AP_AuxilaryMedBotsPurchased=Auxilary Med Bots Purchased +Validator/Name/AP_BanelingLaunchArmed=Baneling Launch Armed +Validator/Name/AP_BanelingLaunchNotFull=Baneling Launch Not Full Validator/Name/AP_BattlecruiserUpgraded=Battlecruiser Upgraded Validator/Name/AP_BearclawNozzlesPurchased=Bearclaw Nozzles Purchased Validator/Name/AP_BroodlingEscortFilters=Broodling Escort Filters diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy index 77ff18fc4..14f988d40 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy @@ -1275,7 +1275,7 @@ void libABFE498B_gf_AP_Triggers_unlockZergProgressiveUpgrades (int lp_player, in lp_bitArrayValue, libABFE498B_gf_AP_Triggers_Zerg_ProgressiveAutomatedMitosis, // 0 libABFE498B_gf_AP_Triggers_Zerg_ProgressiveFungalSnare, // 2 - ap_triggers_PlayerUpgradeLevelBiConsumer_sig, // 4 + libABFE498B_gf_AP_Triggers_Zerg_AberrationProgressiveBanelingLaunch, // 4 ap_triggers_PlayerUpgradeLevelBiConsumer_sig, // 6 ap_triggers_PlayerUpgradeLevelBiConsumer_sig, // 8 ap_triggers_PlayerUpgradeLevelBiConsumer_sig, // 10 @@ -6124,6 +6124,19 @@ void libABFE498B_gf_AP_Triggers_Zerg_AberrationResourceEfficiency (int lp_player libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_AberrationResourceEfficiency", 1); } +void libABFE498B_gf_AP_Triggers_Zerg_AberrationProgressiveBanelingLaunch (int lp_player, int lp_level) { + // Automatic Variable Declarations + // Implementation + if ((lp_level >= 1)) { + libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_AberrationBanelingLaunch", 1); + if ((lp_level >= 2)) { + libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_AberrationBanelingLaunchLevel2", 1); + } + + } + +} + void libABFE498B_gf_AP_Triggers_Zerg_PrimalIgniterFireBreath (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 104144f52..ee6458736 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy @@ -639,6 +639,7 @@ void libABFE498B_gf_AP_Triggers_Zerg_AberrationConstructRegeneration (int lp_pla void libABFE498B_gf_AP_Triggers_Zerg_AberrationBanelingIncubation (int lp_player); void libABFE498B_gf_AP_Triggers_Zerg_AberrationProtectiveCover (int lp_player); void libABFE498B_gf_AP_Triggers_Zerg_AberrationResourceEfficiency (int lp_player); +void libABFE498B_gf_AP_Triggers_Zerg_AberrationProgressiveBanelingLaunch (int lp_player, int lp_level); void libABFE498B_gf_AP_Triggers_Zerg_PrimalIgniterFireBreath (int lp_player); void libABFE498B_gf_AP_Triggers_Zerg_PrimalIgniterToughness (int lp_player); void libABFE498B_gf_AP_Triggers_Zerg_SISCVChargeCount (int lp_player); diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers index 2c981dd72..1c180223c 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers +++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers @@ -4196,7 +4196,7 @@ lp_bitArrayValue, libABFE498B_gf_AP_Triggers_Zerg_ProgressiveAutomatedMitosis, // 0 libABFE498B_gf_AP_Triggers_Zerg_ProgressiveFungalSnare, // 2 - ap_triggers_PlayerUpgradeLevelBiConsumer_sig, // 4 + libABFE498B_gf_AP_Triggers_Zerg_AberrationProgressiveBanelingLaunch, // 4 ap_triggers_PlayerUpgradeLevelBiConsumer_sig, // 6 ap_triggers_PlayerUpgradeLevelBiConsumer_sig, // 8 ap_triggers_PlayerUpgradeLevelBiConsumer_sig, // 10 @@ -48824,6 +48824,7 @@ + @@ -49005,6 +49006,128 @@ + + + + + + + + + + + + + + 0 + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + + + + + + + + + + + + + + + + 1 + + + + + AP_AberrationBanelingLaunch + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 + + + + + + + + + + + + + + + + 1 + + + + + AP_AberrationBanelingLaunchLevel2 + + + diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt index c501a3319..78350d2f2 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -487,6 +487,7 @@ FunctionDef/Name/lib_ABFE498B_76C0FF8C=AP_Triggers_isGenericUpgradeAutoUnlock FunctionDef/Name/lib_ABFE498B_770271E9=AP_Triggers_Protoss_unlockAvenger FunctionDef/Name/lib_ABFE498B_77147727=AP_Triggers_Zerg_ScourgeSwarmScourge FunctionDef/Name/lib_ABFE498B_771492A2=AP_Triggers_Terran_unlockRavenDurableMaterials +FunctionDef/Name/lib_ABFE498B_77406473=AP_Triggers_Zerg_AberrationProgressiveBanelingLaunch FunctionDef/Name/lib_ABFE498B_777AC8E1=AP_Triggers_Zerg_NydusWormFamilySubterraneanScales FunctionDef/Name/lib_ABFE498B_77BBD72D=AP_Triggers_Terran_unlockSpartanCompany FunctionDef/Name/lib_ABFE498B_77BD5D2A=AP_Triggers_Terran_unlockPrideOfAugustgrad @@ -1108,6 +1109,7 @@ ParamDef/Name/lib_ABFE498B_2C287EFD=player ParamDef/Name/lib_ABFE498B_2C4D7A9F=player ParamDef/Name/lib_ABFE498B_2DAE85E9=player ParamDef/Name/lib_ABFE498B_2E14B597=player +ParamDef/Name/lib_ABFE498B_2F1AC178=player ParamDef/Name/lib_ABFE498B_2F2A2E3D=player ParamDef/Name/lib_ABFE498B_2F3A4717=player ParamDef/Name/lib_ABFE498B_2F6B2A41=player @@ -1315,6 +1317,7 @@ ParamDef/Name/lib_ABFE498B_634CD225=player ParamDef/Name/lib_ABFE498B_635E83B4=player ParamDef/Name/lib_ABFE498B_6394C53A=player ParamDef/Name/lib_ABFE498B_63AA435D=player +ParamDef/Name/lib_ABFE498B_63EC759B=level ParamDef/Name/lib_ABFE498B_63F5088B=player ParamDef/Name/lib_ABFE498B_64B341A8=player ParamDef/Name/lib_ABFE498B_64B87707=bitArrayValue From 9673d1e3ed26d1709c004a0d3768bb7c6108a702 Mon Sep 17 00:00:00 2001 From: Snarky Date: Wed, 27 Nov 2024 14:56:56 +0100 Subject: [PATCH 02/26] Clean up buttons on Aberration --- .../Base.SC2Data/GameData/UnitData.xml | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml index d6cd3553e..b3c91264d 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml @@ -10566,24 +10566,16 @@ - + + + + + + + - - - - - - - - - - - - - - - + From 1da91b2e28cd21fc61dac96568c4d5ab389134a8 Mon Sep 17 00:00:00 2001 From: Snarky Date: Wed, 27 Nov 2024 16:27:22 +0100 Subject: [PATCH 03/26] Clean up Requirement Nodes --- .../Base.SC2Data/GameData/AbilData.xml | 2 +- .../Base.SC2Data/GameData/RequirementData.xml | 16 ++-- .../GameData/RequirementNodeData.xml | 85 ++++++------------- .../Base.SC2Data/GameData/UpgradeData.xml | 2 + 4 files changed, 38 insertions(+), 67 deletions(-) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml index 0c179a999..04e6eadf5 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml @@ -14283,7 +14283,7 @@ - diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml index 9857da1d5..7f61a9938 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml @@ -4286,23 +4286,23 @@ - - + + + + - + - + - - + - - + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml index 69b8cb4dc..4daf688c3 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml @@ -6980,84 +6980,53 @@ - - - + + + - - - + + + + - - - - - - - - - - + - - + - - - - - - + - - + - - + + - - - - - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml index 07b84d003..fdb473c3c 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml @@ -16736,11 +16736,13 @@ + + From c6d51d747cfbacc66d94df905661b199bb0532b8 Mon Sep 17 00:00:00 2001 From: Snarky Date: Wed, 27 Nov 2024 16:31:36 +0100 Subject: [PATCH 04/26] Remove duplicate Requirement Node --- .../Base.SC2Data/GameData/RequirementNodeData.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml index 4daf688c3..66c678127 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml @@ -7025,8 +7025,4 @@ - - - - From 6b8fae20200e4dec2f785a3cf3a5a3c9b63778d9 Mon Sep 17 00:00:00 2001 From: Snarky Date: Wed, 27 Nov 2024 16:46:51 +0100 Subject: [PATCH 05/26] Make Baneling missile invulnerable --- .../ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml index b3c91264d..3bef003f8 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml @@ -29721,7 +29721,7 @@ - + From c4cb376d11732b689ea82976ffbb647cd58831a2 Mon Sep 17 00:00:00 2001 From: Snarky Date: Wed, 27 Nov 2024 16:54:32 +0100 Subject: [PATCH 06/26] Changed Baneling launch damage type and armor reduction --- .../Base.SC2Data/GameData/EffectData.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml index fb26ebde9..5904568fa 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml @@ -22909,11 +22909,10 @@ - + - @@ -22962,11 +22961,10 @@ - + - From 6b529509221fd74aa83694010776da7ad23a6edf Mon Sep 17 00:00:00 2001 From: Snarky Date: Thu, 28 Nov 2024 00:58:09 +0100 Subject: [PATCH 07/26] Remove unused Tooltip --- .../Base.SC2Data/GameData/RequirementNodeData.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml index 66c678127..d5a07a454 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml @@ -6985,7 +6985,6 @@ - From 35b19cab83a8ac1a5ec662fcde941ecf5972c25f Mon Sep 17 00:00:00 2001 From: Matthew Date: Mon, 25 Nov 2024 21:09:58 -0800 Subject: [PATCH 08/26] sc2: Added Pygalisks --- .../Base.SC2Data/GameData/AbilData.xml | 64 ++++++++++ .../Base.SC2Data/GameData/ActorData.xml | 67 ++++++++++ .../Base.SC2Data/GameData/ButtonData.xml | 10 ++ .../Base.SC2Data/GameData/EffectData.xml | 10 ++ .../Base.SC2Data/GameData/ModelData.xml | 10 ++ .../Base.SC2Data/GameData/UnitData.xml | 116 ++++++++++++++++++ .../Base.SC2Data/GameData/UpgradeData.xml | 29 +++++ .../Base.SC2Data/GameData/ValidatorData.xml | 3 + .../Base.SC2Data/GameData/WeaponData.xml | 22 ++++ .../LocalizedData/GameHotkeys.txt | 1 + .../LocalizedData/GameStrings.txt | 7 ++ 11 files changed, 339 insertions(+) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml index 899c1f426..2a7bcbfd7 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml @@ -3611,6 +3611,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -11334,6 +11379,25 @@