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
@@ -83,7 +83,7 @@ itemLaserScopeEffect
        it = (cr ^. crInv) IM.! invid
        reloadFrac 
            | _wpLoadedAmmo (_wpAmmo it) == 0 = 1
-            | otherwise = fromIntegral (_wpReloadState it) / fromIntegral (_wpReloadTime it)
+            | otherwise = fromIntegral (_wpReloadState (_wpAmmo it)) / fromIntegral (_wpReloadTime (_wpAmmo it))
        --col = mixColors reloadFrac (1-reloadFrac) red green
 {- | Automatically send out radar pulses that detect walls.  -}
 autoRadarEffect :: ItEffect