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

Cache GainsExperience and Cargo in GivesBounty

Browse Source
This commit is contained in:
abcdefg30
2016-09-03 15:29:39 +02:00
parent 278a812eec
commit a76672b029
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Mods.Common/Traits/GivesBounty.cs
View File

@@ -38,19 +38,26 @@ namespace OpenRA.Mods.Common.Traits
public object Create(ActorInitializer init) { return new GivesBounty(init.Self, this); }
}
class GivesBounty : INotifyKilled
class GivesBounty : INotifyKilled, INotifyCreated
{
readonly GivesBountyInfo info;
GainsExperience gainsExp;
Cargo cargo;
public GivesBounty(Actor self, GivesBountyInfo info)
{
this.info = info;
}
int GetMultiplier(Actor self)
void INotifyCreated.Created(Actor self)
{
gainsExp = self.TraitOrDefault<GainsExperience>();
cargo = self.TraitOrDefault<Cargo>();
}
// Returns 100's as 1, so as to keep accuracy for longer.
int GetMultiplier()
{
// returns 100's as 1, so as to keep accuracy for longer.
var gainsExp = self.TraitOrDefault<GainsExperience>();
if (gainsExp == null)
return 100;
@@ -61,13 +68,12 @@ namespace OpenRA.Mods.Common.Traits
int GetBountyValue(Actor self, int percentage)
{
// Divide by 10000 because of GetMultiplier and info.Percentage.
return self.GetSellValue() * GetMultiplier(self) * percentage / 10000;
return self.GetSellValue() * GetMultiplier() * percentage / 10000;
}
int GetDisplayedBountyValue(Actor self)
{
var bounty = GetBountyValue(self, info.Percentage);
var cargo = self.TraitOrDefault<Cargo>();
if (cargo == null)
return bounty;