Commit before partial cleanup, continue weapon effect refactor

src/Dodge/Default/Item.hs

@@ -52,7 +52,7 @@ defaultBulletWeapon =
         & 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]
+        & itUse . heldAim . aimMuzzles .~ [Muzzle (V2 15 0) 0 0.01 0 PistolFlare MuzzleShootBullet Nothing]
 --        & itType . iyModules . at ModBulletPayload ?~ EMPTYMODULE
 --        & itType . iyModules . at ModBulletTrajectory ?~ EMPTYMODULE
 

src/Dodge/Default/Item/Use.hs

@@ -47,4 +47,5 @@ defaultHeldUse =
             , _weaponRepeat = []
             }
         , _heldTriggerType = HammerTrigger
+        , _heldUsageTime = 0
         }

src/Dodge/Default/Item/Use/AimParams.hs

@@ -25,6 +25,7 @@ defaultMuzzle = Muzzle
     , _mzAmmoSlot = 0
     , _mzFlareType = DefaultFlareType
     , _mzEffect = MuzzleShootBullet
+    , _mzChargeRequirement = Nothing
     }