Merge pull request #210 from MatthewMarinets/mm/war_council_blood_hunter

sc2: Blood Hunter War Council Upgrade
Ziktofel · Jul 24, 2024 · 87ce995 · 87ce995
2 parents ce58bca + df77205
commit 87ce995
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 3 deletions.
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
@@ -2191,6 +2191,11 @@
         <AlertIcon value="Assets\Textures\BTN-Ability-Protoss-VoidStasis.dds"/>
         <EditorCategories value="Race:Protoss"/>
     </CButton>
+    <CButton id="AP_BloodHunterBrutalEfficiency">
+        <Icon value="Assets\Textures\btn-upgrade-protoss-alarak-melleeweapon.dds"/>
+        <AlertIcon value="Assets\Textures\btn-upgrade-protoss-alarak-melleeweapon.dds"/>
+        <EditorCategories value="Race:Protoss"/>
+    </CButton>
     <CButton id="AP_DarkShrineAssignRally">
         <Icon value="Assets\Textures\btn-ability-terran-setrallypoint.dds"/>
         <AlertIcon value="Assets\Textures\btn-ability-terran-setrallypoint.dds"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -3002,6 +3002,10 @@
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Use" Link="AP_HasDarkTemplarShadowFuryLesserOrGreater"/>
     </CRequirement>
+    <CRequirement id="AP_HaveBloodHunterBrutalEfficiency">
+        <EditorCategories value="Race:Protoss,TechType:Ability"/>
+        <NodeArray index="Use" Link="AP_CountUpgradeBloodHunterBrutalEfficiencyCompleteOnly"/>
+    </CRequirement>
     <CRequirement id="AP_HaveHighImpactPsionicStorm">
         <EditorCategories value="Race:Protoss,TechType:Ability"/>
         <NodeArray index="Show" Link="AP_CountUpgradeHighImpactPsionicStormCompleteOnly"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -5402,6 +5402,10 @@
         <OperandArray value="AP_CountUpgradeDarkTemplarShadowFuryLesserCompleteOnly"/>
         <OperandArray value="AP_CountUpgradeDarkTemplarShadowFuryGreaterCompleteOnly"/>
     </CRequirementOr>
+    <CRequirementCountUpgrade id="AP_CountUpgradeBloodHunterBrutalEfficiencyCompleteOnly">
+        <Flags index="TechTreeCheat" value="0"/>
+        <Count Link="AP_BloodHunterBrutalEfficiency" State="CompleteOnly"/>
+    </CRequirementCountUpgrade>
     <CRequirementCountUpgrade id="AP_CountUpgradeHighImpactPsionicStormCompleteOnly">
         <Count Link="AP_HighImpactPsionicStorm" State="CompleteOnly"/>
         <Flags index="TechTreeCheat" value="0"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -13667,6 +13667,7 @@
             <LayoutButtons Face="AP_PermanentlyCloaked" Type="Passive" Row="1" Column="0"/>
             <LayoutButtons Face="AP_ShroudOfAdun" Type="Passive" Requirements="AP_HaveShroudOfAdun" Row="1" Column="1"/>
             <LayoutButtons Face="AP_DarkTemplarShadowGuardTraining" Type="Passive" Requirements="AP_HaveDarkTemplarSuperiorConditioning" Row="1" Column="2"/>
+            <LayoutButtons Face="AP_BloodHunterBrutalEfficiency" Type="Passive" Requirements="AP_HaveBloodHunterBrutalEfficiency" Row="1" Column="3"/>
             <LayoutButtons Face="AP_VoidStasis" Type="AbilCmd" AbilCmd="AP_DarkTemplarVoidStasis,0" Row="2" Column="0"/>
             <LayoutButtons Face="AP_DarkTemplarShadowDash" Type="AbilCmd" AbilCmd="AP_DarkTemplarShadowDash,0" Row="2" Column="1"/>
         </CardLayouts>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -11512,6 +11512,9 @@
         <EffectArray Reference="Behavior,AP_DarkTemplarShadowFuryController,Duration" Value="0.8"/>
         <EffectArray Reference="Behavior,AP_DarkTemplarShadowFuryController,PeriodCount" Value="2"/>
     </CUpgrade>
+    <CUpgrade id="AP_BloodHunterBrutalEfficiency">
+        <EffectArray Operation="Subtract" Reference="Weapon,AP_DarkTemplarTaldarim,Period" Value="2.306"/>
+    </CUpgrade>
     <CUpgrade id="AP_HighImpactPsionicStorm">
         <EffectArray Reference="Effect,AP_HighArchonPsiStormDamage,Amount" Value="4"/>
         <EffectArray Reference="Effect,AP_HighArchonPsiStormDamageInitial,Amount" Value="4"/>

diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
@@ -1969,7 +1969,7 @@
         <DisplayEffect value="AP_WarpBlades"/>
         <TargetFilters value="Ground,Visible;Missile,Stasis,Dead,Hidden,Invulnerable"/>
         <Range value="0.1"/>
-        <Period value="1.694"/>
+        <Period value="4"/>
         <DamagePoint value="0.361"/>
         <Backswing value="1.333"/>
         <Effect value="AP_DarkTemplarTaldarimWeaponSet"/>

diff --git 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 <d ref="Abil,AP_Blink,Cost[0].Cooldown.TimeUse"/> seconds.
 Button/Tooltip/AP_BlinkShieldRestoreUpgrade=Allows the Stalker's Blink ability to restore <d ref="Effect,AP_VoidStalkerBlinkRestoreModifyUnit,VitalArray[Shields].Change*(Behavior,AP_VoidStalkerBlinkShieldRestore,Duration/Behavior,AP_VoidStalkerBlinkShieldRestore,Period)"/> shields over <d time="5"/> 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 <d ref="(100*Upgrade,AP_BloodHunterBrutalEfficiency,EffectArray[0].Value)/(Weapon,AP_DarkTemplarTaldarim,Period)" player="0"/>%.
 Button/Tooltip/AP_BroodLord=Flying heavy-assault unit. Shoots Broodlings at its target. A Broodling is a small creature that can attack ground units.<n/><n/><c val="#ColorAttackInfo">Can attack ground units.</c>
 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)

diff --git 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
@@ -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
@@ -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 @@
             <Item Type="FunctionDef" Library="ABFE498B" Id="C950FF77"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="7F41AF96"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="B324F75E"/>
+            <Item Type="FunctionDef" Library="ABFE498B" Id="22F81202"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="D9071E8C"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="CE51E6F9"/>
             <Item Type="FunctionDef" Library="ABFE498B" Id="3B7CB7D9"/>
@@ -60316,6 +60317,43 @@
             <Value>1</Value>
             <ValueType Type="int"/>
         </Element>
+        <Element Type="FunctionDef" Id="22F81202">
+            <Identifier>AP_Triggers_Protoss_unlockBloodHunterBrutalEfficiency</Identifier>
+            <FlagAction/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="8EE59698"/>
+            <FunctionCall Type="FunctionCall" Library="ABFE498B" Id="EA53F223"/>
+        </Element>
+        <Element Type="ParamDef" Id="8EE59698">
+            <ParameterType>
+                <Type Value="int"/>
+            </ParameterType>
+            <Default Type="Param" Library="ABFE498B" Id="09696453"/>
+        </Element>
+        <Element Type="Param" Id="09696453">
+            <Value>0</Value>
+            <ValueType Type="int"/>
+        </Element>
+        <Element Type="FunctionCall" Id="EA53F223">
+            <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="97D6C6CB"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="1B3C1A4F"/>
+            <Parameter Type="Param" Library="ABFE498B" Id="5D8414B8"/>
+        </Element>
+        <Element Type="Param" Id="97D6C6CB">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
+            <Parameter Type="ParamDef" Library="ABFE498B" Id="8EE59698"/>
+        </Element>
+        <Element Type="Param" Id="1B3C1A4F">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
+            <Value>AP_BloodHunterBrutalEfficiency</Value>
+            <ValueType Type="gamelink"/>
+            <ValueGameType Type="Upgrade"/>
+        </Element>
+        <Element Type="Param" Id="5D8414B8">
+            <ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
+            <Value>1</Value>
+            <ValueType Type="int"/>
+        </Element>
         <Element Type="FunctionDef" Id="D9071E8C">
             <FlagAction/>
             <Parameter Type="ParamDef" Library="ABFE498B" Id="79C9AABA"/>

diff --git 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