From e166cd322233791501f41097bc6ea878e2bff774 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 20 Nov 2016 17:00:46 +0000 Subject: [PATCH] Update TS rules. --- mods/ts/rules/defaults.yaml | 9 ++++++--- mods/ts/rules/misc.yaml | 16 ++++++++-------- mods/ts/weapons/superweapons.yaml | 4 ++-- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index b82ef463c1..c3d01b1bc5 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -64,6 +64,8 @@ ReferencePoint: Bottom, Right RequiresCondition: rank-elite ZOffset: 256 + ExternalConditions@CRATES: + Conditions: crate-firepower, crate-damage, crate-speed, crate-cloak ^EmpDisable: UpgradeOverlay@EMPDISABLE: @@ -71,8 +73,8 @@ Palette: disabled DisableOnUpgrade@EMPDISABLE: RequiresCondition: empdisable - TimedUpgradeBar@EMPDISABLE: - Upgrade: empdisable + TimedConditionBar@EMPDISABLE: + Condition: empdisable Color: FFFFFF WithIdleOverlay@EMPDISABLE: Sequence: emp-overlay @@ -83,6 +85,8 @@ PowerMultiplier@EMPDISABLE: RequiresCondition: empdisable Modifier: 0 + ExternalConditions@EMPDISABLE: + Conditions: empdisable ^EmpDisableMobile: Inherits: ^EmpDisable @@ -639,7 +643,6 @@ Mobile: Speed: 113 TurnSpeed: 16 - Crushes: crate SharesCell: no TerrainSpeeds: Clear: 90 diff --git a/mods/ts/rules/misc.yaml b/mods/ts/rules/misc.yaml index aa176c15f2..45d14be609 100644 --- a/mods/ts/rules/misc.yaml +++ b/mods/ts/rules/misc.yaml @@ -74,24 +74,24 @@ CRATE: SelectionShares: 0 NoBaseSelectionShares: 100 Units: mcv - GrantUpgradeCrateAction@cloak: + GrantExternalConditionCrateAction@cloak: SelectionShares: 5 Effect: stealth - Upgrades: crate-cloak + Condition: crate-cloak Notification: cloak5.aud - GrantUpgradeCrateAction@firepower: + GrantExternalConditionCrateAction@firepower: SelectionShares: 5 Effect: firepower - Upgrades: crate-firepower + Condition: crate-firepower Notification: 00-i070.aud - GrantUpgradeCrateAction@armor: + GrantExternalConditionCrateAction@armor: SelectionShares: 5 Effect: armor - Upgrades: crate-damage + Condition: crate-damage Notification: 00-i068.aud - GrantUpgradeCrateAction@speed: + GrantExternalConditionCrateAction@speed: SelectionShares: 5 - Upgrades: crate-speed + Condition: crate-speed Notification: 00-i080.aud SROCK01: diff --git a/mods/ts/weapons/superweapons.yaml b/mods/ts/weapons/superweapons.yaml index 3f4c789fb9..f85b9a7802 100644 --- a/mods/ts/weapons/superweapons.yaml +++ b/mods/ts/weapons/superweapons.yaml @@ -107,10 +107,10 @@ EMPulseCannon: Image: pulsball Warhead@1Eff: CreateEffect Explosions: pulse_explosion - Warhead@emp: GrantUpgrade + Warhead@emp: GrantExternalCondition Range: 4c0 Duration: 250 - Upgrades: empdisable + Condition: empdisable ClusterMissile: ValidTargets: Ground, Water, Air