From a08bb2494b81f424a166af420a20c23e79e48e5e Mon Sep 17 00:00:00 2001
From: blitzmann <ryan.xgamer99@gmail.com>
Date: Tue, 22 Sep 2015 21:45:32 -0400
Subject: [PATCH] Fix system effect states

---
 eos/saveddata/fit.py    |  4 ++--
 eos/saveddata/module.py |  9 +++++++--
 service/fit.py          | 31 +++++++++++++++++++++----------
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py
index 29df2dbcf..8b1cba9ca 100644
--- a/eos/saveddata/fit.py
+++ b/eos/saveddata/fit.py
@@ -604,8 +604,8 @@ class Fit(object):
                  Slot.RIG: "rigSlots",
                  Slot.SUBSYSTEM: "maxSubSystems"}
 
-        if type == Slot.MODE:
-            # Mode slot doesn't really exist, return default 0
+        if type in (Slot.MODE, Slot.SYSTEM):
+            # These slots don't really exist, return default 0
             return 0
 
         slotsUsed = self.getSlotsUsed(type, countDummies)
diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py
index 32a28c28e..161ed2dbf 100644
--- a/eos/saveddata/module.py
+++ b/eos/saveddata/module.py
@@ -35,12 +35,17 @@ class State(Enum):
     OVERHEATED = 2
 
 class Slot(Enum):
+    # These are self-explanatory
     LOW = 1
     MED = 2
     HIGH = 3
     RIG = 4
     SUBSYSTEM = 5
-    MODE = 6  # not a real slot, need for pyfa display rack separation
+    # not a real slot, need for pyfa display rack separation
+    MODE = 6
+    # system effects. They are projected "modules" and pyfa assumes all modules
+    # have a slot. In this case, make one up.
+    SYSTEM = 7
 
 class Hardpoint(Enum):
     NONE = 0
@@ -528,7 +533,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
             if effectName in item.effects:
                 return slot
         if item.group.name == "Effect Beacon":
-            return Slot.RIG
+            return Slot.SYSTEM
 
         raise ValueError("Passed item does not fit in any known slot")
 
diff --git a/service/fit.py b/service/fit.py
index ce400bdf1..e905dde9f 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -932,21 +932,32 @@ class Fit(object):
         self.checkStates(fit, base)
 
     # Old state : New State
-    localMap = {State.OVERHEATED: State.ACTIVE,
-                State.ACTIVE: State.ONLINE,
-                State.OFFLINE: State.ONLINE,
-                State.ONLINE: State.ACTIVE}
-    projectedMap = {State.OVERHEATED: State.ACTIVE,
-                    State.ACTIVE: State.OFFLINE,
-                    State.OFFLINE: State.ACTIVE,
-                    State.ONLINE: State.ACTIVE}  # Just in case
+    localMap = {
+        State.OVERHEATED: State.ACTIVE,
+        State.ACTIVE: State.ONLINE,
+        State.OFFLINE: State.ONLINE,
+        State.ONLINE: State.ACTIVE}
+    projectedMap = {
+        State.OVERHEATED: State.ACTIVE,
+        State.ACTIVE: State.OFFLINE,
+        State.OFFLINE: State.ACTIVE,
+        State.ONLINE: State.ACTIVE}  # Just in case
+    # For system effects. They should only ever be online or offline
+    projectedSystem = {
+        State.OFFLINE: State.ONLINE,
+        State.ONLINE: State.OFFLINE}
 
     def __getProposedState(self, mod, click, proposedState=None):
-        if mod.slot is Slot.SUBSYSTEM or mod.isEmpty:
+        if mod.slot == Slot.SUBSYSTEM or mod.isEmpty:
             return State.ONLINE
 
+        if mod.slot == Slot.SYSTEM:
+            transitionMap = self.projectedSystem
+        else:
+            transitionMap = self.projectedMap if mod.projected else self.localMap
+
         currState = mod.state
-        transitionMap = self.projectedMap if mod.projected else self.localMap
+
         if proposedState is not None:
             state = proposedState
         elif click == "right":