Update stack lts

src/Dodge/Block.hs

@@ -1,5 +1,6 @@
 module Dodge.Block where
 
+import Control.Monad
 import Data.Set (Set)
 import Dodge.Data.MountedObject
 import Control.Lens

src/Dodge/Creature/ReaderUpdate.hs

@@ -19,7 +19,7 @@ import qualified IntMapHelp as IM
 import Data.List (sortOn)
 import Control.Applicative
 import LensHelp
---import Control.Monad
+import Control.Monad
 import Data.Bifunctor
 import Data.Maybe
 import Dodge.Base

src/Dodge/Creature/State.hs

@@ -3,6 +3,7 @@ module Dodge.Creature.State (
     doDamage,
 ) where
 
+import Control.Monad
 import Dodge.Targeting.Draw
 import Dodge.Data.DoubleTree
 import qualified Data.Map.Strict as M

src/Dodge/HeldUse.hs

@@ -5,6 +5,7 @@ module Dodge.HeldUse (
     mcUseHeld,
 ) where
 
+import Control.Monad
 import Color
 import Data.Maybe
 import Dodge.Base.Collide

src/Dodge/LockAndKey.hs

@@ -7,6 +7,7 @@ import Dodge.Item
 import Dodge.Room
 import Dodge.Tree
 import RandomHelp
+import Control.Monad
 
 bossKeyItems :: RandomGen g => [(State g (Tree Room), State g ItemType)]
 bossKeyItems = [(return . cleatOnward <$> bossRoom autoCrit, takeOne [HELD PISTOL])]

src/Dodge/Placement/PlaceSpot.hs

@@ -84,7 +84,7 @@ placeSpotRoomRand ::
     GenWorld ->
     ((GenWorld, Room), [Placement])
 placeSpotRoomRand rm i f plmnt w =
-    let (ps, g) = runState (_rmRandPSs rm !! i) $_randGen (_gwWorld w)
+    let (ps, g) = runState (_rmRandPSs rm !! i) $ w ^. gwWorld . randGen
      in placeSpot (w & gwWorld . randGen .~ g, rm) (plmnt & plSpot .~ f ps)
 
 placeSpotID :: PlacementSpot -> PSType -> GenWorld -> (Int, GenWorld)

src/Dodge/Projectile/Update.hs

@@ -3,6 +3,7 @@ module Dodge.Projectile.Update
     ( updateProjectile
     ) where
 
+import Control.Monad
 import Dodge.Movement.Turn
 import NewInt
 import Dodge.Payload

src/Dodge/Prop/Gib.hs

@@ -1,5 +1,6 @@
 module Dodge.Prop.Gib where
 
+import Control.Monad
 import Color
 import Data.Foldable
 import Data.List (zip4)

src/Dodge/Room/Boss.hs

@@ -16,6 +16,7 @@ import Dodge.Tree
 import Geometry
 import LensHelp
 import RandomHelp
+import Control.Monad
 
 roomGlassOctogon ::
     -- | Size

src/Dodge/Room/Containing.hs

@@ -15,6 +15,7 @@ import Dodge.Tree
 import Geometry
 import LensHelp
 import RandomHelp
+import Control.Monad
 
 roomsContaining :: RandomGen g => [Creature] -> [Item] -> State g (MetaTree Room String)
 roomsContaining crs its = tToBTree str <$> roomsContaining' crs its

src/Dodge/Room/GlassLesson.hs

@@ -18,6 +18,7 @@ import Dodge.Tree
 import Geometry
 import LensHelp
 import RandomHelp
+import Control.Monad
 
 glassLesson :: RandomGen g => State g (Tree Room)
 glassLesson = do

src/Dodge/Room/LongDoor.hs

@@ -1,6 +1,7 @@
 -- | Rooms containing long doors, probably with a big reveal behind them.
 module Dodge.Room.LongDoor where
 
+import Control.Monad
 import Dodge.LevelGen.Switch
 import Data.Maybe
 import qualified Data.Set as S

src/Dodge/Room/LongRoom.hs

@@ -1,5 +1,6 @@
 module Dodge.Room.LongRoom where
 
+import Control.Monad
 import qualified Data.Set as S
 import Data.Tile
 import Dodge.Cleat

src/Dodge/Room/Procedural.hs

@@ -10,6 +10,7 @@ module Dodge.Room.Procedural (
     makeGrid,
 ) where
 
+import Control.Monad
 import Tile
 import qualified Data.Set as S
 import Data.Tile

src/Dodge/Room/RezBox.hs

@@ -18,6 +18,7 @@ import Geometry
 import LensHelp
 import Padding
 import RandomHelp
+import Control.Monad
 
 rezBox :: LightSource -> Room
 rezBox ls =

src/Dodge/Room/Start.hs

@@ -19,6 +19,7 @@ import Dodge.Room.Room
 import Dodge.Room.RunPast
 import Dodge.Tree
 import RandomHelp
+import Control.Monad
 
 powerFakeout' :: RandomGen g => State g (MetaTree Room String)
 powerFakeout' = tToBTree "powerFakeout'" <$> powerFakeout

src/Dodge/Room/Tanks.hs

@@ -14,10 +14,7 @@ import Geometry
 import LensHelp
 import RandomHelp
 import Shape
-
---import Data.Maybe
---import Data.Tree
---import qualified Data.Set as S
+import Control.Monad
 
 randomTank :: RandomGen g => State g Placement
 randomTank =

src/Dodge/Tree/GenerateStructure.hs

@@ -6,6 +6,7 @@ A /trunk/ refers to the successive first nodes in lists of children.
 module Dodge.Tree.GenerateStructure
     where
 import RandomHelp
+import Control.Monad
 
 import Data.Tree
 {- Single branched tree (a trunk).  -}

src/Dodge/WorldEvent/Explosion.hs

@@ -12,6 +12,7 @@ module Dodge.WorldEvent.Explosion (
 
 --import Geometry.Vector3D
 
+import Control.Monad
 import Data.List
 import Dodge.Base.Collide
 import Dodge.Data.World