Replace some foldr with foldl'

src/Dodge/Creature/Impulse.hs

@@ -4,6 +4,7 @@ module Dodge.Creature.Impulse (
     impulsiveAIBefore,
 ) where
 
+import Data.Foldable
 import Control.Monad.State
 import Data.Bifunctor
 import Dodge.Creature.Impulse.Movement
@@ -29,7 +30,7 @@ impulsiveAIBefore f cr w = g w & cWorld . creatures . ix (_crID cr) .~ cr'
     (g, cr') = followImpulses w $ f w cr
 
 followImpulses :: World -> Creature -> (World -> World, Creature)
-followImpulses w cr = foldr f (id, cr) (_apImpulse $ _crActionPlan cr)
+followImpulses w cr = foldl' (flip f) (id, cr) (reverse $ _apImpulse $ _crActionPlan cr)
   where
     f imp (theupdate, cr') = first (. theupdate) $ followImpulse cr' w imp
 

src/Dodge/Creature/Impulse/UseItem.hs

@@ -4,6 +4,7 @@ module Dodge.Creature.Impulse.UseItem (
     itemEffect,
 ) where
 
+import Data.Foldable
 import Control.Lens
 import qualified Data.Map.Strict as M
 import Data.Maybe
@@ -29,7 +30,7 @@ useItem cr' w = fromMaybe (f w) $ do
 itemEffect :: Creature -> Item -> World -> World
 itemEffect cr it w = case it ^. itUse of
     HeldUse{_heldUse = eff, _heldMods = usemods} ->
-        hammerTest $ tryReload cr it w $ foldr ($) (useHeld eff) (useMod usemods) it cr
+        hammerTest $ tryReload cr it w $ foldl' (flip ($)) (useHeld eff) (reverse $ useMod usemods) it cr
     LeftUse{} -> doequipmentchange
     EquipUse{} -> doequipmentchange
     -- ConsumeUse will cause problems if the item is not selected

src/Dodge/Creature/State.hs

@@ -3,6 +3,7 @@ module Dodge.Creature.State (
     doDamage,
 ) where
 
+import Data.Foldable
 import Dodge.Base
 import Dodge.Corpse.Make
 import Dodge.Creature.Action
@@ -34,9 +35,9 @@ foldCr ::
     World ->
     World
 --foldCr xs cr w = foldr ($ cr) w xs
-foldCr xs cr w = foldr f w xs
+foldCr xs cr w = foldl' f w $ reverse xs
   where
-    f g w' = case w' ^? cWorld . creatures . ix (_crID cr) of
+    f w' g = case w' ^? cWorld . creatures . ix (_crID cr) of
         Just cr' -> g cr' w'
         Nothing -> w'
 
@@ -216,13 +217,13 @@ upInv cr = cWorld . creatures . ix (_crID cr) . crInv %~ IM.mapWithKey (itemUpda
 
 -- a loop going over equipped items
 equipmentEffects :: Creature -> World -> World
-equipmentEffects cr = flip (foldr $ useEquipment cr) (IM.keys $ _crInvEquipped cr)
+equipmentEffects cr = flip (foldl' $ flip $ useEquipment cr) (IM.keys $ _crInvEquipped cr)
 
 -- a loop going over all inventory items
 invSideEff :: Creature -> World -> World
-invSideEff cr w = weaponReloadSounds cr $ IM.foldrWithKey f w (_crInv cr)
+invSideEff cr w = weaponReloadSounds cr $ IM.foldlWithKey' f w (_crInv cr)
   where
-    f i it w' =
+    f w' i it =
         itemInvSideEffect cr it $
             doItemTargeting i cr w' & maybe id (\g -> doInvEffect g it cr) (it ^? itEffect . ieInv)
 

src/Dodge/Creature/YourControl.hs

@@ -2,6 +2,7 @@ module Dodge.Creature.YourControl (
     yourControl,
 ) where
 
+import Data.Foldable
 import qualified Data.Map.Strict as M
 import Dodge.Base.Coordinate
 import Dodge.Creature.Impulse.Movement
@@ -72,7 +73,7 @@ wasdM scancode = case scancode of
     _ -> V2 0 0
 
 wasdDir :: World -> Point2
-wasdDir = foldr ((+.+) . wasdM) (V2 0 0) . _keys
+wasdDir = foldl' (flip $ (+.+) . wasdM) (V2 0 0) . _keys
 
 -- | Set posture according to mouse presses.
 mouseActionsCr :: M.Map SDL.MouseButton Bool -> Creature -> Creature