Move equipType out of record

src/Dodge/Default/Item.hs

@@ -1,17 +1,12 @@
 module Dodge.Default.Item (
     defaultHeldItem,
---    singleAmmo,
-    defaultBulletWeapon,
-    --    defaultLeftItem,
     defaultCraftItem,
     module Dodge.Default.Item.Use,
 ) where
 
 import Control.Lens
---import qualified Data.IntMap.Strict as IM
 import Dodge.Data.Item
 import Dodge.Default.Item.Use
---import Geometry.Data
 
 defaultHeldItem :: Item
 defaultHeldItem =
@@ -21,7 +16,6 @@ defaultHeldItem =
         , _itEffect = defaultItEffect
         , _itID = 0 -- should this return an error ? const $ error "itID not correctly initialised" ?
         , _itTargeting = NoItTargeting
---        , _itAmmoSlots = mempty
         , _itLocation = InVoid
         , _itUse = UseHeld
         , _itParams = NoParams
@@ -30,22 +24,9 @@ defaultHeldItem =
         , _itTimeLastUsed = 0
         }
 
---defaultLeftItem :: Item
---defaultLeftItem = defaultHeldItem & itUse .~ defaultLeftUse
-
 defaultCraftItem :: Item
 defaultCraftItem = defaultHeldItem & itUse .~ UseNothing
 
---singleAmmo :: a -> IM.IntMap a
---singleAmmo x = IM.insert 0 x mempty
-
-defaultBulletWeapon :: Item
-defaultBulletWeapon =
-    defaultHeldItem
---        & itAmmoSlots .~ singleAmmo BulletAmmo
---        & itUse . heldMuzzles .~ 
---            [Muzzle (V2 15 0) 0 0.01 0 BasicFlare MuzzleShootBullet (UseExactly 1) 0]
-
 defaultItEffect :: ItEffect
 defaultItEffect =
     ItEffect

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

@@ -6,8 +6,8 @@ import Dodge.Data.Item.Use.Equipment
 defaultEquip :: EquipEffect
 defaultEquip =
     EquipEffect
-        { _eeType = GoesOnHead
-        , _eeUse = EDoNothing
+        { --_eeType = GoesOnHead
+         _eeUse = EDoNothing
         , _eeOnEquip = ItmCrWdWdDoNothing
         , _eeOnRemove = ItmCrWdWdDoNothing
         , _eeParams = NoEquipParams