Bump version

New stats view: bombing resistance

.appveyor.yml

@@ -25,6 +25,7 @@ for:
     before_build:
       # Prepare pyfa data
       - sh: find locale/ -type f -name "*.po" -exec msgen "{}" -o "{}" \;
+      - sh: pyenv global system
       - sh: python3 -B scripts/compile_lang.py
       - sh: python3 -B scripts/dump_crowdin_progress.py
       - sh: python3 -B db_update.py

db_update.py

@@ -141,14 +141,15 @@ def update_db():
                 (row['typeName_en-us'].startswith('Civilian') and "Shuttle" not in row['typeName_en-us'])
                 or row['typeName_en-us'] == 'Capsule'
                 or row['groupID'] == 4033  # destructible effect beacons
-                or re.match('AIR .+Booster.*', row['typeName_en-us'])
+                or row['typeID'] == 82941  # Metenox service
+                or re.match(r'AIR .+Booster.*', row['typeName_en-us'])
             ):
                 row['published'] = True
             # Nearly useless and clutter search results too much
             elif (
                 row['typeName_en-us'].startswith('Limited Synth ')
                 or row['typeName_en-us'].startswith('Expired ')
-                or re.match('Mining Blitz .+ Booster Dose .+', row['typeName_en-us'])
+                or re.match(r'Mining Blitz .+ Booster Dose .+', row['typeName_en-us'])
                 or row['typeName_en-us'].endswith(' Filament') and (
                     "'Needlejack'" not in row['typeName_en-us'] and
                     "'Devana'" not in row['typeName_en-us'] and
@@ -601,7 +602,7 @@ def update_db():
         eos.gamedata.Item.name.like('%mutated%'),
         eos.gamedata.Item.name.like('%_PLACEHOLDER%'),
         # Drifter weapons are published for some reason
-        eos.gamedata.Item.name.in_(('Lux Kontos', 'Lux Xiphos'))
+        eos.gamedata.Item.name.in_(('Lux Kontos', 'Lux Xiphos', 'Lux Ballistra', 'Lux Kopis'))
     )).all():
         if 'Asteroid Mining Crystal' in item.name:
             continue
@@ -651,6 +652,16 @@ def update_db():
             effect.effectName = effectName
             item.effects[effectName] = effect
 
+    def hardcodeSuppressionTackleRange():
+        beaconTypeID = 79839
+        attrMap = {
+            'warfareBuff1ID': 2405,
+            'warfareBuff1Value': 10}
+        effectMap = {100000: 'pyfaCustomSuppressionTackleRange'}
+        _hardcodeAttribs(beaconTypeID, attrMap)
+        _hardcodeEffects(beaconTypeID, effectMap)
+
+
     def hardcodeShapash():
         shapashTypeID = 1000000
         _copyItem(srcName='Utu', tgtTypeID=shapashTypeID, tgtName='Shapash')
@@ -794,8 +805,7 @@ def update_db():
         _hardcodeAttribs(cybeleTypeID, attrMap)
         _hardcodeEffects(cybeleTypeID, effectMap)
 
-    # hardcodeShapash()
-    # hardcodeCybele()
+    hardcodeSuppressionTackleRange()
 
     eos.db.gamedata_session.commit()
     eos.db.gamedata_engine.execute('VACUUM')

dist_assets/win/dist.py

@@ -14,7 +14,7 @@ with open("version.yml", 'r') as file:
 os.environ["PYFA_DIST_DIR"] = os.path.join(os.getcwd(), 'dist')
 
 os.environ["PYFA_VERSION"] = version
-iscc = "C:\Program Files (x86)\Inno Setup 6\ISCC.exe"
+iscc = r"C:\Program Files (x86)\Inno Setup 6\ISCC.exe"
 
 source = os.path.join(os.environ["PYFA_DIST_DIR"], "pyfa")
 

eos/db/migrations/__init__.py

@@ -21,7 +21,7 @@ for modName in iterNamespace(__name__, __path__):
     # loop through python files, extracting update number and function, and
     # adding it to a list
     modname_tail = modName.rsplit('.', 1)[-1]
-    m = re.match("^upgrade(?P<index>\d+)$", modname_tail)
+    m = re.match(r"^upgrade(?P<index>\d+)$", modname_tail)
     if not m:
         continue
     index = int(m.group("index"))

eos/saveddata/fit.py

@@ -1820,7 +1820,7 @@ class Fit:
             # That's right, for considerations of RR diminishing returns cycle time is rounded this way
             totalRaw += amount / int(cycleTime)
         RR_ADDITION = 7000
-        RR_MULTIPLIER = 10
+        RR_MULTIPLIER = 20
         appliedRr = 0
         for amount, cycleTime in rrList:
             rrps = amount / int(cycleTime)

eos/utils/stats.py

@@ -176,7 +176,7 @@ class DmgTypes:
                 floatUnerr(self._thermal) == floatUnerr(other._thermal) and
                 floatUnerr(self._kinetic) == floatUnerr(other._kinetic) and
                 floatUnerr(self._explosive) == floatUnerr(other._explosive) and
-                sorted(self._breachers) == sorted(other._breachers),
+                sorted(self._breachers) == sorted(other._breachers) and
                 self.profile == other.profile)
 
     def __add__(self, other):

graphs/data/fitDamageStats/calc/application.py

@@ -58,7 +58,8 @@ def getApplicationPerKey(src, tgt, atkSpeed, atkAngle, distance, tgtSpeed, tgtAn
                     tgtSigRadius=tgtSigRadius)
             else:
                 applicationMap[mod] = 0
-        elif mod.hardpoint == FittingHardpoint.MISSILE:
+        # Missile launcher or civilian missile launcher
+        elif mod.hardpoint == FittingHardpoint.MISSILE or mod.item.ID == 32461:
             # FoF missiles can shoot beyond lock range
             if inLockRange or (mod.charge is not None and 'fofMissileLaunching' in mod.charge.effects):
                 applicationMap[mod] = getLauncherMult(

graphs/gui/canvasPanel.py

@@ -273,7 +273,7 @@ class GraphCanvasPanel(wx.Panel):
         legendLines = []
         for i, iData in enumerate(legendData):
             color, lineStyle, label = iData
-            legendLines.append(Line2D([0], [0], color=color, linestyle=lineStyle, label=label.replace('$', '\$')))
+            legendLines.append(Line2D([0], [0], color=color, linestyle=lineStyle, label=label.replace('$', r'\$')))
 
         if len(legendLines) > 0 and self.graphFrame.ctrlPanel.showLegend:
             legend = self.subplot.legend(handles=legendLines)

gui/builtinAdditionPanes/boosterView.py

@@ -43,6 +43,10 @@ class BoosterViewDrop(wx.DropTarget):
         if self.GetData():
             dragged_data = DragDropHelper.data
             data = dragged_data.split(':')
+
+            if dragged_data is None:
+                return t
+
             self.dropFn(x, y, data)
         return t
 

gui/builtinAdditionPanes/cargoView.py

@@ -41,6 +41,10 @@ class CargoViewDrop(wx.DropTarget):
     def OnData(self, x, y, t):
         if self.GetData():
             dragged_data = DragDropHelper.data
+
+            if dragged_data is None:
+                return t
+
             data = dragged_data.split(':')
             self.dropFn(x, y, data)
         return t

gui/builtinAdditionPanes/commandView.py

@@ -56,6 +56,10 @@ class CommandViewDrop(wx.DropTarget):
     def OnData(self, x, y, t):
         if self.GetData():
             dragged_data = DragDropHelper.data
+
+            if dragged_data is None:
+                return t
+
             data = dragged_data.split(':')
             self.dropFn(x, y, data)
         return t

gui/builtinAdditionPanes/droneView.py

@@ -52,6 +52,10 @@ class DroneViewDrop(wx.DropTarget):
     def OnData(self, x, y, t):
         if self.GetData():
             dragged_data = DragDropHelper.data
+
+            if dragged_data is None:
+                return t
+
             data = dragged_data.split(':')
             self.dropFn(x, y, data)
         return t

gui/builtinAdditionPanes/fighterView.py

@@ -52,6 +52,10 @@ class FighterViewDrop(wx.DropTarget):
     def OnData(self, x, y, t):
         if self.GetData():
             dragged_data = DragDropHelper.data
+
+            if dragged_data is None:
+                return t
+
             data = dragged_data.split(':')
             self.dropFn(x, y, data)
         return t

gui/builtinAdditionPanes/implantView.py

@@ -46,6 +46,10 @@ class ImplantViewDrop(wx.DropTarget):
     def OnData(self, x, y, t):
         if self.GetData():
             dragged_data = DragDropHelper.data
+
+            if dragged_data is None:
+                return t
+
             data = dragged_data.split(':')
             self.dropFn(x, y, data)
         return t

gui/builtinAdditionPanes/projectedView.py

@@ -65,6 +65,10 @@ class ProjectedViewDrop(wx.DropTarget):
     def OnData(self, x, y, t):
         if self.GetData():
             dragged_data = DragDropHelper.data
+
+            if dragged_data is None:
+                return t
+
             data = dragged_data.split(':')
             self.dropFn(x, y, data)
         return t

gui/builtinContextMenus/__init__.py

@@ -36,6 +36,7 @@ from gui.builtinContextMenus import skillAffectors
 from gui.builtinContextMenus import itemFill
 from gui.builtinContextMenus import droneAddStack
 from gui.builtinContextMenus import cargoAdd
+from gui.builtinContextMenus import cargoFill
 from gui.builtinContextMenus import cargoAddAmmo
 from gui.builtinContextMenus import itemProject
 from gui.builtinContextMenus import ammoToDmgPattern

gui/builtinContextMenus/cargoFill.py

@@ -0,0 +1,68 @@
+import wx
+
+import gui.fitCommands as cmd
+import gui.mainFrame
+from gui.contextMenu import ContextMenuSingle
+from service.fit import Fit
+from eos.saveddata.cargo import Cargo
+
+_t = wx.GetTranslation
+
+
+class FillCargoWithItem(ContextMenuSingle):
+    def __init__(self):
+        self.mainFrame = gui.mainFrame.MainFrame.getInstance()
+
+    def display(self, callingWindow, srcContext, mainItem):
+        if srcContext not in ("marketItemGroup", "marketItemMisc", "cargoItem"):
+            return False
+
+        if mainItem is None:
+            return False
+
+        if self.mainFrame.getActiveFit() is None:
+            return False
+
+        if srcContext in ("marketItemGroup", "marketItemMisc"):
+            if not (mainItem.isCharge or mainItem.isCommodity):
+                return False
+
+        return True
+
+    def getText(self, callingWindow, itmContext, mainItem):
+        return _t("Fill Cargo With {0}").format(itmContext)
+
+    def activate(self, callingWindow, fullContext, mainItem, i):
+        fitID = self.mainFrame.getActiveFit()
+        fit = Fit.getInstance().getFit(fitID)
+        
+        if isinstance(mainItem, Cargo):
+            itemVolume = mainItem.item.attributes['volume'].value
+            itemID = mainItem.itemID
+        else:
+            itemVolume = mainItem.attributes['volume'].value
+            itemID = int(mainItem.ID)
+            
+        if itemVolume is None or itemVolume <= 0:
+            return
+            
+        # Calculate how many items can fit in the cargo
+        cargoCapacity = fit.ship.getModifiedItemAttr("capacity")
+        currentCargoVolume = fit.cargoBayUsed
+        availableVolume = cargoCapacity - currentCargoVolume
+        
+        if availableVolume <= 0:
+            return
+            
+        # Calculate maximum amount that can fit
+        maxAmount = int(availableVolume / itemVolume)
+        if maxAmount <= 0:
+            return
+            
+        # Add the items to cargo
+        command = cmd.GuiAddCargoCommand(fitID=fitID, itemID=itemID, amount=maxAmount)
+        if self.mainFrame.command.Submit(command):
+            self.mainFrame.additionsPane.select("Cargo", focus=False)
+
+
+FillCargoWithItem.register() 

gui/builtinContextMenus/envEffectAdd.py

@@ -123,9 +123,11 @@ class AddEnvironmentEffect(ContextMenuUnconditional):
         data.groups[_t('Abyssal Weather')] = self.getAbyssalWeather()
         data.groups[_t('Sansha Incursion')] = self.getEffectBeacons(
             _t('ContextMenu|ProjectedEffectManipulation|Sansha Incursion'))
+        data.groups[_t('Drifter Incursion')] = self.getDrifterIncursion()
         data.groups[_t('Triglavian Invasion')] = self.getInvasionBeacons()
-        # data.groups[_t('Pirate Insurgency')] = self.getEffectBeacons(
-        #     _t('ContextMenu|ProjectedEffectManipulation|Insurgency'))
+        data.groups[_t('Pirate Insurgency')] = self.getEffectBeacons(
+            _t('ContextMenu|ProjectedEffectManipulation|Insurgency'),
+            extra_garbage=(_t('ContextMenu|ProjectedEffectManipulation|Beacon'),))
         return data
 
     def getEffectBeacons(self, *groups, extra_garbage=()):
@@ -176,7 +178,6 @@ class AddEnvironmentEffect(ContextMenuUnconditional):
                     container.append(Entry(beacon.ID, beaconname, shortname))
                     # Break loop on 1st result
                     break
-        data.sort()
         return data
 
     def getAbyssalWeather(self):
@@ -233,8 +234,21 @@ class AddEnvironmentEffect(ContextMenuUnconditional):
         data.sort()
         return data
 
+    def getDrifterIncursion(self):
+        data = self.getEffectBeacons(_t('ContextMenu|ProjectedEffectManipulation|Drifter Incursion'))
+        # Drifter Crisis
+        item = Market.getInstance().getItem(87294)
+        data.items.append(Entry(item.ID, item.name, item.name))
+        return data
+
     def getInvasionBeacons(self):
         data = self.getDestructibleBeacons()
+        # Trig Minor Victory
+        item = Market.getInstance().getItem(87177)
+        data.items.append(Entry(item.ID, item.name, item.name))
+        # Trig Final Liminality
+        item = Market.getInstance().getItem(87164)
+        data.items.append(Entry(item.ID, item.name, item.name))
         # Turnur weather
         item = Market.getInstance().getItem(74002)
         data.items.append(Entry(item.ID, item.name, item.name))
@@ -247,5 +261,4 @@ class AddEnvironmentEffect(ContextMenuUnconditional):
         data.items.append(Entry(item.ID, item.name, item.name))
         return data
 
-
 AddEnvironmentEffect.register()

gui/builtinItemStatsViews/itemDescription.py

@@ -22,9 +22,9 @@ class ItemDescription(wx.Panel):
 
         desc = item.description.replace("\n", "<br>")
         # Strip font tags
-        desc = re.sub("<( *)font( *)color( *)=(.*?)>(?P<inside>.*?)<( *)/( *)font( *)>", "\g<inside>", desc)
+        desc = re.sub("<( *)font( *)color( *)=(.*?)>(?P<inside>.*?)<( *)/( *)font( *)>", r"\g<inside>", desc)
         # Strip URLs
-        desc = re.sub("<( *)a(.*?)>(?P<inside>.*?)<( *)/( *)a( *)>", "\g<inside>", desc)
+        desc = re.sub("<( *)a(.*?)>(?P<inside>.*?)<( *)/( *)a( *)>", r"\g<inside>", desc)
         desc = "<body bgcolor='{}' text='{}'>{}</body>".format(
                 bgcolor.GetAsString(wx.C2S_HTML_SYNTAX),
                 fgcolor.GetAsString(wx.C2S_HTML_SYNTAX),

gui/builtinPreferenceViews/pyfaContextMenuPreferences.py

@@ -68,22 +68,27 @@ class PFContextMenuPref(PreferenceView):
         rbSizerRow2.Add(self.rbBox5, 1, wx.ALL, 5)
         self.rbBox5.Bind(wx.EVT_RADIOBOX, self.OnSetting5Change)
 
+        self.rbBox6 = wx.RadioBox(panel, -1, _t("Spoolup"), wx.DefaultPosition, wx.DefaultSize, [_t('Disabled'), _t('Enabled')], 1, wx.RA_SPECIFY_COLS)
+        self.rbBox6.SetSelection(self.settings.get('spoolup'))
+        rbSizerRow2.Add(self.rbBox6, 1, wx.ALL, 5)
+        self.rbBox6.Bind(wx.EVT_RADIOBOX, self.OnSetting6Change)
+
         mainSizer.Add(rbSizerRow2, 1, wx.ALL | wx.EXPAND, 0)
 
         # Row 3
         rbSizerRow3 = wx.BoxSizer(wx.HORIZONTAL)
 
-        self.rbBox6 = wx.RadioBox(panel, -1, _t("Spoolup"), wx.DefaultPosition, wx.DefaultSize, [_t('Disabled'), _t('Enabled')], 1, wx.RA_SPECIFY_COLS)
-        self.rbBox6.SetSelection(self.settings.get('spoolup'))
-        rbSizerRow3.Add(self.rbBox6, 1, wx.ALL, 5)
-        self.rbBox6.Bind(wx.EVT_RADIOBOX, self.OnSetting6Change)
-
         self.rbBox7 = wx.RadioBox(panel, -1, _t("Additions Panel Copy/Paste"), wx.DefaultPosition, wx.DefaultSize, [_t('Disabled'), _t('Enabled')], 1,
                                   wx.RA_SPECIFY_COLS)
         self.rbBox7.SetSelection(self.settings.get('additionsCopyPaste'))
         rbSizerRow3.Add(self.rbBox7, 1, wx.ALL, 5)
         self.rbBox7.Bind(wx.EVT_RADIOBOX, self.OnSetting7Change)
 
+        self.rbBox8 = wx.RadioBox(panel, -1, _t("Fill cargo with"), wx.DefaultPosition, wx.DefaultSize, [_t('Disabled'), _t('Enabled')], 1, wx.RA_SPECIFY_COLS)
+        self.rbBox8.SetSelection(self.settings.get('cargoFill'))
+        rbSizerRow3.Add(self.rbBox8, 1, wx.ALL, 5)
+        self.rbBox8.Bind(wx.EVT_RADIOBOX, self.OnSetting8Change)
+
         mainSizer.Add(rbSizerRow3, 1, wx.ALL | wx.EXPAND, 0)
 
         panel.SetSizer(mainSizer)
@@ -110,6 +115,9 @@ class PFContextMenuPref(PreferenceView):
     def OnSetting7Change(self, event):
         self.settings.set('additionsCopyPaste', event.GetInt())
 
+    def OnSetting8Change(self, event):
+        self.settings.set('cargoFill', event.GetInt())
+
     def getImage(self):
         return BitmapLoader.getBitmap("settings_menu", "gui")
 

gui/builtinPreferenceViews/pyfaStatViewPreferences.py

@@ -106,6 +106,14 @@ class PFStatViewPref(PreferenceView):
         rbSizerRow3.Add(self.rbOutgoing, 1, wx.TOP | wx.RIGHT, 5)
         self.rbOutgoing.Bind(wx.EVT_RADIOBOX, self.OnOutgoingChange)
 
+        self.rbBombing = wx.RadioBox(panel, -1, _t("Bombing"), wx.DefaultPosition, wx.DefaultSize, [_t('None'), _t('Minimal'), _t('Full')], 1,
+                                     wx.RA_SPECIFY_COLS)
+        # Disable minimal as we don't have a view for this yet
+        self.rbBombing.EnableItem(1, False)
+        self.rbBombing.SetSelection(self.settings.get('bombing'))
+        rbSizerRow3.Add(self.rbBombing, 1, wx.TOP | wx.RIGHT, 5)
+        self.rbBombing.Bind(wx.EVT_RADIOBOX, self.OnBombingChange)
+
         mainSizer.Add(rbSizerRow3, 1, wx.ALL | wx.EXPAND, 0)
 
         panel.SetSizer(mainSizer)
@@ -144,5 +152,7 @@ class PFStatViewPref(PreferenceView):
     def getImage(self):
         return BitmapLoader.getBitmap("settings_stats", "gui")
 
+    def OnBombingChange(self, event):
+        self.settings.set('bombing', event.GetInt())
 
 PFStatViewPref.register()

gui/builtinShipBrowser/pfListPane.py

@@ -163,6 +163,10 @@ class PFListPane(wx.ScrolledWindow):
     def RemoveAllChildren(self):
         for widget in self._wList:
             widget.Destroy()
+            # this forces the garbage collector to work properly by removing dangling references to objects which are still alive, otherwise widget cannot be gc-ed eventually causing GDI id exhaustion and crash
+            for i in widget.__dict__.keys():
+                widget.__dict__[i] =None
+            del widget
 
         self.Scroll(0, 0)
         self._wList = []

gui/builtinStatsViews/__init__.py

@@ -7,6 +7,7 @@ __all__ = [
     "outgoingViewFull",
     "outgoingViewMinimal",
     "targetingMiscViewMinimal",
+    "bombingViewFull",
     "priceViewFull",
     "priceViewMinimal",
 ]

gui/builtinStatsViews/bombingViewFull.py

@@ -0,0 +1,165 @@
+# =============================================================================
+# Copyright (C) 2010 Diego Duclos
+#
+# This file is part of pyfa.
+#
+# pyfa is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# pyfa is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with pyfa.  If not, see <http://www.gnu.org/licenses/>.
+# =============================================================================
+
+# noinspection PyPackageRequirements
+import wx
+import math
+
+import gui.mainFrame
+from gui.bitmap_loader import BitmapLoader
+from gui.statsView import StatsView
+from eos.const import FittingModuleState
+from service.market import Market
+
+_t = wx.GetTranslation
+
+
+class BombingViewFull(StatsView):
+    name = "bombingViewFull"
+
+    def __init__(self, parent):
+        StatsView.__init__(self)
+        self.parent = parent
+        self._cachedValues = []
+        self.mainFrame = gui.mainFrame.MainFrame.getInstance()
+
+    def getHeaderText(self, fit):
+        return _t("Bombing")
+
+    def getTextExtentW(self, text):
+        width, height = self.parent.GetTextExtent(text)
+        return width
+
+    def populatePanel(self, contentPanel, headerPanel):
+        contentSizer = contentPanel.GetSizer()
+        self.panel = contentPanel
+
+        self.headerPanel = headerPanel
+
+        # Display table
+        sizerBombing = wx.FlexGridSizer(7, 5, 0, 0)
+        for i in range(4):
+            sizerBombing.AddGrowableCol(i + 1)
+        contentSizer.Add(sizerBombing, 0, wx.EXPAND, 0)
+
+        # first row is for icons
+        bitmap = BitmapLoader.getStaticBitmap("skill_big", contentPanel, "gui")
+        tooltip = wx.ToolTip(_t("Covert Ops level"))
+        bitmap.SetToolTip(tooltip)
+        sizerBombing.Add(bitmap, 0, wx.ALIGN_CENTER)
+        toolTipText = {
+            "em": _t("Electron Bomb"),
+            "thermal": _t("Scorch Bomb"),
+            "kinetic": _t("Concussion Bomb"),
+            "explosive": _t("Shrapnel Bomb")
+        }
+        for damageType in ("em", "thermal", "kinetic", "explosive"):
+            bitmap = BitmapLoader.getStaticBitmap("%s_big" % damageType, contentPanel, "gui")
+            tooltip = wx.ToolTip(toolTipText[damageType])
+            bitmap.SetToolTip(tooltip)
+            sizerBombing.Add(bitmap, 0, wx.ALIGN_CENTER)
+
+        # the other rows are for each possible level of Covert Ops skill
+        for covertLevel in ("0", "1", "2", "3", "4", "5"):
+            label = wx.StaticText(contentPanel, wx.ID_ANY, "%s" % covertLevel)
+            tooltip = wx.ToolTip(_t("Covert Ops level"))
+            label.SetToolTip(tooltip)
+            sizerBombing.Add(label, 0, wx.ALIGN_CENTER)
+
+            for damageType in ("em", "thermal", "kinetic", "explosive"):
+                label = wx.StaticText(contentPanel, wx.ID_ANY, "0.0")
+                setattr(self, "labelDamagetypeCovertlevel%s%s" % (damageType.capitalize(), covertLevel), label)
+                sizerBombing.Add(label, 0, wx.ALIGN_CENTER)
+
+    def refreshPanel(self, fit):
+        # If we did anything interesting, we'd update our labels to reflect the new fit's stats here
+        if fit is None:
+            return
+
+        mkt = Market.getInstance()
+        emBomb = mkt.getItem(27920)
+        thermalBomb = mkt.getItem(27916)
+        kineticBomb = mkt.getItem(27912)
+        explosiveBomb = mkt.getItem(27918)
+        environementBombDamageModifier = 1.0
+
+        # list all environmental effects affecting bomb damage
+        relevantEffects = [
+            'Class 6 Red Giant Effects',
+            'Class 5 Red Giant Effects',
+            'Class 4 Red Giant Effects',
+            'Class 3 Red Giant Effects',
+            'Class 2 Red Giant Effects',
+            'Class 1 Red Giant Effects',
+        ]
+        for effect in fit.projectedModules:
+            if effect.state == FittingModuleState.ONLINE and effect.fullName in relevantEffects:
+                # note: despite the name, smartbombDamageMultiplier applies to the damage of launched bombs
+                environementBombDamageModifier = environementBombDamageModifier *\
+                                                 effect.item.attributes['smartbombDamageMultiplier'].value
+
+        # signature radius of the current fit to calculate the application of bombs
+        shipSigRadius = fit.ship.getModifiedItemAttr('signatureRadius')
+
+        # get the raw values for all hp layers
+        hullHP = fit.ship.getModifiedItemAttr('hp')
+        armorHP = fit.ship.getModifiedItemAttr('armorHP')
+        shieldHP = fit.ship.getModifiedItemAttr('shieldCapacity')
+
+        # we calculate the total ehp for pure damage of all types based on raw hp and resonance (resonance= 1-resistance)
+        emEhp = hullHP / fit.ship.getModifiedItemAttr('emDamageResonance') +\
+                armorHP / fit.ship.getModifiedItemAttr('armorEmDamageResonance') +\
+                shieldHP / fit.ship.getModifiedItemAttr('shieldEmDamageResonance')
+        thermalEhp = hullHP / fit.ship.getModifiedItemAttr('thermalDamageResonance') +\
+                armorHP / fit.ship.getModifiedItemAttr('armorThermalDamageResonance') +\
+                shieldHP / fit.ship.getModifiedItemAttr('shieldThermalDamageResonance')
+        kineticEhp = hullHP / fit.ship.getModifiedItemAttr('kineticDamageResonance') +\
+                armorHP / fit.ship.getModifiedItemAttr('armorKineticDamageResonance') +\
+                shieldHP / fit.ship.getModifiedItemAttr('shieldKineticDamageResonance')
+        explosiveEhp = hullHP / fit.ship.getModifiedItemAttr('explosiveDamageResonance') +\
+                armorHP / fit.ship.getModifiedItemAttr('armorExplosiveDamageResonance') +\
+                shieldHP / fit.ship.getModifiedItemAttr('shieldExplosiveDamageResonance')
+
+        # updates the labels for each combination of covert op level and damage type
+        for covertLevel in ("0", "1", "2", "3", "4", "5"):
+            covertOpsBombDamageModifier = 1 + 0.05 * int(covertLevel)
+            for damageType, ehp, bomber, bomb in (("em", emEhp, "Purifier", emBomb),
+                                                  ("thermal", thermalEhp, "Nemesis", thermalBomb),
+                                                  ("kinetic", kineticEhp, "Manticore", kineticBomb),
+                                                  ("explosive", explosiveEhp, "Hound", explosiveBomb)):
+                baseBombDamage = (bomb.attributes['emDamage'].value + bomb.attributes['thermalDamage'].value +
+                                  bomb.attributes['kineticDamage'].value + bomb.attributes['explosiveDamage'].value)
+                appliedBombDamage = baseBombDamage * covertOpsBombDamageModifier * environementBombDamageModifier * \
+                                    (min(bomb.attributes['signatureRadius'].value, shipSigRadius) /
+                                     bomb.attributes['signatureRadius'].value)
+                label = getattr(self, "labelDamagetypeCovertlevel%s%s" % (damageType.capitalize(), covertLevel))
+                label.SetLabel("{:.1f}".format(math.ceil((ehp / appliedBombDamage) * 10) / 10))
+                if covertLevel != "0":
+                    label.SetToolTip("Number of %s to kill a %s using a %s "
+                                 "with Covert Ops level %s" % (bomb.customName, fit.name, bomber, covertLevel))
+                else:
+                    label.SetToolTip("Number of %s to kill a %s with Covert Ops level %s" %
+                                     (bomb.customName, fit.name, covertLevel))
+
+
+        self.panel.Layout()
+        self.headerPanel.Layout()
+
+
+BombingViewFull.register()

gui/builtinViewColumns/misc.py

@@ -810,13 +810,16 @@ class Miscellanea(ViewColumn):
                 return text, tooltip
             elif chargeGroup in ("SCARAB Breacher Pods",):
                 duration = stuff.getModifiedChargeAttr("dotDuration") / 1000
-                dmgAbs = stuff.getModifiedChargeAttr("dotMaxDamagePerTick") * duration
-                dmgRel = stuff.getModifiedChargeAttr("dotMaxHPPercentagePerTick") * duration
+                dmgAbs = stuff.getModifiedChargeAttr("dotMaxDamagePerTick")
+                dmgRel = stuff.getModifiedChargeAttr("dotMaxHPPercentagePerTick")
                 text = "{}/{}% over {}s".format(
-                    formatAmount(dmgAbs, 3, 0, 6),
-                    formatAmount(dmgRel, 3, 0, 6),
+                    formatAmount(dmgAbs * duration, 3, 0, 6),
+                    formatAmount(dmgRel * duration, 3, 0, 6),
                     formatAmount(duration, 0, 0, 0))
-                tooltip = "Pure damage done over time, minimum of absolute / relative"
+                fullDmgHp = dmgAbs / (dmgRel / 100)
+                tooltip = (
+                    'Pure damage inflicted over time, minimum of absolute / relative\n'
+                    'Full DPS from {} target HP').format(formatAmount(fullDmgHp, 3, 0, 6))
                 return text, tooltip
             else:
                 return "", None

gui/builtinViews/fittingView.py

@@ -127,6 +127,10 @@ class FittingViewDrop(wx.DropTarget):
         if self.GetData():
             dragged_data = DragDropHelper.data
             # pyfalog.debug("fittingView: recieved drag: " + self.dropData.GetText())
+
+            if dragged_data is None:
+                return t
+
             data = dragged_data.split(':')
             self.dropFn(x, y, data)
         return t

gui/builtinViews/implantEditor.py

@@ -13,8 +13,8 @@ from service.market import Market
 
 
 def stripHtml(text):
-    text = re.sub('<\s*br\s*/?\s*>', '\n', text)
-    text = re.sub('</?[^/]+?(/\s*)?>', '', text)
+    text = re.sub(r'<\s*br\s*/?\s*>', '\n', text)
+    text = re.sub(r'</?[^/]+?(/\s*)?>', '', text)
     return text
 
 

gui/characterEditor.py

@@ -481,6 +481,35 @@ class SkillTreeView(wx.Panel):
 
         toClipboard(list)
 
+    def exportSkillsSuperCondensed(self, evt):
+        char = self.charEditor.entityEditor.getActiveEntity()
+
+        skills = {}
+        explicit_levels = {}
+        implicit_levels = {}
+        for s in char.__class__.getSkillNameMap().keys():
+            skill = char.getSkill(s)
+            if skill.level < 1:
+                continue
+            skills[skill.item.ID] = skill
+            explicit_levels[skill.item.ID] = skill.level
+
+        for skill in skills.values():
+            for req_skill, level in skill.item.requiredSkills.items():
+                if req_skill.ID not in implicit_levels or implicit_levels[req_skill.ID] < level:
+                    implicit_levels[req_skill.ID] = level
+
+        condensed = {}
+        for typeID, level in explicit_levels.items():
+            if typeID not in implicit_levels or implicit_levels[typeID] < level:
+                condensed[skills[typeID].item.name] = level
+
+        lines = []
+        for skill in sorted(condensed):
+            lines.append(f'{skill}\t{condensed[skill]}')
+
+        toClipboard('\n'.join(lines))
+
     def onSecStatus(self, event):
         sChar = Character.getInstance()
         char = self.charEditor.entityEditor.getActiveEntity()

gui/statsPane.py

@@ -43,6 +43,7 @@ class StatsPane(wx.Panel):
         "outgoing",
         "capacitor",
         "targetingMisc",
+        "bombing",
         "price",
     ]
 

gui/statsView.py

@@ -51,6 +51,7 @@ from gui.builtinStatsViews import (  # noqa: E402, F401
     capacitorViewFull,
     rechargeViewFull,
     targetingMiscViewMinimal,
+    bombingViewFull,
     priceViewFull,
     priceViewMinimal,
     outgoingViewFull,

gui/updateDialog.py

@@ -66,8 +66,8 @@ class UpdateDialog(wx.Dialog):
         self.browser.Bind(wx.html2.EVT_WEBVIEW_NEWWINDOW, self.OnNewWindow)
 
         link_patterns = [
-            (re.compile("#(\d+)", re.I), r"https://github.com/pyfa-org/Pyfa/issues/\1"),
-            (re.compile("@(\w+)", re.I), r"https://github.com/\1")
+            (re.compile(r"#(\d+)", re.I), r"https://github.com/pyfa-org/Pyfa/issues/\1"),
+            (re.compile(r"@(\w+)", re.I), r"https://github.com/\1")
         ]
 
         markdowner = markdown2.Markdown(

gui/utils/gdi.py

@@ -0,0 +1,32 @@
+import gc
+from ctypes import *
+from collections import defaultdict
+import os
+def gdiReport(desc=''):
+    PH = windll.kernel32.OpenProcess(0x400, 0, os.getpid())
+    numGdi = windll.user32.GetGuiResources(PH, 0)
+    windll.kernel32.CloseHandle(PH)
+    print (f'{desc}, {numGdi}')
+
+
+last = None
+def output_memory():
+    global last
+    d = defaultdict(int) 
+    for o in gc.get_objects():
+        name = type(o).__name__  
+        if name == 'Bitmap':
+            del o
+        d[name] += 1
+
+    items = d.items()
+    items = sorted(items,key=lambda x:x[1])
+    print('------')
+    for key, value in items:
+        if last is not None:
+            if value -last[key] !=0:
+                print(f'{key} {value - last[key]}, {value}')
+        else:
+            print( key, value)
+            
+    last = d

gui/utils/inputs.py

@@ -96,7 +96,7 @@ class FloatBox(wx.TextCtrl):
         if currentValue == self._storedValue:
             event.Skip()
             return
-        if currentValue == '' or re.match('^\d*\.?\d*$', currentValue):
+        if currentValue == '' or re.match(r'^\d*\.?\d*$', currentValue):
             self._storedValue = currentValue
             self.updateColor()
             event.Skip()
@@ -131,7 +131,7 @@ class FloatRangeBox(wx.TextCtrl):
         if currentValue == self._storedValue:
             event.Skip()
             return
-        if currentValue == '' or re.match('^\d*\.?\d*-?\d*\.?\d*$', currentValue):
+        if currentValue == '' or re.match(r'^\d*\.?\d*-?\d*\.?\d*$', currentValue):
             self._storedValue = currentValue
             event.Skip()
         else: