Merge pull request #1270 from pyfa-org/release/v1.31.0

Release/v1.31.0
pyfa-org · Aug 17, 2017 · c33aeb7 · c33aeb7
2 parents 220ce23 + c023790
commit c33aeb7
Show file tree

Hide file tree

Showing 38 changed files with 1,473 additions and 1,291 deletions.
diff --git a/config.py b/config.py
@@ -19,9 +19,9 @@
 saveInRoot = False
 
 # Version data
-version = "1.30.1"
-tag = "git"
-expansionName = "YC119.7"
+version = "1.31.0"
+tag = "Stable   "
+expansionName = "YC119.8"
 expansionVersion = "1.0"
 evemonMinVersion = "4081"
 

diff --git a/eos/effects/ammospeedmultiplier.py b/eos/effects/ammospeedmultiplier.py
@@ -3,7 +3,6 @@
 # Used by:
 # Charges from group: Festival Charges (10 of 10)
 # Charges from group: Interdiction Probe (2 of 2)
-# Charges from group: Survey Probe (3 of 3)
 type = "passive"
 
 

diff --git a/eos/effects/boosterarmorhppenalty.py b/eos/effects/boosterarmorhppenalty.py
@@ -1,7 +1,7 @@
 # boosterArmorHpPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 55)
+# Implants from group: Booster (12 of 48)
 type = "boosterSideEffect"
 
 # User-friendly name for the side effect

diff --git a/eos/effects/boostermaxvelocitypenalty.py b/eos/effects/boostermaxvelocitypenalty.py
@@ -1,7 +1,7 @@
 # boosterMaxVelocityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 55)
+# Implants from group: Booster (12 of 48)
 type = "boosterSideEffect"
 
 # User-friendly name for the side effect

diff --git a/eos/effects/boostershieldcapacitypenalty.py b/eos/effects/boostershieldcapacitypenalty.py
@@ -1,7 +1,7 @@
 # boosterShieldCapacityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 55)
+# Implants from group: Booster (12 of 48)
 type = "boosterSideEffect"
 
 # User-friendly name for the side effect

diff --git a/eos/effects/covertopsandreconopscloakmoduledelaybonus.py b/eos/effects/covertopsandreconopscloakmoduledelaybonus.py
@@ -5,8 +5,8 @@
 # Ships from group: Blockade Runner (4 of 4)
 # Ships from group: Covert Ops (7 of 7)
 # Ships from group: Expedition Frigate (2 of 2)
-# Ships from group: Force Recon Ship (7 of 7)
-# Ships from group: Stealth Bomber (4 of 4)
+# Ships from group: Force Recon Ship (7 of 8)
+# Ships from group: Stealth Bomber (4 of 5)
 # Ships named like: Stratios (2 of 2)
 # Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
 # Ship: Astero

diff --git a/eos/effects/covertopscpubonus1.py b/eos/effects/covertopscpubonus1.py
@@ -1,7 +1,7 @@
 # covertOpsCpuBonus1
 #
 # Used by:
-# Ships from group: Stealth Bomber (4 of 4)
+# Ships from group: Stealth Bomber (4 of 5)
 # Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
 type = "passive"
 

diff --git a/eos/effects/covertopsstealthbombersiegemissilelauncerpowerneedbonus.py b/eos/effects/covertopsstealthbombersiegemissilelauncerpowerneedbonus.py
@@ -1,7 +1,7 @@
 # covertOpsStealthBomberSiegeMissileLauncerPowerNeedBonus
 #
 # Used by:
-# Ships from group: Stealth Bomber (4 of 4)
+# Ships from group: Stealth Bomber (4 of 5)
 type = "passive"
 
 

diff --git a/eos/effects/covertopsstealthbombertargettingdelaybonus.py b/eos/effects/covertopsstealthbombertargettingdelaybonus.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Ships from group: Black Ops (4 of 4)
-# Ships from group: Stealth Bomber (4 of 4)
+# Ships from group: Stealth Bomber (4 of 5)
 # Ship: Caedes
 # Ship: Chremoas
 # Ship: Endurance

diff --git a/eos/effects/cynosuraldurationbonus.py b/eos/effects/cynosuraldurationbonus.py
@@ -1,7 +1,7 @@
 # cynosuralDurationBonus
 #
 # Used by:
-# Ships from group: Force Recon Ship (6 of 7)
+# Ships from group: Force Recon Ship (6 of 8)
 type = "passive"
 
 

diff --git a/eos/effects/cynosuraltheoryconsumptionbonus.py b/eos/effects/cynosuraltheoryconsumptionbonus.py
@@ -1,7 +1,7 @@
 # cynosuralTheoryConsumptionBonus
 #
 # Used by:
-# Ships from group: Force Recon Ship (6 of 7)
+# Ships from group: Force Recon Ship (6 of 8)
 # Skill: Cynosural Field Theory
 type = "passive"
 

diff --git a/eos/effects/doomsdayaoeecm.py b/eos/effects/doomsdayaoeecm.py
@@ -0,0 +1,18 @@
+# doomsdayAOEECM
+#
+# Used by:
+# Module: ECM Jammer Burst Projector
+from eos.modifiedAttributeDict import ModifiedAttributeDict
+
+type = "projected", "active"
+
+
+def handler(fit, module, context, **kwargs):
+    if "projected" in context:
+        # jam formula: 1 - (1- (jammer str/ship str))^(# of jam mods with same str))
+        strModifier = 1 - module.getModifiedItemAttr("scan{0}StrengthBonus".format(fit.scanType)) / fit.scanStrength
+
+        if 'effect' in kwargs:
+            strModifier *= ModifiedAttributeDict.getResistance(fit, kwargs['effect'])
+
+        fit.ecmProjectedStr *= strModifier
diff --git a/eos/effects/missiledmgbonus.py b/eos/effects/missiledmgbonus.py
@@ -1,7 +1,7 @@
 # missileDMGBonus
 #
 # Used by:
-# Modules from group: Ballistic Control system (17 of 17)
+# Modules from group: Ballistic Control system (18 of 18)
 type = "passive"
 
 

diff --git a/eos/effects/missilelauncherspeedmultiplier.py b/eos/effects/missilelauncherspeedmultiplier.py
@@ -1,7 +1,7 @@
 # missileLauncherSpeedMultiplier
 #
 # Used by:
-# Modules from group: Ballistic Control system (17 of 17)
+# Modules from group: Ballistic Control system (18 of 18)
 type = "passive"
 
 

diff --git a/eos/effects/overloadrofbonus.py b/eos/effects/overloadrofbonus.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Missile Launcher Torpedo (22 of 22)
-# Items from market group: Ship Equipment > Turrets & Bays (428 of 859)
+# Items from market group: Ship Equipment > Turrets & Bays (429 of 861)
 # Module: Interdiction Sphere Launcher I
 type = "overheat"
 

diff --git a/eos/effects/reconshipcloakcpubonus1.py b/eos/effects/reconshipcloakcpubonus1.py
@@ -1,7 +1,7 @@
 # reconShipCloakCpuBonus1
 #
 # Used by:
-# Ships from group: Force Recon Ship (6 of 7)
+# Ships from group: Force Recon Ship (6 of 8)
 type = "passive"
 runTime = "early"
 

diff --git a/eos/effects/usemissiles.py b/eos/effects/usemissiles.py
@@ -3,7 +3,7 @@
 # Used by:
 # Modules from group: Missile Launcher Heavy (12 of 12)
 # Modules from group: Missile Launcher Rocket (15 of 15)
-# Modules named like: Launcher (153 of 153)
+# Modules named like: Launcher (154 of 154)
 type = 'active', "projected"
 
 

diff --git a/eos/saveddata/character.py b/eos/saveddata/character.py
@@ -346,7 +346,7 @@ def level(self):
 
         return self.activeLevel or 0
 
-    def setLevel(self, level, persist=False):
+    def setLevel(self, level, persist=False, ignoreRestrict=False):
 
         if (level < 0 or level > 5) and level is not None:
             raise ValueError(str(level) + " is not a valid value for level")
@@ -356,7 +356,9 @@ def setLevel(self, level, persist=False):
 
         self.activeLevel = level
 
-        if eos.config.settings['strictSkillLevels']:
+        # todo: have a way to do bulk skill level editing. Currently, everytime a single skill is changed, this runs,
+        # which affects performance. Should have a checkSkillLevels() or something that is more efficient for bulk.
+        if not ignoreRestrict and eos.config.settings['strictSkillLevels']:
             start = time.time()
             for item, rlevel in self.item.requiredFor.iteritems():
                 if item.group.category.ID == 16:  # Skill category

diff --git a/eve.db b/eve.db
diff --git a/gui/builtinContextMenus/amount.py b/gui/builtinContextMenus/amount.py
@@ -4,6 +4,7 @@
 import gui.globalEvents as GE
 # noinspection PyPackageRequirements
 import wx
+import re
 from service.fit import Fit
 from eos.saveddata.cargo import Cargo as es_Cargo
 from eos.saveddata.fighter import Fighter as es_Fighter
@@ -61,15 +62,16 @@ def change(self, event):
             return
 
         sFit = Fit.getInstance()
+        cleanInput = re.sub(r'[^0-9.]', '', self.input.GetLineText(0).strip())
         mainFrame = gui.mainFrame.MainFrame.getInstance()
         fitID = mainFrame.getActiveFit()
 
         if isinstance(self.thing, es_Cargo):
-            sFit.addCargo(fitID, self.thing.item.ID, int(float(self.input.GetLineText(0))), replace=True)
+            sFit.addCargo(fitID, self.thing.item.ID, int(float(cleanInput)), replace=True)
         elif isinstance(self.thing, es_Fit):
-            sFit.changeAmount(fitID, self.thing, int(float(self.input.GetLineText(0))))
+            sFit.changeAmount(fitID, self.thing, int(float(cleanInput)))
         elif isinstance(self.thing, es_Fighter):
-            sFit.changeActiveFighters(fitID, self.thing, int(float(self.input.GetLineText(0))))
+            sFit.changeActiveFighters(fitID, self.thing, int(float(cleanInput)))
 
         wx.PostEvent(mainFrame, GE.FitChanged(fitID=fitID))
 

diff --git a/gui/builtinContextMenus/metaSwap.py b/gui/builtinContextMenus/metaSwap.py
@@ -14,6 +14,7 @@
 from eos.saveddata.drone import Drone
 from eos.saveddata.fighter import Fighter
 from eos.saveddata.implant import Implant
+from eos.saveddata.cargo import Cargo
 
 
 class MetaSwap(ContextMenu):
@@ -31,6 +32,7 @@ def display(self, srcContext, selection):
                 "fighterItem",
                 "boosterItem",
                 "implantItem",
+                "cargoItem",
         ):
             return False
 
@@ -185,6 +187,13 @@ def handleModule(self, event):
                         sFit.addImplant(fitID, item.ID, True)
                         break
 
+            elif isinstance(selected_item, Cargo):
+                for idx, cargo_stack in enumerate(fit.cargo):
+                    if cargo_stack is selected_item:
+                        sFit.removeCargo(fitID, idx)
+                        sFit.addCargo(fitID, item.ID, cargo_stack.amount, True)
+                        break
+
         wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID))
 
 

diff --git a/gui/builtinItemStatsViews/__init__.py b/gui/builtinItemStatsViews/__init__.py
diff --git a/gui/builtinItemStatsViews/helpers.py b/gui/builtinItemStatsViews/helpers.py
@@ -0,0 +1,18 @@
+# noinspection PyPackageRequirements
+import wx
+
+# noinspection PyPackageRequirements
+import wx.lib.mixins.listctrl as listmix
+
+
+class AutoListCtrl(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ListRowHighlighter):
+    def __init__(self, parent, ID, pos=wx.DefaultPosition, size=wx.DefaultSize, style=0):
+        wx.ListCtrl.__init__(self, parent, ID, pos, size, style)
+        listmix.ListCtrlAutoWidthMixin.__init__(self)
+        listmix.ListRowHighlighter.__init__(self)
+
+
+class AutoListCtrlNoHighlight(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ListRowHighlighter):
+    def __init__(self, parent, ID, pos=wx.DefaultPosition, size=wx.DefaultSize, style=0):
+        wx.ListCtrl.__init__(self, parent, ID, pos, size, style)
+        listmix.ListCtrlAutoWidthMixin.__init__(self)