maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(xanthous): Generators -> Generators.Level

Browse source 
I'm going to start adding generators for things like text soon, so it
makes sense to specifically sequester level generators as their own
thing

Change-Id: I175025375204fab7d75eba67dd06dab9bd2939d3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3201
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
This commit is contained in:
Griffin Smith 2021-06-12 14:57:30 -04:00 • committed by grfn
parent 6f238c1c90
commit 006e5231e5
11 changed files with 40 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

6
users/grfn/xanthous/src/Main.hs
View file

@ -13,15 +13,15 @@ import System.Exit (die)
import qualified Xanthous.Game as Game
import Xanthous.Game.Env (GameEnv(..))
import Xanthous.App
import Xanthous.Generators
import Xanthous.Generators.Level
( GeneratorInput
, parseGeneratorInput
, generateFromInput
, showCells
)
import qualified Xanthous.Entities.Character as Character
import Xanthous.Generators.Util (regions)
import Xanthous.Generators.LevelContents
import Xanthous.Generators.Level.Util (regions)
import Xanthous.Generators.Level.LevelContents
import Xanthous.Data (Dimensions, Dimensions'(Dimensions))
import Data.Array.IArray ( amap )
--------------------------------------------------------------------------------

6
users/grfn/xanthous/src/Xanthous/App.hs
View file

@ -60,9 +60,9 @@ import Xanthous.Entities.RawTypes
( edible, eatMessage, hitpointsHealed
, attackMessage
)
import Xanthous.Generators
import qualified Xanthous.Generators.CaveAutomata as CaveAutomata
import qualified Xanthous.Generators.Dungeon as Dungeon
import Xanthous.Generators.Level
import qualified Xanthous.Generators.Level.CaveAutomata as CaveAutomata
import qualified Xanthous.Generators.Level.Dungeon as Dungeon
--------------------------------------------------------------------------------
type App = Brick.App GameState AppEvent ResourceName

12
users/grfn/xanthous/src/Xanthous/Generators.hs → users/grfn/xanthous/src/Xanthous/Generators/Level.hs
View file

@ -2,7 +2,7 @@
{-# LANGUAGE GADTs #-}
{-# LANGUAGE TemplateHaskell #-}
--------------------------------------------------------------------------------
module Xanthous.Generators
module Xanthous.Generators.Level
( generate
, Generator(..)
, SGenerator(..)
@ -27,11 +27,11 @@ import Data.Array.Unboxed
import qualified Options.Applicative as Opt
import Control.Monad.Random
--------------------------------------------------------------------------------
import qualified Xanthous.Generators.CaveAutomata as CaveAutomata
import qualified Xanthous.Generators.Dungeon as Dungeon
import Xanthous.Generators.Util
import Xanthous.Generators.LevelContents
import Xanthous.Generators.Village as Village
import qualified Xanthous.Generators.Level.CaveAutomata as CaveAutomata
import qualified Xanthous.Generators.Level.Dungeon as Dungeon
import Xanthous.Generators.Level.Util
import Xanthous.Generators.Level.LevelContents
import Xanthous.Generators.Level.Village as Village
import Xanthous.Data (Dimensions, Position'(Position), Position)
import Xanthous.Data.EntityMap (EntityMap, _EntityMap)
import qualified Xanthous.Data.EntityMap as EntityMap

4
users/grfn/xanthous/src/Xanthous/Generators/CaveAutomata.hs → users/grfn/xanthous/src/Xanthous/Generators/Level/CaveAutomata.hs
View file

@ -2,7 +2,7 @@
{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE TemplateHaskell #-}
--------------------------------------------------------------------------------
module Xanthous.Generators.CaveAutomata
module Xanthous.Generators.Level.CaveAutomata
( Params(..)
, defaultParams
, parseParams
@ -18,7 +18,7 @@ import qualified Options.Applicative as Opt
import Xanthous.Util (between)
import Xanthous.Util.Optparse
import Xanthous.Data (Dimensions, width, height)
import Xanthous.Generators.Util
import Xanthous.Generators.Level.Util
import Linear.V2
--------------------------------------------------------------------------------

4
users/grfn/xanthous/src/Xanthous/Generators/Dungeon.hs → users/grfn/xanthous/src/Xanthous/Generators/Level/Dungeon.hs
View file

@ -1,6 +1,6 @@
{-# LANGUAGE TemplateHaskell #-}
--------------------------------------------------------------------------------
module Xanthous.Generators.Dungeon
module Xanthous.Generators.Level.Dungeon
( Params(..)
, defaultParams
, parseParams
@ -24,7 +24,7 @@ import qualified Options.Applicative as Opt
--------------------------------------------------------------------------------
import Xanthous.Random
import Xanthous.Data hiding (x, y, _x, _y, edges)
import Xanthous.Generators.Util
import Xanthous.Generators.Level.Util
import Xanthous.Util.Graphics (delaunay, straightLine)
import Xanthous.Util.Graph (mstSubGraph)
--------------------------------------------------------------------------------

4
users/grfn/xanthous/src/Xanthous/Generators/LevelContents.hs → users/grfn/xanthous/src/Xanthous/Generators/Level/LevelContents.hs
View file

@ -1,5 +1,5 @@
--------------------------------------------------------------------------------
module Xanthous.Generators.LevelContents
module Xanthous.Generators.Level.LevelContents
( chooseCharacterPosition
, randomItems
, randomCreatures
@ -16,7 +16,7 @@ import qualified Data.Array.IArray as Arr
import Data.Foldable (any, toList)
import Linear.V2
--------------------------------------------------------------------------------
import Xanthous.Generators.Util
import Xanthous.Generators.Level.Util
import Xanthous.Random
import Xanthous.Data
( positionFromV2, Position, _Position

2
users/grfn/xanthous/src/Xanthous/Generators/Util.hs → users/grfn/xanthous/src/Xanthous/Generators/Level/Util.hs
View file

@ -1,7 +1,7 @@
{-# LANGUAGE QuantifiedConstraints #-}
{-# LANGUAGE AllowAmbiguousTypes #-}
--------------------------------------------------------------------------------
module Xanthous.Generators.Util
module Xanthous.Generators.Level.Util
( MCells
, Cells
, CellM

5
users/grfn/xanthous/src/Xanthous/Generators/Village.hs → users/grfn/xanthous/src/Xanthous/Generators/Level/Village.hs
View file

@ -1,4 +1,5 @@
module Xanthous.Generators.Village
--------------------------------------------------------------------------------
module Xanthous.Generators.Level.Village
( fromCave
) where
--------------------------------------------------------------------------------
@ -15,7 +16,7 @@ import Xanthous.Data
import Xanthous.Data.EntityMap (EntityMap)
import qualified Xanthous.Data.EntityMap as EntityMap
import Xanthous.Entities.Environment
import Xanthous.Generators.Util
import Xanthous.Generators.Level.Util
import Xanthous.Game.State (SomeEntity(..))
import Xanthous.Random
--------------------------------------------------------------------------------