From ddcbbb7fcfe34d67077a1df3f2c489be57bf4295 Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Fri, 7 Oct 2016 20:43:14 -0700 Subject: [PATCH 1/2] Use the mining effect This effect is only used by mining drones, and it's not been implemented. See #762 for more info --- eos/effects/mining.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 eos/effects/mining.py diff --git a/eos/effects/mining.py b/eos/effects/mining.py new file mode 100644 index 000000000..dac0476a6 --- /dev/null +++ b/eos/effects/mining.py @@ -0,0 +1,15 @@ +# miningDroneOperationMiningAmountBonusPostPercentMiningDroneAmountPercentChar +# +# Used by: +# Mining Drones + +type = "passive" +def handler(fit, container, context): + miningDroneAmountPercent = container.getModifiedItemAttr("miningDroneAmountPercent") + if (miningDroneAmountPercent is None) or (miningDroneAmountPercent == 0): + miningDroneAmountPercent = 1 + else: + miningDroneAmountPercent = miningDroneAmountPercent/100 + + fit.drones.filteredItemMultiply(lambda drone: drone.item.group.name == "Mining Drone", + "miningAmount", miningDroneAmountPercent) From eb9b034d65f705b97bdb939dcb7f80fc2b1149b9 Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Sun, 16 Oct 2016 20:52:09 -0700 Subject: [PATCH 2/2] Fixed maths with more than 1 drone Also tightened up code a bit. Does nothing now if there isn't a miningDroneAmountPercent --- eos/effects/mining.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/eos/effects/mining.py b/eos/effects/mining.py index dac0476a6..f98faf17b 100644 --- a/eos/effects/mining.py +++ b/eos/effects/mining.py @@ -7,9 +7,6 @@ type = "passive" def handler(fit, container, context): miningDroneAmountPercent = container.getModifiedItemAttr("miningDroneAmountPercent") if (miningDroneAmountPercent is None) or (miningDroneAmountPercent == 0): - miningDroneAmountPercent = 1 + pass else: - miningDroneAmountPercent = miningDroneAmountPercent/100 - - fit.drones.filteredItemMultiply(lambda drone: drone.item.group.name == "Mining Drone", - "miningAmount", miningDroneAmountPercent) + container.multiplyItemAttr("miningAmount", miningDroneAmountPercent/100)