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

Remove some deprecated code and rework handled list function

Browse Source
This commit is contained in:
DarkPhoenix
2019-04-18 13:00:06 +03:00
parent f9fd265280
commit b70c1a7c6c
2 changed files with 12 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
eos/effectHandlerHelpers.py
View File

@@ -161,20 +161,27 @@ class HandledModuleList(HandledList):
def replaceRackPosition(self, rackPosition, mod):
listPositions = []
for currMod in self:
for currPos in range(len(self)):
currMod = self[currPos]
if currMod.slot == mod.slot:
listPositions.append(currMod.position)
listPositions.append(currPos)
listPositions.sort()
try:
modListPosition = listPositions[rackPosition]
except IndexError:
self.appendIgnoreEmpty(mod)
else:
self.__toDummy(modListPosition)
if not mod.isEmpty:
oldMod = self[modListPosition]
if mod.isEmpty:
self.__toDummy(modListPosition)
else:
self.__toModule(modListPosition, mod)
# If new module cannot be appended, restore old state
if mod.isInvalid:
self.__toDummy(modListPosition)
if oldMod.isEmpty:
self.__toDummy(modListPosition)
else:
self.__toModule(modListPosition, oldMod)
raise HandledListActionError(mod)
def insert(self, idx, mod):
@@ -192,7 +199,6 @@ class HandledModuleList(HandledList):
def remove(self, mod):
HandledList.remove(self, mod)
oldPos = mod.position
mod.position = None
for i in range(oldPos, len(self)):
self[i].position -= 1
@@ -214,14 +220,6 @@ class HandledModuleList(HandledList):
self[index] = mod
oldMod.position = None
@deprecated
def freeSlot(self, slot):
for i in range(len(self)):
mod = self[i]
if mod.getModifiedItemAttr("subSystemSlot") == slot:
self.__toDummy(i)
break
class HandledDroneCargoList(HandledList):