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

Reimplement combining items

Browse Source
This commit is contained in:
justin
2023-02-20 00:12:44 +00:00
parent 1028fa7d88
commit adbfe5b73b
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Dodge/Creature/YourControl.hs
-2
View File
@@ -12,8 +12,6 @@ import Dodge.Creature.Impulse.Movement
import Dodge.Creature.Test import Dodge.Creature.Test
import Dodge.Data.World import Dodge.Data.World
import Dodge.InputFocus import Dodge.InputFocus
--import Dodge.LightSource
import Dodge.Update.UsingInput
import Geometry import Geometry
import LensHelp import LensHelp
import qualified SDL import qualified SDL
src/Dodge/Update/Input.hs
+14 -3
View File
@@ -2,6 +2,8 @@ module Dodge.Update.Input (
updateUseInput, updateUseInput,
) where ) where
import Data.List (sort)
import Dodge.Inventory.Add
import Dodge.Data.Combine import Dodge.Data.Combine
import Geometry import Geometry
import Dodge.SelectionList import Dodge.SelectionList
@@ -55,7 +57,7 @@ updateUseInputInGame h u = case h of
u & uvWorld . cWorld . lWorld . terminals . ix tmid . tmInput . tiFocus %~ const True u & uvWorld . cWorld . lWorld . terminals . ix tmid . tmInput . tiFocus %~ const True
CombineInventory _ _ sss CombineInventory _ _ sss
| inSubInvRegex (u ^. uvWorld) -> doSubInvRegexInput u | inSubInvRegex (u ^. uvWorld) -> doSubInvRegexInput u
| lbinitialpress -> tryCombine sss u -- maybeexitcombine (maybe id doCombine mi w) | lbinitialpress -> maybeExitCombine $ over uvWorld (tryCombine sss) u -- maybeexitcombine (maybe id doCombine mi w)
_ | inInvRegex (u ^. uvWorld) -> doRegexInput (-1) invRegex invRegex u _ | inInvRegex (u ^. uvWorld) -> doRegexInput (-1) invRegex invRegex u
_ | inCloseRegex (u ^. uvWorld) -> doRegexInput 2 closeRegex closeRegex u _ | inCloseRegex (u ^. uvWorld) -> doRegexInput 2 closeRegex closeRegex u
_ -> M.foldlWithKey' updateKeyInGame u pkeys _ -> M.foldlWithKey' updateKeyInGame u pkeys
@@ -65,8 +67,17 @@ updateUseInputInGame h u = case h of
pmb = u ^. uvWorld . input . mouseButtons pmb = u ^. uvWorld . input . mouseButtons
lbinitialpress = pmb ^? ix ButtonLeft == Just False lbinitialpress = pmb ^? ix ButtonLeft == Just False
tryCombine :: SelectionSections CombinableItem -> Universe -> Universe tryCombine :: SelectionSections CombinableItem -> World -> World
tryCombine sss w = w tryCombine sss w = fromMaybe w $ do
(i,j) <- sss ^? sssSelPos . _Just
CombinableItem is it _ <- sss ^? sssSections . ix i . ssItems . ix j . siPayload
return $ createAndSelectItem it $ foldr (rmInvItem 0) w (sort is)
maybeExitCombine :: Universe -> Universe
maybeExitCombine u
| ButtonRight `M.member` (u ^. uvWorld . input . mouseButtons)
= u
| otherwise = u & uvWorld . hud . hudElement . subInventory .~ NoSubInventory
doTextInputOver :: ASetter' Universe String -> Universe -> Universe doTextInputOver :: ASetter' Universe String -> Universe -> Universe
doTextInputOver p u = doTextInputOver p u =