From a67b46bb9aa0addc23f15037a9067046d1863b83 Mon Sep 17 00:00:00 2001
From: blitzmann <ryan.xgamer99@gmail.com>
Date: Mon, 5 Oct 2015 20:37:41 -0400
Subject: [PATCH] Fix some mining effects

---
 eos/effects/crystalminingamountinfo2.py                    | 7 +++++++
 eos/effects/mercoxitcrystalbonus.py                        | 1 +
 eos/effects/mininginfomultiplier.py                        | 2 +-
 eos/effects/missileskillrapidlauncherrof.py                | 2 +-
 ...tdamagemultiplierlocationshipmodulesrequiringgunnery.py | 2 +-
 eos/saveddata/module.py                                    | 2 +-
 gui/builtinViewColumns/misc.py                             | 2 +-
 7 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 eos/effects/crystalminingamountinfo2.py

diff --git a/eos/effects/crystalminingamountinfo2.py b/eos/effects/crystalminingamountinfo2.py
new file mode 100644
index 000000000..18a059c95
--- /dev/null
+++ b/eos/effects/crystalminingamountinfo2.py
@@ -0,0 +1,7 @@
+# crystalMiningamountInfo2
+#
+# Used by:
+# Modules from group: Frequency Mining Laser (3 of 3)
+type = "passive"
+def handler(fit, module, context):
+    module.preAssignItemAttr("specialtyMiningAmount", module.getModifiedItemAttr("miningAmount"))
diff --git a/eos/effects/mercoxitcrystalbonus.py b/eos/effects/mercoxitcrystalbonus.py
index 395b2fc84..52fb3b2c8 100644
--- a/eos/effects/mercoxitcrystalbonus.py
+++ b/eos/effects/mercoxitcrystalbonus.py
@@ -3,6 +3,7 @@
 # Used by:
 # Module: Medium Mercoxit Mining Crystal Optimization I
 type = "passive"
+runTime="early"
 def handler(fit, module, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Mercoxit Processing"),
                                     "specialisationAsteroidYieldMultiplier", module.getModifiedItemAttr("miningAmountBonus"))
diff --git a/eos/effects/mininginfomultiplier.py b/eos/effects/mininginfomultiplier.py
index 2d05a550c..10ecb4eef 100644
--- a/eos/effects/mininginfomultiplier.py
+++ b/eos/effects/mininginfomultiplier.py
@@ -5,4 +5,4 @@
 # Charges named like: Mining Crystal (32 of 32)
 type = "passive"
 def handler(fit, module, context):
-    module.multiplyItemAttr("miningAmount", module.getModifiedChargeAttr("specialisationAsteroidYieldMultiplier"))
\ No newline at end of file
+    module.multiplyItemAttr("specialtyMiningAmount", module.getModifiedChargeAttr("specialisationAsteroidYieldMultiplier"))
diff --git a/eos/effects/missileskillrapidlauncherrof.py b/eos/effects/missileskillrapidlauncherrof.py
index c0ac8e3be..731f97c5d 100644
--- a/eos/effects/missileskillrapidlauncherrof.py
+++ b/eos/effects/missileskillrapidlauncherrof.py
@@ -1,7 +1,7 @@
 # missileSkillRapidLauncherRoF
 #
 # Used by:
-# Implants named like: Cerebral Accelerator (3 of 5)
+# Implants named like: Cerebral Accelerator (5 of 5)
 # Implants named like: Zainou 'Deadeye' Rapid Launch RL (6 of 6)
 # Implant: Whelan Machorin's Ballistic Smartlink
 # Skill: Missile Launcher Operation
diff --git a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py b/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py
index 3ede43e1f..1a970cad1 100644
--- a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py
+++ b/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py
@@ -1,7 +1,7 @@
 # surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringGunnery
 #
 # Used by:
-# Implants named like: Cerebral Accelerator (3 of 5)
+# Implants named like: Cerebral Accelerator (5 of 5)
 # Implants named like: Eifyr and Co. 'Gunslinger' Surgical Strike SS (6 of 6)
 type = "passive"
 def handler(fit, implant, context):
diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py
index 161ed2dbf..e5468553a 100644
--- a/eos/saveddata/module.py
+++ b/eos/saveddata/module.py
@@ -316,7 +316,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
                 self.__miningyield = 0
             else:
                 if self.state >= State.ACTIVE:
-                    volley = sum(map(lambda attr: self.getModifiedItemAttr(attr) or 0, self.MINING_ATTRIBUTES))
+                    volley = self.getModifiedItemAttr("specialtyMiningAmount") or self.getModifiedItemAttr("miningAmount") or 0
                     if volley:
                         cycleTime = self.cycleTime
                         self.__miningyield = volley / (cycleTime / 1000.0)
diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py
index 11a255a21..034ef792d 100644
--- a/gui/builtinViewColumns/misc.py
+++ b/gui/builtinViewColumns/misc.py
@@ -374,7 +374,7 @@ class Miscellanea(ViewColumn):
             tooltip = "Optimal signature radius"
             return text, tooltip
         elif itemGroup in ("Frequency Mining Laser", "Strip Miner", "Mining Laser", "Gas Cloud Harvester"):
-            miningAmount = stuff.getModifiedItemAttr("miningAmount")
+            miningAmount = stuff.getModifiedItemAttr("specialtyMiningAmount") or stuff.getModifiedItemAttr("miningAmount")
             cycleTime = stuff.cycleTime
             if not miningAmount or not cycleTime:
                 return "", None