Fold some ammo data into its own type

2021-11-27 13:40:56 +00:00
parent bfdac2fad5
commit 92a8dd59b8
21 changed files with 175 additions and 115 deletions
@@ -37,8 +37,10 @@ teslaGun :: Item
 teslaGun = defaultGun 
    { _itName = "TESLA"
    , _itIdentity = TeslaGun
-    , _wpMaxAmmo = 200
-    , _wpLoadedAmmo = 200
+    , _wpAmmo = defaultAmmo
+        { _wpMaxAmmo = 200
+        , _wpLoadedAmmo = 200
+        }
    , _wpReloadTime = 80
    , _wpReloadState = 0
    , _itUseRate = 0
@@ -71,8 +73,10 @@ lasGun :: Item
 lasGun = defaultAutoGun 
    { _itName = "LASGUN ////"
    , _itIdentity = LasGun
-    , _wpMaxAmmo = 200
-    , _wpLoadedAmmo = 200
+    , _wpAmmo = defaultAmmo
+        { _wpMaxAmmo = 200
+        , _wpLoadedAmmo = 200
+        }
    , _wpReloadTime = 80
    , _wpReloadState = 0
    , _itUseRate = 0
@@ -111,8 +115,10 @@ tractorGun :: Item
 tractorGun = defaultAutoGun 
    { _itName = "TRACTORGUN"
    , _itIdentity = TractorGun
-    , _wpMaxAmmo = 10000
-    , _wpLoadedAmmo = 10000
+    , _wpAmmo = defaultAmmo
+        { _wpMaxAmmo = 10000
+        , _wpLoadedAmmo = 10000
+        }
    , _wpReloadTime = 40
    , _wpReloadState = 0
    , _itUseRate = 0