From 225f777eaf1d35497ae1d2515f9338e37da4d41c Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sun, 5 Jun 2016 19:05:21 +0200 Subject: [PATCH] Make Cyborgs explode regardless of death type Also split out death-related traits of all non-cyborg infantry to a separate inheritable default. --- mods/ts/audio/voices.yaml | 8 +-- mods/ts/rules/civilian-infantry.yaml | 3 +- mods/ts/rules/defaults.yaml | 95 ++++++++++++++-------------- mods/ts/rules/nod-infantry.yaml | 8 --- mods/ts/sequences/infantry.yaml | 14 ---- mods/ts/weapons/explosions.yaml | 5 ++ 6 files changed, 58 insertions(+), 75 deletions(-) diff --git a/mods/ts/audio/voices.yaml b/mods/ts/audio/voices.yaml index 2cda082ea7..28f43391ef 100644 --- a/mods/ts/audio/voices.yaml +++ b/mods/ts/audio/voices.yaml @@ -98,18 +98,14 @@ Cyborg: Select: 22-i000, 22-i002, 22-i006 Move: 22-i008, 22-i010, 22-i014, 22-i016, 22-i020 Attack: 22-i008, 22-i010, 22-i012, 22-i018 - Die: 22-n104, 22-n108 - Burned: 22-n106 - Zapped: electro1 + Die: 22-n104, 22-n106, 22-n108 CyborgCommando: Voices: Select: 23-i000, 23-i002, 23-i004, 23-i006 Move: 23-i008, 23-i010, 23-i012, 23-i016 Attack: 23-i014, 23-i018, 23-i020, 23-i022 - Die: 22-n104, 22-n108 - Burned: 22-n106 - Zapped: electro1 + Die: 22-n104, 22-n106, 22-n108 Mutant: Voices: diff --git a/mods/ts/rules/civilian-infantry.yaml b/mods/ts/rules/civilian-infantry.yaml index 0d719f1e9c..8512cba967 100644 --- a/mods/ts/rules/civilian-infantry.yaml +++ b/mods/ts/rules/civilian-infantry.yaml @@ -211,7 +211,8 @@ SLAV: AttackSequence: attack DOGGIE: - Inherits: ^Infantry + Inherits@1: ^Infantry + Inherits@2: ^RegularInfantryDeath Tooltip: Name: Tiberian Fiend Health: diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index a438ff4887..47982db07d 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -274,24 +274,6 @@ QuantizeFacingsFromSequence: Sequence: stand WithInfantryBody: - WithDeathAnimation@normal: - DeathTypes: - BulletDeath: 1 - SmallExplosionDeath: 2 - HeadshotDeath: 3 - SpawnActorOnDeath@FLAMEGUY: - Actor: FLAMEGUY - DeathType: FireDeath - WithDeathAnimation@explosion: - DeathSequencePalette: effect - DeathPaletteIsPlayerPalette: False - DeathTypes: - ExplosionDeath: 4 - WithDeathAnimation@energy: - DeathSequencePalette: ra - DeathPaletteIsPlayerPalette: False - DeathTypes: - EnergyDeath: 6 AutoTarget: AttackMove: Voice: Move @@ -300,27 +282,10 @@ Voice: Move HiddenUnderFog: ActorLostNotification: - Crushable: - CrushSound: squish6.aud PoisonedByTiberium: - SpawnActorOnDeath: - Actor: visc_sml - Probability: 10 - OwnerType: InternalName - InternalOwner: Creeps - DeathType: EnergyDeath # TODO: FIX ME! (Tiberium currently uses the wrong damage type!) - RequiresLobbyCreeps: true Guard: Voice: Move Guardable: - DeathSounds@NORMAL: - DeathTypes: BulletDeath, SmallExplosionDeath, ExplosionDeath - DeathSounds@BURNED: - Voice: Burned - DeathTypes: FireDeath - DeathSounds@ZAPPED: - Voice: Zapped - DeathTypes: EnergyDeath SelfHealing@HOSPITAL: Step: 5 Delay: 100 @@ -339,8 +304,50 @@ UpgradeTypes: hospitalheal UpgradeMinEnabledLevel: 1 +^RegularInfantryDeath: + WithDeathAnimation@normal: + DeathTypes: + BulletDeath: 1 + SmallExplosionDeath: 2 + HeadshotDeath: 3 + WithDeathAnimation@explosion: + DeathSequencePalette: effect + DeathPaletteIsPlayerPalette: False + DeathTypes: + ExplosionDeath: 4 + WithDeathAnimation@energy: + DeathSequencePalette: ra + DeathPaletteIsPlayerPalette: False + DeathTypes: + EnergyDeath: 6 + WithDeathAnimation: + CrushedSequence: die-crushed + CrushedSequencePalette: player + CrushedPaletteIsPlayerPalette: true + DeathSounds@NORMAL: + DeathTypes: BulletDeath, SmallExplosionDeath, ExplosionDeath, HeadshotDeath + DeathSounds@BURNED: + Voice: Burned + DeathTypes: FireDeath + DeathSounds@ZAPPED: + Voice: Zapped + DeathTypes: EnergyDeath + Crushable: + CrushSound: squish6.aud + SpawnActorOnDeath: + Actor: visc_sml + Probability: 10 + OwnerType: InternalName + InternalOwner: Creeps + DeathType: EnergyDeath # TODO: FIX ME! (Tiberium currently uses the wrong damage type!) + RequiresLobbyCreeps: true + SpawnActorOnDeath@FLAMEGUY: + Actor: FLAMEGUY + DeathType: FireDeath + ^Soldier: - Inherits: ^Infantry + Inherits@1: ^Infantry + Inherits@2: ^RegularInfantryDeath RevealsShroud: Range: 4c0 MustBeDestroyed: @@ -354,18 +361,17 @@ DamageTriggers: TriggerProne WithInfantryBody: IdleSequences: idle1,idle2 - WithDeathAnimation: - CrushedSequence: die-crushed - CrushedSequencePalette: player - CrushedPaletteIsPlayerPalette: true ^Cyborg: Inherits@1: ^Infantry Inherits@2: ^EmpDisableMobile + Explodes: + Weapon: CyborgExplode + EmptyWeapon: CyborgExplode + DeathSounds: RevealsShroud: Range: 4c0 MustBeDestroyed: - -Crushable: PoisonedByTiberium: Weapon: TiberiumHeal WithPermanentInjury: @@ -380,16 +386,13 @@ Modifier: 50 ^CivilianInfantry: - Inherits: ^Infantry + Inherits@1: ^Infantry + Inherits@2: ^RegularInfantryDeath Voiced: VoiceSet: Civilian Tooltip: Name: Civilian ScaredyCat: - WithDeathAnimation: - CrushedSequence: die-crushed - CrushedSequencePalette: player - CrushedPaletteIsPlayerPalette: true ^Vehicle: Inherits@1: ^GainsExperience diff --git a/mods/ts/rules/nod-infantry.yaml b/mods/ts/rules/nod-infantry.yaml index 62a2494791..59fc9cd028 100644 --- a/mods/ts/rules/nod-infantry.yaml +++ b/mods/ts/rules/nod-infantry.yaml @@ -57,10 +57,6 @@ CYBORG: VisualBounds: 16,31,0,-10 ProducibleWithLevel: Prerequisites: barracks.upgraded - -SpawnActorOnDeath@FLAMEGUY: - WithDeathAnimation@explosion: - DeathTypes: - FireDeath: 4 CYC2: Inherits: ^Cyborg @@ -96,10 +92,6 @@ CYC2: VisualBounds: 16,32,-1,-12 ProducibleWithLevel: Prerequisites: barracks.upgraded - -SpawnActorOnDeath@FLAMEGUY: - WithDeathAnimation@explosion: - DeathTypes: - FireDeath: 4 MHIJACK: Inherits: ^Soldier diff --git a/mods/ts/sequences/infantry.yaml b/mods/ts/sequences/infantry.yaml index 076e07f3c5..fbff677e46 100644 --- a/mods/ts/sequences/infantry.yaml +++ b/mods/ts/sequences/infantry.yaml @@ -255,18 +255,6 @@ cyc2: Facings: 8 Stride: 9 ShadowStart: 418 - die1: - Start: 182 - Length: 15 - ShadowStart: 490 - die2: - Start: 197 - Length: 15 - ShadowStart: 505 - die3: infexpl - Length: * - die4: s_bang34 - Length: * attack: Start: 212 Length: 6 @@ -277,8 +265,6 @@ cyc2: Length: 6 Facings: 8 ShadowStart: 568 - die6: electro - Length: * emp-overlay: emp_fx01 Length: * ZOffset: 512 diff --git a/mods/ts/weapons/explosions.yaml b/mods/ts/weapons/explosions.yaml index 832a676e89..f51b23ca8e 100644 --- a/mods/ts/weapons/explosions.yaml +++ b/mods/ts/weapons/explosions.yaml @@ -27,6 +27,11 @@ UnitExplodeSmall: Explosions: medium_brnl ImpactSounds: expnew13.aud +CyborgExplode: + Warhead@1Eff: CreateEffect + Explosions: medium_bang + ImpactSounds: expnew10.aud + TiberiumExplosion: Warhead@1Dam: SpreadDamage Spread: 9