diff --git a/mods/cnc/audio/voices.yaml b/mods/cnc/audio/voices.yaml index b7576280b8..46eb2816fa 100644 --- a/mods/cnc/audio/voices.yaml +++ b/mods/cnc/audio/voices.yaml @@ -1,11 +1,12 @@ GenericVoice: Variants: - nod: .v01,.v03 - gdi: .v01,.v03 + nod: .v01, .v03 + gdi: .v01, .v03 Voices: - Select: await1,ready,report1,yessir1 - Action: ackno,affirm1,noprob,ritaway,roger,ugotit - Die: nuyell1,nuyell4,nuyell5,nuyell6 + Select: ackno, await1, ready, report1, yessir1 + Action: affirm1, ritaway, ugotit, roger, movout1 + Attack: affirm1, ritaway, ugotit, noprob, yessir1 + Die: nuyell1, nuyell3, nuyell4, nuyell5, nuyell6 Burned: yell1 Zapped: nuyell3 Poisoned: nuyell12 @@ -13,18 +14,19 @@ GenericVoice: VehicleVoice: Variants: - nod: .v00,.v02 - gdi: .v00,.v02 + nod: .v00, .v02 + gdi: .v00, .v02 Voices: - Select: vehic1,yessir1,report1,await1,unit1 - Action: ackno,affirm1,movout1 - Unload: movout1 + Select: vehic1, yessir1, await1, unit1, report1 + Action: ackno, affirm1, movout1 + Attack: ackno, affirm1, yessir1 + Unload: movout1, affirm1 CivilianMaleVoice: Voices: Select: guyyeah1 Action: guyokay1 - Die: nuyell1,nuyell4,nuyell5,nuyell6 + Die: nuyell1, nuyell3, nuyell4, nuyell5, nuyell6 Burned: yell1 Zapped: nuyell3 Poisoned: nuyell12 @@ -33,33 +35,31 @@ CivilianFemaleVoice: Voices: Select: girlyeah Action: girlokay - Die: nuyell1,nuyell4,nuyell5,nuyell6 + Die: nuyell1, nuyell3, nuyell4, nuyell5, nuyell6 Burned: yell1 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 + Select: mcomnd1, mhello1, myes1, mhmmm1 + Action: myesyes1, mcourse1, mthanks1, mtiber1, mplan3 + Die: nuyell1, nuyell3, nuyell4, nuyell5, nuyell6 Burned: yell1 Zapped: nuyell3 Poisoned: nuyell12 CommandoVoice: Voices: - Select: yeah1,yes1,yo1 - Move: cmon1,onit1,gotit1 - Attack: onit1,gotit1,noprblm1 + Select: yeah1, yes1, yo1 + Action: onit1, gotit1, noprblm1 Demolish: bombit1 Die: ramyell1 Burned: ramyell1 Zapped: ramyell1 Poisoned: ramyell1 - Build: rokroll1 - Kill: keepem1,laugh1,lefty1,tuffguy1 + Build: rokroll1, cmon1 + Kill: keepem1, laugh1, lefty1, tuffguy1 DinoVoice: Voices: diff --git a/mods/cnc/rules/aircraft.yaml b/mods/cnc/rules/aircraft.yaml index 0b5c8d03af..ed67c3cfab 100644 --- a/mods/cnc/rules/aircraft.yaml +++ b/mods/cnc/rules/aircraft.yaml @@ -42,6 +42,7 @@ TRAN: Cargo: Types: Infantry MaxWeight: 10 + UnloadVoice: Unload AfterUnloadDelay: 40 SpawnActorOnDeath: Actor: TRAN.Husk @@ -84,6 +85,10 @@ HELI: LocalOffset: 128,-213,-85, 128,213,-85 MuzzleSequence: muzzle PauseOnCondition: !ammo + AttackFrontal: + Voice: Attack + AttackMove: + Voice: Attack AutoTarget: ScanRadius: 4 AttackAircraft: @@ -149,6 +154,10 @@ ORCA: Weapon: OrcaAAMissiles LocalOffset: 427,-171,-213, 427,171,-213 PauseOnCondition: !ammo + AttackFrontal: + Voice: Attack + AttackMove: + Voice: Attack AutoTarget: ScanRadius: 5 AttackAircraft: diff --git a/mods/cnc/rules/infantry.yaml b/mods/cnc/rules/infantry.yaml index 67eef07300..e11fb9571a 100644 --- a/mods/cnc/rules/infantry.yaml +++ b/mods/cnc/rules/infantry.yaml @@ -22,6 +22,10 @@ E1: ScanRadius: 4 Armament: Weapon: M16 + AttackFrontal: + Voice: Attack + AttackMove: + Voice: Attack WithInfantryBody: IdleSequences: idle1,idle2,idle3,idle4 DefaultAttackSequence: shoot @@ -52,6 +56,10 @@ E2: Weapon: Grenade LocalOffset: 0,0,427 FireDelay: 15 + AttackFrontal: + Voice: Attack + AttackMove: + Voice: Attack TakeCover: ProneOffset: 300,0,-227 WithInfantryBody: @@ -87,6 +95,10 @@ E3: Weapon: Rockets LocalOffset: 256,43,341 FireDelay: 5 + AttackFrontal: + Voice: Attack + AttackMove: + Voice: Attack TakeCover: ProneOffset: 180,0,-200 WithInfantryBody: @@ -119,6 +131,10 @@ E4: LocalOffset: 341,0,256 FireDelay: 3 MuzzleSequence: muzzle + AttackFrontal: + Voice: Attack + AttackMove: + Voice: Attack TakeCover: ProneOffset: 190,0,-198 WithMuzzleOverlay: @@ -153,6 +169,10 @@ E5: LocalOffset: 341,0,256 FireDelay: 3 MuzzleSequence: muzzle + AttackFrontal: + Voice: Attack + AttackMove: + Voice: Attack TakeCover: ProneOffset: 190,0,-190 WithMuzzleOverlay: @@ -210,14 +230,10 @@ RMBO: Description: Elite sniper infantry unit.\n Strong vs Infantry, Buildings\n Weak vs Vehicles Mobile: Speed: 68 - Voice: Move - Guard: - Voice: Move Health: HP: 15000 Passenger: CustomPipType: red - Voice: Move RevealsShroud: Range: 6c0 AutoTarget: @@ -227,10 +243,6 @@ RMBO: Voice: Demolish Armament: Weapon: Sniper - AttackFrontal: - Voice: Attack - AttackMove: - Voice: Attack WithInfantryBody: DefaultAttackSequence: shoot IdleSequences: idle1,idle2,idle3 diff --git a/mods/cnc/rules/ships.yaml b/mods/cnc/rules/ships.yaml index feb59202c2..878089e184 100644 --- a/mods/cnc/rules/ships.yaml +++ b/mods/cnc/rules/ships.yaml @@ -24,6 +24,10 @@ BOAT: Armament: Weapon: BoatMissile LocalOffset: 85,-85,0, 85,85,0 + AttackFrontal: + Voice: Attack + AttackMove: + Voice: Attack AttackTDGunboatTurreted: -QuantizeFacingsFromSequence: BodyOrientation: @@ -79,6 +83,7 @@ LST: Cargo: Types: disabled MaxWeight: 5 + UnloadVoice: Unload PassengerFacing: 0 LoadingCondition: notmobile RejectsOrders: diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index 7d342a8810..b88fb6b78d 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -29,6 +29,7 @@ MCV: Facing: 432 TransformSounds: constru2.aud, hvydoor1.aud NoTransformNotification: BuildingCannotPlaceAudio + Voice: Unload MustBeDestroyed: RequiredForShortGame: true BaseBuilding: @@ -152,6 +153,10 @@ APC: RevokeDelay: 18 RevokeOnNewTarget: False RevokeAll: True + AttackFrontal: + Voice: Attack + AttackMove: + Voice: Attack AttackTurreted: WithMuzzleOverlay: WithSpriteTurret: @@ -162,6 +167,7 @@ APC: Cargo: Types: Infantry MaxWeight: 5 + UnloadVoice: Unload LoadingCondition: notmobile Explodes: Weapon: UnitExplodeBig @@ -205,6 +211,9 @@ ARTY: AttackFrontal: TargetFrozenActors: True ForceFireIgnoresActors: True + Voice: Attack + AttackMove: + Voice: Attack WithMuzzleOverlay: AutoTarget: InitialStanceAI: Defend @@ -249,6 +258,9 @@ FTNK: LocalOffset: 512,128,42, 512,-128,42 MuzzleSequence: muzzle AttackFrontal: + Voice: Attack + AttackMove: + Voice: Attack WithMuzzleOverlay: Explodes: Weapon: FlametankExplode @@ -292,6 +304,10 @@ BGGY: Weapon: MachineGun LocalOffset: 171,0,43 MuzzleSequence: muzzle + AttackFrontal: + Voice: Attack + AttackMove: + Voice: Attack AttackTurreted: WithMuzzleOverlay: WithSpriteTurret: @@ -333,6 +349,9 @@ BIKE: LocalOffset: -128, -170, 170, -128, 170, 170 LocalYaw: 100, -100 AttackFrontal: + Voice: Attack + AttackMove: + Voice: Attack SpawnActorOnDeath: Actor: BIKE.Husk OwnerType: InternalName @@ -372,6 +391,10 @@ JEEP: Weapon: MachineGunH LocalOffset: 171,0,85 MuzzleSequence: muzzle + AttackFrontal: + Voice: Attack + AttackMove: + Voice: Attack AttackTurreted: WithMuzzleOverlay: WithSpriteTurret: @@ -415,6 +438,10 @@ LTNK: RecoilRecovery: 17 LocalOffset: 720,0,90 MuzzleSequence: muzzle + AttackFrontal: + Voice: Attack + AttackMove: + Voice: Attack AttackTurreted: WithMuzzleOverlay: WithSpriteTurret: @@ -457,6 +484,10 @@ MTNK: RecoilRecovery: 26 LocalOffset: 768,0,90 MuzzleSequence: muzzle + AttackFrontal: + Voice: Attack + AttackMove: + Voice: Attack AttackTurreted: WithMuzzleOverlay: WithSpriteTurret: @@ -514,6 +545,10 @@ HTNK: LocalYaw: -100, 100 Recoil: 10 MuzzleSequence: muzzle + AttackFrontal: + Voice: Attack + AttackMove: + Voice: Attack AttackTurreted: WithMuzzleOverlay: ChangesHealth: @@ -571,6 +606,9 @@ MSAM: AttackFrontal: TargetFrozenActors: True ForceFireIgnoresActors: True + Voice: Attack + AttackMove: + Voice: Attack WithSpriteTurret: Explodes: Weapon: UnitExplodeMech @@ -685,6 +723,9 @@ STNK: Weapon: 227mm.stnkAA LocalOffset: 213,43,128, 213,-43,128 AttackFrontal: + Voice: Attack + AttackMove: + Voice: Attack AutoTarget: InitialStance: HoldFire InitialStanceAI: ReturnFire