Cleanup

src/Dodge/Default/Item.hs

@@ -6,7 +6,6 @@ module Dodge.Default.Item (
 
 import qualified Data.IntMap.Strict as IM
 import Control.Lens
---import qualified Data.Map.Strict as M
 import Dodge.Data.Item
 import Dodge.Default.Item.Effect
 import Dodge.Default.Item.Use
@@ -42,26 +41,10 @@ singleAmmo :: a -> IM.IntMap a
 singleAmmo x = IM.insert 0 x mempty
 
 defaultBulletWeapon :: Item
-defaultBulletWeapon =
-    defaultHeldItem
---        & itUse . heldMods .~ PistolMod
+defaultBulletWeapon = defaultHeldItem
         & itUse . heldAmmoTypes .~ singleAmmo BulletAmmo
---        & itUse . heldUse .~ HeldUseAmmoParams -- useAmmoParams
---        & itType . iyModules . at ModBulletCollision ?~ EMPTYMODULE
         & itUse . heldAim . aimMuzzles .~ [Muzzle (V2 15 0) 0 0.01 0 PistolFlare MuzzleShootBullet]
---        & itType . iyModules . at ModBulletPayload ?~ EMPTYMODULE
---        & itType . iyModules . at ModBulletTrajectory ?~ EMPTYMODULE
-
---defaultWeapon :: Item
---defaultWeapon =
---    defaultHeldItem
---        & itUse .~ defaultHeldUse
---        & itType . iyModules
---            .~ M.fromList
---                [ (ModTarget, EMPTYMODULE)
---                , (ModTeleport, EMPTYMODULE)
---                ]
 
 defaultConsumable :: Item
-defaultConsumable = defaultHeldItem & itUse .~ ConsumeUse CDoNothing
+defaultConsumable = defaultHeldItem & itUse .~ UseConsume CDoNothing