Revert "Make sure that modules are put onto their proper place during EFT import, not to the end"
This reverts commit fe063cf19a.
This commit is contained in:
@@ -251,14 +251,14 @@ def importEft(eftString):
|
||||
aFit.addCargo(itemSpec)
|
||||
|
||||
# Subsystems first because they modify slot amount
|
||||
for i, m in enumerate(aFit.subsystems):
|
||||
for m in aFit.subsystems:
|
||||
if m is None:
|
||||
dummy = Module.buildEmpty(aFit.getSlotByContainer(aFit.subsystems))
|
||||
dummy.owner = fit
|
||||
fit.modules.replaceRackPosition(i, dummy)
|
||||
fit.modules.appendIgnoreEmpty(dummy)
|
||||
elif m.fits(fit):
|
||||
m.owner = fit
|
||||
fit.modules.replaceRackPosition(i, m)
|
||||
fit.modules.appendIgnoreEmpty(m)
|
||||
svcFit.getInstance().recalc(fit)
|
||||
|
||||
# Other stuff
|
||||
@@ -269,16 +269,16 @@ def importEft(eftString):
|
||||
aFit.modulesMed,
|
||||
aFit.modulesLow,
|
||||
):
|
||||
for i, m in enumerate(modRack):
|
||||
for m in modRack:
|
||||
if m is None:
|
||||
dummy = Module.buildEmpty(aFit.getSlotByContainer(modRack))
|
||||
dummy.owner = fit
|
||||
fit.modules.replaceRackPosition(i, dummy)
|
||||
fit.modules.appendIgnoreEmpty(dummy)
|
||||
elif m.fits(fit):
|
||||
m.owner = fit
|
||||
if not m.isValidState(m.state):
|
||||
pyfalog.warning('service.port.eft.importEft: module {} cannot have state {}', m, m.state)
|
||||
fit.modules.replaceRackPosition(i, m)
|
||||
fit.modules.appendIgnoreEmpty(m)
|
||||
for implant in aFit.implants:
|
||||
fit.implants.append(implant)
|
||||
for booster in aFit.boosters:
|
||||
|
||||
Reference in New Issue
Block a user