Finish off user-selectable booster side effects - effects are applied correctly now and each has their own display name. Implements #642

eos/saveddata/booster.py

@@ -76,9 +76,13 @@ class Booster(HandledItem, ItemAttrShortcut):
     def sideEffects(self):
         return self.__sideEffects or []
 
+    @property
+    def activeSideEffectEffects(self):
+        return [x.effect for x in self.sideEffects if x.active]
+
     def __getSideEffects(self):
         """Returns list of BoosterSideEffect that are loaded with data"""
-        return [BoosterSideEffect(effect) for effect in self.item.effects.values() if effect.type and 'boosterSideEffect' in effect.type]
+        return [BoosterSideEffect(effect) for effect in self.item.effects.values() if effect.isType("boosterSideEffect")]
 
     @property
     def itemModifiedAttributes(self):
@@ -111,19 +115,14 @@ class Booster(HandledItem, ItemAttrShortcut):
             return
         if not self.active:
             return
+
         for effect in self.item.effects.itervalues():
             if effect.runTime == runTime and \
-                    (effect.isType("passive") or effect.isType("boosterSideEffect")) and \
-                    effect.activeByDefault:
+                    (effect.isType("passive") or effect.isType("boosterSideEffect")):
+                if effect.isType("boosterSideEffect") and effect not in self.activeSideEffectEffects:
+                    continue
                 effect.handler(fit, self, ("booster",))
 
-        # Legacy booster code, not fully implemented
-        '''
-        for sideEffect in self.iterSideEffects():
-            if sideEffect.active and sideEffect.effect.runTime == runTime:
-                sideEffect.effect.handler(fit, self, ("boosterSideEffect",))
-        '''
-
     @validates("ID", "itemID", "ammoID", "active")
     def validator(self, key, val):
         map = {

eos/saveddata/boosterSideEffect.py

@@ -55,9 +55,12 @@ class BoosterSideEffect(object):
 
     @property
     def name(self):
-        return self.__effect.getattr('displayName') or self.__effect.handlerName
+        return "{0}% {1}".format(
+            self.booster.getModifiedItemAttr(self.attr),
+            self.__effect.getattr('displayName') or self.__effect.handlerName,
+        )
 
     @property
-    def attrPrefix(self):
-        return self.__effect.getattr('prefix')
+    def attr(self):
+        return self.__effect.getattr('attr')