Skip to content

Commit

Permalink
Add Warp Ray unlock triggers
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ziktofel
Ziktofel committed Jul 3, 2024
1 parent 8a3c75c commit 0744417
Show file tree
Hide file tree
Showing 7 changed files with 172 additions and 2 deletions.
15 changes: 14 additions & 1 deletion Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1195,7 +1195,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossUnits2 (int lp_player, int lp_bitAr
libABFE498B_gf_AP_Triggers_Protoss_unlockArbiter, // 7
libABFE498B_gf_AP_Triggers_Protoss_unlockOracle, // 8
libABFE498B_gf_AP_Triggers_Protoss_unlockStalwart, // 9
ap_triggers_PlayerConsumer_sig, // 10
libABFE498B_gf_AP_Triggers_Protoss_unlockWarpRay, // 10
ap_triggers_PlayerConsumer_sig, // 11
ap_triggers_PlayerConsumer_sig, // 12
ap_triggers_PlayerConsumer_sig, // 13
Expand Down Expand Up @@ -6518,6 +6518,18 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyer (int lp_player) {

}

void libABFE498B_gf_AP_Triggers_Protoss_unlockWarpRay (int lp_player) {
// Automatic Variable Declarations
// Implementation
if ((libABFE498B_gv_aP_Triggers_Protoss_has_WarpRay[lp_player] == false)) {
libABFE498B_gv_aP_Triggers_Protoss_has_WarpRay[lp_player] = true;
libABFE498B_gf_AP_Triggers_Protoss_unlockStargate(lp_player);
TechTreeUnitAllow(lp_player, "AP_VoidRayAiur", true);
libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_StargateFactionAiur", 1);
}

}

void libABFE498B_gf_AP_Triggers_Protoss_unlockCarrierAiur (int lp_player) {
// Automatic Variable Declarations
// Implementation
Expand Down Expand Up @@ -7647,6 +7659,7 @@ void libABFE498B_gf_AP_Triggers_clearProtossTech (int lp_player) {
TechTreeUnitAllow(lp_player, "AP_CorsairMP", false);
TechTreeUnitAllow(lp_player, "AP_VoidRayShakuras", false);
TechTreeUnitAllow(lp_player, "AP_VoidRayTaldarim", false);
TechTreeUnitAllow(lp_player, "AP_VoidRayAiur", false);
TechTreeUnitAllow(lp_player, "AP_CarrierAiur", false);
TechTreeUnitAllow(lp_player, "AP_ScoutMP", false);
TechTreeUnitAllow(lp_player, "AP_SOAMothershipv4", false);
Expand Down
2 changes: 2 additions & 0 deletions Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ bool[21] libABFE498B_gv_aP_Triggers_Protoss_has_Mirage;
bool[21] libABFE498B_gv_aP_Triggers_Protoss_has_Corsair;
bool[21] libABFE498B_gv_aP_Triggers_Protoss_has_VoidRayShakuras;
bool[21] libABFE498B_gv_aP_Triggers_Protoss_has_Destroyer;
bool[21] libABFE498B_gv_aP_Triggers_Protoss_has_WarpRay;
bool[21] libABFE498B_gv_aP_Triggers_Protoss_has_CarrierAiur;
bool[21] libABFE498B_gv_aP_Triggers_Protoss_has_Scout;
bool[21] libABFE498B_gv_aP_Triggers_Protoss_has_Tempest;
Expand Down Expand Up @@ -646,6 +647,7 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockMirage (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockCorsair (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockVoidRayShakuras (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockDestroyer (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockWarpRay (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockCarrierAiur (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockScout (int lp_player);
void libABFE498B_gf_AP_Triggers_Protoss_unlockTempest (int lp_player);
Expand Down
Binary file modified Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader
View file
Binary file not shown.
Binary file modified Mods/ArchipelagoTriggers.SC2Mod/GameText.version
View file
Binary file not shown.
154 changes: 153 additions & 1 deletion Mods/ArchipelagoTriggers.SC2Mod/Triggers
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3933,7 +3933,7 @@
libABFE498B_gf_AP_Triggers_Protoss_unlockArbiter, // 7
libABFE498B_gf_AP_Triggers_Protoss_unlockOracle, // 8
libABFE498B_gf_AP_Triggers_Protoss_unlockStalwart, // 9
ap_triggers_PlayerConsumer_sig, // 10
libABFE498B_gf_AP_Triggers_Protoss_unlockWarpRay, // 10
ap_triggers_PlayerConsumer_sig, // 11
ap_triggers_PlayerConsumer_sig, // 12
ap_triggers_PlayerConsumer_sig, // 13
Expand Down Expand Up @@ -51237,6 +51237,7 @@
<Item Type="Variable" Library="ABFE498B" Id="C51D2F3D"/>
<Item Type="Variable" Library="ABFE498B" Id="033097CD"/>
<Item Type="Variable" Library="ABFE498B" Id="DDE70B14"/>
<Item Type="Variable" Library="ABFE498B" Id="EB6BCE88"/>
<Item Type="Variable" Library="ABFE498B" Id="31EC2DEE"/>
<Item Type="Variable" Library="ABFE498B" Id="384BF89F"/>
<Item Type="Variable" Library="ABFE498B" Id="0F481473"/>
Expand Down Expand Up @@ -51618,6 +51619,17 @@
<Value>false</Value>
<ValueType Type="bool"/>
</Element>
<Element Type="Variable" Id="EB6BCE88">
<VariableType>
<Type Value="bool"/>
<ArraySize Dim="0" Value="20"/>
</VariableType>
<Value Type="Param" Library="ABFE498B" Id="3C53FE89"/>
</Element>
<Element Type="Param" Id="3C53FE89">
<Value>false</Value>
<ValueType Type="bool"/>
</Element>
<Element Type="Variable" Id="31EC2DEE">
<VariableType>
<Type Value="bool"/>
Expand Down Expand Up @@ -51740,6 +51752,7 @@
<Item Type="Comment" Library="ABFE498B" Id="457EB936"/>
<Item Type="FunctionDef" Library="ABFE498B" Id="172E339A"/>
<Item Type="FunctionDef" Library="ABFE498B" Id="1ED0A5FF"/>
<Item Type="FunctionDef" Library="ABFE498B" Id="6445338B"/>
<Item Type="Comment" Library="ABFE498B" Id="CA207106"/>
<Item Type="FunctionDef" Library="ABFE498B" Id="26EA0868"/>
<Item Type="Comment" Library="ABFE498B" Id="D2F7E6E7"/>
Expand Down Expand Up @@ -56238,6 +56251,124 @@
<Value>false</Value>
<ValueType Type="bool"/>
</Element>
<Element Type="FunctionDef" Id="6445338B">
<FlagAction/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="1D187BC1"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="8B62C51C"/>
</Element>
<Element Type="ParamDef" Id="1D187BC1">
<ParameterType>
<Type Value="int"/>
</ParameterType>
<Default Type="Param" Library="ABFE498B" Id="B5C30D40"/>
</Element>
<Element Type="Param" Id="B5C30D40">
<Value>0</Value>
<ValueType Type="int"/>
</Element>
<Element Type="FunctionCall" Id="8B62C51C">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000137"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="0C2CCBBB"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="03A5D064"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="79CA0B2D"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="E1F7B475"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="4B6FA152"/>
</Element>
<Element Type="FunctionCall" Id="0C2CCBBB">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="00000136"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Library="ABFE498B" Id="394BB086"/>
<Parameter Type="Param" Library="ABFE498B" Id="FF23A53A"/>
</Element>
<Element Type="Param" Id="394BB086">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000219"/>
<Variable Type="Variable" Library="ABFE498B" Id="EB6BCE88"/>
<Array Type="Param" Library="ABFE498B" Id="7CBDE7F1"/>
</Element>
<Element Type="Param" Id="7CBDE7F1">
<Parameter Type="ParamDef" Library="ABFE498B" Id="1D187BC1"/>
</Element>
<Element Type="Param" Id="FF23A53A">
<ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
<Value>true</Value>
<ValueType Type="bool"/>
</Element>
<Element Type="FunctionCall" Id="03A5D064">
<FunctionDef Type="FunctionDef" Library="ABFE498B" Id="43B7CA33"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Library="ABFE498B" Id="AE3425F7"/>
</Element>
<Element Type="Param" Id="AE3425F7">
<ParameterDef Type="ParamDef" Library="ABFE498B" Id="B97BA144"/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="1D187BC1"/>
</Element>
<Element Type="FunctionCall" Id="79CA0B2D">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="51A273F5"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Library="ABFE498B" Id="BD1FAF47"/>
<Parameter Type="Param" Library="ABFE498B" Id="6626981F"/>
<Parameter Type="Param" Library="ABFE498B" Id="B7C25804"/>
</Element>
<Element Type="Param" Id="BD1FAF47">
<ParameterDef Type="ParamDef" Library="Ntve" Id="B15D29C1"/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="1D187BC1"/>
</Element>
<Element Type="Param" Id="6626981F">
<ParameterDef Type="ParamDef" Library="Ntve" Id="C26556EA"/>
<Preset Type="PresetValue" Library="Ntve" Id="00000106"/>
</Element>
<Element Type="Param" Id="B7C25804">
<ParameterDef Type="ParamDef" Library="Ntve" Id="BC66D9AD"/>
<Value>AP_VoidRayAiur</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Unit"/>
</Element>
<Element Type="FunctionCall" Id="E1F7B475">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
<Parameter Type="Param" Library="ABFE498B" Id="3EC5E827"/>
<Parameter Type="Param" Library="ABFE498B" Id="B7DA012E"/>
<Parameter Type="Param" Library="ABFE498B" Id="469F77FA"/>
</Element>
<Element Type="Param" Id="3EC5E827">
<ParameterDef Type="ParamDef" Library="Ntve" Id="C7188352"/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="1D187BC1"/>
</Element>
<Element Type="Param" Id="B7DA012E">
<ParameterDef Type="ParamDef" Library="Ntve" Id="3BFEECBB"/>
<Value>1</Value>
<ValueType Type="int"/>
</Element>
<Element Type="Param" Id="469F77FA">
<ParameterDef Type="ParamDef" Library="Ntve" Id="7E5035EE"/>
<Value>AP_StargateFactionAiur</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Upgrade"/>
</Element>
<Element Type="FunctionCall" Id="4B6FA152">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="C439C375"/>
<SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000003"/>
<Parameter Type="Param" Library="ABFE498B" Id="401FD5E4"/>
<Parameter Type="Param" Library="ABFE498B" Id="EED642E1"/>
<Parameter Type="Param" Library="ABFE498B" Id="FFE68759"/>
</Element>
<Element Type="Param" Id="401FD5E4">
<ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
<Variable Type="Variable" Library="ABFE498B" Id="EB6BCE88"/>
<Array Type="Param" Library="ABFE498B" Id="93C02226"/>
</Element>
<Element Type="Param" Id="93C02226">
<Parameter Type="ParamDef" Library="ABFE498B" Id="1D187BC1"/>
</Element>
<Element Type="Param" Id="EED642E1">
<ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
<Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
</Element>
<Element Type="Param" Id="FFE68759">
<ParameterDef Type="ParamDef" Library="Ntve" Id="4A15EC5F"/>
<Value>false</Value>
<ValueType Type="bool"/>
</Element>
<Element Type="Comment" Id="CA207106">
<Comment>
Carrier Tier
Expand Down Expand Up @@ -65117,6 +65248,7 @@
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="906E1C7A"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="E65A8F85"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="B1206C77"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="92030FD8"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="2DE543B3"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="F31D81FD"/>
<FunctionCall Type="FunctionCall" Library="ABFE498B" Id="6417FE61"/>
Expand Down Expand Up @@ -65881,6 +66013,26 @@
<ValueType Type="gamelink"/>
<ValueGameType Type="Unit"/>
</Element>
<Element Type="FunctionCall" Id="92030FD8">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="51A273F5"/>
<Parameter Type="Param" Library="ABFE498B" Id="1BD1EAF7"/>
<Parameter Type="Param" Library="ABFE498B" Id="105527A7"/>
<Parameter Type="Param" Library="ABFE498B" Id="EFC988D0"/>
</Element>
<Element Type="Param" Id="1BD1EAF7">
<ParameterDef Type="ParamDef" Library="Ntve" Id="B15D29C1"/>
<Parameter Type="ParamDef" Library="ABFE498B" Id="E070D3F5"/>
</Element>
<Element Type="Param" Id="105527A7">
<ParameterDef Type="ParamDef" Library="Ntve" Id="C26556EA"/>
<Preset Type="PresetValue" Library="Ntve" Id="00000107"/>
</Element>
<Element Type="Param" Id="EFC988D0">
<ParameterDef Type="ParamDef" Library="Ntve" Id="BC66D9AD"/>
<Value>AP_VoidRayAiur</Value>
<ValueType Type="gamelink"/>
<ValueGameType Type="Unit"/>
</Element>
<Element Type="FunctionCall" Id="2DE543B3">
<FunctionDef Type="FunctionDef" Library="Ntve" Id="51A273F5"/>
<Parameter Type="Param" Library="ABFE498B" Id="AAA45F73"/>
Expand Down
Binary file modified Mods/ArchipelagoTriggers.SC2Mod/Triggers.version
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,7 @@ FunctionDef/Name/lib_ABFE498B_62B3CA06=AP_Triggers_Terran_unlockBunkerNeosteelBu
FunctionDef/Name/lib_ABFE498B_62B90209=AP_Triggers_Zerg_ScourgeResourceEfficiency
FunctionDef/Name/lib_ABFE498B_6300A2A1=AP_Triggers_Zerg_ImpalerSecretionGlands
FunctionDef/Name/lib_ABFE498B_6438F64B=AP_Triggers_Protoss_unlockMassRecall
FunctionDef/Name/lib_ABFE498B_6445338B=AP_Triggers_Protoss_unlockWarpRay
FunctionDef/Name/lib_ABFE498B_648B29A7=AP_Triggers_Zerg_HydraliskGroovedSpines
FunctionDef/Name/lib_ABFE498B_64BCFCC4=AP_Triggers_Protoss_unlockCorsairNeutronShields
FunctionDef/Name/lib_ABFE498B_64C26431=AP_Triggers_Terran_unlockHERCKineticFoam
Expand Down Expand Up @@ -865,6 +866,7 @@ ParamDef/Name/lib_ABFE498B_1BCDE428=player
ParamDef/Name/lib_ABFE498B_1C214127=player
ParamDef/Name/lib_ABFE498B_1CA997DE=player
ParamDef/Name/lib_ABFE498B_1CFCB385=player
ParamDef/Name/lib_ABFE498B_1D187BC1=player
ParamDef/Name/lib_ABFE498B_1D202509=player
ParamDef/Name/lib_ABFE498B_1D4A8FBD=level
ParamDef/Name/lib_ABFE498B_1D669BFE=player
Expand Down Expand Up @@ -1708,6 +1710,7 @@ Variable/Name/lib_ABFE498B_E337BA13=unitValue
Variable/Name/lib_ABFE498B_E3E3FB2E=AP_Triggers_Protoss_has_Slayer
Variable/Name/lib_ABFE498B_E6AD0ECA=skipCutscenes
Variable/Name/lib_ABFE498B_E720FB8B=AP_Triggers_Protoss_has_Sentinel
Variable/Name/lib_ABFE498B_EB6BCE88=AP_Triggers_Protoss_has_WarpRay
Variable/Name/lib_ABFE498B_EB7F3C1D=progressiveUpgradeValue
Variable/Name/lib_ABFE498B_EC3DC412=unitValue
Variable/Name/lib_ABFE498B_F05A9299=currentPlayer
Expand Down

0 comments on commit 0744417

Please sign in to comment.