When setting fighter's amount attribute to max or more than max, set it to -1 internally

It will show up as max amount when reading
This commit is contained in:
DarkPhoenix
2019-08-21 13:22:04 +03:00
parent d32ff668e1
commit 207818537b
19 changed files with 43 additions and 44 deletions

View File

@@ -111,7 +111,7 @@ class ProjectedDataCache(FitDataCache):
for fighter, ability in src.item.activeFighterAbilityIter():
if ability.effect.name == 'fighterAbilityStasisWebifier':
webFighters.append(MobileProjData(
fighter.getModifiedItemAttr('fighterAbilityStasisWebifierSpeedPenalty') * fighter.amountActive,
fighter.getModifiedItemAttr('fighterAbilityStasisWebifierSpeedPenalty') * fighter.amount,
fighter.getModifiedItemAttr('fighterAbilityStasisWebifierOptimalRange'),
fighter.getModifiedItemAttr('fighterAbilityStasisWebifierFalloffRange'),
'default',

View File

@@ -56,7 +56,7 @@ class Distance2NeutingStrGetter(SmoothPointGetter):
if ability.effect.name == 'fighterAbilityEnergyNeutralizer':
nps = fighter.getModifiedItemAttr('fighterAbilityEnergyNeutralizerAmount') / (ability.cycleTime / 1000)
neuts.append((
nps * fighter.amountActive * resonance,
nps * fighter.amount * resonance,
math.inf, 0))
return {'neuts': neuts}
@@ -98,7 +98,7 @@ class Distance2WebbingStrGetter(SmoothPointGetter):
for fighter, ability in src.item.activeFighterAbilityIter():
if ability.effect.name == 'fighterAbilityStasisWebifier':
webs.append((
fighter.getModifiedItemAttr('fighterAbilityStasisWebifierSpeedPenalty') * fighter.amountActive * resonance,
fighter.getModifiedItemAttr('fighterAbilityStasisWebifierSpeedPenalty') * fighter.amount * resonance,
math.inf, 0, 'default'))
return {'webs': webs}
@@ -143,7 +143,7 @@ class Distance2EcmStrMaxGetter(SmoothPointGetter):
for fighter, ability in src.item.activeFighterAbilityIter():
if ability.effect.name == 'fighterAbilityECM':
ecms.append((
max(fighter.getModifiedItemAttr(a) for a in self.ECM_ATTRS_FIGHTERS) * fighter.amountActive * resonance,
max(fighter.getModifiedItemAttr(a) for a in self.ECM_ATTRS_FIGHTERS) * fighter.amount * resonance,
math.inf, 0))
return {'ecms': ecms}