Work on weapon attachments

src/Dodge/Item/Consumable.hs

@@ -9,7 +9,7 @@ medkit :: Int -> Item
 medkit i =
     defaultConsumable
         & itUse . cUse .~ CHeal i
-        & itType . iyBase .~ Consumable (MEDKIT i)
+        & itType . iyBase .~ CONSUMABLE (MEDKIT i)
 
 heal25 :: Int -> World -> Maybe World
 heal25 = heal 25

src/Dodge/Item/Display.hs

@@ -79,7 +79,6 @@ itemString = head . basicItemDisplay
 
 itemBaseName :: Item -> String
 itemBaseName it = case _iyBase $ _itType it of
-    NoItemType -> show "NoItemType"
     CRAFT str -> show str
     HELD hit -> case hit ^? xNum of
         Just i -> takeWhile (/= ' ') (show hit) ++ show i
@@ -87,7 +86,7 @@ itemBaseName it = case _iyBase $ _itType it of
     LEFT lit -> show lit
     EQUIP eit -> showEquipItem eit
     AMMO ait -> show ait
-    Consumable cit -> show cit
+    CONSUMABLE cit -> show cit
     ATTACH ait -> show ait
 
 showEquipItem :: EquipItemType -> String
@@ -121,7 +120,10 @@ itemNumberDisplay cr itm = case iu of
     HeldUse{} -> [showReloadProgress cr itm]
     LeftUse{} -> [showAutoRechargeProgress (_leftConsumption iu)]
     EquipUse{} -> showEquipmentNumber cr itm
-    _ -> [show $ iu ^?! useAmount . getItAmount]
+    CraftUse x -> [show $ x ^. getItAmount]
+    ConsumeUse {_useAmount = x} -> [show $ x ^. getItAmount]
+    AttachUse {} -> []
+    
   where
     iu = itm ^?! itUse
 

src/Dodge/Item/Draw/SPic.hs

@@ -18,13 +18,12 @@ import ShapePicture
 itemSPic :: Item -> SPic
 itemSPic it =
     M.foldMapWithKey (modulesSPic it) (_iyModules $ _itType it) <> case it ^. itType . iyBase of
-        NoItemType -> over _1 (colorSH magenta) defSPic
         CRAFT _ -> defSPic
         HELD ht -> heldItemSPic ht it
         LEFT lt -> leftItemSPic lt it
         EQUIP et -> equipItemSPic et it
         AMMO {} -> defSPic
-        Consumable{} -> defSPic
+        CONSUMABLE{} -> defSPic
         ATTACH {} -> defSPic
 
 equipItemSPic :: EquipItemType -> Item -> SPic

src/Dodge/Item/Held/Cane.hs

@@ -99,8 +99,8 @@ miniGunUse i =
         & heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}
         & heldConsumption
             .~ (defaultBulletLoadable & laSource .~ AboveSource)
-        & heldConsumption . laSource . _InternalSource . iaCycle
-            .~ [loadEject 40, loadInsert 40, loadPrime 40]
+--        & heldConsumption . laSource . _InternalSource . iaCycle
+--            .~ [loadEject 40, loadInsert 40, loadPrime 40]
 
 miniGunX :: Int -> Item
 miniGunX i =

src/Dodge/Item/Info.hs

@@ -23,7 +23,7 @@ itmBaseInfo itm = case itm ^. itType . iyBase of
     HELD hit -> heldInfo hit
     LEFT lit -> leftInfo lit
     EQUIP eit -> equipInfo eit
-    Consumable cit -> consumableInfo cit
+    CONSUMABLE cit -> consumableInfo cit
     CRAFT fit -> craftInfo fit
     _ -> "THIS SHOULD NOT BE DISPLAYED"
 
@@ -222,7 +222,7 @@ itmUsageInfo itm = case itm ^. itType . iyBase of
         "This item can be equipped" ++ itmEquipSiteInfo itm
             ++ ". When equipped, it can be activated."
     EQUIP _ -> "This item can be equipped " ++ itmEquipSiteInfo itm ++ "."
-    Consumable _ -> "This item can be consumed."
+    CONSUMABLE _ -> "This item can be consumed."
     CRAFT _ -> ""
     _ -> "THIS SHOULD NOT BE DISPLAYED"