Merge branch 'master' into test-3

Conflicts: eos/gamedata.py eos/saveddata/booster.py eos/saveddata/character.py gui/builtinAdditionPanes/commandView.py gui/builtinContextMenus/commandFits.py gui/builtinMarketBrowser/itemView.py gui/builtinMarketBrowser/marketTree.py gui/builtinPreferenceViews/pyfaGeneralPreferences.py gui/builtinShipBrowser/categoryItem.py gui/builtinShipBrowser/fitItem.py gui/builtinShipBrowser/navigationPanel.py gui/builtinShipBrowser/raceSelector.py gui/builtinShipBrowser/shipItem.py gui/builtinStatsViews/priceViewFull.py gui/builtinViews/fittingView.py gui/characterEditor.py gui/characterSelection.py gui/chromeTabs.py gui/crestFittings.py gui/itemStats.py gui/mainFrame.py scripts/itemDiff.py service/price.py
HarukaMa · Nov 23, 2017 · b30b3fc · b30b3fc
2 parents 4a33365 + 455fea7
commit b30b3fc
Show file tree

Hide file tree

Showing 462 changed files with 12,863 additions and 2,422 deletions.
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ pyfa is licensed under the GNU GPL v3.0, see LICENSE
 
 ## Resources
 * Development repository: [https://github.com/pyfa-org/Pyfa](https://github.com/pyfa-org/Pyfa)
-* [EVE forum thread](https://forums.eveonline.com/default.aspx?g=posts&t=466425)
+* [EVE forum thread](https://forums.eveonline.com/t/27156)
 * [EVE University guide using pyfa](http://wiki.eveuniversity.org/Guide_to_using_PYFA)
 * [EVE Online website](http://www.eveonline.com/)
 

diff --git a/config.py b/config.py
@@ -19,10 +19,10 @@
 saveInRoot = False
 
 # Version data
-version = "1.29.4"
-tag = "Stable"
-expansionName = "YC119.5"
-expansionVersion = "1.0"
+version = "1.33.3"
+tag = "git"
+expansionName = "Lifeblood"
+expansionVersion = "1.7"
 evemonMinVersion = "4081"
 
 pyfaPath = None

diff --git a/eos/db/gamedata/item.py b/eos/db/gamedata/item.py
@@ -47,7 +47,7 @@
        properties={
            "group"            : relation(Group, backref="items"),
            "icon"             : relation(Icon),
-           "_Item__attributes": relation(Attribute, collection_class=attribute_mapped_collection('name')),
+           "_Item__attributes": relation(Attribute, cascade='all, delete, delete-orphan', collection_class=attribute_mapped_collection('name')),
            "effects": relation(Effect, secondary=typeeffects_table, collection_class=attribute_mapped_collection('name')),
            "metaGroup"        : relation(MetaType,
                                          primaryjoin=metatypes_table.c.typeID == items_table.c.typeID,

diff --git a/eos/db/gamedata/queries.py b/eos/db/gamedata/queries.py
@@ -317,7 +317,7 @@ def getVariations(itemids, groupIDs=None, where=None, eager=None):
         vars = gamedata_session.query(Item).options(*processEager(eager)).join((groups_table, joinon)).filter(
                 filter).all()
 
-        return vars
+    return vars
 
 
 @cachedQuery(1, "attr")

diff --git a/eos/db/migrations/upgrade25.py b/eos/db/migrations/upgrade25.py
diff --git a/eos/db/migrations/upgrade26.py b/eos/db/migrations/upgrade26.py
@@ -0,0 +1,9 @@
+"""
+Migration 26
+
+- Deletes invalid command fit relationships caused by a bug (see #1244)
+"""
+
+
+def upgrade(saveddata_engine):
+    saveddata_engine.execute("DELETE FROM commandFits WHERE boosterID NOT IN (SELECT ID FROM fits) OR boostedID NOT IN (SELECT ID FROM fits)")
diff --git a/eos/db/migrations/upgrade6.py b/eos/db/migrations/upgrade6.py
@@ -7,5 +7,5 @@
 
 def upgrade(saveddata_engine):
     saveddata_engine.execute('DELETE FROM damagePatterns WHERE name LIKE ? OR ID LIKE ?', ("Uniform", "1"))
-    saveddata_engine.execute('INSERT INTO damagePatterns VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)',
-                             (1, "Uniform", 25, 25, 25, 25, None, None, None))
+    saveddata_engine.execute('INSERT INTO damagePatterns (ID, name, emAmount, thermalAmount, kineticAmount, explosiveAmount, ownerID) VALUES (?, ?, ?, ?, ?, ?, ?)',
+                             (1, "Uniform", 25, 25, 25, 25, None))
diff --git a/eos/db/saveddata/booster.py b/eos/db/saveddata/booster.py
@@ -18,35 +18,38 @@
 # ===============================================================================
 
 from sqlalchemy import Table, Column, ForeignKey, Integer, Boolean, DateTime
-from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.orm import mapper, relation
 import datetime
 
 from eos.db import saveddata_meta
 from eos.saveddata.booster import Booster
+from eos.saveddata.boosterSideEffect import BoosterSideEffect
 
 boosters_table = Table("boosters", saveddata_meta,
-                        Column("ID", Integer, primary_key=True),
-                        Column("itemID", Integer),
-                        Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False),
-                        Column("active", Boolean),
-                        Column("created", DateTime, nullable=True, default=datetime.datetime.now),
-                        Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now),
+                       Column("ID", Integer, primary_key=True),
+                       Column("itemID", Integer),
+                       Column("fitID", Integer, ForeignKey("fits.ID"), nullable=False),
+                       Column("active", Boolean),
+                       Column("created", DateTime, nullable=True, default=datetime.datetime.now),
+                       Column("modified", DateTime, nullable=True, onupdate=datetime.datetime.now),
                        )
 
-# Legacy booster side effect code, should disable but a mapper relies on it.
-activeSideEffects_table = Table("boostersActiveSideEffects", saveddata_meta,
-                                Column("boosterID", ForeignKey("boosters.ID"), primary_key=True),
-                                Column("effectID", Integer, primary_key=True))
 
+booster_side_effect_table = Table("boosterSideEffects", saveddata_meta,
+                                  Column("boosterID", Integer, ForeignKey("boosters.ID"), primary_key=True, index=True),
+                                  Column("effectID", Integer, nullable=False, primary_key=True),
+                                  Column("active", Boolean, default=False)
+                                  )
 
-class ActiveSideEffectsDummy(object):
-    def __init__(self, effectID):
-        self.effectID = effectID
 
-
-mapper(ActiveSideEffectsDummy, activeSideEffects_table)
 mapper(Booster, boosters_table,
-       properties={"_Booster__activeSideEffectDummies": relation(ActiveSideEffectsDummy)})
+       properties={
+        "_Booster__sideEffects": relation(
+            BoosterSideEffect,
+            backref="booster",
+            cascade='all, delete, delete-orphan'),
+       }
+       )
+
 
-Booster._Booster__activeSideEffectIDs = association_proxy("_Booster__activeSideEffectDummies", "effectID")
+mapper(BoosterSideEffect, booster_side_effect_table)
diff --git a/eos/db/saveddata/price.py b/eos/db/saveddata/price.py
@@ -25,8 +25,10 @@
 
 prices_table = Table("prices", saveddata_meta,
                      Column("typeID", Integer, primary_key=True),
-                     Column("price", Float),
+                     Column("price", Float, default=0.0),
                      Column("time", Integer, nullable=False),
                      Column("failed", Integer))
 
-mapper(Price, prices_table)
+mapper(Price, prices_table, properties={
+    "_Price__price": prices_table.c.price,
+})
diff --git a/eos/effects/agilitybonus.py b/eos/effects/agilitybonus.py
@@ -0,0 +1,9 @@
+# agilityBonus
+#
+# Used by:
+# Subsystems named like: Propulsion Interdiction Nullifier (4 of 4)
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.ship.increaseItemAttr("agility", src.getModifiedItemAttr("agilityBonusAdd"))
diff --git a/eos/effects/ammoinfluencecapneed.py b/eos/effects/ammoinfluencecapneed.py
@@ -1,9 +1,7 @@
 # ammoInfluenceCapNeed
 #
 # Used by:
-# Items from category: Charge (466 of 913)
-# Charges from group: Frequency Crystal (185 of 185)
-# Charges from group: Hybrid Charge (209 of 209)
+# Items from category: Charge (478 of 924)
 type = "passive"
 
 

diff --git a/eos/effects/ammoinfluencerange.py b/eos/effects/ammoinfluencerange.py
@@ -1,7 +1,7 @@
 # ammoInfluenceRange
 #
 # Used by:
-# Items from category: Charge (571 of 913)
+# Items from category: Charge (572 of 924)
 type = "passive"
 
 

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

diff --git a/eos/effects/ammotrackingmultiplier.py b/eos/effects/ammotrackingmultiplier.py
@@ -7,7 +7,7 @@
 # Charges from group: Advanced Blaster Charge (8 of 8)
 # Charges from group: Advanced Pulse Laser Crystal (8 of 8)
 # Charges from group: Advanced Railgun Charge (8 of 8)
-# Charges from group: Projectile Ammo (129 of 129)
+# Charges from group: Projectile Ammo (128 of 128)
 type = "passive"
 
 

diff --git a/eos/effects/armorhpbonusaddpassive.py b/eos/effects/armorhpbonusaddpassive.py
@@ -1,9 +1,9 @@
 # armorHPBonusAddPassive
 #
 # Used by:
-# Subsystems from group: Defensive Systems (16 of 16)
+# Subsystems from group: Defensive Systems (9 of 12)
 type = "passive"
 
 
 def handler(fit, module, context):
-    fit.ship.increaseItemAttr("armorHP", module.getModifiedItemAttr("armorHPBonusAdd"))
+    fit.ship.increaseItemAttr("armorHP", module.getModifiedItemAttr("armorHPBonusAdd") or 0)
diff --git a/eos/effects/boosterarmorhppenalty.py b/eos/effects/boosterarmorhppenalty.py
@@ -1,10 +1,15 @@
 # boosterArmorHpPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 48)
+# Implants from group: Booster (12 of 52)
 type = "boosterSideEffect"
-activeByDefault = False
+
+# User-friendly name for the side effect
+displayName = "Armor Capacity"
+
+# Attribute that this effect targets
+attr = "boosterArmorHPPenalty"
 
 
 def handler(fit, booster, context):
-    fit.ship.boostItemAttr("armorHP", booster.getModifiedItemAttr("boosterArmorHPPenalty"))
+    fit.ship.boostItemAttr("armorHP", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/boosterarmorrepairamountpenalty.py b/eos/effects/boosterarmorrepairamountpenalty.py
@@ -5,9 +5,14 @@
 # Implants named like: Mindflood Booster (3 of 4)
 # Implants named like: Sooth Sayer Booster (3 of 4)
 type = "boosterSideEffect"
-activeByDefault = False
+
+# User-friendly name for the side effect
+displayName = "Armor Repair Amount"
+
+# Attribute that this effect targets
+attr = "boosterArmorRepairAmountPenalty"
 
 
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Unit",
-                                  "armorDamageAmount", booster.getModifiedItemAttr("boosterArmorRepairAmountPenalty"))
+                                  "armorDamageAmount", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/boostercapacitorcapacitypenalty.py b/eos/effects/boostercapacitorcapacitypenalty.py
@@ -4,8 +4,13 @@
 # Implants named like: Blue Pill Booster (3 of 5)
 # Implants named like: Exile Booster (3 of 4)
 type = "boosterSideEffect"
-activeByDefault = False
+
+# User-friendly name for the side effect
+displayName = "Cap Capacity"
+
+# Attribute that this effect targets
+attr = "boosterCapacitorCapacityPenalty"
 
 
 def handler(fit, booster, context):
-    fit.ship.boostItemAttr("capacitorCapacity", booster.getModifiedItemAttr("boosterCapacitorCapacityPenalty"))
+    fit.ship.boostItemAttr("capacitorCapacity", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/boostermaxvelocitypenalty.py b/eos/effects/boostermaxvelocitypenalty.py
@@ -1,10 +1,15 @@
 # boosterMaxVelocityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 48)
+# Implants from group: Booster (12 of 52)
 type = "boosterSideEffect"
-activeByDefault = False
+
+# User-friendly name for the side effect
+displayName = "Velocity"
+
+# Attribute that this effect targets
+attr = "boosterMaxVelocityPenalty"
 
 
 def handler(fit, booster, context):
-    fit.ship.boostItemAttr("maxVelocity", booster.getModifiedItemAttr("boosterMaxVelocityPenalty"))
+    fit.ship.boostItemAttr("maxVelocity", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/boostermissileexplosioncloudpenaltyfixed.py b/eos/effects/boostermissileexplosioncloudpenaltyfixed.py
@@ -4,9 +4,14 @@
 # Implants named like: Exile Booster (3 of 4)
 # Implants named like: Mindflood Booster (3 of 4)
 type = "boosterSideEffect"
-activeByDefault = False
+
+# User-friendly name for the side effect
+displayName = "Missile Explosion Radius"
+
+# Attribute that this effect targets
+attr = "boosterMissileAOECloudPenalty"
 
 
 def handler(fit, booster, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "aoeCloudSize", booster.getModifiedItemAttr("boosterMissileAOECloudPenalty"))
+                                    "aoeCloudSize", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/boostermissileexplosionvelocitypenalty.py b/eos/effects/boostermissileexplosionvelocitypenalty.py
@@ -3,9 +3,14 @@
 # Used by:
 # Implants named like: Blue Pill Booster (3 of 5)
 type = "boosterSideEffect"
-activeByDefault = False
+
+# User-friendly name for the side effect
+displayName = "Missile Explosion Velocity"
+
+# Attribute that this effect targets
+attr = "boosterAOEVelocityPenalty"
 
 
 def handler(fit, booster, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "aoeVelocity", booster.getModifiedItemAttr("boosterAOEVelocityPenalty"))
+                                    "aoeVelocity", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/boostermissilevelocitypenalty.py b/eos/effects/boostermissilevelocitypenalty.py
@@ -4,9 +4,14 @@
 # Implants named like: Crash Booster (3 of 4)
 # Implants named like: X Instinct Booster (3 of 4)
 type = "boosterSideEffect"
-activeByDefault = False
+
+# User-friendly name for the side effect
+displayName = "Missile Velocity"
+
+# Attribute that this effect targets
+attr = "boosterMissileVelocityPenalty"
 
 
 def handler(fit, booster, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"),
-                                    "maxVelocity", "boosterMissileVelocityPenalty")
+                                    "maxVelocity", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/boostershieldboostamountpenaltyshieldskills.py b/eos/effects/boostershieldboostamountpenaltyshieldskills.py
@@ -0,0 +1,14 @@
+type = "boosterSideEffect"
+
+# User-friendly name for the side effect
+displayName = "Shield Boost"
+
+# Attribute that this effect targets
+attr = "boosterShieldBoostAmountPenalty"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"), "shieldBonus",
+                                  src.getModifiedItemAttr("boosterShieldBoostAmountPenalty"))
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation"), "shieldBonus",
+                                  src.getModifiedItemAttr("boosterShieldBoostAmountPenalty"))
diff --git a/eos/effects/boostershieldcapacitypenalty.py b/eos/effects/boostershieldcapacitypenalty.py
@@ -1,10 +1,15 @@
 # boosterShieldCapacityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 48)
+# Implants from group: Booster (12 of 52)
 type = "boosterSideEffect"
-activeByDefault = False
+
+# User-friendly name for the side effect
+displayName = "Shield Capacity"
+
+# Attribute that this effect targets
+attr = "boosterShieldCapacityPenalty"
 
 
 def handler(fit, booster, context):
-    fit.ship.boostItemAttr("shieldCapacity", booster.getModifiedItemAttr("boosterShieldCapacityPenalty"))
+    fit.ship.boostItemAttr("shieldCapacity", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/boosterturretfalloffpenalty.py b/eos/effects/boosterturretfalloffpenalty.py
@@ -4,9 +4,14 @@
 # Implants named like: Drop Booster (3 of 4)
 # Implants named like: X Instinct Booster (3 of 4)
 type = "boosterSideEffect"
-activeByDefault = False
+
+# User-friendly name for the side effect
+displayName = "Turret Falloff"
+
+# Attribute that this effect targets
+attr = "boosterTurretFalloffPenalty"
 
 
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "falloff", booster.getModifiedItemAttr("boosterTurretFalloffPenalty"))
+                                  "falloff", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/boosterturretoptimalrangepenalty.py b/eos/effects/boosterturretoptimalrangepenalty.py
@@ -5,9 +5,14 @@
 # Implants named like: Mindflood Booster (3 of 4)
 # Implants named like: Sooth Sayer Booster (3 of 4)
 type = "boosterSideEffect"
-activeByDefault = False
+
+# User-friendly name for the side effect
+displayName = "Turret Optimal Range"
+
+# Attribute that this effect targets
+attr = "boosterTurretOptimalRange"
 
 
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "maxRange", booster.getModifiedItemAttr("boosterTurretOptimalRange"))
+                                  "maxRange", booster.getModifiedItemAttr(attr))
diff --git a/eos/effects/boosterturrettrackingpenalty.py b/eos/effects/boosterturrettrackingpenalty.py
@@ -4,9 +4,14 @@
 # Implants named like: Exile Booster (3 of 4)
 # Implants named like: Frentix Booster (3 of 4)
 type = "boosterSideEffect"
-activeByDefault = False
+
+# User-friendly name for the side effect
+displayName = "Turret Tracking"
+
+# Attribute that this effect targets
+attr = "boosterTurretTrackingPenalty"
 
 
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                  "trackingSpeed", booster.getModifiedItemAttr("boosterTurretTrackingPenalty"))
+                                  "trackingSpeed", booster.getModifiedItemAttr(attr))