Continue refactor of reloading
This commit is contained in:
@@ -186,7 +186,7 @@ targetRBPressUpdate w t
|
||||
& tgActive .~ False
|
||||
|
||||
targetLaserUpdate :: Item -> Creature -> World -> Targeting -> (World,Targeting)
|
||||
targetLaserUpdate it cr w t
|
||||
targetLaserUpdate _ cr w t
|
||||
| crIsAiming cr = (addLaserPic w,t
|
||||
& tgPos .~ fmap fst mp
|
||||
& tgActive .~ True
|
||||
@@ -205,10 +205,10 @@ targetLaserUpdate it cr w t
|
||||
]
|
||||
, _ptUpdate = ptSimpleTime 1
|
||||
}
|
||||
wpammo = _itConsumption it
|
||||
reloadFrac
|
||||
| _laLoaded wpammo == 0 = 1
|
||||
| otherwise = case _laTransfer wpammo of
|
||||
Transfer _ rs -> fromIntegral rs / fromIntegral (_laReloadTime wpammo)
|
||||
NoTransfer -> 1
|
||||
col = mixColors reloadFrac (1-reloadFrac) blue red
|
||||
--wpammo = _itConsumption it
|
||||
-- reloadFrac
|
||||
-- | _laLoaded wpammo == 0 = 1
|
||||
-- | otherwise = case _laTransfer wpammo of
|
||||
-- Transfer _ rs -> fromIntegral rs / fromIntegral (_laReloadTime wpammo)
|
||||
-- NoTransfer -> 1
|
||||
col = blue -- mixColors reloadFrac (1-reloadFrac) blue red
|
||||
|
||||
Reference in New Issue
Block a user