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

Add ShowTicks to sellable

Browse Source
This commit is contained in:
Mustafa Alperen Seki
2017-11-03 19:34:10 +03:00
committed by abcdefg30
parent a3636c69d9
commit 8914227811
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Activities/Sell.cs
View File

@@ -21,9 +21,11 @@ namespace OpenRA.Mods.Common.Activities
readonly Health health; readonly Health health;
readonly SellableInfo sellableInfo; readonly SellableInfo sellableInfo;
readonly PlayerResources playerResources; readonly PlayerResources playerResources;
bool showTicks;
public Sell(Actor self) public Sell(Actor self, bool showTicks)
{ {
this.showTicks = showTicks;
health = self.TraitOrDefault<Health>(); health = self.TraitOrDefault<Health>();
sellableInfo = self.Info.TraitInfo<SellableInfo>(); sellableInfo = self.Info.TraitInfo<SellableInfo>();
playerResources = self.Owner.PlayerActor.Trait<PlayerResources>(); playerResources = self.Owner.PlayerActor.Trait<PlayerResources>();
@@ -40,7 +42,7 @@ namespace OpenRA.Mods.Common.Activities
foreach (var ns in self.TraitsImplementing<INotifySold>()) foreach (var ns in self.TraitsImplementing<INotifySold>())
ns.Sold(self); ns.Sold(self);
if (refund > 0 && self.Owner.IsAlliedWith(self.World.RenderPlayer)) if (showTicks && refund > 0 && self.Owner.IsAlliedWith(self.World.RenderPlayer))
self.World.AddFrameEndTask(w => w.Add(new FloatingText(self.CenterPosition, self.Owner.Color.RGB, FloatingText.FormatCashTick(refund), 30))); self.World.AddFrameEndTask(w => w.Add(new FloatingText(self.CenterPosition, self.Owner.Color.RGB, FloatingText.FormatCashTick(refund), 30)));
self.Dispose(); self.Dispose();

5
OpenRA.Mods.Common/Traits/Sellable.cs
View File

@@ -22,6 +22,7 @@ namespace OpenRA.Mods.Common.Traits
{ {
public readonly int RefundPercent = 50; public readonly int RefundPercent = 50;
public readonly string[] SellSounds = { }; public readonly string[] SellSounds = { };
public readonly bool ShowTicks = true;
[Desc("Skip playing (reversed) make animation.")] [Desc("Skip playing (reversed) make animation.")]
public readonly bool SkipMakeAnimation = false; public readonly bool SkipMakeAnimation = false;
@@ -71,12 +72,12 @@ namespace OpenRA.Mods.Common.Traits
var makeAnimation = self.TraitOrDefault<WithMakeAnimation>(); var makeAnimation = self.TraitOrDefault<WithMakeAnimation>();
if (makeAnimation != null) if (makeAnimation != null)
{ {
makeAnimation.Reverse(self, new Sell(self), false); makeAnimation.Reverse(self, new Sell(self, info.ShowTicks), false);
return; return;
} }
} }
self.QueueActivity(false, new Sell(self)); self.QueueActivity(false, new Sell(self, info.ShowTicks));
} }
public bool IsTooltipVisible(Player forPlayer) public bool IsTooltipVisible(Player forPlayer)