From 37c0feb2e890af7522ddad5973dfb93d3048885c Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 4 Jun 2016 20:58:32 +0200 Subject: [PATCH 1/4] Clean up TD civilian sequences --- mods/cnc/sequences/civilian.yaml | 476 ++----------------------------- 1 file changed, 17 insertions(+), 459 deletions(-) diff --git a/mods/cnc/sequences/civilian.yaml b/mods/cnc/sequences/civilian.yaml index 1953a6d64b..cad93871c3 100644 --- a/mods/cnc/sequences/civilian.yaml +++ b/mods/cnc/sequences/civilian.yaml @@ -51,470 +51,28 @@ c1: Length: 4 Tick: 1600 c2: - stand: - Facings: 8 - panic-stand: - Start: 8 - Length: 6 - Facings: 8 - panic-run: - Start: 8 - Length: 6 - Facings: 8 - run: - Start: 56 - Length: 6 - Facings: 8 - shoot: - Start: 205 - Length: 4 - Facings: 8 - cheer: - Start: 200 - Length: 3 - Facings: 8 - Tick: 120 - die1: - Start: 329 - Length: 8 - Tick: 80 - die2: - Start: 337 - Length: 8 - Tick: 80 - die3: - Start: 337 - Length: 8 - Tick: 80 - die4: - Start: 345 - Length: 12 - Tick: 80 - die5: - Start: 357 - Length: 18 - Tick: 80 - die6: - Start: 182 - Length: 4 - Tick: 80 - die-crushed: e1rot - Start: 16 - Length: 4 - Tick: 1600 + Inherits: c1 + c3: - stand: - Facings: 8 - panic-stand: - Start: 8 - Length: 6 - Facings: 8 - panic-run: - Start: 8 - Length: 6 - Facings: 8 - run: - Start: 56 - Length: 6 - Facings: 8 - shoot: - Start: 205 - Length: 4 - Facings: 8 - cheer: - Start: 200 - Length: 3 - Facings: 8 - Tick: 120 - die1: - Start: 329 - Length: 8 - Tick: 80 - die2: - Start: 337 - Length: 8 - Tick: 80 - die3: - Start: 337 - Length: 8 - Tick: 80 - die4: - Start: 345 - Length: 12 - Tick: 80 - die5: - Start: 357 - Length: 18 - Tick: 80 - die6: - Start: 182 - Length: 4 - Tick: 80 - die-crushed: e1rot - Start: 16 - Length: 4 - Tick: 1600 + Inherits: c1 + c4: - stand: - Facings: 8 - panic-stand: - Start: 8 - Length: 6 - Facings: 8 - panic-run: - Start: 8 - Length: 6 - Facings: 8 - run: - Start: 56 - Length: 6 - Facings: 8 - shoot: - Start: 205 - Length: 4 - Facings: 8 - cheer: - Start: 200 - Length: 3 - Facings: 8 - Tick: 120 - die1: - Start: 329 - Length: 8 - Tick: 80 - die2: - Start: 337 - Length: 8 - Tick: 80 - die3: - Start: 337 - Length: 8 - Tick: 80 - die4: - Start: 345 - Length: 12 - Tick: 80 - die5: - Start: 357 - Length: 18 - Tick: 80 - die6: - Start: 182 - Length: 4 - Tick: 80 - die-crushed: e1rot - Start: 16 - Length: 4 - Tick: 1600 + Inherits: c1 + c5: - stand: - Facings: 8 - panic-stand: - Start: 8 - Length: 6 - Facings: 8 - panic-run: - Start: 8 - Length: 6 - Facings: 8 - run: - Start: 56 - Length: 6 - Facings: 8 - shoot: - Start: 205 - Length: 4 - Facings: 8 - cheer: - Start: 200 - Length: 3 - Facings: 8 - Tick: 120 - die1: - Start: 329 - Length: 8 - Tick: 80 - die2: - Start: 337 - Length: 8 - Tick: 80 - die3: - Start: 337 - Length: 8 - Tick: 80 - die4: - Start: 345 - Length: 12 - Tick: 80 - die5: - Start: 357 - Length: 18 - Tick: 80 - die6: - Start: 182 - Length: 4 - Tick: 80 - die-crushed: e1rot - Start: 16 - Length: 4 - Tick: 1600 + Inherits: c1 + c6: - stand: - Facings: 8 - panic-stand: - Start: 8 - Length: 6 - Facings: 8 - prone-run: - Start: 8 - Length: 6 - Facings: 8 - run: - Start: 56 - Length: 6 - Facings: 8 - shoot: - Start: 205 - Length: 4 - Facings: 8 - cheer: - Start: 200 - Length: 3 - Facings: 8 - Tick: 120 - die1: - Start: 329 - Length: 8 - Tick: 80 - die2: - Start: 337 - Length: 8 - Tick: 80 - die3: - Start: 337 - Length: 8 - Tick: 80 - die4: - Start: 345 - Length: 12 - Tick: 80 - die5: - Start: 357 - Length: 18 - Tick: 80 - die6: - Start: 182 - Length: 4 - Tick: 80 - die-crushed: e1rot - Start: 16 - Length: 4 - Tick: 1600 + Inherits: c1 + c7: - stand: - Facings: 8 - panic-stand: - Start: 8 - Length: 6 - Facings: 8 - panic-run: - Start: 8 - Length: 6 - Facings: 8 - run: - Start: 56 - Length: 6 - Facings: 8 - shoot: - Start: 205 - Length: 4 - Facings: 8 - cheer: - Start: 200 - Length: 3 - Facings: 8 - Tick: 120 - die1: - Start: 329 - Length: 8 - Tick: 80 - die2: - Start: 337 - Length: 8 - Tick: 80 - die3: - Start: 337 - Length: 8 - Tick: 80 - die4: - Start: 345 - Length: 12 - Tick: 80 - die5: - Start: 357 - Length: 18 - Tick: 80 - die6: - Start: 182 - Length: 4 - Tick: 80 - die-crushed: e1rot - Start: 16 - Length: 4 - Tick: 1600 + Inherits: c1 + c8: - stand: - Facings: 8 - panic-stand: - Start: 8 - Length: 6 - Facings: 8 - panic-run: - Start: 8 - Length: 6 - Facings: 8 - run: - Start: 56 - Length: 6 - Facings: 8 - shoot: - Start: 205 - Length: 4 - Facings: 8 - cheer: - Start: 200 - Length: 3 - Facings: 8 - Tick: 120 - die1: - Start: 329 - Length: 8 - Tick: 80 - die2: - Start: 337 - Length: 8 - Tick: 80 - die3: - Start: 337 - Length: 8 - Tick: 80 - die4: - Start: 345 - Length: 12 - Tick: 80 - die5: - Start: 357 - Length: 18 - Tick: 80 - die6: - Start: 182 - Length: 4 - Tick: 80 - die-crushed: e1rot - Start: 16 - Length: 4 - Tick: 1600 + Inherits: c1 + c9: - stand: - Facings: 8 - panic-stand: - Start: 8 - Length: 6 - Facings: 8 - panic-run: - Start: 8 - Length: 6 - Facings: 8 - run: - Start: 56 - Length: 6 - Facings: 8 - shoot: - Start: 205 - Length: 4 - Facings: 8 - cheer: - Start: 200 - Length: 3 - Facings: 8 - Tick: 120 - die1: - Start: 329 - Length: 8 - Tick: 80 - die2: - Start: 337 - Length: 8 - Tick: 80 - die3: - Start: 337 - Length: 8 - Tick: 80 - die4: - Start: 345 - Length: 12 - Tick: 80 - die5: - Start: 357 - Length: 18 - Tick: 80 - die6: - Start: 182 - Length: 4 - Tick: 80 - die-crushed: e1rot - Start: 16 - Length: 4 - Tick: 1600 + Inherits: c1 + c10: - stand: - Facings: 8 - panic-stand: - Start: 8 - Length: 6 - Facings: 8 - panic-run: - Start: 8 - Length: 6 - Facings: 8 - run: - Start: 56 - Length: 6 - Facings: 8 - shoot: - Start: 205 - Length: 4 - Facings: 8 - cheer: - Start: 200 - Length: 3 - Facings: 8 - Tick: 120 - die1: - Start: 329 - Length: 8 - Tick: 80 - die2: - Start: 337 - Length: 8 - Tick: 80 - die3: - Start: 337 - Length: 8 - Tick: 80 - die4: - Start: 345 - Length: 12 - Tick: 80 - die5: - Start: 357 - Length: 18 - Tick: 80 - die6: - Start: 182 - Length: 4 - Tick: 80 - die-crushed: e1rot - Start: 16 - Length: 4 - Tick: 1600 \ No newline at end of file + Inherits: c1 From 5c23dad2e383eddaca2ac0a4757ec56ab6bba63d Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 4 Jun 2016 21:10:55 +0200 Subject: [PATCH 2/4] Fix civilian voices in TD Only civilians 3, 4 and 5 are females. --- mods/cnc/rules/civilian.yaml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/mods/cnc/rules/civilian.yaml b/mods/cnc/rules/civilian.yaml index 934eb59b09..a9935411c6 100644 --- a/mods/cnc/rules/civilian.yaml +++ b/mods/cnc/rules/civilian.yaml @@ -456,16 +456,14 @@ BRIDGEHUT: C1: Inherits: ^CivInfantry - Voiced: - VoiceSet: CivilianMaleVoice C2: Inherits: ^CivInfantry - Voiced: - VoiceSet: CivilianFemaleVoice C3: Inherits: ^CivInfantry + Voiced: + VoiceSet: CivilianFemaleVoice C4: Inherits: ^CivInfantry @@ -474,27 +472,23 @@ C4: C5: Inherits: ^CivInfantry + Voiced: + VoiceSet: CivilianFemaleVoice C6: Inherits: ^CivInfantry - Voiced: - VoiceSet: CivilianFemaleVoice C7: Inherits: ^CivInfantry C8: Inherits: ^CivInfantry - Voiced: - VoiceSet: CivilianFemaleVoice C9: Inherits: ^CivInfantry C10: Inherits: ^CivInfantry - Voiced: - VoiceSet: CivilianFemaleVoice VICE: Inherits: ^Viceroid From e9428ddab57bde71114b03849a5b790533a389e8 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 4 Jun 2016 21:29:06 +0200 Subject: [PATCH 3/4] Move TD civ attack traits to separate default To avoid having to disable several traits for unarmed civilians. --- mods/cnc/rules/civilian.yaml | 10 ++++++++++ mods/cnc/rules/defaults.yaml | 8 +++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/mods/cnc/rules/civilian.yaml b/mods/cnc/rules/civilian.yaml index a9935411c6..910f75af16 100644 --- a/mods/cnc/rules/civilian.yaml +++ b/mods/cnc/rules/civilian.yaml @@ -456,39 +456,49 @@ BRIDGEHUT: C1: Inherits: ^CivInfantry + Inherits@armed: ^ArmedCivilian C2: Inherits: ^CivInfantry + Inherits@armed: ^ArmedCivilian C3: Inherits: ^CivInfantry + Inherits@armed: ^ArmedCivilian Voiced: VoiceSet: CivilianFemaleVoice C4: Inherits: ^CivInfantry + Inherits@armed: ^ArmedCivilian Voiced: VoiceSet: CivilianFemaleVoice C5: Inherits: ^CivInfantry + Inherits@armed: ^ArmedCivilian Voiced: VoiceSet: CivilianFemaleVoice C6: Inherits: ^CivInfantry + Inherits@armed: ^ArmedCivilian C7: Inherits: ^CivInfantry + Inherits@armed: ^ArmedCivilian C8: Inherits: ^CivInfantry + Inherits@armed: ^ArmedCivilian C9: Inherits: ^CivInfantry + Inherits@armed: ^ArmedCivilian C10: Inherits: ^CivInfantry + Inherits@armed: ^ArmedCivilian VICE: Inherits: ^Viceroid diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index e516665f32..10a23a9828 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -291,9 +291,6 @@ HP: 25 RevealsShroud: Range: 2c0 - Armament: - Weapon: Pistol - AttackFrontal: ActorLostNotification: Notification: CivilianKilled NotifyAll: true @@ -302,6 +299,11 @@ CrushSound: squish2.aud Voiced: VoiceSet: CivilianMaleVoice + +^ArmedCivilian: + Armament: + Weapon: Pistol + AttackFrontal: WithInfantryBody: AttackSequence: shoot From adc76638e57a6eb32b1f1a0dfd9765f73cefffcd Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 4 Jun 2016 21:14:36 +0200 Subject: [PATCH 4/4] Add Delphi, Chan and Moebius to TD --- mods/cnc/audio/voices.yaml | 10 +++++++ mods/cnc/rules/civilian.yaml | 18 ++++++++++++ mods/cnc/sequences/civilian.yaml | 50 ++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+) diff --git a/mods/cnc/audio/voices.yaml b/mods/cnc/audio/voices.yaml index 747163cc81..b7576280b8 100644 --- a/mods/cnc/audio/voices.yaml +++ b/mods/cnc/audio/voices.yaml @@ -38,6 +38,16 @@ CivilianFemaleVoice: Zapped: nuyell3 Poisoned: nuyell12 +MoebiusVoice: + Voices: + Select: mcomnd1,mhello1,myes1,mhmmm1,mthanks1 + Move: myesyes1,mplan3,mtiber1,mcourse1 + Action: myesyes1,mplan3,mtiber1,mcourse1 + Die: nuyell1,nuyell4,nuyell5,nuyell6 + Burned: yell1 + Zapped: nuyell3 + Poisoned: nuyell12 + CommandoVoice: Voices: Select: yeah1,yes1,yo1 diff --git a/mods/cnc/rules/civilian.yaml b/mods/cnc/rules/civilian.yaml index 910f75af16..e92d052f30 100644 --- a/mods/cnc/rules/civilian.yaml +++ b/mods/cnc/rules/civilian.yaml @@ -500,6 +500,24 @@ C10: Inherits: ^CivInfantry Inherits@armed: ^ArmedCivilian +DELPHI: + Inherits: ^CivInfantry + Inherits@armed: ^ArmedCivilian + Tooltip: + Name: Agent Delphi + +CHAN: + Inherits: ^CivInfantry + Tooltip: + Name: Dr. Chan + +MOEBIUS: + Inherits: ^CivInfantry + Voiced: + VoiceSet: MoebiusVoice + Tooltip: + Name: Dr. Moebius + VICE: Inherits: ^Viceroid AttackWander: diff --git a/mods/cnc/sequences/civilian.yaml b/mods/cnc/sequences/civilian.yaml index cad93871c3..afc9a36d21 100644 --- a/mods/cnc/sequences/civilian.yaml +++ b/mods/cnc/sequences/civilian.yaml @@ -76,3 +76,53 @@ c9: c10: Inherits: c1 + +delphi: + Inherits: c1 + +moebius: + Defaults: + Tick: 80 + stand: + Facings: 8 + panic-stand: + Start: 8 + Length: 1 + Stride: 6 + Facings: 8 + panic-run: + Start: 8 + Length: 6 + Facings: 8 + run: + Start: 56 + Length: 6 + Facings: 8 + idle1: + Start: 104 + Length: 15 + die1: + Start: 212 + Length: 8 + die2: + Start: 220 + Length: 8 + die3: + Start: 220 + Length: 8 + die4: + Start: 228 + Length: 12 + die5: + Start: 240 + Length: 17 + die6: + Start: 214 + Length: 3 + die-crushed: e1rot + Start: 16 + Length: 4 + Tick: 1600 + +chan: + Inherits: moebius