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

Mm/war council destroyer #223

Merged
merged 2 commits into from
Jul 29, 2024
Merged

Mm/war council destroyer #223

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
93ca1fc
sc2: Added Destroyer resource efficiency upgrade
MatthewMarinets Jul 28, 2024
b947cc8
sc2: Added unlock trigger for destroyer RE; moved unlock trigger for …
MatthewMarinets Jul 28, 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/UpgradeData.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11419,6 +11419,12 @@
<EffectArray Operation="Set" Reference="Weapon,AP_VoidRayChargeBeamBounce,Tip" Value="Weapon/Tip/AP_VoidRayChargeBeamBounceUpgraded"/>
<AffectedUnitArray value="AP_VoidRayTaldarim"/>
</CUpgrade>
<CUpgrade id="AP_DestroyerResourceEfficiency">
<EffectArray Operation="Subtract" Reference="Unit,AP_VoidRayTaldarim,CostResource[Minerals]" Value="50"/>
<EffectArray Operation="Subtract" Reference="Unit,AP_VoidRayTaldarim,CostResource[Vespene]" Value="25"/>
<EffectArray Reference="Unit,AP_VoidRayTaldarim,Food" Value="1"/>
<AffectedUnitArray value="AP_VoidRayTaldarim"/>
</CUpgrade>
<CUpgrade id="AP_ArbiterCloakFieldRange">
<EffectArray Reference="Effect,AP_ArbiterMPCloakingFieldSearch,AreaArray[0].Radius" Value="1"/>
<EffectArray Reference="Actor,AP_ArbiterMPCloakingFieldRange,Range" Value="1"/>
Expand Down
10 changes: 8 additions & 2 deletions Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1468,7 +1468,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossForge2 (int lp_player, int lp_bitAr
libABFE498B_gf_AP_Triggers_Protoss_unlockCarrierGravitonCatapult, // 3
libABFE498B_gf_AP_Triggers_Protoss_unlockCarrierHullOfPastGlories, // 4
libABFE498B_gf_AP_Triggers_Protoss_unlockVoidRayFamilyFluxVanes, // 5
libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyerReforgedBloodshardCore, // 6
libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyerResourceEfficiency, // 6
libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismGraviticDrive, // 7
libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismPhaseBlaster, // 8
libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismWarConfiguration, // 9
Expand Down Expand Up @@ -1587,7 +1587,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossWarCouncil2 (int lp_player, int lp_
ap_triggers_PlayerConsumer_sig, // 2
libABFE498B_gf_AP_Triggers_Protoss_unlockSkirmisherPeerContempt, // 3
ap_triggers_PlayerConsumer_sig, // 4
ap_triggers_PlayerConsumer_sig, // 5
libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyerReforgedBloodshardCore, // 5
ap_triggers_PlayerConsumer_sig, // 6
ap_triggers_PlayerConsumer_sig, // 7
ap_triggers_PlayerConsumer_sig, // 8
Expand Down Expand Up @@ -7096,6 +7096,12 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyerReforgedBloodshardCore (i
libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_DestroyerChargingBeam", 1);
}

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

void libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismGraviticDrive (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 @@ -721,6 +721,7 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockCarrierGravitonCatapult (int lp_pl
void libABFE498B_gf_AP_Triggers_Protoss_unlockCarrierHullOfPastGlories (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockVoidRayFamilyFluxVanes (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyerReforgedBloodshardCore (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyerResourceEfficiency (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismGraviticDrive (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismPhaseBlaster (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismWarConfiguration (int lp_player);
Expand Down
42 changes: 40 additions & 2 deletions Mods/ArchipelagoTriggers.SC2Mod/Triggers
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4422,7 +4422,7 @@
libABFE498B_gf_AP_Triggers_Protoss_unlockCarrierGravitonCatapult, // 3
libABFE498B_gf_AP_Triggers_Protoss_unlockCarrierHullOfPastGlories, // 4
libABFE498B_gf_AP_Triggers_Protoss_unlockVoidRayFamilyFluxVanes, // 5
libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyerReforgedBloodshardCore, // 6
libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyerResourceEfficiency, // 6
libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismGraviticDrive, // 7
libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismPhaseBlaster, // 8
libABFE498B_gf_AP_Triggers_Protoss_unlockWarpPrismWarConfiguration, // 9
Expand Down Expand Up @@ -4621,7 +4621,7 @@
ap_triggers_PlayerConsumer_sig, // 2
libABFE498B_gf_AP_Triggers_Protoss_unlockSkirmisherPeerContempt, // 3
ap_triggers_PlayerConsumer_sig, // 4
ap_triggers_PlayerConsumer_sig, // 5
libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyerReforgedBloodshardCore, // 5
ap_triggers_PlayerConsumer_sig, // 6
ap_triggers_PlayerConsumer_sig, // 7
ap_triggers_PlayerConsumer_sig, // 8
Expand Down Expand Up @@ -58520,6 +58520,7 @@
<Item Type="FunctionDef" Library="ABFE498B" Id="DF908E38"/>
<Item Type="FunctionDef" Library="ABFE498B" Id="7CB9C2C8"/>
<Item Type="FunctionDef" Library="ABFE498B" Id="EDEC759C"/>
<Item Type="FunctionDef" Library="ABFE498B" Id="BCB60FD6"/>
<Item Type="FunctionDef" Library="ABFE498B" Id="DD51D531"/>
<Item Type="FunctionDef" Library="ABFE498B" Id="D97A7F35"/>
<Item Type="FunctionDef" Library="ABFE498B" Id="B3FFF76C"/>
Expand Down Expand Up @@ -60130,6 +60131,43 @@
<ValueType Type="gamelink"/>
<ValueGameType Type="Upgrade"/>
</Element>
<Element Type="FunctionDef" Id="BCB60FD6">
<Identifier>AP_Triggers_Protoss_unlockDestroyerResourceEfficiency</Identifier>
<FlagAction/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="86F01352"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="9F0820E3"/>
</Element>
<Element Type="ParamDef" Id="86F01352">
<ParameterType>
<Type Value="int"/>
</ParameterType>
<Default Type="Param" Library="ABFE498B" Id="05271982"/>
</Element>
<Element Type="Param" Id="05271982">
<Value>0</Value>
<ValueType Type="int"/>
</Element>
<Element Type="FunctionCall" Id="9F0820E3">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
<Parameter Type="Param" Library="ABFE498B" Id="9B539CB8"/>
<Parameter Type="Param" Library="ABFE498B" Id="D34C13D2"/>
<Parameter Type="Param" Library="ABFE498B" Id="7B662107"/>
</Element>
<Element Type="Param" Id="9B539CB8">
<ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="86F01352"/>
</Element>
<Element Type="Param" Id="D34C13D2">
<ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
<Value>AP_DestroyerResourceEfficiency</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Upgrade"/>
</Element>
<Element Type="Param" Id="7B662107">
<ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
<Value>1</Value>
<ValueType Type="int"/>
</Element>
<Element Type="FunctionDef" Id="DD51D531">
<FlagAction/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="11D221E2"/>
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 @@ -616,6 +616,7 @@ FunctionDef/Name/lib_ABFE498B_BADDFA87=AP_Triggers_Terran_unlockMedicStabilizerM
FunctionDef/Name/lib_ABFE498B_BC29CCFF=AP_Triggers_Zerg_unlockSwarmHost
FunctionDef/Name/lib_ABFE498B_BC5C802E=AP_Triggers_Zerg_SISCVChargeCount
FunctionDef/Name/lib_ABFE498B_BCAA01BD=AP_Triggers_Terran_unlockNovaGadgetHoloDecoy
FunctionDef/Name/lib_ABFE498B_BCB60FD6=AP_Triggers_Protoss_unlockDestroyerResourceEfficiency
FunctionDef/Name/lib_ABFE498B_BCCD7C2B=AP_Triggers_Zerg_unlockMutalisk
FunctionDef/Name/lib_ABFE498B_BD2B0D2A=AP_Triggers_setRaceOverride
FunctionDef/Name/lib_ABFE498B_BD2B87FB=AP_Triggers_Protoss_unlockSentryFamilyCloakingModule
Expand Down Expand Up @@ -1254,6 +1255,7 @@ ParamDef/Name/lib_ABFE498B_85B4F873=player
ParamDef/Name/lib_ABFE498B_8630CFD0=player
ParamDef/Name/lib_ABFE498B_866517EF=player
ParamDef/Name/lib_ABFE498B_86D37399=player
ParamDef/Name/lib_ABFE498B_86F01352=player
ParamDef/Name/lib_ABFE498B_870A3EA3=level
ParamDef/Name/lib_ABFE498B_872176AE=player
ParamDef/Name/lib_ABFE498B_876B423A=player
Expand Down