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: Fixing a bug where unlockScorcher was never called #162

Merged
merged 2 commits into from
Jul 5, 2024
Merged

sc2: Fixing a bug where unlockScorcher was never called #162

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
308720d
sc2: Fixing a bug where unlockScorcher was never called
MatthewMarinets Jul 5, 2024
44452f9
sc2: Fixing incorrect unlock guard around scorchers
MatthewMarinets Jul 5, 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
4 changes: 2 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 @@ -1196,7 +1196,7 @@ void libABFE498B_gf_AP_Triggers_unlockProtossUnits2 (int lp_player, int lp_bitAr
libABFE498B_gf_AP_Triggers_Protoss_unlockOracle, // 8
libABFE498B_gf_AP_Triggers_Protoss_unlockStalwart, // 9
libABFE498B_gf_AP_Triggers_Protoss_unlockWarpRay, // 10
ap_triggers_PlayerConsumer_sig, // 11
libABFE498B_gf_AP_Triggers_Protoss_unlockScorcher, // 11
ap_triggers_PlayerConsumer_sig, // 12
ap_triggers_PlayerConsumer_sig, // 13
ap_triggers_PlayerConsumer_sig, // 14
Expand Down Expand Up @@ -6533,7 +6533,7 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockWarpRay (int lp_player) {
void libABFE498B_gf_AP_Triggers_Protoss_unlockScorcher (int lp_player) {
// Automatic Variable Declarations
// Implementation
if ((libABFE498B_gv_aP_Triggers_Protoss_has_WarpRay[lp_player] == false)) {
if ((libABFE498B_gv_aP_Triggers_Protoss_has_Scorcher[lp_player] == false)) {
libABFE498B_gv_aP_Triggers_Protoss_has_Scorcher[lp_player] = true;
libABFE498B_gf_AP_Triggers_Protoss_unlockStargate(lp_player);
TechTreeUnitAllow(lp_player, "AP_VoidRayPurifier", true);
Expand Down
4 changes: 2 additions & 2 deletions Mods/ArchipelagoTriggers.SC2Mod/Triggers
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3934,7 +3934,7 @@
libABFE498B_gf_AP_Triggers_Protoss_unlockOracle, // 8
libABFE498B_gf_AP_Triggers_Protoss_unlockStalwart, // 9
libABFE498B_gf_AP_Triggers_Protoss_unlockWarpRay, // 10
ap_triggers_PlayerConsumer_sig, // 11
libABFE498B_gf_AP_Triggers_Protoss_unlockScorcher, // 11
ap_triggers_PlayerConsumer_sig, // 12
ap_triggers_PlayerConsumer_sig, // 13
ap_triggers_PlayerConsumer_sig, // 14
Expand Down Expand Up @@ -56485,7 +56485,7 @@
</Element>
<Element Type="Param" Id="328C3937">
<ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
<Variable Type="Variable" Library="ABFE498B" Id="EB6BCE88"/>
<Variable Type="Variable" Library="ABFE498B" Id="D7F775C4"/>
<Array Type="Param" Library="ABFE498B" Id="6E81466F"/>
</Element>
<Element Type="Param" Id="6E81466F">
Expand Down