Commit before changing module system to Map

2022-02-21 07:50:15 +00:00
parent 779e076c93
commit 724ee21afc
25 changed files with 171 additions and 86 deletions
@@ -16,7 +16,7 @@ import Control.Lens
 defaultAmmo :: ItemConsumption
 defaultAmmo = LoadableAmmo 
    { _aoType = GenericAmmo
-    , _ammoMax = 15
+    , _ammoBaseMax = 15
    , _ammoLoaded = 0
    , _reloadTime = 40
    , _reloadState = Nothing'
@@ -102,6 +102,7 @@ defaultGun = Item
    , _itTweaks = NoTweaks
    , _itModules = ItemModules
        { _modHitEffect = DefaultModule
+        , _modRifleMag  = BlockedModule
        }
    }
 defaultCraftable :: Item
@@ -125,7 +126,10 @@ defaultCraftable = Item
    , _itParams = NoParams
    , _itDimension = defItDimCol green
    , _itTweaks = NoTweaks
-    , _itModules = ItemModules BlockedModule
+    , _itModules = ItemModules 
+        { _modHitEffect = BlockedModule
+        , _modRifleMag = BlockedModule
+        }
    }
 defItDim :: ItemDimension
 defItDim = ItemDimension