Move around ammo source checks

2024-06-22 16:23:34 +01:00
parent 25cecb8ea6
commit c723d1b1e1
25 changed files with 218 additions and 263 deletions
@@ -34,7 +34,7 @@ defaultHeldUse =
        , _heldMods = HeldModNothing
        , _heldHammer = HammerUp
        , _heldAim = defaultAimParams
-        , _heldConsumption = defaultLoadable
+        , _heldConsumption = []
        , _heldParams = BulletShooterParams
            { _muzVel = 0.8
            , _rifling = 0.8
@@ -1,19 +1,9 @@
 module Dodge.Default.Item.Use.Consumption where

-import Control.Lens
+--import Control.Lens
 import Dodge.Data.Item.Use.Consumption
-import Dodge.Item.Weapon.Bullet
+--import Dodge.Item.Weapon.Bullet
 --import Dodge.Reloading.Action

-defaultLoadable :: HeldConsumption
-defaultLoadable =
-    LoadableAmmo
-        { _laAmmoType = GenericAmmo
-        , _laSourceType = BulletSource
-        }
-
-defaultBulletLoadable :: HeldConsumption
-defaultBulletLoadable = defaultLoadable & laAmmoType .~ basicBulletAmmo
-
 defaultLeftLoadable :: LeftConsumption
 defaultLeftLoadable = AutoRecharging 10 10 100 100