Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sc2: Dark Archon war council upgrade #219

Merged
merged 2 commits into from
Jul 27, 2024
Merged

sc2: Dark Archon war council upgrade #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12ed052
sc2: Added Dark Archon war council upgrade -- Indomitable Will
MatthewMarinets Jul 27, 2024
e5fa7ad
sc2: Added unlock triggers for dark archon indomitable will
MatthewMarinets Jul 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2644,6 +2644,7 @@
<EditorCategories value="Race:Protoss"/>
</CButton>
<CButton id="AP_DarkArchonMindControl">
<Tooltip value="Button/Tooltip/AP_DarkArchonMindControlShieldDrain"/>
<Icon value="Assets\Textures\btn-ability-protoss-mindcontrol.dds"/>
<AlertIcon value="Assets\Textures\btn-ability-protoss-mindcontrol.dds"/>
<EditorCategories value="Race:Protoss"/>
Expand Down Expand Up @@ -4886,6 +4887,11 @@
<AlertIcon value="AP\Assets\Textures\[email protected]"/>
<EditorCategories value="Race:Protoss"/>
</CButton>
<CButton id="AP_DarkArchonIndomitableWill">
<Icon value="assets\textures\btn-ability-zeratul-topbar-serdathlegion.dds"/>
<AlertIcon value="assets\textures\btn-ability-zeratul-topbar-serdathlegion.dds"/>
<EditorCategories value="Race:Protoss"/>
</CButton>
<CButton id="AP_AlarakHighTemplarImprovedSacrifice">
<Icon value="Assets\Textures\btn-upgrade-protoss-alarak-ascendantspermanentlybetter.dds"/>
<AlertIcon value="Assets\Textures\btn-upgrade-protoss-alarak-ascendantspermanentlybetter.dds"/>
Expand Down
8 changes: 8 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10824,7 +10824,15 @@
<EditorCategories value=""/>
<EffectArray value="AP_DarkArchonMindControlApply"/>
<EffectArray value="AP_DarkArchonMindControlRemoveTargetLock"/>
<EffectArray value="AP_DarkArchonLoseShields"/>
</CEffectSet>
<CEffectModifyUnit id="AP_DarkArchonLoseShields">
<EditorCategories value="Race:Protoss"/>
<ImpactUnit Value="Caster"/>
<VitalArray index="Shields">
<ChangeFraction value="-1"/>
</VitalArray>
</CEffectModifyUnit>
<CEffectDamage id="AP_DarkArchonWeaponDamage" parent="DU_WEAP">
<EditorCategories value="Race:Protoss"/>
<Kind value="Ranged"/>
Expand Down
4 changes: 4 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3062,6 +3062,10 @@
<EditorCategories value="Race:Protoss,TechType:Ability"/>
<NodeArray index="Show" Link="AP_CountUpgradeArgusTalismanCompleteOnly"/>
</CRequirement>
<CRequirement id="AP_HaveDarkArchonIndomitableWill">
<EditorCategories value="Race:Protoss,TechType:Ability"/>
<NodeArray index="Use" Link="AP_CountUpgradeDarkArchonIndomitableWillCompleteOnly"/>
</CRequirement>
<CRequirement id="AP_HaveAlarakHighTemplarPsionicOrbTravelDistance">
<EditorCategories value="Race:Protoss,TechType:Ability"/>
<NodeArray index="Show" Link="AP_CountUpgradeAlarakHighTemplarPsionicOrbTravelDistanceCompleteOnly"/>
Expand Down
4 changes: 4 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5458,6 +5458,10 @@
<Count Link="AP_ArgusTalisman" State="CompleteOnly"/>
<Flags index="TechTreeCheat" value="0"/>
</CRequirementCountUpgrade>
<CRequirementCountUpgrade id="AP_CountUpgradeDarkArchonIndomitableWillCompleteOnly">
<Count Link="AP_DarkArchonIndomitableWill" State="CompleteOnly"/>
<Flags index="TechTreeCheat" value="0"/>
</CRequirementCountUpgrade>
<CRequirementCountUpgrade id="AP_CountUpgradeAlarakHighTemplarPsionicOrbTravelDistanceCompleteOnly">
<Count Link="AP_AlarakHighTemplarPsionicOrbTravelDistance" State="CompleteOnly"/>
<Flags index="TechTreeCheat" value="0"/>
Expand Down
7 changes: 4 additions & 3 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15316,14 +15316,15 @@
<LayoutButtons Face="Move" Type="AbilCmd" AbilCmd="move,Move" Row="0" Column="0"/>
<LayoutButtons Face="Stop" Type="AbilCmd" AbilCmd="stop,Stop" Row="0" Column="1"/>
<LayoutButtons Face="MoveHoldPosition" Type="AbilCmd" AbilCmd="move,HoldPos" Row="0" Column="2"/>
<LayoutButtons Face="Attack" Type="AbilCmd" AbilCmd="attack,Execute" Row="0" Column="4"/>
<LayoutButtons Face="MovePatrol" Type="AbilCmd" AbilCmd="move,Patrol" Row="0" Column="3"/>
<LayoutButtons Face="Attack" Type="AbilCmd" AbilCmd="attack,Execute" Row="0" Column="4"/>
<LayoutButtons Face="Rally" Type="AbilCmd" AbilCmd="ProgressRally,Rally1" Row="2" Column="4"/>
<LayoutButtons Face="AP_DarkArchonMindControl" Type="AbilCmd" AbilCmd="AP_DarkArchonMindControl,0" Row="2" Column="1"/>
<LayoutButtons Face="AP_ArgusTalisman" Type="Passive" Requirements="AP_HaveArgusTalisman" Row="1" Column="0"/>
<LayoutButtons Face="AP_DarkArchonIndomitableWill" Type="Passive" Requirements="AP_HaveDarkArchonIndomitableWill" Row="1" Column="1"/>
<LayoutButtons Face="AP_DarkArchonConfusion" Type="AbilCmd" AbilCmd="AP_DarkArchonConfusion,0" Row="2" Column="0"/>
<LayoutButtons Face="AP_DarkArchonMindControl" Type="AbilCmd" AbilCmd="AP_DarkArchonMindControl,0" Row="2" Column="1"/>
<LayoutButtons Face="AP_Feedback" Type="AbilCmd" AbilCmd="AP_FeedbackDarkArchon,0" Row="2" Column="2"/>
<LayoutButtons Face="AP_DarkArchonSCBWMaelstrom" Type="AbilCmd" AbilCmd="AP_DarkArchonSCBWMaelstrom,0" Row="2" Column="3"/>
<LayoutButtons Face="AP_ArgusTalisman" Type="Passive" Requirements="AP_HaveArgusTalisman" Row="1" Column="0"/>
</CardLayouts>
<Radius value="1"/>
<SeparationRadius value="0.75"/>
Expand Down
4 changes: 4 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11606,6 +11606,10 @@
<EffectArray Reference="Unit,AP_DarkArchon,EnergyStart" Value="150"/>
<EffectArray Reference="Unit,AP_DarkArchon,EnergyMax" Value="50"/>
</CUpgrade>
<CUpgrade id="AP_DarkArchonIndomitableWill">
<EffectArray Operation="Set" Reference="Button,AP_DarkArchonMindControl,Tooltip" Value="Button/Tooltip/AP_DarkArchonMindControl"/>
<EffectArray Operation="Set" Reference="Effect,AP_DarkArchonMindControlSet,EffectArray[2]" Value=""/>
</CUpgrade>
<CUpgrade id="AP_AlarakHighTemplarPsionicOrbTravelDistance">
<Icon value="Assets\Textures\btn-upgrade-protoss-alarak-ascendant&apos;spsiorbtravelsfurther.dds"/>
<EffectArray Operation="Set" Reference="Effect,AP_VoidHighTemplarPsiOrbInitialPersistent,InitialOffset" Value="0,-16.25,0"/>
Expand Down
4 changes: 4 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -2021,8 +2022,10 @@ Button/Tooltip/AP_CycloneResearchLockOnDamageUpgrade=Increases <c val="ffff8a">C
Button/Tooltip/AP_D8Charge=Timed explosive that does heavy area damage.
Button/Tooltip/AP_DarkArchon=Nerazim Faction<n/>Potent psionic master. Can use Confuse and Mind Control.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
Button/Tooltip/AP_DarkArchonConfusion=Forces enemy units in the target area to attack each other for <d ref="Behavior,AP_DarkArchonConfusion,Duration"/> seconds.<n/><n/><c val="#ColorAttackInfo">Heroic units are immune.</c>
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.<n/>Potent psionic master. Can use Confuse and Mind Control.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
Button/Tooltip/AP_DarkArchonMindControl=Permanently takes control of a target enemy unit.<n/><n/><c val="#ColorAttackInfo">Heroic units are immune.</c>
Button/Tooltip/AP_DarkArchonMindControlShieldDrain=Permanently takes control of a target enemy unit, at the cost of all of the Dark Archon's shields.<n/><n/><c val="#ColorAttackInfo">Heroic units are immune.</c>
Button/Tooltip/AP_DarkArchonSCBWMaelstrom=Creates a focused blast of psionic energy that stuns all biological targets in the target area for <d ref="Behavior,AP_DarkArchonSCBWMaelstrom,Duration"/> seconds.
Button/Tooltip/AP_DarkShrine=Dark Templar tech structure.
Button/Tooltip/AP_DarkShrineAssignRally=Sends recalled Avengers to the designated point.
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 7 additions & 1 deletion Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
40 changes: 39 additions & 1 deletion Mods/ArchipelagoTriggers.SC2Mod/Triggers
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -58416,6 +58416,7 @@
<Item Type="FunctionDef" Library="ABFE498B" Id="D4116829"/>
<Item Type="FunctionDef" Library="ABFE498B" Id="1677C710"/>
<Item Type="FunctionDef" Library="ABFE498B" Id="34A84A24"/>
<Item Type="FunctionDef" Library="ABFE498B" Id="8494B3E9"/>
<Item Type="FunctionDef" Library="ABFE498B" Id="1B25348F"/>
<Item Type="FunctionDef" Library="ABFE498B" Id="3ECDB091"/>
<Item Type="FunctionDef" Library="ABFE498B" Id="38AA59D6"/>
Expand Down Expand Up @@ -61715,6 +61716,43 @@
<ValueType Type="gamelink"/>
<ValueGameType Type="Upgrade"/>
</Element>
<Element Type="FunctionDef" Id="8494B3E9">
<Identifier>AP_Triggers_Protoss_unlockDarkArchonIndomitableWill</Identifier>
<FlagAction/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="6DE56CE3"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="13826947"/>
</Element>
<Element Type="ParamDef" Id="6DE56CE3">
<ParameterType>
<Type Value="int"/>
</ParameterType>
<Default Type="Param" Library="ABFE498B" Id="059D6AB8"/>
</Element>
<Element Type="Param" Id="059D6AB8">
<Value>0</Value>
<ValueType Type="int"/>
</Element>
<Element Type="FunctionCall" Id="13826947">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
<Parameter Type="Param" Library="ABFE498B" Id="DCDC6B7E"/>
<Parameter Type="Param" Library="ABFE498B" Id="8AAC245A"/>
<Parameter Type="Param" Library="ABFE498B" Id="CB68C220"/>
</Element>
<Element Type="Param" Id="DCDC6B7E">
<ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="6DE56CE3"/>
</Element>
<Element Type="Param" Id="8AAC245A">
<ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
<Value>AP_DarkArchonIndomitableWill</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Upgrade"/>
</Element>
<Element Type="Param" Id="CB68C220">
<ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
<Value>1</Value>
<ValueType Type="int"/>
</Element>
<Element Type="FunctionDef" Id="1B25348F">
<FlagAction/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="D7A9EA68"/>
Expand Down
2 changes: 2 additions & 0 deletions Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down