Skip to content

Commit

Permalink
Merge pull request #329 from EnvyDragon/warp-on-warp-off
Browse files Browse the repository at this point in the history 
Warp Relocate balance/bugfix
  • Loading branch information
@Ziktofel
Ziktofel authored Dec 3, 2024
2 parents 5cb94db + ed309a7 commit 246447b
Show file tree
Hide file tree
Showing 6 changed files with 452 additions and 33 deletions.
66 changes: 33 additions & 33 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13665,10 +13665,10 @@
<CountUse value="1"/>
<Link value="AP_WarpRelocate"/>
<Location value="Player"/>
<TimeUse value="60"/>
<TimeUse value="45"/>
</Charge>
<Cooldown TimeUse="10"/>
<Button DefaultButtonFace="AP_WarpRelocate" State="Restricted" Requirements="AP_HaveWarpRelocate"/>
<Button DefaultButtonFace="AP_WarpRelocate" Requirements="AP_HaveWarpRelocate"/>
<ValidatorArray value="AP_TargetLocationHasPower"/>
</InfoArray>
<InfoArray index="Build4" Unit="AP_Gateway" Time="10">
Expand All @@ -13679,10 +13679,10 @@
<CountUse value="1"/>
<Link value="AP_WarpRelocate"/>
<Location value="Player"/>
<TimeUse value="60"/>
<TimeUse value="45"/>
</Charge>
<Cooldown TimeUse="10"/>
<Button DefaultButtonFace="AP_WarpRelocate" State="Restricted" Requirements="AP_HaveWarpRelocate"/>
<Button DefaultButtonFace="AP_WarpRelocate" Requirements="AP_HaveWarpRelocate"/>
</InfoArray>
<InfoArray index="Build5" Unit="AP_Forge" Time="10">
<Resource index="Minerals" value="50"/>
Expand All @@ -13692,10 +13692,10 @@
<CountUse value="1"/>
<Link value="AP_WarpRelocate"/>
<Location value="Player"/>
<TimeUse value="60"/>
<TimeUse value="45"/>
</Charge>
<Cooldown TimeUse="10"/>
<Button DefaultButtonFace="AP_WarpRelocate" State="Restricted" Requirements="AP_HaveWarpRelocate"/>
<Button DefaultButtonFace="AP_WarpRelocate" Requirements="AP_HaveWarpRelocate"/>
</InfoArray>
<InfoArray index="Build6" Unit="AP_FleetBeacon" Time="10">
<Resource index="Minerals" value="50"/>
Expand All @@ -13705,15 +13705,15 @@
<CountUse value="1"/>
<Link value="AP_WarpRelocate"/>
<Location value="Player"/>
<TimeUse value="60"/>
<TimeUse value="45"/>
</Charge>
<Cooldown TimeUse="10"/>
<Button DefaultButtonFace="AP_WarpRelocate" State="Restricted" Requirements="AP_HaveWarpRelocate"/>
<Button DefaultButtonFace="AP_WarpRelocate" Requirements="AP_HaveWarpRelocate"/>
</InfoArray>
<InfoArray index="Build8" Unit="AP_PhotonCannon" Time="10">
<Resource index="Minerals" value="50"/>
<Cooldown TimeUse="10"/>
<Button DefaultButtonFace="AP_WarpRelocate" State="Restricted" Requirements="AP_HaveWarpRelocate"/>
<Button DefaultButtonFace="AP_WarpRelocate" Requirements="AP_HaveWarpRelocate"/>
</InfoArray>
<InfoArray index="Build10" Unit="AP_Stargate" Time="10">
<Resource index="Minerals" value="50"/>
Expand All @@ -13723,10 +13723,10 @@
<CountUse value="1"/>
<Link value="AP_WarpRelocate"/>
<Location value="Player"/>
<TimeUse value="60"/>
<TimeUse value="45"/>
</Charge>
<Cooldown TimeUse="10"/>
<Button DefaultButtonFace="AP_WarpRelocate" State="Restricted" Requirements="AP_HaveWarpRelocate"/>
<Button DefaultButtonFace="AP_WarpRelocate" Requirements="AP_HaveWarpRelocate"/>
</InfoArray>
<InfoArray index="Build11" Unit="AP_TemplarArchive" Time="10">
<Resource index="Minerals" value="50"/>
Expand All @@ -13736,10 +13736,10 @@
<CountUse value="1"/>
<Link value="AP_WarpRelocate"/>
<Location value="Player"/>
<TimeUse value="60"/>
<TimeUse value="45"/>
</Charge>
<Cooldown TimeUse="10"/>
<Button DefaultButtonFace="AP_WarpRelocate" State="Restricted" Requirements="AP_HaveWarpRelocate"/>
<Button DefaultButtonFace="AP_WarpRelocate" Requirements="AP_HaveWarpRelocate"/>
</InfoArray>
<InfoArray index="Build12" Unit="AP_DarkShrine" Time="10">
<Resource index="Minerals" value="50"/>
Expand All @@ -13749,10 +13749,10 @@
<CountUse value="1"/>
<Link value="AP_WarpRelocate"/>
<Location value="Player"/>
<TimeUse value="60"/>
<TimeUse value="45"/>
</Charge>
<Cooldown TimeUse="10"/>
<Button DefaultButtonFace="AP_WarpRelocate" State="Restricted" Requirements="AP_HaveWarpRelocate"/>
<Button DefaultButtonFace="AP_WarpRelocate" Requirements="AP_HaveWarpRelocate"/>
</InfoArray>
<InfoArray index="Build13" Unit="AP_RoboticsBay" Time="10">
<Resource index="Minerals" value="50"/>
Expand All @@ -13762,10 +13762,10 @@
<CountUse value="1"/>
<Link value="AP_WarpRelocate"/>
<Location value="Player"/>
<TimeUse value="60"/>
<TimeUse value="45"/>
</Charge>
<Cooldown TimeUse="10"/>
<Button DefaultButtonFace="AP_WarpRelocate" State="Restricted" Requirements="AP_HaveWarpRelocate"/>
<Button DefaultButtonFace="AP_WarpRelocate" Requirements="AP_HaveWarpRelocate"/>
</InfoArray>
<InfoArray index="Build14" Unit="AP_RoboticsFacility" Time="10">
<Resource index="Minerals" value="50"/>
Expand All @@ -13775,10 +13775,10 @@
<CountUse value="1"/>
<Link value="AP_WarpRelocate"/>
<Location value="Player"/>
<TimeUse value="60"/>
<TimeUse value="45"/>
</Charge>
<Cooldown TimeUse="10"/>
<Button DefaultButtonFace="AP_WarpRelocate" State="Restricted" Requirements="AP_HaveWarpRelocate"/>
<Button DefaultButtonFace="AP_WarpRelocate" Requirements="AP_HaveWarpRelocate"/>
</InfoArray>
<InfoArray index="Build15" Unit="AP_CyberneticsCore" Time="10">
<Resource index="Minerals" value="50"/>
Expand All @@ -13788,20 +13788,20 @@
<CountUse value="1"/>
<Link value="AP_WarpRelocate"/>
<Location value="Player"/>
<TimeUse value="60"/>
<TimeUse value="45"/>
</Charge>
<Cooldown TimeUse="10"/>
<Button DefaultButtonFace="AP_WarpRelocate" State="Restricted" Requirements="AP_HaveWarpRelocate"/>
<Button DefaultButtonFace="AP_WarpRelocate" Requirements="AP_HaveWarpRelocate"/>
</InfoArray>
<InfoArray index="Build22" Unit="AP_ShieldBattery" Time="10">
<Resource index="Minerals" value="50"/>
<Cooldown TimeUse="10"/>
<Button DefaultButtonFace="AP_WarpRelocate" State="Restricted" Requirements="AP_HaveWarpRelocate"/>
<Button DefaultButtonFace="AP_WarpRelocate" Requirements="AP_HaveWarpRelocate"/>
</InfoArray>
<InfoArray index="Build25" Unit="AP_KhaydarinMonolith" Time="10">
<Resource index="Minerals" value="50"/>
<Cooldown TimeUse="10"/>
<Button DefaultButtonFace="AP_WarpRelocate" State="Restricted" Requirements="AP_HaveWarpRelocate"/>
<Button DefaultButtonFace="AP_WarpRelocate" Requirements="AP_HaveWarpRelocate"/>
</InfoArray>
<InfoArray index="Build26" Unit="AP_WarpGate" Time="10">
<Resource index="Minerals" value="50"/>
Expand All @@ -13811,10 +13811,10 @@
<CountUse value="1"/>
<Link value="AP_WarpRelocate"/>
<Location value="Player"/>
<TimeUse value="60"/>
<TimeUse value="45"/>
</Charge>
<Cooldown TimeUse="10"/>
<Button DefaultButtonFace="AP_WarpRelocate" State="Restricted" Requirements="AP_HaveWarpRelocate"/>
<Button DefaultButtonFace="AP_WarpRelocate" Requirements="AP_HaveWarpRelocate"/>
</InfoArray>
<InfoArray index="Build27" Unit="AP_StargateWarp" Time="10">
<Resource index="Minerals" value="50"/>
Expand All @@ -13824,10 +13824,10 @@
<CountUse value="1"/>
<Link value="AP_WarpRelocate"/>
<Location value="Player"/>
<TimeUse value="60"/>
<TimeUse value="45"/>
</Charge>
<Cooldown TimeUse="10"/>
<Button DefaultButtonFace="AP_WarpRelocate" State="Restricted" Requirements="AP_HaveWarpRelocate"/>
<Button DefaultButtonFace="AP_WarpRelocate" Requirements="AP_HaveWarpRelocate"/>
</InfoArray>
<InfoArray index="Build28" Unit="AP_RoboticsFacilityWarp" Time="10">
<Resource index="Minerals" value="50"/>
Expand All @@ -13837,10 +13837,10 @@
<CountUse value="1"/>
<Link value="AP_WarpRelocate"/>
<Location value="Player"/>
<TimeUse value="60"/>
<TimeUse value="45"/>
</Charge>
<Cooldown TimeUse="10"/>
<Button DefaultButtonFace="AP_WarpRelocate" State="Restricted" Requirements="AP_HaveWarpRelocate"/>
<Button DefaultButtonFace="AP_WarpRelocate" Requirements="AP_HaveWarpRelocate"/>
</InfoArray>
<Alert value="NoAlert"/>
<Range value="1000"/>
Expand All @@ -13861,10 +13861,10 @@
<CountUse value="1"/>
<Link value="AP_WarpRelocate"/>
<Location value="Player"/>
<TimeUse value="60"/>
<TimeUse value="45"/>
</Charge>
<Cooldown TimeUse="10"/>
<Button DefaultButtonFace="AP_WarpRelocate" State="Restricted" Requirements="AP_HaveWarpRelocate"/>
<Button DefaultButtonFace="AP_WarpRelocate" Requirements="AP_HaveWarpRelocate"/>
<ValidatorArray value="AP_HasVespeneAndLocationHasPower"/>
</InfoArray>
<InfoArray index="Build24" Unit="AP_AutomatedAssimilator" Time="10">
Expand All @@ -13875,10 +13875,10 @@
<CountUse value="1"/>
<Link value="AP_WarpRelocate"/>
<Location value="Player"/>
<TimeUse value="60"/>
<TimeUse value="45"/>
</Charge>
<Cooldown TimeUse="10"/>
<Button DefaultButtonFace="AP_WarpRelocate" State="Restricted" Requirements="AP_HaveWarpRelocate"/>
<Button DefaultButtonFace="AP_WarpRelocate" Requirements="AP_HaveWarpRelocate"/>
<ValidatorArray value="AP_HasVespeneAndLocationHasPower"/>
</InfoArray>
<Alert value="NoAlert"/>
Expand Down
18 changes: 18 additions & 0 deletions Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16614,6 +16614,24 @@
<EffectArray Operation="Set" Reference="Abil,AP_WarpRelocate,InfoArray[Build28].Charge.CountStart" Value="0"/>
<EffectArray Operation="Set" Reference="Abil,AP_WarpRelocateAssimilator,InfoArray[Build3].Charge.CountStart" Value="0"/>
<EffectArray Operation="Set" Reference="Abil,AP_WarpRelocateAssimilator,InfoArray[Build24].Charge.CountStart" Value="0"/>
<EffectArray Operation="Set" Reference="Abil,AP_WarpRelocate,InfoArray[Build1].Resource[Minerals]" Value="0"/>
<EffectArray Operation="Set" Reference="Abil,AP_WarpRelocate,InfoArray[Build4].Resource[Minerals]" Value="0"/>
<EffectArray Operation="Set" Reference="Abil,AP_WarpRelocate,InfoArray[Build5].Resource[Minerals]" Value="0"/>
<EffectArray Operation="Set" Reference="Abil,AP_WarpRelocate,InfoArray[Build6].Resource[Minerals]" Value="0"/>
<EffectArray Operation="Set" Reference="Abil,AP_WarpRelocate,InfoArray[Build8].Resource[Minerals]" Value="0"/>
<EffectArray Operation="Set" Reference="Abil,AP_WarpRelocate,InfoArray[Build10].Resource[Minerals]" Value="0"/>
<EffectArray Operation="Set" Reference="Abil,AP_WarpRelocate,InfoArray[Build11].Resource[Minerals]" Value="0"/>
<EffectArray Operation="Set" Reference="Abil,AP_WarpRelocate,InfoArray[Build12].Resource[Minerals]" Value="0"/>
<EffectArray Operation="Set" Reference="Abil,AP_WarpRelocate,InfoArray[Build13].Resource[Minerals]" Value="0"/>
<EffectArray Operation="Set" Reference="Abil,AP_WarpRelocate,InfoArray[Build14].Resource[Minerals]" Value="0"/>
<EffectArray Operation="Set" Reference="Abil,AP_WarpRelocate,InfoArray[Build15].Resource[Minerals]" Value="0"/>
<EffectArray Operation="Set" Reference="Abil,AP_WarpRelocate,InfoArray[Build22].Resource[Minerals]" Value="0"/>
<EffectArray Operation="Set" Reference="Abil,AP_WarpRelocate,InfoArray[Build25].Resource[Minerals]" Value="0"/>
<EffectArray Operation="Set" Reference="Abil,AP_WarpRelocate,InfoArray[Build26].Resource[Minerals]" Value="0"/>
<EffectArray Operation="Set" Reference="Abil,AP_WarpRelocate,InfoArray[Build27].Resource[Minerals]" Value="0"/>
<EffectArray Operation="Set" Reference="Abil,AP_WarpRelocate,InfoArray[Build28].Resource[Minerals]" Value="0"/>
<EffectArray Operation="Set" Reference="Abil,AP_WarpRelocateAssimilator,InfoArray[Build3].Resource[Minerals]" Value="0"/>
<EffectArray Operation="Set" Reference="Abil,AP_WarpRelocateAssimilator,InfoArray[Build24].Resource[Minerals]" Value="0"/>
<EffectArray Operation="Set" Reference="Button,AP_WarpRelocate,Tooltip" Value="Button/Tooltip/AP_WarpRelocateUpgraded"/>
</CUpgrade>
<CUpgrade id="AP_GuardianPropellantSacs">
Expand Down
18 changes: 18 additions & 0 deletions Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
Binary file modified Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader
View file
Binary file not shown.
Loading

0 comments on commit 246447b

Please sign in to comment.