Improve detector equipment, various cleanup

src/Dodge/Data.hs

@@ -20,6 +20,7 @@ module Dodge.Data
     , module Dodge.Item.Attachment.Data
     , module Dodge.Item.Data
     , module Dodge.Config.Data
+    , module Dodge.Equipment.Data
     ) where
 import Dodge.ShortShow
 import Dodge.Creature.State.Data
@@ -27,6 +28,7 @@ import Dodge.Creature.Stance.Data
 import Dodge.Creature.Perception.Data
 import Dodge.Creature.Memory.Data
 import Dodge.Distortion.Data
+import Dodge.Equipment.Data
 import Dodge.Data.SoundOrigin
 import Dodge.Data.DamageType
 import Dodge.Combine.Data
@@ -335,7 +337,12 @@ data Creature = Creature
     , _crHammerPosition :: HammerPosition
     , _crName           :: String
     , _crStatistics     :: CreatureStatistics
+    , _crCamouflage     :: CamouflageStatus
     }
+data CamouflageStatus
+    = FullyVisible
+    | Invisible
+    deriving (Eq,Ord,Enum)
 data CreatureStatistics = CreatureStatistics
     { _crStrength       :: Int
     , _crDexterity      :: Int
@@ -432,23 +439,6 @@ data ItemUse
         , _eqParams     :: EquipParams
         }
     | NoUse
-data EquipSite
-    = GoesOnHead
-    | GoesOnChest
-    | GoesOnBack
-    | GoesOnWrist
-    | GoesOnLegs
-    | GoesOnSpecial
-    deriving (Eq,Ord,Show)
-data EquipPosition
-    = OnHead
-    | OnChest
-    | OnBack
-    | OnLeftWrist
-    | OnRightWrist
-    | OnLegs
-    | OnSpecial
-    deriving (Eq,Ord,Show)
 _itUseAimStance :: Item -> AimStance
 _itUseAimStance = _aimStance . _useAim . _itUse
 data ItemConsumption