From f21c254d803d91f0b2eb2580c1be62e46f8bbe83 Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 23 Jul 2024 23:09:00 -0700 Subject: [PATCH 1/2] sc2: Added Blood Hunter War Council upgrade -- Brutal Efficiency --- .../Base.SC2Data/GameData/UpgradeData.xml | 3 ++ .../Base.SC2Data/GameData/WeaponData.xml | 2 +- .../Base.SC2Data/LibABFE498B.galaxy | 8 +++- .../Base.SC2Data/LibABFE498B_h.galaxy | 1 + Mods/ArchipelagoTriggers.SC2Mod/Triggers | 40 ++++++++++++++++++- .../LocalizedData/TriggerStrings.txt | 2 + 6 files changed, 53 insertions(+), 3 deletions(-) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml index fdcc54c98..5543f78c1 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml @@ -11512,6 +11512,9 @@ + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml index 85070c208..ebb8e334c 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml @@ -1969,7 +1969,7 @@ - + diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy index 81a5f086d..79381d453 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy @@ -1553,7 +1553,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossWarCouncil (int lp_player, int lp_b libABFE498B_gf_AP_Triggers_Protoss_unlockAvengerKryhasCloak, // 8 libABFE498B_gf_AP_Triggers_Protoss_unlockDarkTemplarLesserShadowFury, // 9 libABFE498B_gf_AP_Triggers_Protoss_unlockDarkTemplarGreaterShadowFury, // 10 - ap_triggers_PlayerConsumer_sig, // 11 + libABFE498B_gf_AP_Triggers_Protoss_unlockBloodHunterBrutalEfficiency, // 11 ap_triggers_PlayerConsumer_sig, // 12 ap_triggers_PlayerConsumer_sig, // 13 ap_triggers_PlayerConsumer_sig, // 14 @@ -7110,6 +7110,12 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkTemplarGreaterShadowFury (int } +void libABFE498B_gf_AP_Triggers_Protoss_unlockBloodHunterBrutalEfficiency (int lp_player) { + // Automatic Variable Declarations + // Implementation + libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_BloodHunterBrutalEfficiency", 1); +} + void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkTemplarFamilyShroudOfAdun (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 28610887e..ba0fbe7c6 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy @@ -729,6 +729,7 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockWrathwalkerEyeOfWrath (int lp_play void libABFE498B_gf_AP_Triggers_Protoss_unlockAvengerKryhasCloak (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkTemplarLesserShadowFury (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkTemplarGreaterShadowFury (int lp_player); +void libABFE498B_gf_AP_Triggers_Protoss_unlockBloodHunterBrutalEfficiency (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkTemplarFamilyShroudOfAdun (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkTemplarFamilyShadowGuardTraining (int lp_player); void libABFE498B_gf_AP_Triggers_Protoss_unlockDarkTemplarFamilyBlink (int lp_player); diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers index a7a763c2f..5c9bd92d2 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers +++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers @@ -4559,7 +4559,7 @@ libABFE498B_gf_AP_Triggers_Protoss_unlockAvengerKryhasCloak, // 8 libABFE498B_gf_AP_Triggers_Protoss_unlockDarkTemplarLesserShadowFury, // 9 libABFE498B_gf_AP_Triggers_Protoss_unlockDarkTemplarGreaterShadowFury, // 10 - ap_triggers_PlayerConsumer_sig, // 11 + libABFE498B_gf_AP_Triggers_Protoss_unlockBloodHunterBrutalEfficiency, // 11 ap_triggers_PlayerConsumer_sig, // 12 ap_triggers_PlayerConsumer_sig, // 13 ap_triggers_PlayerConsumer_sig, // 14 @@ -57911,6 +57911,7 @@ + @@ -60316,6 +60317,43 @@ 1 + + AP_Triggers_Protoss_unlockBloodHunterBrutalEfficiency + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + AP_BloodHunterBrutalEfficiency + + + + + + 1 + + diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt index a7359449d..d6998fe85 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -177,6 +177,7 @@ FunctionDef/Name/lib_ABFE498B_1FC30E51=AP_Triggers_Terran_unlockGhostOcularImpla FunctionDef/Name/lib_ABFE498B_1FF01166=AP_Triggers_Terran_unlockHelsAngel FunctionDef/Name/lib_ABFE498B_20F9E489=AP_Triggers_Protoss_unlockAdept FunctionDef/Name/lib_ABFE498B_214D0735=AP_Triggers_Terran_unlockWraith +FunctionDef/Name/lib_ABFE498B_22F81202=AP_Triggers_Protoss_unlockBloodHunterBrutalEfficiency FunctionDef/Name/lib_ABFE498B_23111300=AP_Triggers_Protoss_unlockReaverReaverCapacity FunctionDef/Name/lib_ABFE498B_2345CE7B=AP_Triggers_Protoss_unlockMirage FunctionDef/Name/lib_ABFE498B_237A0428=AP_Triggers_Terran_unlockMedivacAdvancedHealingAI @@ -1246,6 +1247,7 @@ ParamDef/Name/lib_ABFE498B_8D327E85=newUpgrade ParamDef/Name/lib_ABFE498B_8DDC17F6=player ParamDef/Name/lib_ABFE498B_8E0F5BE2=onCasual ParamDef/Name/lib_ABFE498B_8E86BB32=player +ParamDef/Name/lib_ABFE498B_8EE59698=player ParamDef/Name/lib_ABFE498B_8F1069F3=player ParamDef/Name/lib_ABFE498B_8F40B939=player ParamDef/Name/lib_ABFE498B_8F71D318=onHard From df772056927ac50b5570661f34aab6d65a385631 Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 23 Jul 2024 23:34:57 -0700 Subject: [PATCH 2/2] sc2: Adding a passive icon to the blood hunter for brutal efficiency --- .../Base.SC2Data/GameData/ButtonData.xml | 5 +++++ .../Base.SC2Data/GameData/RequirementData.xml | 4 ++++ .../Base.SC2Data/GameData/RequirementNodeData.xml | 4 ++++ .../Base.SC2Data/GameData/UnitData.xml | 1 + .../enUS.SC2Data/LocalizedData/GameStrings.txt | 3 +++ 5 files changed, 17 insertions(+) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml index 9d2657a44..81322f7c5 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml @@ -2191,6 +2191,11 @@ + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml index a496139e2..5df16b8f9 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml @@ -3002,6 +3002,10 @@ + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml index f06d3d265..101b2e024 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml @@ -5402,6 +5402,10 @@ + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml index 429193d43..467c8daa1 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml @@ -13667,6 +13667,7 @@ + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt index ac1a734f8..8e4c2542c 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt +++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt @@ -852,6 +852,7 @@ Button/Name/AP_BioMechanicalTransfusionPassive=Bio-Mechanical Transfusion Button/Name/AP_Blink=Blink Button/Name/AP_BlinkShieldRestoreUpgrade=Phase Reactor Button/Name/AP_BloodAmulet=Blood Amulet +Button/Name/AP_BloodHunterBrutalEfficiency=Brutal Efficiency Button/Name/AP_BroodLordEvolvedCarapace=Evolved Carapace Button/Name/AP_BroodLordKeneticMitosis=Splitter Mitosis Button/Name/AP_BroodLordPassive=Brood Lord @@ -1871,6 +1872,7 @@ Button/Tooltip/AP_BioMechanicalTransfusionPassive=Rapid Transfusion healing incr Button/Tooltip/AP_Blink=Teleports the Stalker to a nearby target location. Ability can only be used once every seconds. Button/Tooltip/AP_BlinkShieldRestoreUpgrade=Allows the Stalker's Blink ability to restore shields over after use. Button/Tooltip/AP_BloodAmulet=Increases starting energy by 150 and maximum energy by 50. +Button/Tooltip/AP_BloodHunterBrutalEfficiency=Increases the Blood Hunter's attack rate by %. Button/Tooltip/AP_BroodLord=Flying heavy-assault unit. Shoots Broodlings at its target. A Broodling is a small creature that can attack ground units.Can attack ground units. Button/Tooltip/AP_BroodLordCocoon=This cocoon contains a Mutalisk that is morphing into a Brood Lord. Button/Tooltip/AP_BroodLordEvolvedCarapace=Increases Brood Lord life by 100 and armor by 1. @@ -4548,6 +4550,7 @@ RequirementNode/Tooltip/AP_CountUnitLurkerDenCompleteOnlyTechTreeCheat=Mutate Hy RequirementNode/Tooltip/AP_CountUnitNukeCompleteOnly=Build Nuke at the Shadow Ops 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_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)