diff --git a/OpenRA.Mods.RA/C4Demolition.cs b/OpenRA.Mods.RA/C4Demolition.cs index 1c386410ff..3760ec3a19 100644 --- a/OpenRA.Mods.RA/C4Demolition.cs +++ b/OpenRA.Mods.RA/C4Demolition.cs @@ -30,6 +30,8 @@ namespace OpenRA.Mods.RA public readonly int FlashInterval = 4; [Desc("Duration of each flash")] public readonly int FlashDuration = 3; + [Desc("Voice string when planting explosive charges.")] + public readonly string Voice = "Attack"; public object Create(ActorInitializer init) { return new C4Demolition(this); } } @@ -82,7 +84,7 @@ namespace OpenRA.Mods.RA public string VoicePhraseForOrder(Actor self, Order order) { - return order.OrderString == "C4" ? "Attack" : null; + return order.OrderString == "C4" ? info.Voice : null; } class C4DemolitionOrderTargeter : UnitOrderTargeter diff --git a/mods/ra/maps/desert-shellmap/map.yaml b/mods/ra/maps/desert-shellmap/map.yaml index 711f967fa9..20e421c712 100644 --- a/mods/ra/maps/desert-shellmap/map.yaml +++ b/mods/ra/maps/desert-shellmap/map.yaml @@ -1338,6 +1338,8 @@ Rules: Percentage: 0 InvulnerabilityUpgrade@UNKILLABLE: RequiresUpgrade: unkillable + E7: + -Selectable: Sequences: diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index c96304ea82..67a182d115 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -250,6 +250,7 @@ E7: Range: 6c0 C4Demolition: C4Delay: 45 + Voice: Demolish Passenger: PipType: Red Armament@PRIMARY: @@ -264,6 +265,8 @@ E7: TakeCover: RenderInfantry: IdleAnimations: idle1,idle2 + AnnounceOnBuild: + AnnounceOnKill: MEDI: Inherits: ^Infantry diff --git a/mods/ra/voices.yaml b/mods/ra/voices.yaml index 3adc13e76d..39d5ebd718 100644 --- a/mods/ra/voices.yaml +++ b/mods/ra/voices.yaml @@ -46,11 +46,14 @@ MechanicVoice: TanyaVoice: Voices: Select: yo1,yes1,yeah1 - Move: rokroll1,onit1,cmon1 - Attack: tuffguy1,bombit1,gotit1 + Move: onit1,cmon1,rokroll1 + Attack: tuffguy1,bombit1 Die: tandeth1 Burned: tandeth1 Zapped: tandeth1 + Build: laugh1 + Kill: gotit1,lefty1 + Demolish: keepem1,tuffguy1 DogVoice: Voices: