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 934eb59b09..e92d052f30 100644 --- a/mods/cnc/rules/civilian.yaml +++ b/mods/cnc/rules/civilian.yaml @@ -456,45 +456,67 @@ BRIDGEHUT: C1: Inherits: ^CivInfantry - Voiced: - VoiceSet: CivilianMaleVoice + Inherits@armed: ^ArmedCivilian C2: Inherits: ^CivInfantry - Voiced: - VoiceSet: CivilianFemaleVoice + 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 - Voiced: - VoiceSet: CivilianFemaleVoice + Inherits@armed: ^ArmedCivilian C7: Inherits: ^CivInfantry + Inherits@armed: ^ArmedCivilian C8: Inherits: ^CivInfantry - Voiced: - VoiceSet: CivilianFemaleVoice + Inherits@armed: ^ArmedCivilian C9: Inherits: ^CivInfantry + Inherits@armed: ^ArmedCivilian 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: CivilianFemaleVoice + VoiceSet: MoebiusVoice + Tooltip: + Name: Dr. Moebius 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 diff --git a/mods/cnc/sequences/civilian.yaml b/mods/cnc/sequences/civilian.yaml index 1953a6d64b..afc9a36d21 100644 --- a/mods/cnc/sequences/civilian.yaml +++ b/mods/cnc/sequences/civilian.yaml @@ -51,375 +51,44 @@ 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: + Inherits: c1 + +c10: + Inherits: c1 + +delphi: + Inherits: c1 + +moebius: + Defaults: + Tick: 80 stand: Facings: 8 panic-stand: Start: 8 - Length: 6 + Length: 1 + Stride: 6 Facings: 8 panic-run: Start: 8 @@ -429,92 +98,31 @@ c9: Start: 56 Length: 6 Facings: 8 - shoot: - Start: 205 - Length: 4 - Facings: 8 - cheer: - Start: 200 - Length: 3 - Facings: 8 - Tick: 120 + idle1: + Start: 104 + Length: 15 die1: - Start: 329 + Start: 212 Length: 8 - Tick: 80 die2: - Start: 337 + Start: 220 Length: 8 - Tick: 80 die3: - Start: 337 + Start: 220 Length: 8 - Tick: 80 die4: - Start: 345 + Start: 228 Length: 12 - Tick: 80 die5: - Start: 357 - Length: 18 - Tick: 80 + Start: 240 + Length: 17 die6: - Start: 182 - Length: 4 - Tick: 80 + Start: 214 + Length: 3 die-crushed: e1rot Start: 16 Length: 4 Tick: 1600 -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 + +chan: + Inherits: moebius