epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change SoundOnDamageTransition to randomly select

Browse Source 
from a string[] instead of a single string.
This commit is contained in:
Taryn Hill
2015-03-11 09:29:21 -05:00
parent 32edeccb56
commit 1e0612ddf0
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Mods.Common/Traits/Sound/SoundOnDamageTransition.cs
View File

@@ -8,14 +8,18 @@
*/ */
#endregion #endregion
using OpenRA.Support;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
{ {
public class SoundOnDamageTransitionInfo : ITraitInfo public class SoundOnDamageTransitionInfo : ITraitInfo
{ {
public readonly string DamagedSound; [Desc("Play a random sound from this list when damaged.")]
public readonly string DestroyedSound; public readonly string[] DamagedSounds = { };
[Desc("Play a random sound from this list when destroyed.")]
public readonly string[] DestroyedSounds = { };
public object Create(ActorInitializer init) { return new SoundOnDamageTransition(this); } public object Create(ActorInitializer init) { return new SoundOnDamageTransition(this); }
} }
@@ -31,10 +35,18 @@ namespace OpenRA.Mods.Common.Traits
public void DamageStateChanged(Actor self, AttackInfo e) public void DamageStateChanged(Actor self, AttackInfo e)
{ {
var rand = Game.CosmeticRandom;
if (e.DamageState == DamageState.Dead) if (e.DamageState == DamageState.Dead)
Sound.Play(info.DestroyedSound, self.CenterPosition); {
var sound = info.DestroyedSounds.RandomOrDefault(rand);
Sound.Play(sound, self.CenterPosition);
}
else if (e.DamageState >= DamageState.Heavy && e.PreviousDamageState < DamageState.Heavy) else if (e.DamageState >= DamageState.Heavy && e.PreviousDamageState < DamageState.Heavy)
Sound.Play(info.DamagedSound, self.CenterPosition); {
var sound = info.DamagedSounds.RandomOrDefault(rand);
Sound.Play(sound, self.CenterPosition);
}
} }
} }
} }

12
OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
View File

@@ -707,6 +707,18 @@ namespace OpenRA.Mods.Common.UtilityCommands
node.Key = "Refinery"; node.Key = "Refinery";
} }
// Append an 's' as the fields were changed from string to string[]
if (engineVersion < 20150311)
{
if (depth == 2 && parentKey == "SoundOnDamageTransition")
{
if (node.Key == "DamagedSound")
node.Key = "DamagedSounds";
else if (node.Key == "DestroyedSound")
node.Key = "DestroyedSounds";
}
}
UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1); UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);
} }
} }