diff --git a/OpenRA.Mods.Cnc/WithFire.cs b/OpenRA.Mods.Cnc/WithFire.cs index 1550f04196..3ee0f2dbeb 100644 --- a/OpenRA.Mods.Cnc/WithFire.cs +++ b/OpenRA.Mods.Cnc/WithFire.cs @@ -15,8 +15,6 @@ namespace OpenRA.Mods.Cnc { class WithFireInfo : ITraitInfo, Requires { - public readonly WVec Offset = new WVec(299,-640,0); - public object Create(ActorInitializer init) { return new WithFire(init.self, this); } } @@ -27,8 +25,7 @@ namespace OpenRA.Mods.Cnc var rs = self.Trait(); var roof = new Animation(rs.GetImage(self)); roof.PlayThen("fire-start", () => roof.PlayRepeating("fire-loop")); - - rs.anims.Add("fire", new AnimationWithOffset(roof, () => info.Offset, null, 1024)); + rs.anims.Add("fire", new AnimationWithOffset(roof, null, null, 1024)); } } } diff --git a/OpenRA.Mods.RA/Burns.cs b/OpenRA.Mods.RA/Burns.cs index ece4d23566..50a0cbd300 100644 --- a/OpenRA.Mods.RA/Burns.cs +++ b/OpenRA.Mods.RA/Burns.cs @@ -18,7 +18,6 @@ namespace OpenRA.Mods.RA public readonly string Anim = "1"; public readonly int Damage = 1; public readonly int Interval = 8; - public readonly WVec Offset = new WVec(0,0,128); public object Create(ActorInitializer init) { return new Burns(init.self, this); } } @@ -34,8 +33,7 @@ namespace OpenRA.Mods.RA var anim = new Animation("fire", () => 0); anim.PlayRepeating(Info.Anim); - self.Trait().anims.Add("fire", - new AnimationWithOffset(anim, () => info.Offset, null)); + self.Trait().anims.Add("fire", anim); } public void Tick(Actor self) diff --git a/mods/cnc/sequences/map.yaml b/mods/cnc/sequences/map.yaml index 29d1c012c7..e6a6f3419c 100644 --- a/mods/cnc/sequences/map.yaml +++ b/mods/cnc/sequences/map.yaml @@ -482,9 +482,11 @@ v19.husk: fire-start: flmspt Start: 0 Length: * + Offset: 7,-15 fire-loop: flmspt Start: 50 Length: * + Offset: 7,-15 v20: idle: diff --git a/mods/cnc/sequences/misc.yaml b/mods/cnc/sequences/misc.yaml index 7fb25ff7a2..7db6352692 100644 --- a/mods/cnc/sequences/misc.yaml +++ b/mods/cnc/sequences/misc.yaml @@ -7,9 +7,11 @@ fire: 1: fire1 Start: 0 Length: * + Offset: 0,-3 2: fire2 Start: 0 Length: * + Offset: 0,-3 120mm: idle: diff --git a/mods/d2k/sequences.yaml b/mods/d2k/sequences.yaml index 46b9bd7e56..6a97b0cd13 100644 --- a/mods/d2k/sequences.yaml +++ b/mods/d2k/sequences.yaml @@ -1259,15 +1259,19 @@ fire: 1: fire2 Start: 0 Length: * + Offset: 0,-3 2: fire2 Start: 0 Length: * + Offset: 0,-3 3: fire3 Start: 0 Length: * + Offset: 0,-3 4: fire Start: 0 Length: * + Offset: 0,-3 smoke_m: idle: minifire diff --git a/mods/ra/sequences/animations.yaml b/mods/ra/sequences/animations.yaml index acf1b73280..4830ba4ae2 100644 --- a/mods/ra/sequences/animations.yaml +++ b/mods/ra/sequences/animations.yaml @@ -319,15 +319,19 @@ fire: 1: fire1 Start: 0 Length: * + Offset: 0,-3 2: fire2 Start: 0 Length: * + Offset: 0,-3 3: fire3 Start: 0 Length: * + Offset: 0,-3 4: fire4 Start: 0 Length: * + Offset: 0,-3 rank: rank: