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: Added instigator war council upgrade - resource efficiency #165

Merged
merged 1 commit into from
Jul 6, 2024
Merged

sc2: Added instigator war council upgrade - resource efficiency #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 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 @@ -19422,8 +19422,8 @@
<Sight value="10"/>
<Food value="-2"/>
<CostCategory value="Army"/>
<CostResource index="Minerals" value="125"/>
<CostResource index="Vespene" value="50"/>
<CostResource index="Minerals" value="165"/>
<CostResource index="Vespene" value="65"/>
<RepairTime value="42"/>
<AttackTargetPriority value="20"/>
<DamageDealtXP value="1"/>
Expand Down
6 changes: 6 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 @@ -11100,6 +11100,12 @@
<EffectArray Operation="Set" Reference="Effect,AP_DragoonLM,ImpactEffect" Value="AP_HighImpactDragoonDamage"/>
<EffectArray Operation="Set" Reference="Weapon,AP_Dragoon,DisplayEffect" Value="AP_HighImpactDragoonDamage"/>
</CUpgrade>
<CUpgrade id="AP_InstigatorResourceEfficiency">
<!-- <CostResource index="Minerals" value="160"/> -->
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment is wrong (shall be 165)

<!-- <CostResource index="Vespene" value="65"/> -->
<EffectArray Operation="Subtract" Reference="Unit,AP_StalkerPurifier,CostResource[Minerals]" Value="40"/>
<EffectArray Operation="Subtract" Reference="Unit,AP_StalkerPurifier,CostResource[Vespene]" Value="15"/>
</CUpgrade>
<CUpgrade id="AP_DragoonHealth">
<Icon value="Assets\Textures\btn-ability-protoss-dragoonchassis.dds"/>
<Alert value="ResearchComplete"/>
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 @@ -1512,7 +1512,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossWarCouncil (int lp_player, int lp_b
libABFE498B_gf_AP_Triggers_Protoss_unlockSentinelResourceEfficiency, // 2
libABFE498B_gf_AP_Triggers_Protoss_unlockStalkerPhaseReactor, // 3
libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonPhalanxSuit, // 4
ap_triggers_PlayerConsumer_sig, // 5
libABFE498B_gf_AP_Triggers_Protoss_unlockInstigatorResourceEfficiency, // 5
ap_triggers_PlayerConsumer_sig, // 6
ap_triggers_PlayerConsumer_sig, // 7
ap_triggers_PlayerConsumer_sig, // 8
Expand Down Expand Up @@ -6698,6 +6698,12 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockStalkerFamilyParticleReflection (i
libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_VoidStalkerMultishot", 1);
}

void libABFE498B_gf_AP_Triggers_Protoss_unlockInstigatorResourceEfficiency (int lp_player) {
// Automatic Variable Declarations
// Implementation
libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_InstigatorResourceEfficiency", 1);
}

void libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonHighImpactPhaseDisruptors (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 @@ -669,6 +669,7 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockAdeptResonatingGlaives (int lp_pla
void libABFE498B_gf_AP_Triggers_Protoss_unlockAdeptPhaseBulwark (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockStalkerFamilyDisintegratingParticles (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockStalkerFamilyParticleReflection (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockInstigatorResourceEfficiency (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonHighImpactPhaseDisruptors (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonTrillicCompressionSystems (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonSingularityCharge (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 @@ -4485,7 +4485,7 @@
libABFE498B_gf_AP_Triggers_Protoss_unlockSentinelResourceEfficiency, // 2
libABFE498B_gf_AP_Triggers_Protoss_unlockStalkerPhaseReactor, // 3
libABFE498B_gf_AP_Triggers_Protoss_unlockDragoonPhalanxSuit, // 4
ap_triggers_PlayerConsumer_sig, // 5
libABFE498B_gf_AP_Triggers_Protoss_unlockInstigatorResourceEfficiency, // 5
ap_triggers_PlayerConsumer_sig, // 6
ap_triggers_PlayerConsumer_sig, // 7
ap_triggers_PlayerConsumer_sig, // 8
Expand Down Expand Up @@ -57598,6 +57598,7 @@
<Item Type="FunctionDef" Library="ABFE498B" Id="6933E179"/>
<Item Type="FunctionDef" Library="ABFE498B" Id="2B757594"/>
<Item Type="FunctionDef" Library="ABFE498B" Id="2CB07261"/>
<Item Type="FunctionDef" Library="ABFE498B" Id="EDEEBAA9"/>
<Item Type="FunctionDef" Library="ABFE498B" Id="F6E2E3BE"/>
<Item Type="FunctionDef" Library="ABFE498B" Id="56A57BC2"/>
<Item Type="FunctionDef" Library="ABFE498B" Id="D9676346"/>
Expand Down Expand Up @@ -57965,6 +57966,43 @@
<ValueType Type="gamelink"/>
<ValueGameType Type="Upgrade"/>
</Element>
<Element Type="FunctionDef" Id="EDEEBAA9">
<Identifier>AP_Triggers_Protoss_unlockInstigatorResourceEfficiency</Identifier>
<FlagAction/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="CA672396"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="29353E4D"/>
</Element>
<Element Type="ParamDef" Id="CA672396">
<ParameterType>
<Type Value="int"/>
</ParameterType>
<Default Type="Param" Library="ABFE498B" Id="9A5E6618"/>
</Element>
<Element Type="Param" Id="9A5E6618">
<Value>0</Value>
<ValueType Type="int"/>
</Element>
<Element Type="FunctionCall" Id="29353E4D">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
<Parameter Type="Param" Library="ABFE498B" Id="4D852201"/>
<Parameter Type="Param" Library="ABFE498B" Id="3BF0DA91"/>
<Parameter Type="Param" Library="ABFE498B" Id="96EA9608"/>
</Element>
<Element Type="Param" Id="4D852201">
<ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="CA672396"/>
</Element>
<Element Type="Param" Id="3BF0DA91">
<ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
<Value>AP_InstigatorResourceEfficiency</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Upgrade"/>
</Element>
<Element Type="Param" Id="96EA9608">
<ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
<Value>1</Value>
<ValueType Type="int"/>
</Element>
<Element Type="FunctionDef" Id="F6E2E3BE">
<FlagAction/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="930C98C2"/>
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 @@ -737,6 +737,7 @@ FunctionDef/Name/lib_ABFE498B_EC85396E=AP_Triggers_Terran_unlockVikingShredderRo
FunctionDef/Name/lib_ABFE498B_ECD098A2=AP_Triggers_Zerg_SwarmHostPressurizedGlands
FunctionDef/Name/lib_ABFE498B_ED81992F=AP_Triggers_replaceUpgrade
FunctionDef/Name/lib_ABFE498B_EDEC759C=AP_Triggers_Protoss_unlockDestroyerReforgedBloodshardCore
FunctionDef/Name/lib_ABFE498B_EDEEBAA9=AP_Triggers_Protoss_unlockInstigatorResourceEfficiency
FunctionDef/Name/lib_ABFE498B_EE4A905F=AP_Triggers_Terran_unlockThor330mmBarrageCannon
FunctionDef/Name/lib_ABFE498B_EE64D006=AP_Triggers_Terran_unlockVikingRipwaveMissiles
FunctionDef/Name/lib_ABFE498B_EFBB1950=AP_Triggers_Protoss_unlockArbiterSpacetimeAnchor
Expand Down Expand Up @@ -1377,6 +1378,7 @@ ParamDef/Name/lib_ABFE498B_C9354091=player
ParamDef/Name/lib_ABFE498B_C9699C93=player
ParamDef/Name/lib_ABFE498B_C9E57784=player
ParamDef/Name/lib_ABFE498B_CA59940A=player
ParamDef/Name/lib_ABFE498B_CA672396=player
ParamDef/Name/lib_ABFE498B_CB32EAFA=player
ParamDef/Name/lib_ABFE498B_CB6B1E85=player
ParamDef/Name/lib_ABFE498B_CBC9B69F=player
Expand Down