Tweak scrolling, move onto reloading
This commit is contained in:
@@ -66,7 +66,7 @@ showAutoRechargeProgress lc = case lc of
|
||||
|
||||
showReloadProgress :: Creature -> HeldConsumption -> String
|
||||
showReloadProgress cr ic = case cr ^? crInvSel . iselAction of
|
||||
Just (ReloadAction i la _) -> show i ++ showLoadActionType la (_laLoaded ic)
|
||||
Just (ReloadAction i la) -> show i ++ showLoadActionType la (_laLoaded ic)
|
||||
_ -> case ic ^? laProgress . _Just . ix 0 of
|
||||
Nothing -> show $ _laLoaded ic
|
||||
Just la -> show (_actionTime la) ++ showLoadActionType la (_laLoaded ic)
|
||||
|
||||
@@ -4,16 +4,16 @@ import Dodge.Data.Item
|
||||
import LensHelp
|
||||
-- should be possible without the creature
|
||||
|
||||
zoomLongGun :: Float -> Item -> Item
|
||||
zoomLongGun x
|
||||
setZoomScopeChange :: Float -> Item -> Item
|
||||
setZoomScopeChange x
|
||||
| x > 0 = itScope . scopeZoomChange %~ (max 0 . (+ xi))
|
||||
| x < 0 = itScope . scopeZoomChange %~ (min 0 . (+ xi))
|
||||
| otherwise = id
|
||||
where
|
||||
xi | x > 2 = 20
|
||||
| x > 1 = 4
|
||||
| x > 1 = 10
|
||||
| x > 0 = 1
|
||||
| x < -2 = - 20
|
||||
| x < -1 = - 4
|
||||
| x < -1 = - 10
|
||||
| x < -0 = - 1
|
||||
| otherwise = 0
|
||||
|
||||
Reference in New Issue
Block a user