justin/loop
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Start removing tweakables

Browse Source
This commit is contained in:
justin
2024-09-30 14:07:20 +01:00
parent ad76359dcf
commit 06cca549d9
11 changed files with 184 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Update/Input/InGame.hs
+2 -2
View File
@@ -244,10 +244,10 @@ toggleMap u = case u ^. uvWorld . hud . hudElement of
toggleTweakInv :: World -> World
toggleTweakInv w = case w ^? hud . hudElement . subInventory of
Just ExamineInventory{} -> w & thepointer .~ NoSubInventory
_ -> w & thepointer .~ ExamineInventory mi
_ -> w & thepointer .~ ExamineInventory -- mi
where
thepointer = hud . hudElement . subInventory
mi = 0 <$ (yourSelectedItem w >>= (^? itTweaks . tweakParams . ix 0))
-- mi = 0 <$ (yourSelectedItem w >>= (^? itTweaks . tweakParams . ix 0))
tryCombine :: SelectionSections CombinableItem -> World -> World
tryCombine sss w = fromMaybe w $ do
src/Dodge/Update/Scroll.hs
+25 -24
View File
@@ -36,11 +36,12 @@ updateWheelEvent yi w = case w ^. hud . hudElement of
| lbDown -> w & wCam . camZoom +~ y
| invKeyDown -> changeSwapSel yi w
| otherwise -> scrollAugInvSel yi w
DisplayInventory{_subInventory = ExamineInventory mi}
| invKeyDown && rbDown -> w & moveTweakSel yi
| invKeyDown -> scrollAugInvSel yi w
| rbDown -> w & changeTweakParam mi yi
| otherwise -> w & moveTweakSel yi
--DisplayInventory{_subInventory = ExamineInventory mi} -> w
DisplayInventory{_subInventory = ExamineInventory} -> w
-- | invKeyDown && rbDown -> w & moveTweakSel yi
-- | invKeyDown -> scrollAugInvSel yi w
-- | rbDown -> w & changeTweakParam mi yi
-- | otherwise -> w & moveTweakSel yi
DisplayInventory{_subInventory = CombineInventory{}} -> w & moveCombineSel yi
DisplayInventory{_subInventory = DisplayTerminal tmid} -> terminalWheelEvent yi tmid w
_ -> w
@@ -62,10 +63,10 @@ moveCombineSel yi =
)
. (worldEventFlags . at CombineInventoryChange ?~ ())
moveSubSel :: Int -> Int -> World -> World
moveSubSel yi maxyi =
hud . hudElement . subInventory . subInvMSel . _Just
%~ ((`mod` maxyi) . subtract yi)
--moveSubSel :: Int -> Int -> World -> World
--moveSubSel yi maxyi =
-- hud . hudElement . subInventory . subInvMSel . _Just
-- %~ ((`mod` maxyi) . subtract yi)
guardDisconnectedID :: Int -> World -> World -> World
guardDisconnectedID tmid w w' = case w ^? cWorld . lWorld . terminals . ix tmid . tmStatus of
@@ -110,22 +111,22 @@ scrollRBOption dy ymax
| dy > 0 = max 0 . subtract dy
| otherwise = id
moveTweakSel :: Int -> World -> World
moveTweakSel i w = case yourSelectedItem w ^? _Just . itTweaks . tweakParams of
Just l -> moveSubSel i (length l) w
_ -> w
--moveTweakSel :: Int -> World -> World
--moveTweakSel i w = case yourSelectedItem w ^? _Just . itTweaks . tweakParams of
-- Just l -> moveSubSel i (length l) w
-- _ -> w
changeTweakParam :: Maybe Int -> Int -> World -> World
changeTweakParam mi i w = fromMaybe w $ do
curpos <- you w ^? crManipulation . manObject . imSelectedItem
paramid <- mi
params <- yourSelectedItem w ^? _Just . itTweaks . tweakParams . ix paramid
let x = (_tweakVal params + i) `mod` _tweakMax params
return $
w & cWorld . lWorld . creatures . ix 0 . crInv . ix curpos
%~ ( (itTweaks . tweakParams . ix paramid . tweakVal .~ x)
. doTweak (_tweakType params) x
)
--changeTweakParam :: Maybe Int -> Int -> World -> World
--changeTweakParam mi i w = fromMaybe w $ do
-- curpos <- you w ^? crManipulation . manObject . imSelectedItem
-- paramid <- mi
-- params <- yourSelectedItem w ^? _Just . itTweaks . tweakParams . ix paramid
-- let x = (_tweakVal params + i) `mod` _tweakMax params
-- return $
-- w & cWorld . lWorld . creatures . ix 0 . crInv . ix curpos
-- %~ ( (itTweaks . tweakParams . ix paramid . tweakVal .~ x)
-- . doTweak (_tweakType params) x
-- )
scrollCommands :: Terminal -> [TerminalCommand]
scrollCommands = (nullCommand :) . _tmScrollCommands