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

Style/Readability changes

Browse Source
This commit is contained in:
abcdefg30
2020-06-19 18:22:11 +02:00
committed by Oliver Brakmann
parent 7d630e63e7
commit ab8790e8f1
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenRA.Mods.Common/Traits/Power/Player/PowerManager.cs
View File

@@ -73,16 +73,21 @@ namespace OpenRA.Mods.Common.Traits
public void UpdateActor(Actor a) public void UpdateActor(Actor a)
{ {
// old is 0 if a is not in powerDrain
int old; int old;
powerDrain.TryGetValue(a, out old); // old is 0 if a is not in powerDrain powerDrain.TryGetValue(a, out old);
var amount = a.TraitsImplementing<Power>().Where(t => !t.IsTraitDisabled).Sum(p => p.GetEnabledPower()); var amount = a.TraitsImplementing<Power>().Where(t => !t.IsTraitDisabled).Sum(p => p.GetEnabledPower());
powerDrain[a] = amount; powerDrain[a] = amount;
if (amount == old || devMode.UnlimitedPower) if (amount == old || devMode.UnlimitedPower)
return; return;
if (old > 0) if (old > 0)
totalProvided -= old; totalProvided -= old;
else if (old < 0) else if (old < 0)
totalDrained += old; totalDrained += old;
if (amount > 0) if (amount > 0)
totalProvided += amount; totalProvided += amount;
else if (amount < 0) else if (amount < 0)
@@ -113,11 +118,15 @@ namespace OpenRA.Mods.Common.Traits
totalDrained = 0; totalDrained = 0;
if (!devMode.UnlimitedPower) if (!devMode.UnlimitedPower)
{
foreach (var kv in powerDrain) foreach (var kv in powerDrain)
{
if (kv.Value > 0) if (kv.Value > 0)
totalProvided += kv.Value; totalProvided += kv.Value;
else if (kv.Value < 0) else if (kv.Value < 0)
totalDrained -= kv.Value; totalDrained -= kv.Value;
}
}
wasHackEnabled = devMode.UnlimitedPower; wasHackEnabled = devMode.UnlimitedPower;
} }
@@ -148,8 +157,12 @@ namespace OpenRA.Mods.Common.Traits
{ {
get get
{ {
if (PowerProvided >= PowerDrained) return PowerState.Normal; if (PowerProvided >= PowerDrained)
if (PowerProvided > PowerDrained / 2) return PowerState.Low; return PowerState.Normal;
if (PowerProvided > PowerDrained / 2)
return PowerState.Low;
return PowerState.Critical; return PowerState.Critical;
} }
} }