Commit before changing module system to Map

src/Dodge/Item/Weapon/BulletGun/Cane.hs

@@ -53,7 +53,7 @@ bangCane = defaultGun
         }
     , _itConsumption = defaultAmmo 
         { _aoType = basicBullet
-        , _ammoMax = 1
+        , _ammoBaseMax = 1
         , _reloadTime = 20
         , _reloadType = ActivePartial 1
         }
@@ -115,7 +115,7 @@ bangCaneX i = bangCane
       & itUse . useAim . aimRange .~ 1
       & itUse . useAim . aimStance .~ TwoHandFlat
       & itUse . useAim . aimZoom .~ defaultItZoom {_itZoomFac = 1.5}
-    & itConsumption . ammoMax .~ i
+    & itConsumption . ammoBaseMax .~ i
     & itParams . gunBarrels .~ MultiBarrel
         {_brlSpread = AlignedBarrels
         ,_brlNum = i
@@ -145,21 +145,23 @@ rifle = bangCane
         , _dimSPic = \it -> noPic $ baseRifleShape
             <> makeSingleClipAt (V3 5 0 3) it
         }
-    , _itModules = ItemModules
-        { _modHitEffect = DefaultModule }
     }
     & itUse . useAim . aimStance .~ TwoHandTwist
     & itName .~ "RIFLE"
     & itType .~ RIFLE
-    & itConsumption . ammoMax .~ 1
+    & itConsumption . ammoBaseMax .~ 1
 
 repeater :: Item
 repeater = rifle
+    & itModules .~ ItemModules
+        { _modHitEffect = DefaultModule 
+        , _modRifleMag = DefaultModule
+        }
     & itName .~ "REPEATER"
     & itType .~ REPEATER
     & itConsumption . reloadType .~ ActiveClear
     & itConsumption . reloadTime .~ 80
-    & itConsumption . ammoMax .~ 15
+    & itConsumption . ammoBaseMax .~ 15
     & itDimension . dimSPic .~ (\it -> noPic $ baseRifleShape
             <> makeTinClipAt 0 (V3 10 (-2) 0) it
             )
@@ -216,6 +218,7 @@ completeBurstRifle :: Item
 completeBurstRifle = repeater
     & itName .~ "COMPLETEBURSTRIFLE"
     & itType .~ COMPLETEBURSTRIFLE
+    & itModules . modRifleMag .~ BlockedModule
     & itParams . gunBarrels . brlInaccuracy .~ 0.1
     & itUse . useDelay . rateMax .~ 28
     & itUse . useMods .~
@@ -263,7 +266,7 @@ miniGunX i = defaultAutoGun
     , _itType = MINIGUNX i
     , _itConsumption = defaultAmmo 
         { _aoType = basicBullet
-        , _ammoMax = 1500
+        , _ammoBaseMax = 1500
         , _ammoLoaded = 1500
         , _reloadTime = 200
         }
@@ -291,6 +294,7 @@ miniGunX i = defaultAutoGun
         ["*" ++ replicate 13 ' ' ++ "*"
         ,"*    " ++ fromMaybe "    " (maybeWarmupStatus it) ++ "     *"
         ,"*" ++ replicate 13 ' ' ++ "*" ]
+        ++ moduleStrings it
     , _itDimension = ItemDimension
         { _dimRad = 20
         , _dimCenter = V3 5 0 0

src/Dodge/Item/Weapon/BulletGun/Rod.hs

@@ -65,7 +65,7 @@ bangRod = defaultGun
         }
     , _itConsumption = defaultAmmo 
         { _aoType = basicBullet
-        , _ammoMax = 1
+        , _ammoBaseMax = 1
         , _reloadTime = 20
         , _reloadType = ActiveClear
         }
@@ -101,7 +101,7 @@ amr :: Item
 amr = elephantGun
     & itName .~ "AMR"
     & itType .~ AMR
-    & itConsumption . ammoMax .~ 15
+    & itConsumption . ammoBaseMax .~ 15
     & itDimension . dimSPic .~ (\it -> noPic $ baseAMRShape
             <> makeTinClipAt 0 (V3 10 (-2) 0) it
             )

src/Dodge/Item/Weapon/BulletGun/Stick.hs

@@ -48,7 +48,7 @@ bangStick i = defaultGun
     , _itType = BANGSTICK i
     , _itConsumption = defaultAmmo 
         { _aoType = basicBullet
-        , _ammoMax = i
+        , _ammoBaseMax = i
         , _reloadTime = 15
         , _reloadType = ActivePartial 1
         }
@@ -119,7 +119,7 @@ revolver = pistol
     , _itType = REVOLVER
     , _itConsumption = defaultAmmo 
         { _aoType = basicBullet
-        , _ammoMax = 6
+        , _ammoBaseMax = 6
         , _ammoLoaded = 0
         , _reloadTime = 15
         , _reloadType = ActivePartial 1
@@ -174,7 +174,7 @@ pistol = (bangStick 1)
     , _itType = PISTOL
     , _itConsumption = defaultAmmo 
         { _aoType = basicBullet
-        , _ammoMax = 15
+        , _ammoBaseMax = 15
         , _ammoLoaded = 0
         , _reloadTime = 70
         , _reloadType = ActiveClear
@@ -233,4 +233,4 @@ revolverX i = revolver
         , torqueAfterI 0.2
         , withRecoilI 10
         ]
-    }   & itConsumption . ammoMax .~ i * 6
+    }   & itConsumption . ammoBaseMax .~ i * 6