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
@@ -10,14 +10,19 @@ import Shape
 import Geometry.Vector3D
 import Geometry

+defaultAmmo :: ItemAmmo
+defaultAmmo = LoadableAmmo 
+    { _aoType = GenericAmmo
+    , _wpMaxAmmo = 15
+    , _wpLoadedAmmo = 15
+    }
+
 defaultGun :: Item
 defaultGun = Weapon 
    { _itName = "default"
    , _itCurseStatus = Uncursed
    , _itIdentity = Pistol
-    , _wpMaxAmmo = 15
-    , _wpLoadedAmmo = 15
-    , _wpAmmo = GenericAmmo
+    , _wpAmmo = defaultAmmo
    , _wpReloadTime = 40
    , _wpReloadState = 0
    , _wpReloadType = ActiveReload