Move equipType out of record

src/Dodge/Item/Held/Cane.hs

@@ -12,17 +12,9 @@ import Dodge.Default
 --import qualified Data.IntMap.Strict as IM
 import LensHelp
 
-defaultBangCane :: Item
-defaultBangCane =
-    defaultBulletWeapon
---        & itUse . heldParams . recoil .~ 50
---        & itUse . heldDelay . rateMax .~ 6
---        & itUse . heldMods .~ BangCaneMod
-        -- & itUse . heldAim . aimHandlePos .~ 5
-
 volleyGun :: Int -> Item
 volleyGun i =
-    defaultBangCane
+    defaultHeldItem
 --        & itUse . heldMuzzles .~ getZipList 
 --            (ZipList [Muzzle (V2 15 x) 0 0.01 | x <- spreadAroundCenter i 6]
 --            <*> ZipList [0..i-1] 
@@ -36,7 +28,7 @@ volleyGun i =
 --        & itUse . heldUseEffect .~ RandomiseMuzzleFrames i
 
 rifle :: Item
-rifle = defaultBangCane & itType .~ HELD RIFLE
+rifle = defaultHeldItem & itType .~ HELD RIFLE
 --        & itUse . heldMuzzles . ix 0 . mzPos .~ V2 25 0
 
 alteRifle :: Item

src/Dodge/Item/Held/Cone.hs

@@ -7,24 +7,12 @@ module Dodge.Item.Held.Cone (
 import Control.Lens
 import Dodge.Data.Item
 import Dodge.Default.Item
---import Geometry.Data
---import Linear
 
 bangCone :: Item
-bangCone =
-    defaultBulletWeapon
---        & itUse . heldDelay . rateMax .~ 20
---        & itUse . heldMuzzles
---            .~ [Muzzle (V2 15 0) 0 0.5 0 BasicFlare MuzzleShootBullet (UseUpTo 15) 0]
-        & itType .~ HELD BANGCONE
+bangCone = defaultHeldItem & itType .~ HELD BANGCONE
 
 blunderbuss :: Item
-blunderbuss =
-    bangCone
---        & itUse . heldMuzzles . ix 0 . mzPos . _x .~ 30
-        & itType .~ HELD BLUNDERBUSS
+blunderbuss = bangCone & itType .~ HELD BLUNDERBUSS
 
 grapeCannon :: Int -> Item
-grapeCannon i =
-    blunderbuss
-        & itType .~ HELD (GRAPECANNON i)
+grapeCannon i = blunderbuss & itType .~ HELD (GRAPECANNON i)

src/Dodge/Item/Held/Rod.hs

@@ -17,7 +17,7 @@ import LensHelp
 
 bangRod :: Item
 bangRod =
-    defaultBulletWeapon
+    defaultHeldItem
 --        & itUse . heldDelay . rateMax .~ 12
         & itType .~ HELD BANGROD
 --        & itUse . heldMuzzles . ix 0 . mzPos .~ V2 30 0

src/Dodge/Item/Held/Stick.hs

@@ -14,7 +14,7 @@ import LensHelp
 
 bangStick :: Int -> Item
 bangStick i =
-    defaultBulletWeapon
+    defaultHeldItem
 --        & itUse . heldParams . recoil .~ 25
         & itType .~ HELD (BANGSTICK i)
 --        & itUse . heldDelay . rateMax .~ 8