Broken commit

src/Dodge/Item/Ammo.hs

@@ -5,17 +5,17 @@ import Dodge.Data.World
 import Dodge.Default.Item
 
 tinMag :: Item
-tinMag = defaultHeldItem & itType . iyBase .~ AMMO TINMAGAZINE
+tinMag = defaultHeldItem & itType . iyBase .~ ATTACH (AMMOATTACH TINMAG)
     & itUse .~ AttachUse AmmoAttachParams
 
 drumMag :: Item
-drumMag = tinMag & itType . iyBase .~ AMMO DRUMMAGAZINE
+drumMag = tinMag & itType . iyBase .~ ATTACH (AMMOATTACH DRUMMAG)
 
 beltMag :: Item
-beltMag = tinMag & itType . iyBase .~ AMMO BULLETBELT
+beltMag = tinMag & itType . iyBase .~ ATTACH (AMMOATTACH BULLETBELT)
 
 zoomScope :: Item
 zoomScope = tinMag
-    & itType . iyBase .~ ATTACH ZOOMSCOPE
+    & itType . iyBase .~ ATTACH (SCROLLATTACH ZOOMSCOPE)
     & itUse .~ AttachUse (ScrollAttachParams (ZoomScrollParams {_opticPos = 0, _opticZoom = 1, _opticDefaultZoom = 0.5}))
     

src/Dodge/Item/Display.hs

@@ -85,7 +85,6 @@ itemBaseName it = case _iyBase $ _itType it of
         Nothing -> show hit
     LEFT lit -> show lit
     EQUIP eit -> showEquipItem eit
-    AMMO ait -> show ait
     CONSUMABLE cit -> show cit
     ATTACH ait -> show ait
 

src/Dodge/Item/Draw/SPic.hs

@@ -22,7 +22,6 @@ itemSPic it =
         HELD ht -> heldItemSPic ht it
         LEFT lt -> leftItemSPic lt it
         EQUIP et -> equipItemSPic et it
-        AMMO {} -> defSPic
         CONSUMABLE{} -> defSPic
         ATTACH {} -> defSPic
 

src/Dodge/Item/Held/Rod.hs

@@ -74,7 +74,7 @@ sniperRifle =
 --            , _scopeZoom =  1
 --            , _scopeDefaultZoom = 0.5 
 --            }
-        & itType . iyModules . at ModTarget ?~ TARGET TargetLaser
+--        & itType . iyModules . at ModTarget ?~ TARGET TargetLaser
 --        & itUse . useTargeting ?~ TargetLaser
 
 machineGun :: Item

src/Dodge/Item/InventoryColor.hs

@@ -9,7 +9,6 @@ itemInvColor itm = case itm ^. itType . iyBase of
     HELD {} -> white
     LEFT {} -> cyan
     EQUIP {} -> yellow
-    AMMO {} -> orange
     CONSUMABLE {} -> blue
     CRAFT {} -> green
-    ATTACH {} -> chartreuse
+    ATTACH {} -> orange

src/Dodge/Item/Weapon/Remote.hs

@@ -7,7 +7,6 @@ import Dodge.Data.World
 import Dodge.Default
 import Geometry
 
-
 setRemoteScope :: Int -> Point2 -> World -> World
 setRemoteScope itid pos w = case w ^? cWorld . lWorld . itemLocations . ix itid of
     Just (InInv cid' invid) ->