Merge branch 'master' into dep_facelift

.appveyor.yml

@@ -11,7 +11,7 @@ for:
     environment:
       APPVEYOR_SSH_KEY: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDJDW/+oYNGOiPvwuwAL9tc/LQgg58aosIVpMYfepQZ20V+VZnHpZh8IRDA8Jo5xht19p2PksA+hFgqA0kpKtrSkuiWdE8rATQItfk4gf7yB0yGasJGGQZYazy9k/9XtmYkq2HHOOeEqdxvrICddJQ88MLCLT9lJENSUP/YS/yGcjZFXVxE11pTeIcqlCRU+3eYa1v7BeNvXIKNhZoK5orXWrtuH3cy8jrSns/u70aYfJ6B2jA8CnWnDbuvpeQtEY61SQqlKUsSArNa8NAsXj41wr3Ar9gAG9330w7EMTqlutk8HZO35uHI0q5qinUhaQYufPPrVkb2L/N+ZCfu0fnh appveyor"
       APPIMAGE_TOOL: appimagetool-x86_64.AppImage
-      PYTHON_APPIMAGE: python3.7.15-cp37-cp37m-manylinux2014_x86_64.AppImage
+      PYTHON_APPIMAGE: python3.7.16-cp37-cp37m-manylinux2014_x86_64.AppImage
       DEPLOY_DIR: AppDir/opt/pyfa
 #      APPVEYOR_SSH_BLOCK: true
     cache:

db_update.py

@@ -117,8 +117,7 @@ def update_db():
         for k, v in compiled_data.items():
             row = {}
             row.update(v)
-            if keyIdName not in row:
-                row[keyIdName] = int(k)
+            row[keyIdName] = int(k)
             data.append(row)
         return data
 
@@ -642,6 +641,139 @@ def update_db():
             effect.effectName = effectName
             item.effects[effectName] = effect
 
+    def hardcodeGeri():
+        attrMap = {
+            # Fitting
+            'powerOutput': 50,
+            'cpuOutput': 200,
+            'capacitorCapacity': 325,
+            'rechargeRate': 130000,
+            # Slots
+            'hiSlots': 5,
+            'medSlots': 4,
+            'lowSlots': 4,
+            'launcherSlotsLeft': 3,
+            'turretSlotsLeft': 2,
+            # Rigs
+            'rigSlots': 2,
+            'rigSize': 1,
+            'upgradeCapacity': 400,
+            # Shield
+            'shieldCapacity': 1000,
+            'shieldEmDamageResonance': 1 - 0.75,
+            'shieldThermalDamageResonance': 1 - 0.6,
+            'shieldKineticDamageResonance': 1 - 0.4,
+            'shieldExplosiveDamageResonance': 1 - 0.5,
+            # Armor
+            'armorHP': 1000,
+            'armorEmDamageResonance': 1 - 0.9,
+            'armorThermalDamageResonance': 1 - 0.675,
+            'armorKineticDamageResonance': 1 - 0.25,
+            'armorExplosiveDamageResonance': 1 - 0.1,
+            # Structure
+            'hp': 700,
+            'emDamageResonance': 1 - 0.33,
+            'thermalDamageResonance': 1 - 0.33,
+            'kineticDamageResonance': 1 - 0.33,
+            'explosiveDamageResonance': 1 - 0.33,
+            'mass': 1309000,
+            'volume': 27289,
+            'capacity': 260,
+            # Navigation
+            'maxVelocity': 440,
+            'agility': 2.5,
+            'warpSpeedMultiplier': 5.5,
+            # Drones
+            'droneCapacity': 50,
+            'droneBandwidth': 10,
+            # Targeting
+            'maxTargetRange': 42000,
+            'maxLockedTargets': 6,
+            'scanRadarStrength': 0,
+            'scanLadarStrength': 12,
+            'scanMagnetometricStrength': 0,
+            'scanGravimetricStrength': 0,
+            'signatureRadius': 33,
+            'scanResolution': 770}
+        effectMap = {
+            100100: 'pyfaCustomGeriAfExploVel',
+            100101: 'pyfaCustomGeriAfRof',
+            100102: 'pyfaCustomGeriMfDmg',
+            100103: 'pyfaCustomGeriMfRep',
+            100104: 'pyfaCustomGeriRoleWebDroneStr',
+            100105: 'pyfaCustomGeriRoleWebDroneHP',
+            100106: 'pyfaCustomGeriRoleWebDroneSpeed',
+            100107: 'pyfaCustomGeriRoleMWDSigBloom'}
+        _hardcodeAttribs(74141, attrMap)
+        _hardcodeEffects(74141, effectMap)
+
+    def hardcodeBestla():
+        attrMap = {
+            # Fitting
+            'powerOutput': 1300,
+            'cpuOutput': 500,
+            'capacitorCapacity': 1500,
+            'rechargeRate': 200000,
+            'hiSlots': 6,
+            'medSlots': 5,
+            'lowSlots': 5,
+            'launcherSlotsLeft': 4,
+            'turretSlotsLeft': 2,
+            # Rigs
+            'rigSlots': 2,
+            'rigSize': 2,
+            'upgradeCapacity': 400,
+            # Shield
+            'shieldCapacity': 3000,
+            'shieldEmDamageResonance': 1 - 0.75,
+            'shieldThermalDamageResonance': 1 - 0.6,
+            'shieldKineticDamageResonance': 1 - 0.4,
+            'shieldExplosiveDamageResonance': 1 - 0.5,
+            # Armor
+            'armorHP': 3000,
+            'armorEmDamageResonance': 1 - 0.9,
+            'armorThermalDamageResonance': 1 - 0.675,
+            'armorKineticDamageResonance': 1 - 0.25,
+            'armorExplosiveDamageResonance': 1 - 0.1,
+            # Structure
+            'hp': 1600,
+            'emDamageResonance': 1 - 0.33,
+            'thermalDamageResonance': 1 - 0.33,
+            'kineticDamageResonance': 1 - 0.33,
+            'explosiveDamageResonance': 1 - 0.33,
+            'mass': 11650000,
+            'volume': 96000,
+            'capacity': 660,
+            # Navigation
+            'maxVelocity': 300,
+            'agility': 0.47,
+            'warpSpeedMultiplier': 4.5,
+            # Drones
+            'droneCapacity': 125,
+            'droneBandwidth': 20,
+            # Targeting
+            'maxTargetRange': 80000,
+            'maxLockedTargets': 7,
+            'scanRadarStrength': 0,
+            'scanLadarStrength': 22,
+            'scanMagnetometricStrength': 0,
+            'scanGravimetricStrength': 0,
+            'signatureRadius': 120,
+            'scanResolution': 340}
+        effectMap = {
+            100200: 'pyfaCustomBestlaHacExploVel',
+            100201: 'pyfaCustomBestlaHacRof',
+            100202: 'pyfaCustomBestlaMcDmg',
+            100203: 'pyfaCustomBestlaMcRep',
+            100204: 'pyfaCustomBestlaRoleWebDroneStr',
+            100205: 'pyfaCustomBestlaRoleWebDroneHP',
+            100206: 'pyfaCustomBestlaRoleWebDroneSpeed'}
+        _hardcodeAttribs(74316, attrMap)
+        _hardcodeEffects(74316, effectMap)
+
+    # hardcodeGeri()
+    # hardcodeBestla()
+
     eos.db.gamedata_session.commit()
     eos.db.gamedata_engine.execute('VACUUM')
 

gui/builtinContextMenus/commandFitAdd.py

@@ -44,7 +44,6 @@ class AddCommandFit(ContextMenuUnconditional):
     def display(self, callingWindow, srcContext):
         if self.mainFrame.getActiveFit() is None or len(self.__class__.commandFits) == 0 or srcContext != "commandView":
             return False
-
         return True
 
     def getText(self, callingWindow, itmContext):
@@ -52,6 +51,8 @@ class AddCommandFit(ContextMenuUnconditional):
 
     def addFit(self, menu, fit, includeShip=False):
         label = fit.name if not includeShip else "({}) {}".format(fit.ship.item.name, fit.name)
+        if not label:
+            label = ' '
         id = ContextMenuUnconditional.nextID()
         self.fitMenuItemIds[id] = fit
         menuItem = wx.MenuItem(menu, id, label)

gui/builtinContextMenus/envEffectAdd.py

@@ -123,7 +123,7 @@ 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('Triglavian Invasion')] = self.getDestructibleBeacons()
+        data.groups[_t('Triglavian Invasion')] = self.getInvasionBeacons()
         return data
 
     def getEffectBeacons(self, *groups, extra_garbage=()):
@@ -231,5 +231,12 @@ class AddEnvironmentEffect(ContextMenuUnconditional):
         data.sort()
         return data
 
+    def getInvasionBeacons(self):
+        data = self.getDestructibleBeacons()
+        # Turnur weather
+        item = Market.getInstance().getItem(74002)
+        data.items.append(Entry(item.ID, item.name, item.name))
+        return data
+
 
 AddEnvironmentEffect.register()

gui/builtinStatsViews/targetingMiscViewMinimal.py

@@ -127,7 +127,9 @@ class TargetingMiscViewMinimal(StatsView):
             ("specialSalvageHoldCapacity", _t("Salvage hold")),
             ("specialCommandCenterHoldCapacity", _t("Command center hold")),
             ("specialPlanetaryCommoditiesHoldCapacity", _t("Planetary goods hold")),
-            ("specialQuafeHoldCapacity", _t("Quafe hold"))))
+            ("specialQuafeHoldCapacity", _t("Quafe hold")),
+            ("specialMobileDepotHoldCapacity", _t("Mobile depot hold")),
+        ))
 
         cargoValues = {
             "main": lambda: fit.ship.getModifiedItemAttr("capacity"),
@@ -148,7 +150,8 @@ class TargetingMiscViewMinimal(StatsView):
             "specialSalvageHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialSalvageHoldCapacity"),
             "specialCommandCenterHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialCommandCenterHoldCapacity"),
             "specialPlanetaryCommoditiesHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialPlanetaryCommoditiesHoldCapacity"),
-            "specialQuafeHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialQuafeHoldCapacity")
+            "specialQuafeHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialQuafeHoldCapacity"),
+            "specialMobileDepotHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialMobileDepotHoldCapacity"),
         }
 
         stats = (("labelTargets", {"main": lambda: fit.maxTargets}, 3, 0, 0, ""),

gui/builtinViewColumns/misc.py

@@ -182,6 +182,13 @@ class Miscellanea(ViewColumn):
             text = "{0} | {1}".format(formatAmount(strength, 3, 0, 3), formatAmount(coherence, 3, 0, 3))
             tooltip = "Virus strength and coherence"
             return text, tooltip
+        elif itemGroup == "Damage Control":
+            duration = stuff.getModifiedItemAttr("duration")
+            if not duration:
+                return "", None
+            text = "{0}s".format(formatAmount(duration / 1000, 3, 0, 0))
+            tooltip = "Assault ability duration"
+            return text, tooltip
         elif itemGroup in ("Warp Scrambler", "Warp Core Stabilizer", "Structure Warp Scrambler"):
             scramStr = stuff.getModifiedItemAttr("warpScrambleStrength")
             if not scramStr:

gui/characterSelection.py

@@ -22,6 +22,7 @@ import traceback
 
 # noinspection PyPackageRequirements
 import wx
+import roman
 from logbook import Logger
 
 import config
@@ -105,6 +106,9 @@ class CharacterSelection(wx.Panel):
         exportItem = menu.Append(wx.ID_ANY, _t("Copy Missing Skills"))
         self.Bind(wx.EVT_MENU, self.exportSkills, exportItem)
 
+        exportItem = menu.Append(wx.ID_ANY, _t("Copy Missing Skills (EVEMon)"))
+        self.Bind(wx.EVT_MENU, self.exportSkillsEveMon, exportItem)
+
         self.PopupMenu(menu, pos)
 
         event.Skip()
@@ -264,6 +268,15 @@ class CharacterSelection(wx.Panel):
 
         toClipboard(list)
 
+    def exportSkillsEveMon(self, evt):
+        skillsMap = self._buildSkillsTooltipCondensed(self.reqs, skillsMap={})
+
+        list = ""
+        for key in sorted(skillsMap):
+            list += "%s %s\n" % (key, roman.toRoman(skillsMap[key][0]))
+
+        toClipboard(list)
+
     def _buildSkillsTooltip(self, reqs, currItem="", tabulationLevel=0):
         tip = ""
         sCharacter = Character.getInstance()