diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml index 421695ad3b..0b73d866eb 100644 --- a/mods/ts/rules/aircraft.yaml +++ b/mods/ts/rules/aircraft.yaml @@ -66,6 +66,7 @@ ORCA: Inherits: ^Helicopter Inherits@EXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove + Inherits@EMPDISABLE: ^EmpDisable Valued: Cost: 1000 Tooltip: @@ -97,6 +98,7 @@ ORCA: AttackHeli: FacingTolerance: 20 Voice: Attack + PauseOnCondition: empdisable AmmoPool: Ammo: 5 PipCount: 5 @@ -111,6 +113,7 @@ ORCAB: Inherits: ^Aircraft Inherits@EXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove + Inherits@EMPDISABLE: ^EmpDisable Valued: Cost: 1600 Tooltip: @@ -146,6 +149,7 @@ ORCAB: AttackPlane: Voice: Attack FacingTolerance: 20 + PauseOnCondition: empdisable AmmoPool: Ammo: 10 PipCount: 2 @@ -237,6 +241,7 @@ SCRIN: Inherits: ^Aircraft Inherits@EXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove + Inherits@EMPDISABLE: ^EmpDisable Valued: Cost: 1500 Tooltip: @@ -274,6 +279,7 @@ SCRIN: AttackPlane: Voice: Attack FacingTolerance: 20 + PauseOnCondition: empdisable AmmoPool: Ammo: 15 PipCount: 3 @@ -290,6 +296,7 @@ APACHE: Inherits: ^Helicopter Inherits@EXPERIENCE: ^GainsExperience Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove + Inherits@EMPDISABLE: ^EmpDisable Valued: Cost: 1000 Tooltip: @@ -319,6 +326,7 @@ APACHE: AttackHeli: FacingTolerance: 20 Voice: Attack + PauseOnCondition: empdisable AmmoPool: Ammo: 12 PipCount: 4 diff --git a/mods/ts/rules/civilian-vehicles.yaml b/mods/ts/rules/civilian-vehicles.yaml index 405d3a9b08..b1c7cc2f5e 100644 --- a/mods/ts/rules/civilian-vehicles.yaml +++ b/mods/ts/rules/civilian-vehicles.yaml @@ -31,6 +31,7 @@ LocalOffset: 0,283,580, 0,-283,580 AttackTurreted: Voice: Attack + PauseOnCondition: empdisable SelfHealing: Delay: 10 HealIfBelow: 50 diff --git a/mods/ts/rules/gdi-support.yaml b/mods/ts/rules/gdi-support.yaml index e654720880..5b02c2e322 100644 --- a/mods/ts/rules/gdi-support.yaml +++ b/mods/ts/rules/gdi-support.yaml @@ -63,12 +63,13 @@ GACTWR: BodyOrientation: QuantizedFacings: 32 DetectCloaked: - RequiresCondition: tower.vulcan || tower.rocket || tower.sam + RequiresCondition: !empdisable && (tower.vulcan || tower.rocket || tower.sam) Turreted: TurnSpeed: 10 InitialFacing: 224 AttackTurreted: RequiresCondition: tower.vulcan || tower.rocket || tower.sam + PauseOnCondition: empdisable WithSpriteTurret@VULC: RequiresCondition: tower.vulcan Recoils: false diff --git a/mods/ts/rules/gdi-vehicles.yaml b/mods/ts/rules/gdi-vehicles.yaml index dffbf999f6..dd8d68a035 100644 --- a/mods/ts/rules/gdi-vehicles.yaml +++ b/mods/ts/rules/gdi-vehicles.yaml @@ -90,6 +90,7 @@ HVR: Offset: -128,0,85 AttackTurreted: Voice: Attack + PauseOnCondition: empdisable WithVoxelTurret: Hovers: LeavesTrails: @@ -129,6 +130,7 @@ SMECH: MaxHeightDelta: 3 AttackFrontal: Voice: Attack + PauseOnCondition: empdisable Armament: Weapon: AssaultCannon Voiced: @@ -182,6 +184,7 @@ MMCH: TurnSpeed: 5 AttackTurreted: Voice: Attack + PauseOnCondition: empdisable WithSpriteTurret: Recoils: false Armament: @@ -234,6 +237,7 @@ HMEC: MaxHeightDelta: 3 AttackFrontal: Voice: Attack + PauseOnCondition: empdisable Armament@MISSILES: Weapon: MammothTusk LocalOffset: -243,-368,1208, -243,368,1208 @@ -281,6 +285,7 @@ SONIC: LocalOffset: -71,0,580 AttackTurreted: Voice: Attack + PauseOnCondition: empdisable Turreted: TurnSpeed: 5 Offset: -170,0,0 @@ -364,7 +369,9 @@ JUGG: AttackTurreted@deployed: Voice: Attack Armaments: deployed + Turrets: deployed RequiresCondition: deployed + PauseOnCondition: empdisable Armament@deployed: Name: deployed Turret: deployed diff --git a/mods/ts/rules/nod-support.yaml b/mods/ts/rules/nod-support.yaml index 21178fc64f..e6dc2d11d3 100644 --- a/mods/ts/rules/nod-support.yaml +++ b/mods/ts/rules/nod-support.yaml @@ -161,6 +161,7 @@ NALASR: InitialFacing: 224 Offset: 298,-171,288 AttackTurreted: + PauseOnCondition: empdisable Armament: Weapon: TurretLaserFire LocalOffset: 498,0,317 @@ -203,7 +204,7 @@ NAOBEL: Weapon: ObeliskLaserFire LocalOffset: 1980,297,1131 AttackCharges: - RequiresCondition: !disabled + PauseOnCondition: empdisable || disabled ChargeLevel: 65 ChargingCondition: charging AmbientSound: @@ -249,7 +250,7 @@ NASAM: TurnSpeed: 10 InitialFacing: 224 AttackTurreted: - RequiresCondition: !disabled + PauseOnCondition: empdisable || disabled WithSpriteTurret: Recoils: false Armament: diff --git a/mods/ts/rules/nod-vehicles.yaml b/mods/ts/rules/nod-vehicles.yaml index c5c5d1d0ab..6e0b097cfb 100644 --- a/mods/ts/rules/nod-vehicles.yaml +++ b/mods/ts/rules/nod-vehicles.yaml @@ -31,6 +31,7 @@ BGGY: MuzzleSplitFacings: 8 AttackFrontal: Voice: Attack + PauseOnCondition: empdisable WithMuzzleOverlay: -DamagedByTerrain@VEINS: -LeavesTrails@VEINS: @@ -70,6 +71,7 @@ BIKE: LocalOffset: -153,-204,509, -153,204,509 AttackFrontal: Voice: Attack + PauseOnCondition: empdisable DamagedByTerrain@VEINS: RequiresCondition: !inside-tunnel && !rank-elite LeavesTrails@VEINS: @@ -139,6 +141,7 @@ TTNK: AttackFrontal: Voice: Attack RequiresCondition: undeployed + PauseOnCondition: empdisable Turreted: TurnSpeed: 6 Turret: deployed @@ -155,7 +158,9 @@ TTNK: AttackTurreted@deployed: Voice: Attack Armaments: deployed + Turrets: deployed RequiresCondition: deployed + PauseOnCondition: empdisable Armament@deployed: Name: deployed Turret: deployed @@ -251,7 +256,9 @@ ART2: AttackTurreted@deployed: Voice: Attack Armaments: deployed + Turrets: deployed RequiresCondition: deployed + PauseOnCondition: empdisable Armament@deployed: Name: deployed Turret: deployed @@ -295,6 +302,7 @@ REPAIR: ForceTargetStances: None AttackFrontal: Voice: Attack + PauseOnCondition: empdisable AutoTarget: AutoTargetPriority@DEFAULT: ValidTargets: Vehicles @@ -425,6 +433,7 @@ SUBTANK: Weapon: FireballLauncher AttackFrontal: Voice: Attack + PauseOnCondition: empdisable WithVoxelBody: RequiresCondition: !submerged Targetable: @@ -472,6 +481,7 @@ STNK: LocalOffset: 301,61,421, 301,-61,421 AttackFrontal: Voice: Attack + PauseOnCondition: empdisable AutoTarget: InitialStance: HoldFire InitialStanceAI: ReturnFire diff --git a/mods/ts/sequences/aircraft.yaml b/mods/ts/sequences/aircraft.yaml index 397f508e7f..9c9799016e 100644 --- a/mods/ts/sequences/aircraft.yaml +++ b/mods/ts/sequences/aircraft.yaml @@ -1,16 +1,20 @@ orca: + Inherits: ^VehicleOverlays icon: orcaicon orcab: + Inherits: ^VehicleOverlays icon: obmbicon trnsport: icon: otrnicon scrin: + Inherits: ^VehicleOverlays icon: proicon apache: + Inherits: ^VehicleOverlays icon: apchicon rotor: lrotor Length: 4