Fold in more ammo parameters, distinguish loadable and charging weapons

2021-11-27 14:29:44 +00:00
parent 92a8dd59b8
commit 224db733f6
19 changed files with 112 additions and 111 deletions
@@ -15,6 +15,9 @@ defaultAmmo = LoadableAmmo
    { _aoType = GenericAmmo
    , _wpMaxAmmo = 15
    , _wpLoadedAmmo = 15
+    , _wpReloadTime = 40
+    , _wpReloadState = 0
+    , _wpReloadType = ActiveReload
    }

 defaultGun :: Item
@@ -23,9 +26,6 @@ defaultGun = Weapon
    , _itCurseStatus = Uncursed
    , _itIdentity = Pistol
    , _wpAmmo = defaultAmmo
-    , _wpReloadTime = 40
-    , _wpReloadState = 0
-    , _wpReloadType = ActiveReload
    , _wpMaxWarmUp = 0
    , _wpCurWarmUp = 0
    , _wpMaxCoolDown = 0