From ed309a7abeb17e92c3853bc1cf0a1072e3354c6c Mon Sep 17 00:00:00 2001
From: EnvyDragon <138727357+EnvyDragon@users.noreply.github.com>
Date: Mon, 2 Dec 2024 13:30:18 -0500
Subject: [PATCH] Warp Relocate balance/bugfix
---
.../Base.SC2Data/GameData/AbilData.xml | 66 +--
.../Base.SC2Data/GameData/UpgradeData.xml | 18 +
.../Base.SC2Data/LibABFE498B.galaxy | 18 +
.../ArchipelagoTriggers.SC2Mod/DocumentHeader | Bin 161 -> 161 bytes
Mods/ArchipelagoTriggers.SC2Mod/Triggers | 383 ++++++++++++++++++
.../Triggers.version | Bin 44 -> 44 bytes
6 files changed, 452 insertions(+), 33 deletions(-)
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index ad2bbcccc..f9f68fa14 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -13665,10 +13665,10 @@
-
+
-
+
@@ -13679,10 +13679,10 @@
-
+
-
+
@@ -13692,10 +13692,10 @@
-
+
-
+
@@ -13705,15 +13705,15 @@
-
+
-
+
-
+
@@ -13723,10 +13723,10 @@
-
+
-
+
@@ -13736,10 +13736,10 @@
-
+
-
+
@@ -13749,10 +13749,10 @@
-
+
-
+
@@ -13762,10 +13762,10 @@
-
+
-
+
@@ -13775,10 +13775,10 @@
-
+
-
+
@@ -13788,20 +13788,20 @@
-
+
-
+
-
+
-
+
@@ -13811,10 +13811,10 @@
-
+
-
+
@@ -13824,10 +13824,10 @@
-
+
-
+
@@ -13837,10 +13837,10 @@
-
+
-
+
@@ -13861,10 +13861,10 @@
-
+
-
+
@@ -13875,10 +13875,10 @@
-
+
-
+
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 35ce9bbe1..af7983c2c 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -16614,6 +16614,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
index b32ae4cd5..e566cb230 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
@@ -8689,6 +8689,24 @@ void libABFE498B_gf_AP_Triggers_Protoss_unlockAmplifiedAssimilators (int lp_play
void libABFE498B_gf_AP_Triggers_Protoss_unlockProgressiveWarpRelocate (int lp_player, int lp_level) {
// Automatic Variable Declarations
// Implementation
+ TechTreeAbilityAllow(lp_player, AbilityCommand("AP_WarpRelocate", 0), true);
+ TechTreeAbilityAllow(lp_player, AbilityCommand("AP_WarpRelocate", 10), true);
+ TechTreeAbilityAllow(lp_player, AbilityCommand("AP_WarpRelocate", 11), true);
+ TechTreeAbilityAllow(lp_player, AbilityCommand("AP_WarpRelocate", 13), true);
+ TechTreeAbilityAllow(lp_player, AbilityCommand("AP_WarpRelocate", 12), true);
+ TechTreeAbilityAllow(lp_player, AbilityCommand("AP_WarpRelocate", 14), true);
+ TechTreeAbilityAllow(lp_player, AbilityCommand("AP_WarpRelocate", 21), true);
+ TechTreeAbilityAllow(lp_player, AbilityCommand("AP_WarpRelocate", 24), true);
+ TechTreeAbilityAllow(lp_player, AbilityCommand("AP_WarpRelocate", 25), true);
+ TechTreeAbilityAllow(lp_player, AbilityCommand("AP_WarpRelocate", 26), true);
+ TechTreeAbilityAllow(lp_player, AbilityCommand("AP_WarpRelocate", 27), true);
+ TechTreeAbilityAllow(lp_player, AbilityCommand("AP_WarpRelocate", 3), true);
+ TechTreeAbilityAllow(lp_player, AbilityCommand("AP_WarpRelocate", 4), true);
+ TechTreeAbilityAllow(lp_player, AbilityCommand("AP_WarpRelocate", 5), true);
+ TechTreeAbilityAllow(lp_player, AbilityCommand("AP_WarpRelocate", 7), true);
+ TechTreeAbilityAllow(lp_player, AbilityCommand("AP_WarpRelocate", 9), true);
+ TechTreeAbilityAllow(lp_player, AbilityCommand("AP_WarpRelocateAssimilator", 2), true);
+ TechTreeAbilityAllow(lp_player, AbilityCommand("AP_WarpRelocateAssimilator", 23), true);
if ((lp_level >= 1)) {
libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_WarpRelocateLevel1", 1);
if ((lp_level >= 2)) {
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader
index 88bee823103fe9db9e1b9076d9fc28c59cecd814..2f1f0f1eca5f807041fb275b088f9815014ed650 100644
GIT binary patch
delta 32
gcmZ3;xR7yzjPMt)TZ|yg00qnp3=;#yCc4G|0HAsZVgLXD
delta 32
gcmZ3;xR7yzjPQYiwKGAO0ScHI7$ydYO>~U`0ImoL8~^|S
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
index 15b1c1061..7189368f1 100644
--- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers
+++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers
@@ -72034,6 +72034,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -72056,6 +72075,370 @@
0
+
+
+ Must directly enable each index in case the associated structure is disabled
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_WarpRelocate
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_WarpRelocate
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_WarpRelocate
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_WarpRelocate
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_WarpRelocate
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_WarpRelocate
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_WarpRelocate
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_WarpRelocate
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_WarpRelocate
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_WarpRelocate
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_WarpRelocate
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_WarpRelocate
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_WarpRelocate
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_WarpRelocate
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_WarpRelocate
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_WarpRelocate
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_WarpRelocateAssimilator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AP_WarpRelocateAssimilator
+
+
+
diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version b/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version
index 2eadb7fc165851839043279793f938e976699117..223917227437361afc867fd852758cc92372877e 100644
GIT binary patch
delta 17
YcmdPVnV`Tkje~(<`cL0