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
@@ -40,9 +40,8 @@ teslaGun = defaultGun
    , _wpAmmo = defaultAmmo
        { _wpMaxAmmo = 200
        , _wpLoadedAmmo = 200
+        , _wpReloadTime = 80
        }
-    , _wpReloadTime = 80
-    , _wpReloadState = 0
    , _itUseRate = 0
    , _itAimStance = TwoHandFlat
    , _itUseTime = 0
@@ -76,9 +75,8 @@ lasGun = defaultAutoGun
    , _wpAmmo = defaultAmmo
        { _wpMaxAmmo = 200
        , _wpLoadedAmmo = 200
+        , _wpReloadTime = 80
        }
-    , _wpReloadTime = 80
-    , _wpReloadState = 0
    , _itUseRate = 0
    , _itUseTime = 0
    , _itUse = RightUse $ const aLaser
@@ -118,9 +116,8 @@ tractorGun = defaultAutoGun
    , _wpAmmo = defaultAmmo
        { _wpMaxAmmo = 10000
        , _wpLoadedAmmo = 10000
+        , _wpReloadTime = 40
        }
-    , _wpReloadTime = 40
-    , _wpReloadState = 0
    , _itUseRate = 0
    , _itUseTime = 0
    , _itUse = RightUse aTractorBeam