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

Lint test and SpawnActorPower effect sprite and palette.

Browse Source
This commit is contained in:
Matthias Mailänder
2016-04-02 15:12:08 +02:00
parent aa4ffe5bd4
commit 9458a74e9c
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Traits/SupportPowers/SpawnActorPower.cs
View File

@@ -28,8 +28,9 @@ namespace OpenRA.Mods.Common.Traits
public readonly string DeploySound = null; public readonly string DeploySound = null;
public readonly string EffectSequence = null; public readonly string EffectImage = null;
public readonly string EffectPalette = null; [SequenceReference("EffectImage")] public readonly string EffectSequence = "idle";
[PaletteReference] public readonly string EffectPalette = null;
public override object Create(ActorInitializer init) { return new SpawnActorPower(init.Self, this); } public override object Create(ActorInitializer init) { return new SpawnActorPower(init.Self, this); }
} }
@@ -52,7 +53,7 @@ namespace OpenRA.Mods.Common.Traits
Game.Sound.Play(info.DeploySound, location); Game.Sound.Play(info.DeploySound, location);
if (!string.IsNullOrEmpty(info.EffectSequence) && !string.IsNullOrEmpty(info.EffectPalette)) if (!string.IsNullOrEmpty(info.EffectSequence) && !string.IsNullOrEmpty(info.EffectPalette))
w.Add(new SpriteEffect(location, w, info.EffectSequence, "idle", info.EffectPalette)); w.Add(new SpriteEffect(location, w, info.EffectImage, info.EffectSequence, info.EffectPalette));
var actor = w.CreateActor(info.Actor, new TypeDictionary var actor = w.CreateActor(info.Actor, new TypeDictionary
{ {

7
OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
View File

@@ -750,6 +750,13 @@ namespace OpenRA.Mods.Common.UtilityCommands
} }
} }
if (engineVersion < 20160402)
{
// Fix misleading property naming.
if (node.Key == "EffectSequence" && parent.Key == "SpawnActorPower")
node.Key = "EffectImage";
}
UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1); UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);
} }
} }

2
mods/ra/rules/misc.yaml
View File

@@ -298,7 +298,7 @@ powerproxy.sonarpulse:
Actor: sonar Actor: sonar
LifeTime: 250 LifeTime: 250
DeploySound: sonpulse.aud DeploySound: sonpulse.aud
EffectSequence: moveflsh EffectImage: moveflsh
EffectPalette: moveflash EffectPalette: moveflash
powerproxy.paratroopers: powerproxy.paratroopers: