Cleanup

src/Dodge/HeldScroll.hs

@@ -10,28 +10,16 @@ doHeldScroll :: HeldScroll -> Float -> Creature -> Item -> Item
 doHeldScroll hs = case hs of
     HeldScrollDoNothing -> const . const id
     HeldScrollZoom -> zoomLongGun
-    HeldScrollCharMode -> scrollCharMode
-scrollCharMode
-    :: Float    -- ^ Amount scrolled
-    -> Creature
-    -> Item
-    -> Item
-scrollCharMode x _ 
-    | x > 0 = incCharMode
-    | x < 0 = decCharMode
-    | otherwise = id
+    HeldScrollCharMode {} -> \ x _ -> itUse . heldScroll . hsCharMode %~ cycleSignum x
+    HeldScrollInt {} -> undefined
 
-incCharMode 
-    :: Item 
-    -> Item
-incCharMode = itAttachment . atCharMode %~ cycleL
-  where
-    cycleL (x :<| xs) = xs |> x
-    cycleL xs = xs
-decCharMode 
-    :: Item 
-    -> Item
-decCharMode = itAttachment . atCharMode %~ cycleR
-  where
-    cycleR (xs :|> x) = x <| xs
-    cycleR xs = xs
+cycleSignum :: Float -> Seq a -> Seq a
+cycleSignum x
+    | x > 0 = cycleL
+    | otherwise = cycleR
+
+cycleL,cycleR :: Seq a -> Seq a
+cycleL (x :<| xs) = xs |> x
+cycleL xs = xs
+cycleR (xs :|> x) = x <| xs
+cycleR xs = xs