Improve detector equipment, various cleanup

src/Dodge/Combine/Data.hs

@@ -1,6 +1,8 @@
 module Dodge.Combine.Data
     (CombineType (..)
+    ,Detector (..)
     ) where
+import Dodge.Equipment.Data
 -- TODO make this an enum somehow...?
 data CombineType
     = NOTDEFINED
@@ -74,12 +76,13 @@ data CombineType
     | FORCEFIELDGUN
     | SHRINKER
     -- Equipment
-    | RADAR
-    | ITEMFINDER
+    | CLICKDETECTOR Detector
+    | AUTODETECTOR Detector
     | MAGSHIELD
     | FLAMESHIELD
     | FRONTARMOUR
     | WRISTARMOUR
+    | INVISIBILITYEQUIPMENT EquipSite
     | BRAINHAT
     | HEADLAMP
     | POWERLEGS
@@ -139,3 +142,9 @@ data CombineType
     --
     | NoCombineType
   deriving (Eq,Ord,Show)
+
+data Detector
+    = ITEMDETECTOR
+    | CREATUREDETECTOR
+    | WALLDETECTOR
+  deriving (Eq,Ord,Show)