From 00c6ea48e03c3949b883a8e87bdd99e6d6601ba9 Mon Sep 17 00:00:00 2001 From: EnvyDragon <138727357+EnvyDragon@users.noreply.github.com> Date: Mon, 29 Jul 2024 19:16:10 -0400 Subject: [PATCH] Predator Rework --- .../Base.SC2Data/GameData/AbilData.xml | 19 +- .../Base.SC2Data/GameData/ActorData.xml | 17 + .../Base.SC2Data/GameData/BehaviorData.xml | 68 ++++ .../Base.SC2Data/GameData/ButtonData.xml | 7 +- .../Base.SC2Data/GameData/EffectData.xml | 121 ++++++ .../Base.SC2Data/GameData/RequirementData.xml | 4 + .../GameData/RequirementNodeData.xml | 4 + .../Base.SC2Data/GameData/UnitData.xml | 12 +- .../Base.SC2Data/GameData/UpgradeData.xml | 19 +- .../Base.SC2Data/GameData/ValidatorData.xml | 44 +++ .../LocalizedData/GameStrings.txt | 29 +- .../Base.SC2Data/LibABFE498B.galaxy | 45 +-- .../Base.SC2Data/LibABFE498B_h.galaxy | 1 + .../ArchipelagoTriggers.SC2Mod/DocumentHeader | Bin 156 -> 156 bytes .../GameText.version | Bin 44 -> 44 bytes Mods/ArchipelagoTriggers.SC2Mod/Triggers | 368 ++---------------- .../Triggers.version | Bin 44 -> 44 bytes .../LocalizedData/TriggerStrings.txt | 4 +- 18 files changed, 362 insertions(+), 400 deletions(-) diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml index bbf6013f9..533693155 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml @@ -1051,22 +1051,15 @@ - - - - - - - - - - + + + - + - - + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml index 1e1edde0f..640754153 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml @@ -25183,6 +25183,7 @@ + @@ -25213,6 +25214,22 @@ + + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml index 1f148adfd..c7159d4a7 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml @@ -7309,4 +7309,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml index 7ca51da5b..8a28d7ec6 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ButtonData.xml @@ -4663,7 +4663,7 @@ - + @@ -5753,4 +5753,9 @@ + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml index 1b544fe58..45d1719fe 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml @@ -2192,10 +2192,17 @@ + + + + + + + @@ -17568,4 +17575,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml index f4598f785..fdd338496 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml @@ -3560,4 +3560,8 @@ + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml index 874010ce2..6daf23b99 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml @@ -6038,4 +6038,8 @@ + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml index f12933486..abe287a97 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml @@ -3150,6 +3150,7 @@ + @@ -3170,7 +3171,10 @@ - + + + + @@ -3180,10 +3184,10 @@ + + - - - + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml index ddcf7b67d..aaaf69484 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml @@ -524,6 +524,8 @@ + + @@ -674,6 +676,7 @@ + @@ -10670,14 +10673,20 @@ - - + + - - - + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml index cc66de872..2bb3e3423 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml +++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml @@ -5804,4 +5804,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt index 1029c1e5f..baa3c1d76 100644 --- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt +++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt @@ -510,6 +510,11 @@ Behavior/Name/AP_KerriganPrimalRage2=Fury Behavior/Name/AP_KerriganPrimalRage3=Fury Behavior/Name/AP_KerriganPrimalRage4=Fury Behavior/Name/AP_KerriganPrimalRage5=Fury +Behavior/Name/AP_PredatorFury1=Synthetic Adrenaline - 20% full +Behavior/Name/AP_PredatorFury2=Synthetic Adrenaline - 40% full +Behavior/Name/AP_PredatorFury3=Synthetic Adrenaline - 60% full +Behavior/Name/AP_PredatorFury4=Synthetic Adrenaline - 80% full +Behavior/Name/AP_PredatorFury5=Synthetic Adrenaline - 100% full Behavior/Name/AP_LiberatorCloak=Cloak Behavior/Name/AP_LiberatorGuerillaMissilesDebuff=Guerilla Missiled Behavior/Name/AP_LightningBomb=Disintegration @@ -542,7 +547,8 @@ Behavior/Name/AP_ParalyticSpines=Paralytic Spines Behavior/Name/AP_PersonalCloakingFree=Cloak Behavior/Name/AP_PersonalDefensiveMatrix=Ionic Force Field Behavior/Name/AP_PhaseBlinkDamage=Phase Blink -Behavior/Name/AP_PredatorCloaking=Cloak +Behavior/Name/AP_PredatorCloak=Phase Cloak +Behavior/Name/AP_PredatorAdaptiveDefensesShieldsToLife=Adaptive Defenses (Out of Combat) Behavior/Name/AP_PrimalHealBig=Mend Behavior/Name/AP_PrimalHealSmall=Mend Behavior/Name/AP_PsiDisruption=Psi Disruption @@ -690,6 +696,11 @@ Behavior/Tooltip/AP_KerriganPrimalRage2=Attack speed increased by %. Behavior/Tooltip/AP_KerriganPrimalRage4=Attack speed increased by %. Behavior/Tooltip/AP_KerriganPrimalRage5=Attack speed increased by %. +Behavior/Tooltip/AP_PredatorFury1=Attack speed increased by %. +Behavior/Tooltip/AP_PredatorFury2=Attack speed increased by %. +Behavior/Tooltip/AP_PredatorFury3=Attack speed increased by %. +Behavior/Tooltip/AP_PredatorFury4=Attack speed increased by %. +Behavior/Tooltip/AP_PredatorFury5=Attack speed increased by %. Behavior/Tooltip/AP_LiberatorGuerillaMissilesDebuff=This unit has % reduced move speed and % reduced attack speed. Behavior/Tooltip/AP_LightningBomb=This unit or structure is taking damage over time. Behavior/Tooltip/AP_LockOn=This unit has been targeted by a Cyclone's Lock On ability. @@ -711,7 +722,8 @@ Behavior/Tooltip/AP_ParalyticSpines=This unit's attack speed is slowed. Behavior/Tooltip/AP_PersonalCloakingFree=This unit is cloaked and will only be revealed by detectors or effects. Behavior/Tooltip/AP_PersonalDefensiveMatrix=Nova is absorbing a portion of the damage dealt to her. Behavior/Tooltip/AP_PhaseBlinkDamage=This unit's next attack will deal double the damage. -Behavior/Tooltip/AP_PredatorCloaking=This unit is cloaked and will only be revealed by detectors or effects. +Behavior/Tooltip/AP_PredatorCloak=This unit is cloaked ignores unit collision. +Behavior/Tooltip/AP_PredatorAdaptiveDefensesShieldsToLife=The Predator is out of combat and is consuming its shield to repair itself. Behavior/Tooltip/AP_PrimalHealBig=Regenerating life. Behavior/Tooltip/AP_PrimalHealSmall=Regenerating life. Behavior/Tooltip/AP_PsiDisruption=Attack and movement speeds halved. @@ -906,7 +918,7 @@ Button/Name/AP_CloakOnBanshee=Cloak Button/Name/AP_CloakOnBattlecruiser=Cloak Button/Name/AP_CloakOnGhost=Cloak Button/Name/AP_CloakOnLiberator=Cloak -Button/Name/AP_CloakOnPredator=Cloak +Button/Name/AP_CloakOnPredator=Phase Cloak Button/Name/AP_CloakOnReaper=Permanently Cloaked Button/Name/AP_CloakOnSpectre=Cloak Button/Name/AP_Colossus=Warp In Colossus @@ -1351,7 +1363,8 @@ Button/Name/AP_PlanetaryFortressAttackAirlift=Armament Stabilizers Button/Name/AP_PlanetaryFortressLoad=Load Button/Name/AP_PoisonNova=Toxic Blast Button/Name/AP_Predator=Build Predator -Button/Name/AP_PredatorFury=Predator's Fury +Button/Name/AP_PredatorFury=Synthetic Adrenaline +Button/Name/AP_PredatorAdaptiveDefenses=Adaptive Defenses Button/Name/AP_PrimalAdaptation=Primal Adaptation Button/Name/AP_PrimalHeal=Mend Button/Name/AP_PrimalIgniterMerge=Merge to Primal Igniter @@ -1976,7 +1989,7 @@ Button/Tooltip/AP_CloakOnBattlecruiser=Cloaks the unit, preventing enemy units f Button/Tooltip/AP_CloakOnGhost=Cloaks the unit, preventing enemy units from seeing or attacking it. A cloaked unit will only be revealed by detectors or effects.Drains energy per second. Button/Tooltip/AP_CloakOnGhostFree=Cloaks the unit, preventing enemy units from seeing or attacking it. A cloaked unit will only be revealed by detectors or effects. Button/Tooltip/AP_CloakOnLiberator=Cloaks the unit, preventing enemy units from seeing or attacking it. A cloaked unit will only be revealed by detectors or effects.Drains energy per second. -Button/Tooltip/AP_CloakOnPredator=Cloaks the unit, preventing enemy units from seeing or attacking it. A cloaked unit will only be revealed by detectors or effects.Drains energy per second. +Button/Tooltip/AP_CloakOnPredator=Cloaks the unit, preventing enemy units from seeing or attacking it. A cloaked unit will only be revealed by detectors or effects.Effect lasts seconds. While cloaked, the Predator ignores unit collision. Button/Tooltip/AP_CloakOnReaper=The Reaper is permanently cloaked. Button/Tooltip/AP_CloakOnSpectre=Cloaks the unit, preventing enemy units from seeing or attacking it. A cloaked unit will only be revealed by detectors or effects.Drains energy per second. Button/Tooltip/AP_CloakOnSpectreFree=Cloaks the unit, preventing enemy units from seeing or attacking it. A cloaked unit will only be revealed by detectors or effects. @@ -2487,7 +2500,8 @@ Button/Tooltip/AP_PlanetaryFortressLoad=Loads nearby SCVs into the Planetary For Button/Tooltip/AP_PointDefenseDrone=Uses a laser to shoot down enemy missiles. Cannot target special attacks. Times out after seconds.Each shot consumes 10 energy. Button/Tooltip/AP_PoisonNova=Instantly deals 20 damage to enemy ground units nearby. Button/Tooltip/AP_Predator=Anti-infantry specialist that deals area damage with each attack.Can attack ground units. -Button/Tooltip/AP_PredatorFury=Jump from target to target, dealing damage with each jump. Hits times. +Button/Tooltip/AP_PredatorFury=Builds up attack speed while out of combat, up to % increased attack speed.Each attack reduces this bonus by % until the Predator leaves combat again. +Button/Tooltip/AP_PredatorAdaptiveDefenses=Damage dealt by the Predator charges a temporary protective shield.The shield is drained out of combat. A portion of shields lost this way are converted to healing for the Predator. Button/Tooltip/AP_PrimalAdaptation=Allows Guardians to attack air units with a decreased attack damage. Button/Tooltip/AP_PrimalHeal=Heals Kerrigan for life and friendly biological units nearby for life. An additional 50% of the amount healed regenerates over . Button/Tooltip/AP_PrimalIgniter=Assault unit. Has an area-damage attack. Regenerates life quickly when burrowed.Can attack ground units. @@ -2568,7 +2582,7 @@ Button/Tooltip/AP_ResearchAlarakHighTemplarPsionicOrbTravelDistancePassive=Incre Button/Tooltip/AP_ResearchCycloneRapidFireLaunchers=Increases the attack speed of the first 12 shots of the Cyclone's Lock On. Button/Tooltip/AP_ResearchMagFieldLaunchers=Increases Cyclone's attack range by +. Button/Tooltip/AP_RespawnZergling=Respawns up to Zerglings at no cost until all Zerglings have returned to life. -Button/Tooltip/AP_RetributionField=The Predator unleashes a deadly field of electricity each time it attacks. Deals 20 damage. +Button/Tooltip/AP_RetributionField=The Predator unleashes a deadly field of electricity each time it attacks. Deals damage. Button/Tooltip/AP_RipwaveMissiles=Viking missiles deal area damage. Button/Tooltip/AP_Roach=Assault unit. Regenerates life quickly when burrowed.Can attack ground units. Button/Tooltip/AP_RoachCorpserPassive=Corpser StrainRoach Warren enables you to morph Roaches. @@ -5203,6 +5217,7 @@ Unit/Name/AP_SIInfestedBunkerUprooted=Infested Bunker Unit/ShieldArmorName/AP_DefensiveMatrixShields=Defensive Matrix Unit/ShieldArmorName/AP_NovaShieldArmor=Terran Energy Shields Unit/ShieldArmorName/AP_TerranShieldArmor=Terran Energy Shields +Unit/ShieldArmorName/AP_PredatorAdaptiveDefenses=Adaptive Defenses UnitKillRank/AP_Nova=Dominion Assassin UnitSubtitle/AP_HotSHunter=Hunter Strain UnitSubtitle/AP_HotSHunterSplitter=Hunter + Splitter diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy index c0df5bcb1..a7dcd10c2 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B.galaxy @@ -502,7 +502,7 @@ void libABFE498B_gf_AP_Triggers_unlockTerranArmory7 (int lp_player, int lp_bitAr libABFE498B_gf_AP_Triggers_Terran_unlockMissileTurretResourceEfficency, // 3 libABFE498B_gf_AP_Triggers_Terran_unlockScienceVesselTacticalJump, // 4 libABFE498B_gf_AP_Triggers_Terran_unlockLiberatorCompressedRocketFuel, // 5 - ap_triggers_PlayerConsumer_sig, // 6 + libABFE498B_gf_AP_Triggers_Terran_unlockPredatorAdaptiveDefenses, // 6 ap_triggers_PlayerConsumer_sig, // 7 ap_triggers_PlayerConsumer_sig, // 8 ap_triggers_PlayerConsumer_sig, // 9 @@ -2734,46 +2734,9 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorResourceEfficiency (int lp_ } void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorCloak (int lp_player) { - // Variable Declarations - int lv_upgradeLevels; - unit lv_currentUnit; - // Automatic Variable Declarations - unitgroup autoA2DC915D_g; - int autoA2DC915D_u; - unitgroup auto458755E3_g; - int auto458755E3_u; - - // Variable Initialization - // Implementation - lv_upgradeLevels = TechTreeUpgradeCount(lp_player, "AP_CloakingTechnologyPredator", c_techCountQueuedOrBetter); libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CloakingTechnologyPredator", 1); - if ((TechTreeUpgradeCount(lp_player, "AP_CellularReactors", c_techCountQueuedOrBetter) == 1)) { - libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_CellularReactorsPredator", 1); - if ((lv_upgradeLevels == 0)) { - auto458755E3_g = UnitGroup("AP_Predator", lp_player, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); - auto458755E3_u = UnitGroupCount(auto458755E3_g, c_unitCountAll); - for (;; auto458755E3_u -= 1) { - lv_currentUnit = UnitGroupUnitFromEnd(auto458755E3_g, auto458755E3_u); - if (lv_currentUnit == null) { break; } - UnitSetPropertyFixed(lv_currentUnit, c_unitPropEnergy, 150.0); - } - } - - } - else { - if ((lv_upgradeLevels == 0)) { - autoA2DC915D_g = UnitGroup("AP_Predator", lp_player, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0); - autoA2DC915D_u = UnitGroupCount(autoA2DC915D_g, c_unitCountAll); - for (;; autoA2DC915D_u -= 1) { - lv_currentUnit = UnitGroupUnitFromEnd(autoA2DC915D_g, autoA2DC915D_u); - if (lv_currentUnit == null) { break; } - UnitSetPropertyFixed(lv_currentUnit, c_unitPropEnergy, 50.0); - } - } - - } } void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorCharge (int lp_player) { @@ -2788,6 +2751,12 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorFury (int lp_player) { libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_PredatorFury", 1); } +void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorAdaptiveDefenses (int lp_player) { + // Automatic Variable Declarations + // Implementation + libNtve_gf_SetUpgradeLevelForPlayer(lp_player, "AP_PredatorAdaptiveDefenses", 1); +} + void libABFE498B_gf_AP_Triggers_Terran_unlockMedivacRapidDeploymentTube (int lp_player) { // Automatic Variable Declarations // Implementation diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy index 817edaf15..9483db0fd 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy +++ b/Mods/ArchipelagoTriggers.SC2Mod/Base.SC2Data/LibABFE498B_h.galaxy @@ -287,6 +287,7 @@ void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorResourceEfficiency (int lp_ void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorCloak (int lp_player); void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorCharge (int lp_player); void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorFury (int lp_player); +void libABFE498B_gf_AP_Triggers_Terran_unlockPredatorAdaptiveDefenses (int lp_player); void libABFE498B_gf_AP_Triggers_Terran_unlockMedivacRapidDeploymentTube (int lp_player); void libABFE498B_gf_AP_Triggers_Terran_unlockMedivacAdvancedHealingAI (int lp_player); void libABFE498B_gf_AP_Triggers_Terran_unlockMedivacExpandedHull (int lp_player); diff --git a/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader b/Mods/ArchipelagoTriggers.SC2Mod/DocumentHeader index 6313cb0a3cea96fb6cebe7367764181069c1d6ad..fb6afa472e41df35b28d4a2d30decc6a156b9824 100644 GIT binary patch delta 32 gcmbQkIEQh9jPRk0$EJcX0~9bbFiZ>(o9G%20KrcQ{Qv*} delta 32 fcmbQkIEQh9jPT;}UM&!2fC6R)hKT`U6J5grk~0Ux diff --git a/Mods/ArchipelagoTriggers.SC2Mod/GameText.version b/Mods/ArchipelagoTriggers.SC2Mod/GameText.version index 3ff7538fbb22f548dfec874a3b64fdbe99cbf01b..1ed9b0f68082f559b9851dc5d233fc25b668a988 100644 GIT binary patch delta 17 YcmdPVnV`U9#LU1TFSR0#k%55$02-nKk^lez delta 17 YcmdPVnV`U9$jrcy@??G*BLf2i03r?pmjD0& diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers b/Mods/ArchipelagoTriggers.SC2Mod/Triggers index 767537a67..3d4ccbe63 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/Triggers +++ b/Mods/ArchipelagoTriggers.SC2Mod/Triggers @@ -2753,7 +2753,7 @@ libABFE498B_gf_AP_Triggers_Terran_unlockMissileTurretResourceEfficency, // 3 libABFE498B_gf_AP_Triggers_Terran_unlockScienceVesselTacticalJump, // 4 libABFE498B_gf_AP_Triggers_Terran_unlockLiberatorCompressedRocketFuel, // 5 - ap_triggers_PlayerConsumer_sig, // 6 + libABFE498B_gf_AP_Triggers_Terran_unlockPredatorAdaptiveDefenses, // 6 ap_triggers_PlayerConsumer_sig, // 7 ap_triggers_PlayerConsumer_sig, // 8 ap_triggers_PlayerConsumer_sig, // 9 @@ -18818,6 +18818,7 @@ + @@ -18858,11 +18859,7 @@ - - - - @@ -18874,58 +18871,6 @@ 0 - - - - - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - AP_CloakingTechnologyPredator - - - - - - - @@ -18947,279 +18892,6 @@ - - - - - - - - - - - - - - - - - If the player didn't have the upgrade before, set the starting energy - - - - - - - - - - - - - - - - - - - - - - - - - AP_Predator - - - - - - - - - - - - - - - - - -;Missile,Dead,Hidden - - - - - - - - - - - - - - - - - - - - - - - - - - - - 50.0 - - - - - - - - - - - - - - - - - - - - 0 - - - - - - - - - - - - - - - - 1 - - - - - AP_CellularReactorsPredator - - - - - - - - - - - - - If the player didn't have the upgrade before, set the starting energy - - - - - - - - - - - - - - - - - - - - - - - - - AP_Predator - - - - - - - - - - - - - - - - - -;Missile,Dead,Hidden - - - - - - - - - - - - - - - - - - - - - - - - - - - - 150.0 - - - - - - - - - - - - - - - - - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - AP_CellularReactors - - - - - - - - - - 1 - - @@ -19292,6 +18964,42 @@ + + + + + + + + + + + + + 0 + + + + + + + + + + + + + + + 1 + + + + + AP_PredatorAdaptiveDefenses + + + diff --git a/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version b/Mods/ArchipelagoTriggers.SC2Mod/Triggers.version index 30f115a8fa39a2a5f70d8c34fc4e4d46ec7a172f..55eae1e8a6e0820685b4ccfe33c020eb7b45b8b3 100644 GIT binary patch delta 17 YcmdPVnV`TEz`?*EFSR0#k%55$031OAwEzGB delta 17 YcmdPVnV`Vq&%wZ;@PB?9BLf2i03u2QkpKVy diff --git a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt index a2119c83b..b80885e88 100644 --- a/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt +++ b/Mods/ArchipelagoTriggers.SC2Mod/enUS.SC2Data/LocalizedData/TriggerStrings.txt @@ -372,6 +372,7 @@ FunctionDef/Name/lib_ABFE498B_64C26431=AP_Triggers_Terran_unlockHERCKineticFoam FunctionDef/Name/lib_ABFE498B_64F777D3=AP_Triggers_Zerg_BroodLordEvolvedCarapace FunctionDef/Name/lib_ABFE498B_651AD4D5=AP_Triggers_unlockTerranArmory7 FunctionDef/Name/lib_ABFE498B_652B58E3=AP_Triggers_Terran_unlockHERCGrapplePull +FunctionDef/Name/lib_ABFE498B_6649708D=AP_Triggers_Terran_unlockPredatorAdaptiveDefenses FunctionDef/Name/lib_ABFE498B_66568157=AP_Triggers_unlockTerranBuildings FunctionDef/Name/lib_ABFE498B_66759A11=AP_Triggers_Terran_unlockScienceVesselAdvancedAISystems FunctionDef/Name/lib_ABFE498B_671B0162=AP_Triggers_Zerg_unlockSpineCrawler @@ -1011,6 +1012,7 @@ ParamDef/Name/lib_ABFE498B_3BC06227=level ParamDef/Name/lib_ABFE498B_3C1D477D=player ParamDef/Name/lib_ABFE498B_3C96567F=player ParamDef/Name/lib_ABFE498B_3CC53835=bitArrayValue +ParamDef/Name/lib_ABFE498B_3CFF4268=player ParamDef/Name/lib_ABFE498B_3D0270E9=player ParamDef/Name/lib_ABFE498B_3D29B8AC=level ParamDef/Name/lib_ABFE498B_3EC8574D=player @@ -1623,7 +1625,6 @@ Variable/Name/lib_ABFE498B_07352B2A=AP_Triggers_Terran_terranShipArmorLevel Variable/Name/lib_ABFE498B_08801FBF=AP_Triggers_Terran_hasBanshee Variable/Name/lib_ABFE498B_0CCA3825=AP_Triggers_onDifficultyCasual Variable/Name/lib_ABFE498B_0D7B4949=AP_Triggers_Protoss_has_Energizer -Variable/Name/lib_ABFE498B_0E436422=upgradeLevels Variable/Name/lib_ABFE498B_0F2909FC=mutation1Value Variable/Name/lib_ABFE498B_0F481473=AP_Triggers_Protoss_has_Tempest Variable/Name/lib_ABFE498B_0FAF9046=AP_Triggers_Protoss_has_Annihilator @@ -1675,7 +1676,6 @@ Variable/Name/lib_ABFE498B_4B49FCFE=mutation3Value Variable/Name/lib_ABFE498B_4C07DE09=overrideRace Variable/Name/lib_ABFE498B_4D3F73BE=upgradeLevels Variable/Name/lib_ABFE498B_4DCCF6C3=enableMorphling -Variable/Name/lib_ABFE498B_4EADCD86=currentUnit Variable/Name/lib_ABFE498B_4F2C5082=unit Variable/Name/lib_ABFE498B_4F660184=AP_Triggers_Protoss_has_StalkerShakuras Variable/Name/lib_ABFE498B_50E9FC36=AP_Triggers_Option_SoAPresenceAutocasts