Merge pull request #7626 from Mailaender/ts-radar-dishes

Fixed Tiberian Sun radar dishes
This commit is contained in:
Oliver Brakmann
2015-03-16 18:37:59 +01:00
2 changed files with 19 additions and 9 deletions

View File

@@ -61,7 +61,7 @@ namespace OpenRA.Mods.Common.Traits
buildComplete = !self.HasTrait<Building>(); // always render instantly for units
overlay = new Animation(self.World, rs.GetImage(self));
overlay.PlayRepeating(info.Sequence);
overlay.PlayRepeating(RenderSprites.NormalizeSequence(overlay, self.GetDamageState(), info.Sequence));
rs.Add("idle_overlay_{0}".F(info.Sequence),
new AnimationWithOffset(overlay,
() => body.LocalToWorld(info.Offset.Rotate(body.QuantizeOrientation(self, self.Orientation))),

View File

@@ -440,10 +440,10 @@ naradr:
Start: 1
ShadowStart: 4
Offset: 0, -24
# critical-idle: ntradr #shows a destroyed dish
# Start: 2
# ShadowStart: 5
# Offset: 0, -24
critical-idle: ntradr
Start: 2
ShadowStart: 5
Offset: 0, -24
idle-dish: ntradr_a
Start: 0
Length: 24
@@ -454,6 +454,11 @@ naradr:
Length: 24
Tick: 120
Offset: 0, -24
critical-idle-dish: ntradr_a
Start: 48
Length: 24
Tick: 120
Offset: 0, -24
make: ntradrmk
Start: 0
Length: 20
@@ -507,10 +512,10 @@ garadr:
Start: 1
ShadowStart: 4
Offset: 0, -24
# critical-idle: gtradr #shows a destroyed radar dish
# Start: 2
# ShadowStart: 5
# Offset: 0, -24
critical-idle: gtradr
Start: 2
ShadowStart: 5
Offset: 0, -24
idle-dish: gtradr_a
Frames: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1
Length: 28
@@ -521,6 +526,11 @@ garadr:
Length: 28
Tick: 240
Offset: 0, -24
critical-idle-dish: gtradr_a
Start: 30
Length: 30
Tick: 240
Offset: 0, -24
make: gtradrmk
Start: 0
Length: 20