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