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

Revamp CashTrickler.

Browse Source 
Added upgrade support.
Decoupled the capture bonus to a separate trait.
This commit is contained in:
Zimmermann Gyula
2016-10-05 17:01:01 +02:00
committed by reaperrr
parent 2b92daa955
commit bc1e2a7058
5 changed files with 103 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenRA.Mods.Common/Traits/CashTrickler.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Lets the actor generate cash in a set periodic time.")]
class CashTricklerInfo : ITraitInfo
class CashTricklerInfo : ConditionalTraitInfo
{
[Desc("Number of ticks to wait between giving money.")]
public readonly int Period = 50;
@@ -23,23 +23,25 @@ namespace OpenRA.Mods.Common.Traits
public readonly int Amount = 15;
[Desc("Whether to show the cash tick indicators (+$15 rising from actor).")]
public readonly bool ShowTicks = true;
[Desc("Amount of money awarded for capturing the actor.")]
public readonly int CaptureAmount = 0;
public object Create(ActorInitializer init) { return new CashTrickler(this); }
public override object Create(ActorInitializer init) { return new CashTrickler(this); }
}
class CashTrickler : ITick, ISync, INotifyCapture
class CashTrickler : ConditionalTrait<CashTricklerInfo>, ITick, ISync
{
readonly CashTricklerInfo info;
[Sync] int ticks;
public CashTrickler(CashTricklerInfo info)
: base(info)
{
this.info = info;
}
public void Tick(Actor self)
{
if (IsTraitDisabled)
return;
if (--ticks < 0)
{
ticks = info.Period;
@@ -48,15 +50,6 @@ namespace OpenRA.Mods.Common.Traits
}
}
public void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner)
{
if (info.CaptureAmount > 0)
{
newOwner.PlayerActor.Trait<PlayerResources>().GiveCash(info.CaptureAmount);
MaybeAddCashTick(self, info.CaptureAmount);
}
}
void MaybeAddCashTick(Actor self, int amount)
{
if (info.ShowTicks)