Work on weapon attachments

src/Dodge/Default/Item.hs

@@ -18,37 +18,28 @@ defaultItemDimension = ItemDimension
     , _dimAttachPos = V3 10 (-5) 3
     }
 
-defaultItem :: Item
-defaultItem =
-    Item
+defaultHeldItem :: Item
+defaultHeldItem = Item
         { _itCurseStatus = Uncursed
-        , _itType = defaultItemType
+        , _itType = ItemType (HELD PISTOL) mempty
         , _itEffect = defaultItEffect
         , _itID = 0
         , _itIsHeld = False
---        , _itInvColor = yellow
         , _itInvSize = 1
         , _itLocation = InVoid
         , _itDimension = defaultItemDimension
-        , _itUse = CraftUse (ItAmount 1)
+        , _itUse = defaultHeldUse
         , _itParams = NoParams
         , _itTweaks = NoTweaks
         , _itScope = NoScope
         , _itAttachments = mempty
---        , _itValue = ItemValue 0 MundaneItem
         }
 
 defaultLeftItem :: Item
-defaultLeftItem = defaultItem & itUse .~ defaultLeftUse
-
-defaultHeldItem :: Item
-defaultHeldItem = defaultItem & itUse .~ defaultHeldUse
+defaultLeftItem = defaultHeldItem & itUse .~ defaultLeftUse
 
 defaultCraftItem :: Item
-defaultCraftItem = defaultItem & itUse .~ CraftUse 1
-
-defaultItemType :: ItemType
-defaultItemType = ItemType NoItemType mempty
+defaultCraftItem = defaultHeldItem & itUse .~ CraftUse 1
 
 defaultBulletWeapon :: Item
 defaultBulletWeapon =
@@ -70,5 +61,5 @@ defaultWeapon =
                 ]
 
 defaultConsumable :: Item
-defaultConsumable = defaultItem & itUse .~ ConsumeUse CDoNothing 1
+defaultConsumable = defaultHeldItem & itUse .~ ConsumeUse CDoNothing 1
 

src/Dodge/Default/Item/Use.hs

@@ -36,5 +36,4 @@ defaultHeldUse =
         , _heldAim = defaultAimParams
         , _heldScroll = HeldScrollDoNothing
         , _heldConsumption = defaultLoadable
---        , _useTargeting = Nothing
         }