From 2f7a3e0287123d21293674048a2585a2f56d96af Mon Sep 17 00:00:00 2001 From: MaruMaruOO Date: Tue, 17 Jul 2018 22:35:09 -0400 Subject: [PATCH 1/2] Have imported fits always use implants if present --- service/port.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/service/port.py b/service/port.py index a0dd0a89c..e659a5899 100644 --- a/service/port.py +++ b/service/port.py @@ -306,8 +306,11 @@ class Port(object): fit.character = sFit.character fit.damagePattern = sFit.pattern fit.targetResists = sFit.targetResists - useCharImplants = sFit.serviceFittingOptions["useCharacterImplantsByDefault"] - fit.implantLocation = ImplantLocation.CHARACTER if useCharImplants else ImplantLocation.FIT + if len(fit.implants) > 0: + fit.implantLocation = ImplantLocation.FIT + else: + useCharImplants = sFit.serviceFittingOptions["useCharacterImplantsByDefault"] + fit.implantLocation = ImplantLocation.CHARACTER if useCharImplants else ImplantLocation.FIT db.save(fit) # IDs.append(fit.ID) if iportuser: # Pulse @@ -339,8 +342,11 @@ class Port(object): fit.character = sFit.character fit.damagePattern = sFit.pattern fit.targetResists = sFit.targetResists - useCharImplants = sFit.serviceFittingOptions["useCharacterImplantsByDefault"] - fit.implantLocation = ImplantLocation.CHARACTER if useCharImplants else ImplantLocation.FIT + if len(fit.implants) > 0: + fit.implantLocation = ImplantLocation.FIT + else: + useCharImplants = sFit.serviceFittingOptions["useCharacterImplantsByDefault"] + fit.implantLocation = ImplantLocation.CHARACTER if useCharImplants else ImplantLocation.FIT db.save(fit) return fits From e9cb7696ddd3951d233603eafeddf670de0f4b42 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Thu, 19 Jul 2018 00:03:17 -0400 Subject: [PATCH 2/2] Fix an issue for Polycarbon Engine Housing (#1682) --- eos/effects/agilitymultipliereffectpassive.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eos/effects/agilitymultipliereffectpassive.py b/eos/effects/agilitymultipliereffectpassive.py index affa839e8..d185a5002 100644 --- a/eos/effects/agilitymultipliereffectpassive.py +++ b/eos/effects/agilitymultipliereffectpassive.py @@ -6,4 +6,4 @@ type = "passive" def handler(fit, module, context): - fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("agilityMultiplier"), stackingPenalties=True) + fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("agilityBonus"), stackingPenalties=True)