Commit on returning to work

src/Dodge/Item/Display.hs

@@ -88,6 +88,7 @@ itemBaseName it = case _iyBase $ _itType it of
     EQUIP eit -> showEquipItem eit
     AMMO ait -> show ait
     Consumable cit -> show cit
+    ATTACH ait -> show ait
 
 showEquipItem :: EquipItemType -> String
 showEquipItem eit = case eit of

src/Dodge/Item/Draw/SPic.hs

@@ -25,6 +25,7 @@ itemSPic it =
         EQUIP et -> equipItemSPic et it
         AMMO {} -> defSPic
         Consumable{} -> defSPic
+        ATTACH {} -> defSPic
 
 equipItemSPic :: EquipItemType -> Item -> SPic
 equipItemSPic et _ = case et of

src/Dodge/Item/Held/Cane.hs

@@ -96,14 +96,10 @@ miniGunUse i =
         & heldAim . aimRange .~ 1
         & heldAim . aimStance .~ TwoHandUnder
         & heldAim . aimZoom .~ defaultItZoom{_izFac = 1.5}
-        -- & heldAim . aimHandlePos .~ 5
         & heldConsumption
             .~ (defaultBulletLoadable & laSource .~ AboveSource)
-                --(defaultBulletLoadable
-                --    & laSource . iaMax .~ 1500
-                --    & laSource . iaLoaded .~ 1500
-                --)
-        & 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 =
@@ -111,7 +107,6 @@ miniGunX i =
         & itUse .~ miniGunUse i
         & itUse . heldAim . aimTurnSpeed .~ 0.5
         & itUse . heldAim . aimMuzzles .~ replicate i (Muzzle (V2 30 0) 0 0.05)
---        & itUse . heldAim . aimMuzzles .~ replicate i (Muzzle (V2 50 0) 0 0.05)
         & itParams . recoil .~ 10
         & itParams . torqueAfter .~ 0.01
         & itParams . randomOffset .~ 10

src/Dodge/Item/Held/Rod.hs

@@ -69,7 +69,11 @@ sniperRifle =
         & itUse . heldAim . aimMuzzles . ix 0 . mzInaccuracy .~ 0
         & itUse . heldAim . aimZoom .~ defaultItZoom{_izMax = 0.5, _izMin = 0.5,_izFac = 1}
         & itUse . heldScroll .~ HeldScrollZoom -- zoomLongGun
-        & itScope .~ ZoomScope (V2 0 0) 1 0.5 False
+        & itScope .~ ZoomScope 
+            { _scopePos = (V2 0 0)
+            , _scopeZoom =  1
+            , _scopeDefaultZoom = 0.5 
+            }
         & itType . iyModules . at ModTarget ?~ TARGET TargetLaser
 --        & itUse . useTargeting ?~ TargetLaser
 

src/Dodge/Item/Held/Utility.hs

@@ -32,7 +32,11 @@ latchkey _ =
 binoculars :: Item
 binoculars =
     defaultHeldItem
-        & itScope .~ ZoomScope (V2 0 0) 1 0.5 False
+        & itScope .~ ZoomScope 
+            { _scopePos = (V2 0 0) 
+            , _scopeZoom = 1 
+            , _scopeDefaultZoom = 0.5 
+            }
         & itType . iyBase .~ HELD BINOCULARS
         -- & itUse . heldAim . aimHandlePos .~ 5
 --        & itUse . heldAim . aimMuzPos .~ 10