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

Add a RenderSprites.UnnormalizeSequence helper.

Browse Source
This commit is contained in:
Paul Chote
2016-11-26 12:47:18 +00:00
parent 0d769383e2
commit 842e004ec5
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
OpenRA.Mods.Common/Traits/Render/RenderSprites.cs
View File

@@ -85,6 +85,14 @@ namespace OpenRA.Mods.Common.Traits.Render
public class RenderSprites : IRender, ITick, INotifyOwnerChanged, INotifyEffectiveOwnerChanged, IActorPreviewInitModifier public class RenderSprites : IRender, ITick, INotifyOwnerChanged, INotifyEffectiveOwnerChanged, IActorPreviewInitModifier
{ {
static readonly Pair<DamageState, string>[] DamagePrefixes =
{
Pair.New(DamageState.Critical, "critical-"),
Pair.New(DamageState.Heavy, "damaged-"),
Pair.New(DamageState.Medium, "scratched-"),
Pair.New(DamageState.Light, "scuffed-")
};
class AnimationWrapper class AnimationWrapper
{ {
public readonly AnimationWithOffset Animation; public readonly AnimationWithOffset Animation;
@@ -196,27 +204,27 @@ namespace OpenRA.Mods.Common.Traits.Render
anims.RemoveAll(a => a.Animation == anim); anims.RemoveAll(a => a.Animation == anim);
} }
public static string NormalizeSequence(Animation anim, DamageState state, string sequence) public static string UnnormalizeSequence(string sequence)
{ {
var states = new Pair<DamageState, string>[]
{
Pair.New(DamageState.Critical, "critical-"),
Pair.New(DamageState.Heavy, "damaged-"),
Pair.New(DamageState.Medium, "scratched-"),
Pair.New(DamageState.Light, "scuffed-")
};
// Remove existing damage prefix // Remove existing damage prefix
foreach (var s in states) foreach (var s in DamagePrefixes)
{ {
if (sequence.StartsWith(s.Second)) if (sequence.StartsWith(s.Second, StringComparison.Ordinal))
{ {
sequence = sequence.Substring(s.Second.Length); sequence = sequence.Substring(s.Second.Length);
break; break;
} }
} }
foreach (var s in states) return sequence;
}
public static string NormalizeSequence(Animation anim, DamageState state, string sequence)
{
// Remove any existing damage prefix
sequence = UnnormalizeSequence(sequence);
foreach (var s in DamagePrefixes)
if (state >= s.First && anim.HasSequence(s.Second + sequence)) if (state >= s.First && anim.HasSequence(s.Second + sequence))
return s.Second + sequence; return s.Second + sequence;