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

Do not activate ADC on fit import as well

Browse Source
This commit is contained in:
DarkPhoenix
2019-05-03 04:24:59 +03:00
parent e9f3453b04
commit a5475eb244
7 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/fitCommands/calc/module/localAdd.py
View File

@@ -2,7 +2,7 @@ import wx
from logbook import Logger
import eos.db
from gui.fitCommands.helpers import restoreCheckedStates, stateLimit
from gui.fitCommands.helpers import restoreCheckedStates, activeStateLimit
from service.fit import Fit
@@ -25,7 +25,7 @@ class CalcAddLocalModuleCommand(wx.Command):
sFit = Fit.getInstance()
fit = sFit.getFit(self.fitID)
newMod = self.newModInfo.toModule(fallbackState=stateLimit(self.newModInfo.itemID))
newMod = self.newModInfo.toModule(fallbackState=activeStateLimit(self.newModInfo.itemID))
if newMod is None:
return False

4
gui/fitCommands/calc/module/localReplace.py
View File

@@ -2,7 +2,7 @@ import wx
from logbook import Logger
import eos.db
from gui.fitCommands.helpers import ModuleInfo, restoreCheckedStates, stateLimit
from gui.fitCommands.helpers import ModuleInfo, restoreCheckedStates, activeStateLimit
from service.fit import Fit
@@ -33,7 +33,7 @@ class CalcReplaceLocalModuleCommand(wx.Command):
self.oldModInfo = ModuleInfo.fromModule(oldMod)
if self.newModInfo == self.oldModInfo:
return False
newMod = self.newModInfo.toModule(fallbackState=stateLimit(self.newModInfo.itemID))
newMod = self.newModInfo.toModule(fallbackState=activeStateLimit(self.newModInfo.itemID))
if newMod is None:
return False
if newMod.slot != oldMod.slot:

2
gui/fitCommands/helpers.py
View File

@@ -317,7 +317,7 @@ class CargoInfo:
return makeReprStr(self, ['itemID', 'amount'])
def stateLimit(itemIdentity):
def activeStateLimit(itemIdentity):
item = Market.getInstance().getItem(itemIdentity)
if {'moduleBonusAssaultDamageControl', 'moduleBonusIndustrialInvulnerability'}.intersection(item.effects):
return FittingModuleState.ONLINE