Merge pull request #9681 from pchote/fix-d2k-refinery

Fix D2K refinery flames.
This commit is contained in:
abcdefg30
2015-10-19 21:49:14 +02:00
4 changed files with 4 additions and 7 deletions

View File

@@ -53,7 +53,7 @@ namespace OpenRA.Mods.Common.Traits
anim = new AnimationWithOffset(overlay, anim = new AnimationWithOffset(overlay,
() => body.LocalToWorld(info.Offset.Rotate(body.QuantizeOrientation(self, self.Orientation))), () => body.LocalToWorld(info.Offset.Rotate(body.QuantizeOrientation(self, self.Orientation))),
() => !buildComplete); () => !buildComplete || !docked);
rs.Add(anim, info.Palette, info.IsPlayerPalette); rs.Add(anim, info.Palette, info.IsPlayerPalette);
} }

View File

@@ -51,11 +51,6 @@
Name: effect50alpha Name: effect50alpha
BasePalette: effect BasePalette: effect
Alpha: 0.5 Alpha: 0.5
PaletteFromPaletteWithAlpha@effectAdditive:
Name: effectAdditive
BasePalette: effect
Alpha: 0
Premultiply: false
PaletteFromScaledPalette@starportlights: PaletteFromScaledPalette@starportlights:
Name: starportlights Name: starportlights
BasePalette: d2k BasePalette: d2k

View File

@@ -224,7 +224,6 @@ refinery:
ordos: refinery.ordos ordos: refinery.ordos
WithDockingOverlay@SMOKE: WithDockingOverlay@SMOKE:
Sequence: smoke Sequence: smoke
Palette: effectAdditive
Power: Power:
Amount: -75 Amount: -75
WithIdleOverlay@TOP: WithIdleOverlay@TOP:

View File

@@ -380,6 +380,7 @@ refinery.atreides:
Length: 14 Length: 14
Offset: 10,-16 Offset: 10,-16
Tick: 200 Tick: 200
BlendMode: Additive
silo.atreides: silo.atreides:
idle: DATA.R8 idle: DATA.R8
@@ -874,6 +875,7 @@ refinery.harkonnen:
Length: 14 Length: 14
Offset: 10,-16 Offset: 10,-16
Tick: 200 Tick: 200
BlendMode: Additive
silo.harkonnen: silo.harkonnen:
idle: DATA.R8 idle: DATA.R8
@@ -1277,6 +1279,7 @@ refinery.ordos:
Length: 14 Length: 14
Offset: 10,-16 Offset: 10,-16
Tick: 200 Tick: 200
BlendMode: Additive
silo.ordos: silo.ordos:
idle: DATA.R8 idle: DATA.R8