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

Merge pull request #10923 from abcdefg30/isPlayerNuke

Browse Source 
Add an IsPlayerPalette flag to NukePowerInfo
This commit is contained in:
Matthias Mailänder
2016-03-14 19:59:29 +01:00
parent 79bad0f8b1 8547fac90d
commit b75c7e4869
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs
View File

@@ -36,7 +36,10 @@ namespace OpenRA.Mods.Common.Traits
public readonly WVec SpawnOffset = WVec.Zero;
[Desc("Palette to use for the missile weapon image.")]
[PaletteReference] public readonly string MissilePalette = "effect";
[PaletteReference("IsPlayerPalette")] public readonly string MissilePalette = "effect";
[Desc("Custom palette is a player palette BaseName")]
public readonly bool IsPlayerPalette = false;
[Desc("Travel time - split equally between ascent and descent")]
public readonly int FlightDelay = 400;
@@ -101,7 +104,8 @@ namespace OpenRA.Mods.Common.Traits
}
var targetPosition = self.World.Map.CenterOfCell(order.TargetLocation);
var missile = new NukeLaunch(self.Owner, info.MissileWeapon, info.WeaponInfo, info.MissilePalette, info.MissileUp, info.MissileDown,
var palette = info.IsPlayerPalette ? info.MissilePalette + self.Owner.InternalName : info.MissilePalette;
var missile = new NukeLaunch(self.Owner, info.MissileWeapon, info.WeaponInfo, palette, info.MissileUp, info.MissileDown,
self.CenterPosition + body.LocalToWorld(info.SpawnOffset),
targetPosition,
info.FlightVelocity, info.FlightDelay, info.SkipAscent,