From 48babec519a785bd6cd6ffe0745082d05cfc4422 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 18 Oct 2015 03:23:05 +0200 Subject: [PATCH] Use aggregate sequences for all TD flame/chem muzzles --- mods/cnc/rules/defaults.yaml | 2 - mods/cnc/rules/infantry.yaml | 2 - mods/cnc/rules/vehicles.yaml | 2 - mods/cnc/sequences/infantry.yaml | 156 +++++++++++++++++-------------- mods/cnc/sequences/vehicles.yaml | 52 ++++++----- 5 files changed, 112 insertions(+), 102 deletions(-) diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 5cddb1a5b5..c76fcedc1c 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -372,14 +372,12 @@ Weapon: Chemspray LocalOffset: 384,0,0 MuzzleSequence: muzzle - MuzzleSplitFacings: 8 AttackFrontal: Voice: Attack BodyOrientation: QuantizedFacings: 8 WithSpriteBody: WithMuzzleOverlay: - SplitFacings: true Guard: Voice: Move Guardable: diff --git a/mods/cnc/rules/infantry.yaml b/mods/cnc/rules/infantry.yaml index 95fc843c42..b8cda2fe61 100644 --- a/mods/cnc/rules/infantry.yaml +++ b/mods/cnc/rules/infantry.yaml @@ -120,10 +120,8 @@ E5: LocalOffset: 341,0,256 FireDelay: 3 MuzzleSequence: muzzle - MuzzleSplitFacings: 8 AttackFrontal: WithMuzzleOverlay: - SplitFacings: true -PoisonedByTiberium: WithInfantryBody: AttackSequence: shoot diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index 5a98afecd8..c03cc58cc4 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -182,11 +182,9 @@ FTNK: Weapon: BigFlamer LocalOffset: 512,128,42, 512,-128,42 MuzzleSequence: muzzle - MuzzleSplitFacings: 8 AttackFrontal: AutoTarget: WithMuzzleOverlay: - SplitFacings: true Explodes: Weapon: FlametankExplode EmptyWeapon: FlametankExplode diff --git a/mods/cnc/sequences/infantry.yaml b/mods/cnc/sequences/infantry.yaml index aef7ce65b1..29f5519e77 100644 --- a/mods/cnc/sequences/infantry.yaml +++ b/mods/cnc/sequences/infantry.yaml @@ -1,59 +1,67 @@ vice: idle: Length: * - muzzle0: chem-n - Length: * - Offset: 3,4 - muzzle1: chem-nw - Length: * - Offset: 4,1 - muzzle2: chem-w - Length: * - Offset: 7,-3 - muzzle3: chem-sw - Length: * - Offset: 3,-6 - muzzle4: chem-s - Length: * - Offset: 1,-6 - muzzle5: chem-se - Length: * - Offset: -3,-5 - muzzle6: chem-e - Length: * - Offset: -6,-3 - muzzle7: chem-ne - Length: * - Offset: -1,0 + muzzle: + Combine: + chem-n: + Length: * + Offset: 1,2 + chem-nw: + Length: * + Offset: 8,2 + chem-w: + Length: * + Offset: 8,-3 + chem-sw: + Length: * + Offset: 7,-6 + chem-s: + Length: * + Offset: 1,-6 + chem-se: + Length: * + Offset: -5,-6 + chem-e: + Length: * + Offset: -7,-3 + chem-ne: + Length: * + Offset: -3,2 + Facings: 8 + Length: 13 icon: viceicnh pvice: idle: Length: * - muzzle0: chem-n - Length: * - Offset: 3,4 - muzzle1: chem-nw - Length: * - Offset: 4,1 - muzzle2: chem-w - Length: * - Offset: 7,-3 - muzzle3: chem-sw - Length: * - Offset: 3,-6 - muzzle4: chem-s - Length: * - Offset: 1,-6 - muzzle5: chem-se - Length: * - Offset: -3,-5 - muzzle6: chem-e - Length: * - Offset: -6,-3 - muzzle7: chem-ne - Length: * - Offset: -1,0 + muzzle: + Combine: + chem-n: + Length: * + Offset: 1,2 + chem-nw: + Length: * + Offset: 8,2 + chem-w: + Length: * + Offset: 8,-3 + chem-sw: + Length: * + Offset: 7,-6 + chem-s: + Length: * + Offset: 1,-6 + chem-se: + Length: * + Offset: -5,-6 + chem-e: + Length: * + Offset: -7,-3 + chem-ne: + Length: * + Offset: -3,2 + Facings: 8 + Length: 13 icon: viceicnh e1: @@ -555,30 +563,34 @@ e5: Length: 4 Tick: 1600 ZOffset: -511 - muzzle0: chem-n - Length: * - Offset: 1,2 - muzzle1: chem-nw - Length: * - Offset: 8,2 - muzzle2: chem-w - Length: * - Offset: 8,-3 - muzzle3: chem-sw - Length: * - Offset: 7,-6 - muzzle4: chem-s - Length: * - Offset: 1,-6 - muzzle5: chem-se - Length: * - Offset: -5,-6 - muzzle6: chem-e - Length: * - Offset: -7,-3 - muzzle7: chem-ne - Length: * - Offset: -3,2 + muzzle: + Combine: + chem-n: + Length: * + Offset: 1,2 + chem-nw: + Length: * + Offset: 8,2 + chem-w: + Length: * + Offset: 8,-3 + chem-sw: + Length: * + Offset: 7,-6 + chem-s: + Length: * + Offset: 1,-6 + chem-se: + Length: * + Offset: -5,-6 + chem-e: + Length: * + Offset: -7,-3 + chem-ne: + Length: * + Offset: -3,2 + Facings: 8 + Length: 13 icon: e5icnh.tem AddExtension: False diff --git a/mods/cnc/sequences/vehicles.yaml b/mods/cnc/sequences/vehicles.yaml index 237ff9b6f1..7b6cd1a98a 100644 --- a/mods/cnc/sequences/vehicles.yaml +++ b/mods/cnc/sequences/vehicles.yaml @@ -145,30 +145,34 @@ bike.destroyed: ftnk: idle: Facings: 32 - muzzle0: flame-n - Length: * - Offset: 3,8 - muzzle1: flame-nw - Length: * - Offset: 4,6 - muzzle2: flame-w - Length: * - Offset: 7,2 - muzzle3: flame-sw - Length: * - Offset: 3,-2 - muzzle4: flame-s - Length: * - Offset: 1,-2 - muzzle5: flame-se - Length: * - Offset: -3,-1 - muzzle6: flame-e - Length: * - Offset: -6,2 - muzzle7: flame-ne - Length: * - Offset: -5,6 + muzzle: + Combine: + flame-n: + Length: * + Offset: 3,6 + flame-nw: + Length: * + Offset: 8,7 + flame-w: + Length: * + Offset: 8,2 + flame-sw: + Length: * + Offset: 7,-2 + flame-s: + Length: * + Offset: 3,-2 + flame-se: + Length: * + Offset: -5,-2 + flame-e: + Length: * + Offset: -7,2 + flame-ne: + Length: * + Offset: -7,8 + Facings: 8 + Length: 13 icon: ftnkicnh.tem AddExtension: False