dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Revert "Switch Shield/Cap to using new formula"

Browse Source 
This reverts commit d2a52e26b2.
This commit is contained in:
Ebag333
2016-11-16 12:11:27 -08:00
parent 5bca2d723e
commit 3217980ada
1 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
eos/saveddata/fit.py
View File

@@ -32,7 +32,7 @@ import time
import copy
from utils.timer import Timer
from eos.enum import Enum
from gnosis.formulas.formulas import Formulas
import logging
@@ -50,6 +50,8 @@ class ImplantLocation(Enum):
class Fit(object):
"""Represents a fitting, with modules, ship, implants, etc."""
PEAK_RECHARGE = 0.25
def __init__(self, ship=None, name=""):
"""Initialize a fit from the program"""
# use @mode.setter's to set __attr and IDs. This will set mode as well
@@ -878,29 +880,15 @@ class Fit(object):
return self.__sustainableTank
def calculateCapRecharge(self):
return_matrix = Formulas.capacitor_shield_regen_matrix(self.ship.getModifiedItemAttr("capacitorCapacity"),
self.ship.getModifiedItemAttr("rechargeRate"))
high_water_percent = 0
high_water_delta = 0
for item in return_matrix:
if high_water_delta < item['DeltaAmount']:
high_water_percent = item['Percent']
high_water_delta = item['DeltaAmount']
def calculateCapRecharge(self, percent = PEAK_RECHARGE):
capacity = self.ship.getModifiedItemAttr("capacitorCapacity")
rechargeRate = self.ship.getModifiedItemAttr("rechargeRate") / 1000.0
return 10 / rechargeRate * sqrt(percent) * (1 - sqrt(percent)) * capacity
return high_water_delta
def calculateShieldRecharge(self):
return_matrix = Formulas.capacitor_shield_regen_matrix(self.ship.getModifiedItemAttr("shieldCapacity"),
self.ship.getModifiedItemAttr("shieldRechargeRate"))
high_water_percent = 0
high_water_delta = 0
for item in return_matrix:
if high_water_delta < item['DeltaAmount']:
high_water_percent = item['Percent']
high_water_delta = item['DeltaAmount']
return high_water_delta
def calculateShieldRecharge(self, percent = PEAK_RECHARGE):
capacity = self.ship.getModifiedItemAttr("shieldCapacity")
rechargeRate = self.ship.getModifiedItemAttr("shieldRechargeRate") / 1000.0
return 10 / rechargeRate * sqrt(percent) * (1 - sqrt(percent)) * capacity
def addDrain(self, src, cycleTime, capNeed, clipSize=0):
""" Used for both cap drains and cap fills (fills have negative capNeed) """