Merge branch 'master' into singularity

eos/db/saveddata/character.py

@@ -29,9 +29,6 @@ from eos.saveddata.user import User
 from eos.saveddata.character import Character, Skill
 from eos.saveddata.ssocharacter import SsoCharacter
 
-
-
-
 characters_table = Table("characters", saveddata_meta,
                          Column("ID", Integer, primary_key=True),
                          Column("name", String, nullable=False),

eos/effects/structurerigaoevelocitybonussingletargetmissiles.py

@@ -5,6 +5,6 @@ type = "passive"
 def handler(fit, src, context):
     groups = ("Structure Anti-Subcapital Missile", "Structure Anti-Capital Missile")
 
-    fit.modules.filteredItemBoost(lambda mod: mod.charge.group.name in groups,
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
                                   "aoeVelocity", src.getModifiedItemAttr("structureRigMissileExploVeloBonus"),
                                   stackingPenalties=True)

eos/effects/structurerigvelocitybonussingletargetmissiles.py

@@ -4,6 +4,6 @@ type = "passive"
 
 def handler(fit, src, context):
     groups = ("Structure Anti-Subcapital Missile", "Structure Anti-Capital Missile")
-    fit.modules.filteredItemBoost(lambda mod: mod.charge.group.name in groups,
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups,
                                   "maxVelocity", src.getModifiedItemAttr("structureRigMissileVelocityBonus"),
                                   stackingPenalties=True)

eos/effects/warpscrambleblockmwdwithnpceffect.py

@@ -17,8 +17,8 @@ def handler(fit, module, context):
     # this is such a dirty hack
     for mod in fit.modules:
         if not mod.isEmpty and mod.state > State.ONLINE and (
-                mod.item.requiresSkill("Micro Jump Drive Operation")
-                or mod.item.requiresSkill("High Speed Maneuvering")
+                mod.item.requiresSkill("Micro Jump Drive Operation") or
+                mod.item.requiresSkill("High Speed Maneuvering")
         ):
             mod.state = State.ONLINE
         if not mod.isEmpty and mod.item.requiresSkill("Micro Jump Drive Operation") and mod.state > State.ONLINE:

eos/saveddata/character.py

@@ -170,7 +170,6 @@ class Character(object):
                 if x.client == clientHash:
                     self.__ssoCharacters.remove(x)
 
-
     def getSsoCharacter(self, clientHash):
         return next((x for x in self.__ssoCharacters if x.client == clientHash), None)
 

eos/saveddata/module.py

@@ -144,10 +144,11 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
         return empty
 
     @classmethod
-    def buildRack(cls, slot):
+    def buildRack(cls, slot, num=None):
         empty = Rack(None)
         empty.__slot = slot
         empty.dummySlot = slot
+        empty.num = num
         return empty
 
     @property
@@ -801,6 +802,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
 class Rack(Module):
     """
     This is simply the Module class named something else to differentiate
-    it for app logic. This class does not do anything special
+    it for app logic. The only thing interesting about it is the num property,
+    which is the number of slots for this rack
     """
-    pass
+    num = None

eos/saveddata/ssocharacter.py

@@ -33,7 +33,6 @@ class SsoCharacter(object):
         self.refreshToken = refreshToken
         self.accessTokenExpires = None
 
-
     @reconstructor
     def init(self):
         pass