death sounds for infantry

This commit is contained in:
Chris Forbes
2009-12-20 18:18:11 +13:00
parent b08e1e9350
commit effc642c04
5 changed files with 21 additions and 3 deletions

View File

@@ -11,9 +11,10 @@ namespace OpenRa.Game.GameRules
{ {
public readonly string[] SovietVariants = { ".aud" }; public readonly string[] SovietVariants = { ".aud" };
public readonly string[] AlliedVariants = { ".aud" }; public readonly string[] AlliedVariants = { ".aud" };
public readonly string[] Select = {}; public readonly string[] Select = { };
public readonly string[] Move = {}; public readonly string[] Move = { };
public readonly string[] Attack = null; public readonly string[] Attack = null;
public readonly string[] Die = { };
public readonly Lazy<Dictionary<string, VoicePool>> Pools; public readonly Lazy<Dictionary<string, VoicePool>> Pools;
@@ -25,6 +26,7 @@ namespace OpenRa.Game.GameRules
{ "Select", new VoicePool(Select) }, { "Select", new VoicePool(Select) },
{ "Move", new VoicePool(Move) }, { "Move", new VoicePool(Move) },
{ "Attack", new VoicePool( Attack ?? Move ) }, { "Attack", new VoicePool( Attack ?? Move ) },
{ "Die", new VoicePool(Die) },
}); });
} }
} }

View File

@@ -49,6 +49,12 @@ namespace OpenRa.Game
if (clip == null) if (clip == null)
return; return;
if (clip.Contains(".")) /* no variants! */
{
Play(clip);
return;
}
var variants = (voicedUnit.Owner.Race == Race.Soviet) var variants = (voicedUnit.Owner.Race == Race.Soviet)
? vi.SovietVariants : vi.AlliedVariants; ? vi.SovietVariants : vi.AlliedVariants;

View File

@@ -78,7 +78,10 @@ namespace OpenRa.Game.Traits
public void Damaged(Actor self, AttackInfo e) public void Damaged(Actor self, AttackInfo e)
{ {
if (e.DamageState == DamageState.Dead) if (e.DamageState == DamageState.Dead)
{
Sound.PlayVoice("Die", self);
Game.world.AddFrameEndTask(w => w.Add(new Corpse(self, e.Warhead.InfDeath))); Game.world.AddFrameEndTask(w => w.Add(new Corpse(self, e.Warhead.InfDeath)));
}
} }
} }
} }

View File

@@ -1,7 +1,7 @@
Ground Units: Ground Units:
All Infantry No death sounds, no idle animations All Infantry No idle animations
E1 Range is wrong. E1 Range is wrong.
E2 Grenade origin is wrong, grenades are too accurate. E2 Grenade origin is wrong, grenades are too accurate.
E3 AA weapon doesn't work. E3 AA weapon doesn't work.

View File

@@ -688,6 +688,7 @@ SovietVariants=.r01,.r03
AlliedVariants=.v01,.v03 AlliedVariants=.v01,.v03
Select=await1,ready,report1,yessir1 Select=await1,ready,report1,yessir1
Move=ackno,affirm1,noprob,overout,ritaway,roger,ugotit Move=ackno,affirm1,noprob,overout,ritaway,roger,ugotit
Die=dedman1.aud,dedman2.aud,dedman3.aud,dedman4.aud,dedman5.aud,dedman6.aud,dedman7.aud,dedman8.aud,dedman10.aud
[VehicleVoice] [VehicleVoice]
SovietVariants=.r00,.r02 SovietVariants=.r00,.r02
@@ -698,29 +699,35 @@ Move=ackno,affirm1
[EngineerVoice] [EngineerVoice]
Select=eengin1,eyessir1 Select=eengin1,eyessir1
Move=eaffirm1,emovout1 Move=eaffirm1,emovout1
Die=dedman1.aud,dedman2.aud,dedman3.aud,dedman4.aud,dedman5.aud,dedman6.aud,dedman7.aud,dedman8.aud,dedman10.aud
[MedicVoice] [MedicVoice]
Select=mrespon1,myessir1 Select=mrespon1,myessir1
Move=maffirm1,mmovout1 Move=maffirm1,mmovout1
Die=dedman1.aud,dedman2.aud,dedman3.aud,dedman4.aud,dedman5.aud,dedman6.aud,dedman7.aud,dedman8.aud,dedman10.aud
[TanyaVoice] [TanyaVoice]
Select=yo1,yes1,yeah1 Select=yo1,yes1,yeah1
Move=rokroll1,onit1,cmon1 Move=rokroll1,onit1,cmon1
Attack=tuffguy1,bombit1,gotit1 Attack=tuffguy1,bombit1,gotit1
Die=tandeth1
[DogVoice] [DogVoice]
Select= Select=
Move=dogy1 Move=dogy1
Attack=dogg5p,dogw3px Attack=dogg5p,dogw3px
Die=dogw5,dogw6,dogw7
[SpyVoice] [SpyVoice]
Select=syessir1,scomnd1 Select=syessir1,scomnd1
Move=sonway1,sindeed1 Move=sonway1,sindeed1
Attack=sking1 Attack=sking1
Die=dedman1.aud,dedman2.aud,dedman3.aud,dedman4.aud,dedman5.aud,dedman6.aud,dedman7.aud,dedman8.aud,dedman10.aud
[ThiefVoice] [ThiefVoice]
Select=swhat1,syeah1 Select=swhat1,syeah1
Move=saffirm1,smout1,sokay1 Move=saffirm1,smout1,sokay1
Die=dedman1.aud,dedman2.aud,dedman3.aud,dedman4.aud,dedman5.aud,dedman6.aud,dedman7.aud,dedman8.aud,dedman10.aud
[CivilianMaleVoice] [CivilianMaleVoice]
Select=guyyeah1 Select=guyyeah1