Cleanup

src/Dodge/Data/Item/Combine.hs

@@ -102,7 +102,7 @@ data EquipItemType
     | FLAMESHIELD
     | FRONTARMOUR
     | WRISTARMOUR
-    | INVISIBILITYEQUIPMENT EquipSite
+    | INVISIBILITYEQUIPMENT EquipType
     | BRAINHAT
     | HAT
     | HEADLAMP

src/Dodge/Data/Item/Effect.hs

@@ -18,9 +18,6 @@ data ItEffect = ItEffect
 
 data ItInvEffect
     = NoInvEffect
---    | ChargeIfEquipped
---    | ChargeIfInInventory
---    | SetCharge Int
     | EffectRootNotroot ItInvEffect ItInvEffect
     | CreateShieldWall
     | RemoveShieldWall

src/Dodge/Data/Item/Location.hs

@@ -32,7 +32,7 @@ data ItemLocation
         , _ilIsRoot :: Bool
         , _ilIsSelected :: Bool
         , _ilIsAttached :: Bool
-        , _ilEquipPosition :: Maybe EquipPosition
+        , _ilEquipSite :: Maybe EquipSite
         }
     | OnTurret {_ilTuID :: Int}
     | OnFloor {_ilFlID :: NewInt FloorInt}

src/Dodge/Data/Item/Use/Equipment.hs

@@ -18,7 +18,7 @@ data EquipEffect = EquipEffect
     { _eeUse :: Euse --Item -> Creature -> World -> World
     , _eeOnEquip :: ItmCrWdWd --Item -> Creature -> World -> World
     , _eeOnRemove :: ItmCrWdWd --Item -> Creature -> World -> World
-    , _eeSite :: EquipSite
+    , _eeType :: EquipType
     , _eeParams :: EquipParams
     , _eeViewDist :: Maybe Float
     , _eeAttachPos :: Point3