Tweak combine inventory regex

2023-02-13 21:18:11 +00:00
parent b5db7a3420
commit 8b39a99194
12 changed files with 78 additions and 88 deletions
@@ -35,14 +35,15 @@ updateWheelEvent yi w = case w ^. hud . hudElement of
        | otherwise -> stopSoundFrom (CrReloadSound 0) $ changeAugInvSel yi w
    DisplayInventory {_subInventory = ExamineInventory mi}
        | invKeyDown && rbDown -> w & moveTweakSel yi
-        | invKeyDown -> stopSoundFrom (CrReloadSound 0) $ changeInvSel yi w
+        | invKeyDown -> stopSoundFrom (CrReloadSound 0) $ changeAugInvSel yi w
        | rbDown -> w & changeTweakParam mi yi
        | otherwise -> w & moveTweakSel yi
-    DisplayInventory {_subInventory = CombineInventory SelectionIntMap {_smRegexInput = False}} 
-        -> w & moveCombineSel yi
+    DisplayInventory {_subInventory = CombineInventory sm} 
+        | regexnotinput $ _smRegex sm -> w & moveCombineSel yi
    DisplayInventory {_subInventory = DisplayTerminal tmid} -> terminalWheelEvent yi tmid w
    _ -> w
  where
+    regexnotinput smr = not $ smr ^? smrInput == Just True
    y = fromIntegral yi
    numLocs = (fst . IM.findMax $ (w ^. cWorld . lWorld . seenLocations)) + 1
    rbDown = ButtonRight `M.member` _mouseButtons (_input w)