Work on terminals, add deactive data type status
This commit is contained in:
@@ -218,9 +218,9 @@ updateMouseClickInGame cfig w = case w ^. input . mouseContext of
|
||||
&& isGroupSelectableSection (fst x) ->
|
||||
w & input . mouseContext .~ OverInvDragSelect x (Just $ snd x)
|
||||
OverInvSelect x -> startDrag x cfig w
|
||||
OverTerminalReturn tmid -> terminalReturnEffect tmid w
|
||||
OverTerminalContinue tmid -> undefined
|
||||
OverTerminalEscape -> w & hud . hudElement . subInventory .~ NoSubInventory
|
||||
OverTerminal tmid (TerminalTextInput {}) -> terminalReturnEffect tmid w
|
||||
OverTerminal tmid (TerminalPressTo{}) -> continueTerminal tmid w
|
||||
OutsideTerminal -> w & hud . hudElement . subInventory .~ NoSubInventory
|
||||
OverCombSelect x ->
|
||||
w & hud . hudElement . subInventory . ciSelection ?~ f x
|
||||
& worldEventFlags . at CombineInventoryChange ?~ ()
|
||||
@@ -388,11 +388,16 @@ updateKeysInTerminal tmid u = fromMaybe u $ do
|
||||
TerminalTextInput{} -> updateKeysTextInputTerminal tmid u
|
||||
TerminalPressTo{} -> updateKeyContinueTerminal tmid u
|
||||
_ -> u
|
||||
|
||||
updateKeyContinueTerminal :: Int -> Universe -> Universe
|
||||
updateKeyContinueTerminal tmid u
|
||||
| any (==0) $ u ^. uvWorld . input . pressedKeys =
|
||||
u & uvWorld . cWorld . lWorld . terminals . ix tmid . tmStatus .~ TerminalLineRead
|
||||
u & uvWorld %~ continueTerminal tmid
|
||||
| otherwise = u
|
||||
|
||||
continueTerminal :: Int -> World -> World
|
||||
continueTerminal tmid = cWorld . lWorld . terminals . ix tmid . tmStatus .~ TerminalLineRead
|
||||
|
||||
updateKeysTextInputTerminal :: Int -> Universe -> Universe
|
||||
updateKeysTextInputTerminal tmid u =
|
||||
u
|
||||
|
||||
Reference in New Issue
Block a user