From 430c7a4d7d7ad0e1c5f6d178137546b345c3b4cc Mon Sep 17 00:00:00 2001 From: reaperrr Date: Wed, 27 Oct 2021 23:15:10 +0200 Subject: [PATCH] Fix TD voice crashes The original PR used too much copy-paste. --- mods/cnc/rules/aircraft.yaml | 6 ++---- mods/cnc/rules/ships.yaml | 3 +-- mods/cnc/rules/vehicles.yaml | 15 +++++---------- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/mods/cnc/rules/aircraft.yaml b/mods/cnc/rules/aircraft.yaml index ed67c3cfab..f25f25cb6c 100644 --- a/mods/cnc/rules/aircraft.yaml +++ b/mods/cnc/rules/aircraft.yaml @@ -85,8 +85,6 @@ HELI: LocalOffset: 128,-213,-85, 128,213,-85 MuzzleSequence: muzzle PauseOnCondition: !ammo - AttackFrontal: - Voice: Attack AttackMove: Voice: Attack AutoTarget: @@ -96,6 +94,7 @@ HELI: OpportunityFire: false PersistentTargeting: false AttackType: Hover + Voice: Attack AmmoPool: Ammo: 10 AmmoCondition: ammo @@ -154,8 +153,6 @@ ORCA: Weapon: OrcaAAMissiles LocalOffset: 427,-171,-213, 427,171,-213 PauseOnCondition: !ammo - AttackFrontal: - Voice: Attack AttackMove: Voice: Attack AutoTarget: @@ -165,6 +162,7 @@ ORCA: OpportunityFire: false PersistentTargeting: false AttackType: Hover + Voice: Attack AmmoPool: Ammo: 6 AmmoCondition: ammo diff --git a/mods/cnc/rules/ships.yaml b/mods/cnc/rules/ships.yaml index 878089e184..54651fd487 100644 --- a/mods/cnc/rules/ships.yaml +++ b/mods/cnc/rules/ships.yaml @@ -24,11 +24,10 @@ BOAT: Armament: Weapon: BoatMissile LocalOffset: 85,-85,0, 85,85,0 - AttackFrontal: - Voice: Attack AttackMove: Voice: Attack AttackTDGunboatTurreted: + Voice: Attack -QuantizeFacingsFromSequence: BodyOrientation: QuantizedFacings: 2 diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index 2bc4dc2db7..9fa31a16e2 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -153,11 +153,10 @@ APC: RevokeDelay: 18 RevokeOnNewTarget: False RevokeAll: True - AttackFrontal: - Voice: Attack AttackMove: Voice: Attack AttackTurreted: + Voice: Attack WithMuzzleOverlay: WithSpriteTurret: RequiresCondition: !attack-air @@ -390,11 +389,10 @@ JEEP: Weapon: MachineGunH LocalOffset: 171,0,85 MuzzleSequence: muzzle - AttackFrontal: - Voice: Attack AttackMove: Voice: Attack AttackTurreted: + Voice: Attack WithMuzzleOverlay: WithSpriteTurret: SpawnActorOnDeath: @@ -437,11 +435,10 @@ LTNK: RecoilRecovery: 17 LocalOffset: 720,0,90 MuzzleSequence: muzzle - AttackFrontal: - Voice: Attack AttackMove: Voice: Attack AttackTurreted: + Voice: Attack WithMuzzleOverlay: WithSpriteTurret: SpawnActorOnDeath: @@ -483,11 +480,10 @@ MTNK: RecoilRecovery: 26 LocalOffset: 768,0,90 MuzzleSequence: muzzle - AttackFrontal: - Voice: Attack AttackMove: Voice: Attack AttackTurreted: + Voice: Attack WithMuzzleOverlay: WithSpriteTurret: Explodes: @@ -544,11 +540,10 @@ HTNK: LocalYaw: -100, 100 Recoil: 10 MuzzleSequence: muzzle - AttackFrontal: - Voice: Attack AttackMove: Voice: Attack AttackTurreted: + Voice: Attack WithMuzzleOverlay: ChangesHealth: Step: 500