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

Fix CashTrickler crashing without IOccupiesSpace

Browse Source
This commit is contained in:
abcdefg30
2020-05-24 19:55:38 +02:00
committed by Paul Chote
parent 19b02875c7
commit b5e3f25418
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
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 : PausableConditionalTraitInfo public class CashTricklerInfo : PausableConditionalTraitInfo, IRulesetLoaded
{ {
[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,6 +36,12 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Use resource storage for cash granted.")] [Desc("Use resource storage for cash granted.")]
public readonly bool UseResourceStorage = false; public readonly bool UseResourceStorage = false;
void IRulesetLoaded<ActorInfo>.RulesetLoaded(Ruleset rules, ActorInfo info)
{
if (ShowTicks && !info.HasTraitInfo<IOccupySpaceInfo>())
throw new YamlException("CashTrickler is defined with ShowTicks 'true' but actor '{0}' occupies no space.".F(info.Name));
}
public override object Create(ActorInitializer init) { return new CashTrickler(this); } public override object Create(ActorInitializer init) { return new CashTrickler(this); }
} }
@@ -78,7 +84,7 @@ namespace OpenRA.Mods.Common.Traits
var cashTrickerModifier = self.TraitsImplementing<ICashTricklerModifier>().Select(x => x.GetCashTricklerModifier()); var cashTrickerModifier = self.TraitsImplementing<ICashTricklerModifier>().Select(x => x.GetCashTricklerModifier());
Ticks = info.Interval; Ticks = info.Interval;
ModifyCash(self, self.Owner, Util.ApplyPercentageModifiers(info.Amount, cashTrickerModifier)); ModifyCash(self, Util.ApplyPercentageModifiers(info.Amount, cashTrickerModifier));
} }
} }
@@ -88,7 +94,7 @@ namespace OpenRA.Mods.Common.Traits
new FloatingText(self.CenterPosition, self.Owner.Color, FloatingText.FormatCashTick(amount), info.DisplayDuration))); new FloatingText(self.CenterPosition, self.Owner.Color, FloatingText.FormatCashTick(amount), info.DisplayDuration)));
} }
void ModifyCash(Actor self, Player newOwner, int amount) void ModifyCash(Actor self, int amount)
{ {
if (info.UseResourceStorage) if (info.UseResourceStorage)
{ {