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

Makes CrateEffect color palette customizable.

Browse Source 
CrateAction can now define a custom Palette, levelup effect of GainsExperience uses ChevronPalette.
This commit is contained in:
reaperrr
2014-04-28 21:03:59 +02:00
parent 0162cac91a
commit a422f03c0a
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.RA/CrateAction.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -21,6 +21,8 @@ namespace OpenRA.Mods.RA
public int SelectionShares = 10; public int SelectionShares = 10;
[Desc("An animation defined in sequence yaml(s) to draw.")] [Desc("An animation defined in sequence yaml(s) to draw.")]
public string Effect = null; public string Effect = null;
[Desc("Palette to draw the animation in.")]
public string Palette = "effect";
[Desc("Audio clip to play when the crate is collected.")] [Desc("Audio clip to play when the crate is collected.")]
public string Notification = null; public string Notification = null;
[ActorReference] [ActorReference]
@@ -59,7 +61,7 @@ namespace OpenRA.Mods.RA
if (info.Effect != null) if (info.Effect != null)
collector.World.AddFrameEndTask( collector.World.AddFrameEndTask(
w => w.Add(new CrateEffect(collector, info.Effect))); w => w.Add(new CrateEffect(collector, info.Effect, info.Palette)));
} }
} }
} }

8
OpenRA.Mods.RA/Effects/CrateEffect.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -16,12 +16,14 @@ namespace OpenRA.Mods.RA.Effects
{ {
class CrateEffect : IEffect class CrateEffect : IEffect
{ {
readonly string palette;
Actor a; Actor a;
Animation anim = new Animation("crate-effects"); Animation anim = new Animation("crate-effects");
public CrateEffect(Actor a, string seq) public CrateEffect(Actor a, string seq, string palette)
{ {
this.a = a; this.a = a;
this.palette = palette;
anim.PlayThen(seq, () => a.World.AddFrameEndTask(w => w.Remove(this))); anim.PlayThen(seq, () => a.World.AddFrameEndTask(w => w.Remove(this)));
} }
@@ -35,7 +37,7 @@ namespace OpenRA.Mods.RA.Effects
if (!a.IsInWorld || a.World.FogObscures(a.Location)) if (!a.IsInWorld || a.World.FogObscures(a.Location))
return SpriteRenderable.None; return SpriteRenderable.None;
return anim.Render(a.CenterPosition, wr.Palette("effect")); return anim.Render(a.CenterPosition, wr.Palette(palette));
} }
} }
} }

4
OpenRA.Mods.RA/GainsExperience.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -71,7 +71,7 @@ namespace OpenRA.Mods.RA
Level++; Level++;
Sound.PlayNotification(self.Owner, "Sounds", "LevelUp", self.Owner.Country.Race); Sound.PlayNotification(self.Owner, "Sounds", "LevelUp", self.Owner.Country.Race);
self.World.AddFrameEndTask(w => w.Add(new CrateEffect(self, "levelup"))); self.World.AddFrameEndTask(w => w.Add(new CrateEffect(self, "levelup", info.ChevronPalette)));
if (Level == 1) if (Level == 1)
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w =>
{ {