diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy index 82c2fda68..f84501f6e 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy @@ -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 @@ -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 @@ -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); diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy index 42ed424f1..04447d048 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy @@ -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; @@ -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); diff --git a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader index be3d51ef6..354b95fec 100644 Binary files a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader and b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader differ diff --git a/Mods/ArchipelagoTriggers.SC2Mod/GameText.version b/Mods/ArchipelagoTriggers.SC2Mod/GameText.version index 2477f013c..19f070b9d 100644 Binary files a/Mods/ArchipelagoTriggers.SC2Mod/GameText.version and b/Mods/ArchipelagoTriggers.SC2Mod/GameText.version differ diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers index 5ee12cd0d..23868c4e9 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers +++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers @@ -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 @@ -51237,6 +51237,7 @@ + @@ -51618,6 +51619,17 @@ false + + + + + + + + + false + + @@ -51740,6 +51752,7 @@ + @@ -56238,6 +56251,124 @@ false + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AP_VoidRayAiur + + + + + + + + + + + + + + + + + 1 + + + + + AP_StargateFactionAiur + + + + + + + + + + + + + + + + + + + + + + + + + false + + Carrier Tier @@ -65117,6 +65248,7 @@ + @@ -65881,6 +66013,26 @@ + + + + + + + + + + + + + + + + + AP_VoidRayAiur + + + diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version b/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version index e8689db5c..8d2be5cae 100644 Binary files a/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version and b/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version differ diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt index 1abdc794a..0e20b0cd8 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -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 @@ -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 @@ -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