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

Make CashTrickler PausableConditional

Browse Source
This commit is contained in:
Mustafa Alperen Seki
2017-09-21 20:58:53 +03:00
committed by reaperrr
parent 049096efd7
commit a4b0bf5c52
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("Lets the actor generate cash in a set periodic time.")] [Desc("Lets the actor generate cash in a set periodic time.")]
public class CashTricklerInfo : ConditionalTraitInfo public class CashTricklerInfo : PausableConditionalTraitInfo
{ {
[Desc("Number of ticks to wait between giving money.")] [Desc("Number of ticks to wait between giving money.")]
public readonly int Interval = 50; public readonly int Interval = 50;
@@ -36,7 +36,7 @@ namespace OpenRA.Mods.Common.Traits
public override object Create(ActorInitializer init) { return new CashTrickler(this); } public override object Create(ActorInitializer init) { return new CashTrickler(this); }
} }
public class CashTrickler : ConditionalTrait<CashTricklerInfo>, ITick, ISync, INotifyCreated, INotifyOwnerChanged public class CashTrickler : PausableConditionalTrait<CashTricklerInfo>, ITick, ISync, INotifyCreated, INotifyOwnerChanged
{ {
readonly CashTricklerInfo info; readonly CashTricklerInfo info;
PlayerResources resources; PlayerResources resources;
@@ -64,6 +64,9 @@ namespace OpenRA.Mods.Common.Traits
void ITick.Tick(Actor self) void ITick.Tick(Actor self)
{ {
if (IsTraitDisabled) if (IsTraitDisabled)
ticks = info.Interval;
if (IsTraitPaused || IsTraitDisabled)
return; return;
if (--ticks < 0) if (--ticks < 0)