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

fix TS repair indicator palette

Browse Source
This commit is contained in:
Matthias Mailänder
2015-04-16 20:38:24 +02:00
parent e8493ab855
commit a5f60deedd
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenRA.Mods.Common/Effects/RepairIndicator.cs
View File

@@ -19,18 +19,17 @@ namespace OpenRA.Mods.Common.Effects
class RepairIndicator : IEffect class RepairIndicator : IEffect
{ {
readonly Actor building; readonly Actor building;
readonly string palettePrefix;
readonly Animation anim; readonly Animation anim;
readonly RepairableBuilding rb; readonly RepairableBuilding rb;
int shownPlayer = 0; int shownPlayer = 0;
public RepairIndicator(Actor building, string palettePrefix) public RepairIndicator(Actor building)
{ {
this.building = building; this.building = building;
this.palettePrefix = palettePrefix;
rb = building.TraitOrDefault<RepairableBuilding>(); rb = building.Trait<RepairableBuilding>();
anim = new Animation(building.World, "allyrepair"); anim = new Animation(building.World, rb.Info.IndicatorImage);
anim.Paused = () => !rb.RepairActive || rb.IsTraitDisabled; anim.Paused = () => !rb.RepairActive || rb.IsTraitDisabled;
CycleRepairer(); CycleRepairer();
@@ -38,8 +37,7 @@ namespace OpenRA.Mods.Common.Effects
public void Tick(World world) public void Tick(World world)
{ {
if (!building.IsInWorld || building.IsDead || if (!building.IsInWorld || building.IsDead || !rb.Repairers.Any())
rb == null || !rb.Repairers.Any())
world.AddFrameEndTask(w => w.Remove(this)); world.AddFrameEndTask(w => w.Remove(this));
anim.Tick(); anim.Tick();
@@ -50,13 +48,18 @@ namespace OpenRA.Mods.Common.Effects
if (building.Destroyed || wr.World.FogObscures(building) || rb.Repairers.Count == 0) if (building.Destroyed || wr.World.FogObscures(building) || rb.Repairers.Count == 0)
return SpriteRenderable.None; return SpriteRenderable.None;
var palette = wr.Palette(palettePrefix + rb.Repairers[shownPlayer % rb.Repairers.Count].InternalName); PaletteReference palette;
if (!string.IsNullOrEmpty(rb.Info.IndicatorPalette))
palette = wr.Palette(rb.Info.IndicatorPalette);
else
palette = wr.Palette(rb.Info.IndicatorPalettePrefix + rb.Repairers[shownPlayer % rb.Repairers.Count].InternalName);
return anim.Render(building.CenterPosition, palette); return anim.Render(building.CenterPosition, palette);
} }
void CycleRepairer() void CycleRepairer()
{ {
anim.PlayThen("repair", CycleRepairer); anim.PlayThen(rb.Info.IndicatorSequence, CycleRepairer);
if (++shownPlayer == rb.Repairers.Count) if (++shownPlayer == rb.Repairers.Count)
shownPlayer = 0; shownPlayer = 0;

9
OpenRA.Mods.Common/Traits/Buildings/RepairableBuilding.cs
View File

@@ -25,6 +25,13 @@ namespace OpenRA.Mods.Common.Traits
public readonly int[] RepairBonuses = { 100, 150, 175, 200, 220, 240, 260, 280, 300 }; public readonly int[] RepairBonuses = { 100, 150, 175, 200, 220, 240, 260, 280, 300 };
public readonly bool CancelWhenDisabled = false; public readonly bool CancelWhenDisabled = false;
public readonly string IndicatorImage = "allyrepair";
public readonly string IndicatorSequence = "repair";
[Desc("Overrides the IndicatorPalettePrefix.")]
public readonly string IndicatorPalette = "";
[Desc("Suffixed by the interal repairing player name.")]
public readonly string IndicatorPalettePrefix = "player"; public readonly string IndicatorPalettePrefix = "player";
public object Create(ActorInitializer init) { return new RepairableBuilding(init.Self, this); } public object Create(ActorInitializer init) { return new RepairableBuilding(init.Self, this); }
@@ -61,7 +68,7 @@ namespace OpenRA.Mods.Common.Traits
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w =>
{ {
if (!self.IsDead) if (!self.IsDead)
w.Add(new RepairIndicator(self, Info.IndicatorPalettePrefix)); w.Add(new RepairIndicator(self));
}); });
} }
} }

1
mods/ts/rules/defaults.yaml
View File

@@ -24,6 +24,7 @@
DeathSequence: dead DeathSequence: dead
UseDeathTypeSuffix: false UseDeathTypeSuffix: false
RepairableBuilding: RepairableBuilding:
IndicatorPalette: mouse
EngineerRepairable: EngineerRepairable:
EmitInfantryOnSell@gdi: EmitInfantryOnSell@gdi:
ActorTypes: e1, e1, e2, medic ActorTypes: e1, e1, e2, medic