Attempt to work around postgres issue on linux

Replace dead README badges with current CI badge

.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.17-cp37-cp37m-manylinux2014_x86_64.AppImage
       DEPLOY_DIR: AppDir/opt/pyfa
 #      APPVEYOR_SSH_BLOCK: true
     cache:
@@ -20,6 +20,7 @@ for:
       - sh: curl -sflL 'https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-ssh.sh' | bash -e -
     install:
       - sh: git fetch --prune --unshallow # to fix the version dump issues
+      - sh: sudo DEBIAN_FRONTEND=noninteractive sed -i '/postgres/d' /etc/apt/sources.list # As of 2023-11-14, postgres repo fail to update, but we don't need them anyway
       - sh: sudo DEBIAN_FRONTEND=noninteractive apt-get -y update
       - sh: sudo DEBIAN_FRONTEND=noninteractive apt-get -y install python3.7-dev libgtk-3-dev python3-pip libwebkit2gtk-4.0-dev
     before_build:

README.md

@@ -1,6 +1,6 @@
 # pyfa
 
-[![Join us on Slack!](https://pyfainvite.azurewebsites.net/badge.svg)](https://pyfainvite.azurewebsites.net/) [![Build Status](https://travis-ci.org/pyfa-org/Pyfa.svg?branch=master)](https://travis-ci.org/pyfa-org/Pyfa)
+[![Build Status](https://ci.appveyor.com/api/projects/status/github/pyfa-org/pyfa?branch=master&svg=true)]([https://travis-ci.org/pyfa-org/Pyfa](https://ci.appveyor.com/project/pyfa-org/pyfa))
 
 ![pyfa](https://user-images.githubusercontent.com/275209/66119992-864be080-e5e2-11e9-994a-3a4368c9fad7.png)
 

db_update.py

@@ -617,6 +617,16 @@ def update_db():
         eos.db.gamedata_session.delete(cat)
 
     # Unused normally, can be useful for customizing items
+    def _copyItem(srcName, tgtTypeID, tgtName):
+        eveType = eos.db.gamedata_session.query(eos.gamedata.Item).filter(eos.gamedata.Item.name == srcName).one()
+        eos.db.gamedata_session.expunge(eveType)
+        sqlalchemy.orm.make_transient(eveType)
+        eveType.ID = tgtTypeID
+        for suffix in eos.config.translation_mapping.values():
+            setattr(eveType, f'typeName{suffix}', tgtName)
+        eos.db.gamedata_session.add(eveType)
+        eos.db.gamedata_session.flush()
+
     def _hardcodeAttribs(typeID, attrMap):
         for attrName, value in attrMap.items():
             try:
@@ -625,7 +635,7 @@ def update_db():
             except sqlalchemy.orm.exc.NoResultFound:
                 attrInfo = eos.db.gamedata_session.query(eos.gamedata.AttributeInfo).filter(eos.gamedata.AttributeInfo.name == attrName).one()
                 attr = eos.gamedata.Attribute()
-                attr.ID = attrInfo.ID
+                attr.attributeID = attrInfo.ID
                 attr.typeID = typeID
                 attr.value = value
                 eos.db.gamedata_session.add(attr)
@@ -641,139 +651,151 @@ def update_db():
             effect.effectName = effectName
             item.effects[effectName] = effect
 
-    def hardcodeGeri():
+    def hardcodeShapash():
+        shapashTypeID = 1000000
+        _copyItem(srcName='Utu', tgtTypeID=shapashTypeID, tgtName='Shapash')
         attrMap = {
             # Fitting
             'powerOutput': 50,
-            'cpuOutput': 200,
-            'capacitorCapacity': 325,
-            'rechargeRate': 130000,
+            'cpuOutput': 225,
+            'capacitorCapacity': 420,
+            'rechargeRate': 187500,
             # Slots
-            'hiSlots': 5,
+            'hiSlots': 3,
             'medSlots': 4,
             'lowSlots': 4,
-            'launcherSlotsLeft': 3,
-            'turretSlotsLeft': 2,
+            'launcherSlotsLeft': 0,
+            'turretSlotsLeft': 3,
             # Rigs
             'rigSlots': 2,
             'rigSize': 1,
             'upgradeCapacity': 400,
             # Shield
-            'shieldCapacity': 1000,
-            'shieldEmDamageResonance': 1 - 0.75,
+            'shieldCapacity': 575,
+            'shieldRechargeRate': 625000,
+            'shieldEmDamageResonance': 1 - 0.0,
             'shieldThermalDamageResonance': 1 - 0.6,
-            'shieldKineticDamageResonance': 1 - 0.4,
+            'shieldKineticDamageResonance': 1 - 0.85,
             'shieldExplosiveDamageResonance': 1 - 0.5,
             # Armor
-            'armorHP': 1000,
-            'armorEmDamageResonance': 1 - 0.9,
+            'armorHP': 1015,
+            'armorEmDamageResonance': 1 - 0.5,
             'armorThermalDamageResonance': 1 - 0.675,
-            'armorKineticDamageResonance': 1 - 0.25,
+            'armorKineticDamageResonance': 1 - 0.8375,
             'armorExplosiveDamageResonance': 1 - 0.1,
             # Structure
-            'hp': 700,
+            'hp': 1274,
             'emDamageResonance': 1 - 0.33,
             'thermalDamageResonance': 1 - 0.33,
             'kineticDamageResonance': 1 - 0.33,
             'explosiveDamageResonance': 1 - 0.33,
-            'mass': 1309000,
-            'volume': 27289,
-            'capacity': 260,
+            'mass': 1215000,
+            'volume': 29500,
+            'capacity': 165,
             # Navigation
-            'maxVelocity': 440,
-            'agility': 2.5,
+            'maxVelocity': 325,
+            'agility': 3.467,
             'warpSpeedMultiplier': 5.5,
             # Drones
-            'droneCapacity': 50,
-            'droneBandwidth': 10,
+            'droneCapacity': 75,
+            'droneBandwidth': 25,
             # Targeting
-            'maxTargetRange': 42000,
+            'maxTargetRange': 49000,
             'maxLockedTargets': 6,
             'scanRadarStrength': 0,
-            'scanLadarStrength': 12,
-            'scanMagnetometricStrength': 0,
+            'scanLadarStrength': 0,
+            'scanMagnetometricStrength': 9,
             'scanGravimetricStrength': 0,
-            'signatureRadius': 33,
-            'scanResolution': 770}
+            'signatureRadius': 39,
+            'scanResolution': 550,
+            # Misc
+            'energyWarfareResistance': 0,
+            'stasisWebifierResistance': 0,
+            'weaponDisruptionResistance': 0}
         effectMap = {
-            100100: 'pyfaCustomGeriAfExploVel',
-            100101: 'pyfaCustomGeriAfRof',
-            100102: 'pyfaCustomGeriMfDmg',
-            100103: 'pyfaCustomGeriMfRep',
-            100104: 'pyfaCustomGeriRoleWebDroneStr',
-            100105: 'pyfaCustomGeriRoleWebDroneHP',
-            100106: 'pyfaCustomGeriRoleWebDroneSpeed',
-            100107: 'pyfaCustomGeriRoleMWDSigBloom'}
-        _hardcodeAttribs(74141, attrMap)
-        _hardcodeEffects(74141, effectMap)
+            100100: 'pyfaCustomShapashAfArAmount',
+            100101: 'pyfaCustomShapashAfShtTrackingOptimal',
+            100102: 'pyfaCustomShapashGfShtDamage',
+            100103: 'pyfaCustomShapashGfPointRange',
+            100104: 'pyfaCustomShapashGfPropOverheat',
+            100105: 'pyfaCustomShapashRolePlateMass',
+            100106: 'pyfaCustomShapashRoleHeat'}
+        _hardcodeAttribs(shapashTypeID, attrMap)
+        _hardcodeEffects(shapashTypeID, effectMap)
 
-    def hardcodeBestla():
+    def hardcodeCybele():
+        cybeleTypeID = 1000001
+        _copyItem(srcName='Adrestia', tgtTypeID=cybeleTypeID, tgtName='Cybele')
         attrMap = {
             # Fitting
-            'powerOutput': 1300,
-            'cpuOutput': 500,
-            'capacitorCapacity': 1500,
-            'rechargeRate': 200000,
-            'hiSlots': 6,
-            'medSlots': 5,
-            'lowSlots': 5,
-            'launcherSlotsLeft': 4,
-            'turretSlotsLeft': 2,
+            'powerOutput': 1284,
+            'cpuOutput': 400,
+            'capacitorCapacity': 2400,
+            'rechargeRate': 334000,
+            'hiSlots': 5,
+            'medSlots': 4,
+            'lowSlots': 6,
+            'launcherSlotsLeft': 0,
+            'turretSlotsLeft': 5,
             # Rigs
             'rigSlots': 2,
             'rigSize': 2,
             'upgradeCapacity': 400,
             # Shield
-            'shieldCapacity': 3000,
-            'shieldEmDamageResonance': 1 - 0.75,
-            'shieldThermalDamageResonance': 1 - 0.6,
-            'shieldKineticDamageResonance': 1 - 0.4,
+            'shieldCapacity': 1200,
+            'shieldRechargeRate': 1250000,
+            'shieldEmDamageResonance': 1 - 0.0,
+            'shieldThermalDamageResonance': 1 - 0.5,
+            'shieldKineticDamageResonance': 1 - 0.9,
             'shieldExplosiveDamageResonance': 1 - 0.5,
             # Armor
-            'armorHP': 3000,
-            'armorEmDamageResonance': 1 - 0.9,
-            'armorThermalDamageResonance': 1 - 0.675,
-            'armorKineticDamageResonance': 1 - 0.25,
+            'armorHP': 1900,
+            'armorEmDamageResonance': 1 - 0.5,
+            'armorThermalDamageResonance': 1 - 0.69,
+            'armorKineticDamageResonance': 1 - 0.85,
             'armorExplosiveDamageResonance': 1 - 0.1,
             # Structure
-            'hp': 1600,
+            'hp': 2300,
             'emDamageResonance': 1 - 0.33,
             'thermalDamageResonance': 1 - 0.33,
             'kineticDamageResonance': 1 - 0.33,
             'explosiveDamageResonance': 1 - 0.33,
-            'mass': 11650000,
-            'volume': 96000,
-            'capacity': 660,
+            'mass': 11100000,
+            'volume': 112000,
+            'capacity': 450,
             # Navigation
-            'maxVelocity': 300,
-            'agility': 0.47,
+            'maxVelocity': 235,
+            'agility': 0.457,
             'warpSpeedMultiplier': 4.5,
             # Drones
-            'droneCapacity': 125,
-            'droneBandwidth': 20,
+            'droneCapacity': 100,
+            'droneBandwidth': 50,
             # Targeting
-            'maxTargetRange': 80000,
-            'maxLockedTargets': 7,
+            'maxTargetRange': 60000,
+            'maxLockedTargets': 6,
             'scanRadarStrength': 0,
-            'scanLadarStrength': 22,
-            'scanMagnetometricStrength': 0,
+            'scanLadarStrength': 0,
+            'scanMagnetometricStrength': 15,
             'scanGravimetricStrength': 0,
-            'signatureRadius': 120,
-            'scanResolution': 340}
+            'signatureRadius': 115,
+            'scanResolution': 330,
+            # Misc
+            'energyWarfareResistance': 0,
+            'stasisWebifierResistance': 0,
+            'weaponDisruptionResistance': 0}
         effectMap = {
-            100200: 'pyfaCustomBestlaHacExploVel',
-            100201: 'pyfaCustomBestlaHacRof',
-            100202: 'pyfaCustomBestlaMcDmg',
-            100203: 'pyfaCustomBestlaMcRep',
-            100204: 'pyfaCustomBestlaRoleWebDroneStr',
-            100205: 'pyfaCustomBestlaRoleWebDroneHP',
-            100206: 'pyfaCustomBestlaRoleWebDroneSpeed'}
-        _hardcodeAttribs(74316, attrMap)
-        _hardcodeEffects(74316, effectMap)
-
-    hardcodeGeri()
-    hardcodeBestla()
+            100200: 'pyfaCustomCybeleHacMhtFalloff',
+            100201: 'pyfaCustomCybeleHacMhtTracking',
+            100202: 'pyfaCustomCybeleGcMhtDamage',
+            100203: 'pyfaCustomCybeleGcArAmount',
+            100204: 'pyfaCustomCybeleGcPointRange',
+            100205: 'pyfaCustomCybeleRoleVelocity',
+            100206: 'pyfaCustomCybeleRolePlateMass'}
+        _hardcodeAttribs(cybeleTypeID, attrMap)
+        _hardcodeEffects(cybeleTypeID, effectMap)
 
+    hardcodeShapash()
+    hardcodeCybele()
 
     eos.db.gamedata_session.commit()
     eos.db.gamedata_engine.execute('VACUUM')

eos/saveddata/fit.py

@@ -159,6 +159,12 @@ class Fit:
         self.gangBoosts = None
         self.__ecmProjectedList = []
         self.commandBonuses = {}
+        # Reps received, as a list of (amount, cycle time in seconds)
+        self._hullRr = []
+        self._armorRr = []
+        self._armorRrPreSpool = []
+        self._armorRrFullSpool = []
+        self._shieldRr = []
 
     def clearFactorReloadDependentData(self):
         # Here we clear all data known to rely on cycle parameters
@@ -550,6 +556,12 @@ class Fit:
             if stuff is not None and stuff != self:
                 stuff.clear()
 
+        self._hullRr.clear()
+        self._armorRr.clear()
+        self._armorRrPreSpool.clear()
+        self._armorRrFullSpool.clear()
+        self._shieldRr.clear()
+
         # If this is the active fit that we are clearing, not a projected fit,
         # then this will run and clear the projected ships and flag the next
         # iteration to skip this part to prevent recursion.
@@ -621,7 +633,7 @@ class Fit:
                             "duration", value)
 
                 if warfareBuffID == 12:  # Shield Burst: Shield Extension: Shield HP
-                    self.ship.boostItemAttr("shieldCapacity", value, stackingPenalties=True)
+                    self.ship.boostItemAttr("shieldCapacity", value)
 
                 if warfareBuffID == 13:  # Armor Burst: Armor Energizing: Armor Resistance
                     for damageType in ("Em", "Thermal", "Explosive", "Kinetic"):
@@ -640,7 +652,7 @@ class Fit:
                             "duration", value)
 
                 if warfareBuffID == 15:  # Armor Burst: Armor Reinforcement: Armor HP
-                    self.ship.boostItemAttr("armorHP", value, stackingPenalties=True)
+                    self.ship.boostItemAttr("armorHP", value)
 
                 if warfareBuffID == 16:  # Information Burst: Sensor Optimization: Scan Resolution
                     self.ship.boostItemAttr("scanResolution", value, stackingPenalties=True)
@@ -734,7 +746,7 @@ class Fit:
                         self.ship.boostItemAttr(attr, value, stackingPenalties=True)
 
                 if warfareBuffID == 42:  # Erebus Effect Generator : Armor HP bonus
-                    self.ship.boostItemAttr("armorHP", value, stackingPenalties=True)
+                    self.ship.boostItemAttr("armorHP", value)
 
                 if warfareBuffID == 43:  # Erebus Effect Generator : Explosive resistance bonus
                     for attr in ("armorExplosiveDamageResonance", "shieldExplosiveDamageResonance", "explosiveDamageResonance"):
@@ -756,7 +768,7 @@ class Fit:
                         self.ship.boostItemAttr(attr, value, stackingPenalties=True)
 
                 if warfareBuffID == 48:  # Leviathan Effect Generator : Shield HP bonus
-                    self.ship.boostItemAttr("shieldCapacity", value, stackingPenalties=True)
+                    self.ship.boostItemAttr("shieldCapacity", value)
 
                 if warfareBuffID == 49:  # Leviathan Effect Generator : EM resistance bonus
                     for attr in ("armorEmDamageResonance", "shieldEmDamageResonance", "emDamageResonance"):
@@ -1478,11 +1490,11 @@ class Fit:
     def tank(self):
         reps = {
             "passiveShield": self.calculateShieldRecharge(),
-            "shieldRepair": self.extraAttributes["shieldRepair"],
-            "armorRepair": self.extraAttributes["armorRepair"],
-            "armorRepairPreSpool": self.extraAttributes["armorRepairPreSpool"],
-            "armorRepairFullSpool": self.extraAttributes["armorRepairFullSpool"],
-            "hullRepair": self.extraAttributes["hullRepair"]
+            "shieldRepair": self.extraAttributes["shieldRepair"] + self._getAppliedShieldRr(),
+            "armorRepair": self.extraAttributes["armorRepair"] + self._getAppliedArmorRr(),
+            "armorRepairPreSpool": self.extraAttributes["armorRepairPreSpool"] + self._getAppliedArmorPreSpoolRr(),
+            "armorRepairFullSpool": self.extraAttributes["armorRepairFullSpool"] + self._getAppliedArmorFullSpoolRr(),
+            "hullRepair": self.extraAttributes["hullRepair"] + self._getAppliedHullRr()
         }
         return reps
 
@@ -1519,11 +1531,11 @@ class Fit:
         if self.__sustainableTank is None:
             sustainable = {
                 "passiveShield": self.calculateShieldRecharge(),
-                "shieldRepair": self.extraAttributes["shieldRepair"],
-                "armorRepair": self.extraAttributes["armorRepair"],
-                "armorRepairPreSpool": self.extraAttributes["armorRepairPreSpool"],
-                "armorRepairFullSpool": self.extraAttributes["armorRepairFullSpool"],
-                "hullRepair": self.extraAttributes["hullRepair"]
+                "shieldRepair": self.extraAttributes["shieldRepair"] + self._getAppliedShieldRr(),
+                "armorRepair": self.extraAttributes["armorRepair"] + self._getAppliedArmorRr(),
+                "armorRepairPreSpool": self.extraAttributes["armorRepairPreSpool"] + self._getAppliedArmorPreSpoolRr(),
+                "armorRepairFullSpool": self.extraAttributes["armorRepairFullSpool"] + self._getAppliedArmorFullSpoolRr(),
+                "hullRepair": self.extraAttributes["hullRepair"] + self._getAppliedHullRr()
             }
             if not self.capStable or self.factorReload:
                 # Map a local repairer type to the attribute it uses
@@ -1760,6 +1772,38 @@ class Fit:
             mults.setdefault(stackingGroup, []).append((1 + strength / 100, None))
         return calculateMultiplier(mults)
 
+    def _getAppliedHullRr(self):
+        return self.__getAppliedRr(self._hullRr)
+
+    def _getAppliedArmorRr(self):
+        return self.__getAppliedRr(self._armorRr)
+
+    def _getAppliedArmorPreSpoolRr(self):
+        return self.__getAppliedRr(self._armorRrPreSpool)
+
+    def _getAppliedArmorFullSpoolRr(self):
+        return self.__getAppliedRr(self._armorRrFullSpool)
+
+    def _getAppliedShieldRr(self):
+        return self.__getAppliedRr(self._shieldRr)
+
+    @staticmethod
+    def __getAppliedRr(rrList):
+        totalRaw = 0
+        for amount, cycleTime in rrList:
+            # 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
+        appliedRr = 0
+        for amount, cycleTime in rrList:
+            rrps = amount / int(cycleTime)
+            modified_rrps = RR_ADDITION + (rrps * RR_MULTIPLIER)
+            rrps_mult = 1 - (((rrps + modified_rrps) / (totalRaw + modified_rrps)) - 1) ** 2
+            appliedRr += rrps_mult * amount / cycleTime
+        return appliedRr
+
+
     def __deepcopy__(self, memo=None):
         fitCopy = Fit()
         # Character and owner are not copied

eos/saveddata/module.py

@@ -477,7 +477,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut, M
             # Some delay attributes have non-0 default value, so we have to pick according to effects
             if {'superWeaponAmarr', 'superWeaponCaldari', 'superWeaponGallente', 'superWeaponMinmatar', 'lightningWeapon'}.intersection(self.item.effects):
                 dmgDelay = self.getModifiedItemAttr("damageDelayDuration", 0)
-            elif {'doomsdayBeamDOT', 'doomsdaySlash', 'doomsdayConeDOT'}.intersection(self.item.effects):
+            elif {'doomsdayBeamDOT', 'doomsdaySlash', 'doomsdayConeDOT', 'debuffLance'}.intersection(self.item.effects):
                 dmgDelay = self.getModifiedItemAttr("doomsdayWarningDuration", 0)
             else:
                 dmgDelay = 0

graphs/data/fitDamageStats/calc/application.py

@@ -211,7 +211,7 @@ def getDoomsdayMult(mod, tgt, distance, tgtSigRadius):
         # Disallow only against subcaps, allow against caps and tgt profiles
         if tgt.isFit and not tgt.item.ship.item.requiresSkill('Capital Ships'):
             return 0
-    damageSig = mod.getModifiedItemAttr('doomsdayDamageRadius') or mod.getModifiedItemAttr('signatureRadius')
+    damageSig = mod.getModifiedItemAttr('signatureRadius')
     if not damageSig:
         return 1
     return min(1, tgtSigRadius / damageSig)

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/characterEditor.py

@@ -516,7 +516,10 @@ class SkillTreeView(wx.Panel):
     def populateSkillTreeSkillSearch(self, event=None):
         sChar = Character.getInstance()
         char = self.charEditor.entityEditor.getActiveEntity()
-        search = self.searchInput.GetLineText(0)
+        try:
+            search = self.searchInput.GetLineText(0)
+        except AttributeError:
+            search = self.searchInput.GetValue()
 
         root = self.root
         tree = self.skillTreeListCtrl

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()

gui/copySelectDialog.py

@@ -193,7 +193,7 @@ class CopySelectDialog(wx.Dialog):
 
     def exportEsi(self, options, callback):
         fit = getFit(self.mainFrame.getActiveFit())
-        Port.exportESI(fit, True, callback)
+        Port.exportESI(fit, False, False, False, callback)
 
     def exportXml(self, options, callback):
         fit = getFit(self.mainFrame.getActiveFit())

gui/esiFittings.py

@@ -283,7 +283,7 @@ class ExportToEve(AuxiliaryFrame):
     def __init__(self, parent):
         super().__init__(
             parent, id=wx.ID_ANY, title=_t("Export fit to EVE"), pos=wx.DefaultPosition,
-            size=wx.Size(400, 140) if "wxGTK" in wx.PlatformInfo else wx.Size(350, 115), resizeable=True)
+            size=wx.Size(400, 175) if "wxGTK" in wx.PlatformInfo else wx.Size(350, 145), resizeable=True)
 
         self.mainFrame = parent
 
@@ -305,6 +305,16 @@ class ExportToEve(AuxiliaryFrame):
         self.exportChargesCb.Bind(wx.EVT_CHECKBOX, self.OnChargeExportChange)
         mainSizer.Add(self.exportChargesCb, 0, 0, 5)
 
+        self.exportImplantsCb = wx.CheckBox(self, wx.ID_ANY, _t('Export Implants'), wx.DefaultPosition, wx.DefaultSize, 0)
+        self.exportImplantsCb.SetValue(EsiSettings.getInstance().get('exportImplants'))
+        self.exportImplantsCb.Bind(wx.EVT_CHECKBOX, self.OnImplantsExportChange)
+        mainSizer.Add(self.exportImplantsCb, 0, 0, 5)
+
+        self.exportBoostersCb = wx.CheckBox(self, wx.ID_ANY, _t('Export Boosters'), wx.DefaultPosition, wx.DefaultSize, 0)
+        self.exportBoostersCb.SetValue(EsiSettings.getInstance().get('exportBoosters'))
+        self.exportBoostersCb.Bind(wx.EVT_CHECKBOX, self.OnBoostersExportChange)
+        mainSizer.Add(self.exportBoostersCb, 0, 0, 5)
+
         self.exportBtn.Bind(wx.EVT_BUTTON, self.exportFitting)
 
         self.statusbar = wx.StatusBar(self)
@@ -324,6 +334,14 @@ class ExportToEve(AuxiliaryFrame):
         EsiSettings.getInstance().set('exportCharges', self.exportChargesCb.GetValue())
         event.Skip()
 
+    def OnImplantsExportChange(self, event):
+        EsiSettings.getInstance().set('exportImplants', self.exportImplantsCb.GetValue())
+        event.Skip()
+
+    def OnBoostersExportChange(self, event):
+        EsiSettings.getInstance().set('exportBoosters', self.exportBoostersCb.GetValue())
+        event.Skip()
+
     def updateCharList(self):
         sEsi = Esi.getInstance()
         chars = sEsi.getSsoCharacters()
@@ -360,8 +378,10 @@ class ExportToEve(AuxiliaryFrame):
 
         sFit = Fit.getInstance()
         exportCharges = self.exportChargesCb.GetValue()
+        exportImplants = self.exportImplantsCb.GetValue()
+        exportBoosters = self.exportBoostersCb.GetValue()
         try:
-            data = sPort.exportESI(sFit.getFit(fitID), exportCharges)
+            data = sPort.exportESI(sFit.getFit(fitID), exportCharges, exportImplants, exportBoosters)
         except ESIExportException as e:
             msg = str(e)
             if not msg:

requirements.txt

@@ -3,7 +3,7 @@ logbook >= 1.0.0
 numpy == 1.19.2
 matplotlib == 3.2.2
 python-dateutil
-requests >= 2.0.0
+requests == 2.28.1
 sqlalchemy == 1.3.23
 cryptography >= 2.3
 markdown2 >= 2.3.5

service/conversions/releaseFeb2023.py

@@ -0,0 +1,16 @@
+"""
+Conversion pack for February 2023 release
+"""
+
+CONVERSIONS = {
+    # Renamed items
+    "Restrained Interdiction Nullifier": "Enduring Interdiction Nullifier",
+    "Synthetic Hull Conversion Inertia Stabilizers": "Synthetic Hull Conversion Inertial Stabilizers",
+    "Tobias's Modified Torpedo Launcher": "Tobias' Modified Torpedo Launcher",
+    "Vepas's Modified Torpedo Launcher": "Vepas' Modified Torpedo Launcher",
+    "Vepas's Modified Kinetic Shield Hardener": "Vepas' Modified Kinetic Shield Hardener",
+    "Vepas's Modified EM Shield Hardener": "Vepas' Modified EM Shield Hardener",
+    "Vepas's Modified Explosive Shield Hardener": "Vepas' Modified Explosive Shield Hardener",
+    "Vepas's Modified Thermal Shield Hardener": "Vepas' Modified Thermal Shield Hardener",
+    "Vepas's Modified Multispectrum Shield Hardener": "Vepas' Modified Multispectrum Shield Hardener",
+}

service/conversions/releaseSep2023.py

@@ -0,0 +1,10 @@
+"""
+Actually renamed somewhere during summer, but updated only in september
+"""
+
+CONVERSIONS = {
+    # Renamed items
+    "‘Atgeir’ Explosive Disruptive Lance": "'Atgeir' Explosive Disruptive Lance",
+    "‘Steel Yari’ Kinetic Disruptive Lance": "'Steel Yari' Kinetic Disruptive Lance",
+    "‘Sarissa’ Thermal Disruptive Lance": "'Sarissa' Thermal Disruptive Lance",
+}

service/jargon/defaults.yaml

@@ -976,6 +976,9 @@ cdfe:
 cp:
   - 'cp'
   - 'command processor'
+ats:
+  - 'ats'
+  - 'auto targeting system'
 
 # Implants
 lg:

service/market.py

@@ -321,6 +321,9 @@ class Market:
             "Boobook"                     : self.les_grp,  # 19th EVE anniversary gift
             "Geri"                        : self.les_grp,  # AT18 prize
             "Bestla"                      : self.les_grp,  # AT18 prize
+            "Metamorphosis"               : self.les_grp,  # Seems to be anniversary gift
+            "Shapash"                     : self.les_grp,  # AT19 prize
+            "Cybele"                      : self.les_grp,  # AT19 prize
         }
 
         self.ITEMS_FORCEGROUP_R = self.__makeRevDict(self.ITEMS_FORCEGROUP)