Destroying mounted lights flashes, move equipment datatype

src/Dodge/Item.hs

@@ -23,18 +23,16 @@ itemFromBase ibt = case ibt of
     AUTOEFFGUN _ -> undefined
     -- Weapons
     HELD ht -> itemFromHeldType ht
+    LEFT lt -> itemFromLeftType lt
+    EQUIP et -> itemFromEquipType et
     --GRENADE
     --REMOTEBOMB
     -- Utility items
-    BOOSTER -> boosterGun
-    REWINDER    -> rewindGun
-    BLINKER     -> blinkGun
-    BLINKERUNSAFE       -> unsafeBlinkGun
-    SHRINKER        -> shrinkGun
-    SPAWNER     -> error "need to datify creatures first"
-    -- Equipment
-    CLICKDETECTOR d -> clickDetector d
-    AUTODETECTOR  d -> autoDetector d
+    CRAFT cr -> makeTypeCraft cr
+    KEYCARD i -> keyCard i
+    MEDKIT i -> medkit i
+itemFromEquipType :: EquipItemType -> Item
+itemFromEquipType et = case et of
     MAGSHIELD -> magShield
     FLAMESHIELD     -> flameShield
     FRONTARMOUR     -> frontArmour
@@ -49,9 +47,16 @@ itemFromBase ibt = case ibt of
     JUMPLEGS        -> jumpLegs
     FLATSHIELD      -> flatShield
     JETPACK     -> jetPack
-    CRAFT cr -> makeTypeCraft cr
-    KEYCARD i -> keyCard i
-    MEDKIT i -> medkit i
+    AUTODETECTOR  d -> autoDetector d
+itemFromLeftType :: LeftItemType -> Item
+itemFromLeftType lt = case lt of
+    BOOSTER -> boosterGun
+    REWINDER    -> rewindGun
+    BLINKER     -> blinkGun
+    BLINKERUNSAFE       -> unsafeBlinkGun
+    SHRINKER        -> shrinkGun
+    SPAWNER     -> error "need to datify creatures first"
+    -- Equipment
 itemFromHeldType :: HeldItemType -> Item
 itemFromHeldType ht = case ht of
     SHATTERGUN        -> shatterGun
@@ -109,34 +114,17 @@ itemFromHeldType ht = case ht of
     POISONSPRAYER   -> poisonSprayer
     DRONELAUNCHER   -> droneLauncher
     FORCEFIELDGUN       -> forceFieldGun
+
+    HELDDETECTOR d -> clickDetector d
 baseToFamily :: ItemBaseType -> ItemFamily
 baseToFamily ibt = case ibt of
     NOTDEFINED -> undefined
     EFFGUN _ -> undefined
     AUTOEFFGUN _ -> undefined
     HELD _ -> HeldFamily
-    BOOSTER             -> LeftClickFamily
-    REWINDER            -> LeftClickFamily
-    BLINKER             -> LeftClickFamily
-    BLINKERUNSAFE       -> LeftClickFamily
-    SHRINKER            -> LeftClickFamily
-    SPAWNER             -> LeftClickFamily
-    CLICKDETECTOR _   -> HeldFamily
-    AUTODETECTOR _    -> LeftClickFamily
-    MAGSHIELD               -> EquipmentFamily
-    FLAMESHIELD             -> EquipmentFamily
-    FRONTARMOUR             -> EquipmentFamily
-    WRISTARMOUR             -> EquipmentFamily
-    INVISIBILITYEQUIPMENT _   -> EquipmentFamily
-    BRAINHAT            -> EquipmentFamily
-    HEADLAMP            -> EquipmentFamily
-    HEADLAMP1           -> EquipmentFamily
-    POWERLEGS           -> EquipmentFamily
-    SPEEDLEGS           -> EquipmentFamily
-    JUMPLEGS            -> EquipmentFamily
-    FLATSHIELD          -> EquipmentFamily
-    JETPACK             -> EquipmentFamily
-    CRAFT _             -> CraftingFamily
+    LEFT _ -> LeftClickFamily
+    EQUIP _ -> EquipmentFamily
+    CRAFT _ -> CraftingFamily
     
     KEYCARD _   -> HeldFamily