Remove mtl dependency
This commit is contained in:
+2
-2
@@ -25,7 +25,7 @@ dependencies:
|
|||||||
- aeson-pretty
|
- aeson-pretty
|
||||||
- containers
|
- containers
|
||||||
- deepseq
|
- deepseq
|
||||||
- dlist
|
#- dlist
|
||||||
- directory
|
- directory
|
||||||
- extra
|
- extra
|
||||||
- foldl
|
- foldl
|
||||||
@@ -34,7 +34,7 @@ dependencies:
|
|||||||
- text
|
- text
|
||||||
- bytestring
|
- bytestring
|
||||||
- lens
|
- lens
|
||||||
- mtl
|
#- mtl
|
||||||
- fgl
|
- fgl
|
||||||
- JuicyPixels
|
- JuicyPixels
|
||||||
- random
|
- random
|
||||||
|
|||||||
@@ -3,7 +3,8 @@
|
|||||||
|
|
||||||
module Dodge.Creature.Impulse (followImpulse) where
|
module Dodge.Creature.Impulse (followImpulse) where
|
||||||
|
|
||||||
import Control.Monad.State
|
import Control.Monad.Trans.State.Lazy
|
||||||
|
--import Control.Monad.State -- moving from mtl to transformers
|
||||||
import Data.Maybe
|
import Data.Maybe
|
||||||
import Dodge.Creature.Impulse.Movement
|
import Dodge.Creature.Impulse.Movement
|
||||||
import Dodge.Creature.MoveType
|
import Dodge.Creature.MoveType
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ module Dodge.Data.GenWorld (
|
|||||||
|
|
||||||
import ShortShow
|
import ShortShow
|
||||||
import Control.Lens
|
import Control.Lens
|
||||||
import Control.Monad.State
|
--import Control.Monad.State
|
||||||
|
import Control.Monad.Trans.State.Lazy
|
||||||
import qualified Data.Set as S
|
import qualified Data.Set as S
|
||||||
import Data.Tile
|
import Data.Tile
|
||||||
import Dodge.Data.Room
|
import Dodge.Data.Room
|
||||||
|
|||||||
@@ -6,7 +6,8 @@ module Dodge.Data.MetaTree where
|
|||||||
import Control.Lens
|
import Control.Lens
|
||||||
import Data.Tree
|
import Data.Tree
|
||||||
import System.Random
|
import System.Random
|
||||||
import Control.Monad.State
|
--import Control.Monad.State
|
||||||
|
import Control.Monad.Trans.State.Lazy
|
||||||
|
|
||||||
data MetaTree a b = MTree
|
data MetaTree a b = MTree
|
||||||
{_mtLabel :: b, _mtTree :: MetaNode a b, _mtBranches :: [MetaBranch a b]}
|
{_mtLabel :: b, _mtTree :: MetaNode a b, _mtBranches :: [MetaBranch a b]}
|
||||||
|
|||||||
@@ -4,7 +4,8 @@ Random generation of high level layout of rooms.
|
|||||||
module Dodge.Layout.Generate
|
module Dodge.Layout.Generate
|
||||||
where
|
where
|
||||||
import Data.Tree
|
import Data.Tree
|
||||||
import Control.Monad.State
|
--import Control.Monad.State
|
||||||
|
import Control.Monad.Trans.State.Lazy
|
||||||
--import System.Random
|
--import System.Random
|
||||||
|
|
||||||
generateLayout :: State g (Tree RoomProperties)
|
generateLayout :: State g (Tree RoomProperties)
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
module Dodge.LevelGen (generateWorldFromSeed) where
|
module Dodge.LevelGen (generateWorldFromSeed) where
|
||||||
|
|
||||||
import Control.Lens
|
import Control.Lens
|
||||||
import Control.Monad.State
|
--import Control.Monad.State
|
||||||
|
import Control.Monad.Trans.State.Lazy
|
||||||
import Data.Foldable
|
import Data.Foldable
|
||||||
import Data.Preload.Render
|
import Data.Preload.Render
|
||||||
import Dodge.Data.GenWorld
|
import Dodge.Data.GenWorld
|
||||||
|
|||||||
@@ -6,7 +6,8 @@
|
|||||||
-}
|
-}
|
||||||
module Dodge.Placement.PlaceSpot (placeSpot) where
|
module Dodge.Placement.PlaceSpot (placeSpot) where
|
||||||
|
|
||||||
import Control.Monad.State
|
--import Control.Monad.State
|
||||||
|
import Control.Monad.Trans.State.Lazy
|
||||||
import Data.Bifunctor
|
import Data.Bifunctor
|
||||||
import Data.Foldable
|
import Data.Foldable
|
||||||
import qualified Data.IntSet as IS
|
import qualified Data.IntSet as IS
|
||||||
|
|||||||
@@ -38,7 +38,8 @@ module Dodge.PlacementSpot (
|
|||||||
) where
|
) where
|
||||||
|
|
||||||
import Control.Lens
|
import Control.Lens
|
||||||
import Control.Monad.State
|
--import Control.Monad.State
|
||||||
|
import Control.Monad.Trans.State.Lazy
|
||||||
import Data.Bifunctor
|
import Data.Bifunctor
|
||||||
import Data.Maybe
|
import Data.Maybe
|
||||||
import qualified Data.Set as S
|
import qualified Data.Set as S
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
module Dodge.RandImpulse where
|
module Dodge.RandImpulse where
|
||||||
|
|
||||||
import Control.Monad.State
|
--import Control.Monad.State
|
||||||
|
import Control.Monad.Trans.State.Lazy
|
||||||
import Dodge.Data.ActionPlan
|
import Dodge.Data.ActionPlan
|
||||||
import RandomHelp
|
import RandomHelp
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,8 @@ module Dodge.Randify (
|
|||||||
) where
|
) where
|
||||||
|
|
||||||
import Control.Lens
|
import Control.Lens
|
||||||
import Control.Monad.State
|
--import Control.Monad.State
|
||||||
|
import Control.Monad.Trans.State.Lazy
|
||||||
import Dodge.Data.GenWorld
|
import Dodge.Data.GenWorld
|
||||||
import System.Random
|
import System.Random
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
module Dodge.Room.BlinkAcross where
|
module Dodge.Room.BlinkAcross where
|
||||||
|
|
||||||
import Control.Monad.State
|
--import Control.Monad.State
|
||||||
|
import Control.Monad.Trans.State.Lazy
|
||||||
import Dodge.Cleat
|
import Dodge.Cleat
|
||||||
import Dodge.Data.GenWorld
|
import Dodge.Data.GenWorld
|
||||||
import Dodge.PlacementSpot
|
import Dodge.PlacementSpot
|
||||||
|
|||||||
@@ -3,7 +3,8 @@ Collections of rooms that branch into multiple paths.
|
|||||||
-}
|
-}
|
||||||
module Dodge.Room.Branch where
|
module Dodge.Room.Branch where
|
||||||
|
|
||||||
import Control.Monad.State
|
--import Control.Monad.State
|
||||||
|
import Control.Monad.Trans.State.Lazy
|
||||||
import Dodge.Cleat
|
import Dodge.Cleat
|
||||||
import Dodge.Data.GenWorld
|
import Dodge.Data.GenWorld
|
||||||
import Dodge.Room.Door
|
import Dodge.Room.Door
|
||||||
|
|||||||
@@ -4,7 +4,8 @@ Typically dead ends.
|
|||||||
-}
|
-}
|
||||||
module Dodge.Room.Treasure where
|
module Dodge.Room.Treasure where
|
||||||
|
|
||||||
import Control.Monad.State
|
--import Control.Monad.State
|
||||||
|
import Control.Monad.Trans.State.Lazy
|
||||||
import Dodge.Data.GenWorld
|
import Dodge.Data.GenWorld
|
||||||
import Dodge.Default.Room
|
import Dodge.Default.Room
|
||||||
import Dodge.LevelGen.PlacementHelper
|
import Dodge.LevelGen.PlacementHelper
|
||||||
|
|||||||
+2
-1
@@ -7,13 +7,14 @@ module Dodge.Spark (
|
|||||||
makeSpark,
|
makeSpark,
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import Control.Monad.State
|
--import Control.Monad.State
|
||||||
import Dodge.Damage
|
import Dodge.Damage
|
||||||
import Dodge.Data.World
|
import Dodge.Data.World
|
||||||
import Dodge.WorldEvent.ThingsHit
|
import Dodge.WorldEvent.ThingsHit
|
||||||
import Geometry
|
import Geometry
|
||||||
import LensHelp
|
import LensHelp
|
||||||
import System.Random
|
import System.Random
|
||||||
|
import Control.Monad.Trans.State.Lazy
|
||||||
|
|
||||||
-- should probably reduce spark speed more if it is very fast
|
-- should probably reduce spark speed more if it is very fast
|
||||||
updateSpark :: World -> Spark -> (World, Maybe Spark)
|
updateSpark :: World -> Spark -> (World, Maybe Spark)
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ import LensHelp
|
|||||||
--import MonadHelp
|
--import MonadHelp
|
||||||
import Picture
|
import Picture
|
||||||
import RandomHelp
|
import RandomHelp
|
||||||
|
|
||||||
--import Shape
|
--import Shape
|
||||||
|
|
||||||
makeTeslaArc :: ItemParams -> Point2 -> Float -> World -> (World, ItemParams)
|
makeTeslaArc :: ItemParams -> Point2 -> Float -> World -> (World, ItemParams)
|
||||||
|
|||||||
@@ -19,7 +19,8 @@ module Dodge.Tree.Compose (
|
|||||||
module Dodge.Data.MetaTree
|
module Dodge.Data.MetaTree
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import Control.Monad.State
|
--import Control.Monad.State
|
||||||
|
import Control.Monad.Trans.State.Lazy
|
||||||
import Data.List (intersperse)
|
import Data.List (intersperse)
|
||||||
import Data.Maybe
|
import Data.Maybe
|
||||||
import Data.Tuple
|
import Data.Tuple
|
||||||
|
|||||||
+4
-2
@@ -2,12 +2,14 @@
|
|||||||
{- Helpers for random generation. -}
|
{- Helpers for random generation. -}
|
||||||
module RandomHelp (
|
module RandomHelp (
|
||||||
module System.Random,
|
module System.Random,
|
||||||
module Control.Monad.State,
|
-- module Control.Monad.State,
|
||||||
module RandomHelp,
|
module RandomHelp,
|
||||||
|
module Control.Monad.Trans.State.Lazy,
|
||||||
) where
|
) where
|
||||||
|
|
||||||
import Control.Monad
|
import Control.Monad
|
||||||
import Control.Monad.State
|
--import Control.Monad.State
|
||||||
|
import Control.Monad.Trans.State.Lazy
|
||||||
import Data.List
|
import Data.List
|
||||||
import Geometry
|
import Geometry
|
||||||
import StrictHelp
|
import StrictHelp
|
||||||
|
|||||||
+2
-1
@@ -28,7 +28,8 @@ import Data.Maybe
|
|||||||
import qualified IntMapHelp as IM
|
import qualified IntMapHelp as IM
|
||||||
import qualified Data.Map as M
|
import qualified Data.Map as M
|
||||||
import Control.Monad
|
import Control.Monad
|
||||||
import Control.Monad.Trans
|
import Control.Monad.IO.Class
|
||||||
|
--import Control.Monad.Trans
|
||||||
import Control.Monad.Trans.Maybe
|
import Control.Monad.Trans.Maybe
|
||||||
import Control.Lens
|
import Control.Lens
|
||||||
import Data.Int (Int16)
|
import Data.Int (Int16)
|
||||||
|
|||||||
Reference in New Issue
Block a user