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

Merge pull request #5912 from pchote/powr-fix

Browse Source 
Allow NormalizeSequence to remove existing damage prefixes.
This commit is contained in:
Matthias Mailänder
2014-07-10 09:37:31 +02:00
parent d3128463c0 2e9e4cff5c
commit 17310b7234
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Traits/Render/RenderSimple.cs
View File

@@ -47,9 +47,9 @@ namespace OpenRA.Traits
public int2 SelectionSize(Actor self) { return AutoSelectionSize(self); } public int2 SelectionSize(Actor self) { return AutoSelectionSize(self); }
public string NormalizeSequence(Actor self, string baseSequence) public string NormalizeSequence(Actor self, string sequence)
{ {
return NormalizeSequence(DefaultAnimation, self.GetDamageState(), baseSequence); return NormalizeSequence(DefaultAnimation, self.GetDamageState(), sequence);
} }
public void PlayCustomAnim(Actor self, string name) public void PlayCustomAnim(Actor self, string name)

18
OpenRA.Game/Traits/Render/RenderSprites.cs
View File

@@ -149,7 +149,7 @@ namespace OpenRA.Traits
anims.Remove(key); anims.Remove(key);
} }
public static string NormalizeSequence(Animation anim, DamageState state, string baseSequence) public static string NormalizeSequence(Animation anim, DamageState state, string sequence)
{ {
var states = new Pair<DamageState, string>[] var states = new Pair<DamageState, string>[]
{ {
@@ -159,11 +159,21 @@ namespace OpenRA.Traits
Pair.New(DamageState.Light, "scuffed-") Pair.New(DamageState.Light, "scuffed-")
}; };
// Remove existing damage prefix
foreach (var s in states) foreach (var s in states)
if (state >= s.First && anim.HasSequence(s.Second + baseSequence)) {
return s.Second + baseSequence; if (sequence.StartsWith(s.Second))
{
sequence = sequence.Substring(s.Second.Length);
break;
}
}
return baseSequence; foreach (var s in states)
if (state >= s.First && anim.HasSequence(s.Second + sequence))
return s.Second + sequence;
return sequence;
} }
// Required by RenderSimple // Required by RenderSimple