Cleanup

src/Dodge/Combine/Combinations.hs

@@ -86,7 +86,6 @@ itemCombinations =
            , po [HELD FLAMESPITTER, cr STEELDRUM] flameThrower
            , po [HELD FLAMETHROWER, cr STEELDRUM] flameWall
            , po [HELD FLAMETHROWER, cr PUMP] flameTorrent
-           , po [HELD LASER, HELD BURSTRIFLE] flameTorrent
            , p [o $ cr PRISM, o $ cr TRANSFORMER, o $ cr PIPE] laser
 --           , po [HELD LASGUN, HELD LASGUN, cr HARDWARE] dualBeam
 --           , po [HELD LASGUN, cr TRANSFORMER] (lasWide 2)

src/Dodge/Update.hs

@@ -384,26 +384,23 @@ shiftInvItemsDown (_, i) x w = fromMaybe w $ do
     g i' m = fst <$> IM.lookupGT i' m
 
 updateMouseOverInventory :: Configuration -> World -> World
-updateMouseOverInventory cfig w = fromMaybe
-    (w & hud . hudElement . diMouseOver .~ Nothing)
-    $ do
-        sss <- w ^? hud . hudElement . diSections
-        guard $ ButtonRight `M.notMember` (w ^. input . mouseButtons)
-            || not (null $ w ^? hud . hudElement . subInventory . ciSelection)
-        return $
-            w & hud . hudElement . diMouseOver
-                .~ inverseSelNumPos cfig ldp sss (w ^. input . mousePos)
+updateMouseOverInventory cfig w = 
+    w & hud . hudElement . diMouseOver .~ newmouseover
   where
-    ldp = invDisplayParams w
+    newmouseover = do
+        sss <- w ^? hud . hudElement . diSections
+        guard $
+            ButtonRight `M.notMember` (w ^. input . mouseButtons)
+                || not (null $ w ^? hud . hudElement . subInventory . ciSelection)
+        inverseSelNumPos cfig (invDisplayParams w) sss (w ^. input . mousePos)
 
 updateMouseOverCombineInventory :: Configuration -> World -> World
-updateMouseOverCombineInventory cfig w = fromMaybe w $ do
-    sss <- w ^? hud . hudElement . subInventory . ciSections
-    return $
-        w & hud . hudElement . subInventory . ciMouseOver
-            .~ inverseSelNumPos cfig ldp sss (w ^. input . mousePos)
+updateMouseOverCombineInventory cfig w =
+    w & hud . hudElement . subInventory . ciMouseOver .~ newmouseover
   where
-    ldp = secondColumnParams
+    newmouseover = do
+        sss <- w ^? hud . hudElement . subInventory . ciSections
+        inverseSelNumPos cfig secondColumnParams sss (w ^. input . mousePos)
 
 updateWheelEvents :: World -> World
 updateWheelEvents w