More code cleanup.

parent d9bd0fb1
...@@ -20,19 +20,19 @@ import Control.Monad.Error ...@@ -20,19 +20,19 @@ import Control.Monad.Error
import Roguestar.Lib.Behavior.Combat import Roguestar.Lib.Behavior.Combat
import Roguestar.Lib.Behavior.Activate import Roguestar.Lib.Behavior.Activate
import Roguestar.Lib.Behavior.Travel import Roguestar.Lib.Behavior.Travel
import Roguestar.Lib.TravelData import Roguestar.Lib.Data.TravelData
import Roguestar.Lib.Core.Monster import Roguestar.Lib.Core.Monster
import Roguestar.Lib.Data.MonsterData import Roguestar.Lib.Data.MonsterData
import Roguestar.Lib.Core.Plane import Roguestar.Lib.Core.Plane
import Roguestar.Lib.PlaneVisibility import Roguestar.Lib.PlaneVisibility
import Data.List import Data.List
import Roguestar.Lib.TerrainData import Roguestar.Lib.Data.TerrainData
import Roguestar.Lib.Behavior.Make import Roguestar.Lib.Behavior.Make
import Roguestar.Lib.Behavior.Construction import Roguestar.Lib.Behavior.Construction
import Roguestar.Lib.Core.Building import Roguestar.Lib.Core.Building
import Roguestar.Lib.Reference import Roguestar.Lib.Reference
import Roguestar.Lib.Utility.DetailedLocation import Roguestar.Lib.Utility.DetailedLocation
import Roguestar.Lib.PlaneData import Roguestar.Lib.Data.PlaneData
data FacingBehavior = data FacingBehavior =
Step Step
......
...@@ -5,7 +5,7 @@ module Roguestar.Lib.Behavior.Activate ...@@ -5,7 +5,7 @@ module Roguestar.Lib.Behavior.Activate
where where
import Roguestar.Lib.Tool import Roguestar.Lib.Tool
import Roguestar.Lib.ToolData import Roguestar.Lib.Data.ToolData
import Roguestar.Lib.Core.Monster import Roguestar.Lib.Core.Monster
import Roguestar.Lib.DB import Roguestar.Lib.DB
import Control.Monad.Error import Control.Monad.Error
......
...@@ -9,8 +9,8 @@ module Roguestar.Lib.Behavior.CharacterAdvancement ...@@ -9,8 +9,8 @@ module Roguestar.Lib.Behavior.CharacterAdvancement
import qualified Data.Map as Map import qualified Data.Map as Map
import Roguestar.Lib.Data.MonsterData import Roguestar.Lib.Data.MonsterData
import Roguestar.Lib.PowerUpData import Roguestar.Lib.Data.PowerUpData
import Roguestar.Lib.PersistantData import Roguestar.Lib.Data.PersistantData
-- TODO: rename "bump" to more clear language, like "advance" or "advanceCharacterLevel". -- TODO: rename "bump" to more clear language, like "advance" or "advanceCharacterLevel".
......
...@@ -12,7 +12,7 @@ import Roguestar.Lib.DB ...@@ -12,7 +12,7 @@ import Roguestar.Lib.DB
import Roguestar.Lib.Core.Monster import Roguestar.Lib.Core.Monster
import Roguestar.Lib.Data.MonsterData import Roguestar.Lib.Data.MonsterData
import Roguestar.Lib.Tool import Roguestar.Lib.Tool
import Roguestar.Lib.ToolData import Roguestar.Lib.Data.ToolData
import Control.Monad.Error import Control.Monad.Error
import Roguestar.Lib.Data.FacingData import Roguestar.Lib.Data.FacingData
import Data.Maybe import Data.Maybe
......
...@@ -8,8 +8,8 @@ module Roguestar.Lib.Behavior.Construction ...@@ -8,8 +8,8 @@ module Roguestar.Lib.Behavior.Construction
import Roguestar.Lib.DB import Roguestar.Lib.DB
import Roguestar.Lib.Core.Plane import Roguestar.Lib.Core.Plane
import Roguestar.Lib.PlaneData import Roguestar.Lib.Data.PlaneData
import Roguestar.Lib.TerrainData import Roguestar.Lib.Data.TerrainData
import Roguestar.Lib.Data.FacingData import Roguestar.Lib.Data.FacingData
import Control.Monad import Control.Monad
import Control.Monad.Maybe import Control.Monad.Maybe
......
module Roguestar.Lib.Behavior.Make module Roguestar.Lib.Behavior.Make
(module Roguestar.Lib.MakeData, (module Roguestar.Lib.Data.MakeData,
MakeOutcome, MakeOutcome,
resolveMake, resolveMake,
executeMake) executeMake)
where where
import Roguestar.Lib.MakeData import Roguestar.Lib.Data.MakeData
import Roguestar.Lib.DB import Roguestar.Lib.DB
import Roguestar.Lib.Tool import Roguestar.Lib.Tool
import Roguestar.Lib.ToolData import Roguestar.Lib.Data.ToolData
import Data.List import Data.List
data MakeOutcome = MakeSuccess MonsterRef Tool [ToolRef] | MakeFailed data MakeOutcome = MakeSuccess MonsterRef Tool [ToolRef] | MakeFailed
......
...@@ -20,12 +20,12 @@ import Control.Monad ...@@ -20,12 +20,12 @@ import Control.Monad
import Control.Monad.Trans import Control.Monad.Trans
import Data.Ord import Data.Ord
import Roguestar.Lib.Position as Position import Roguestar.Lib.Position as Position
import Roguestar.Lib.TerrainData import Roguestar.Lib.Data.TerrainData
import Data.List (minimumBy) import Data.List (minimumBy)
import Roguestar.Lib.Core.Monster import Roguestar.Lib.Core.Monster
import Roguestar.Lib.Data.MonsterData import Roguestar.Lib.Data.MonsterData
import Roguestar.Lib.Logging import Roguestar.Lib.Logging
import Roguestar.Lib.TravelData import Roguestar.Lib.Data.TravelData
import Roguestar.Lib.Utility.DetailedLocation import Roguestar.Lib.Utility.DetailedLocation
import Roguestar.Lib.Utility.DetailedTravel as DetailedTravel import Roguestar.Lib.Utility.DetailedTravel as DetailedTravel
......
...@@ -16,12 +16,12 @@ import Roguestar.Lib.Data.FacingData ...@@ -16,12 +16,12 @@ import Roguestar.Lib.Data.FacingData
import Data.Maybe import Data.Maybe
import Control.Monad.Maybe import Control.Monad.Maybe
import Control.Monad.Random import Control.Monad.Random
import Roguestar.Lib.PlaneData import Roguestar.Lib.Data.PlaneData
import Roguestar.Lib.Core.Plane import Roguestar.Lib.Core.Plane
import Roguestar.Lib.Position import Roguestar.Lib.Position
import Roguestar.Lib.TerrainData import Roguestar.Lib.Data.TerrainData
import Control.Monad.Error import Control.Monad.Error
import Roguestar.Lib.PowerUpData import Roguestar.Lib.Data.PowerUpData
import Roguestar.Lib.Behavior.CharacterAdvancement import Roguestar.Lib.Behavior.CharacterAdvancement
import Roguestar.Lib.Utility.DetailedLocation import Roguestar.Lib.Utility.DetailedLocation
import Roguestar.Lib.Data.PlayerState import Roguestar.Lib.Data.PlayerState
......
...@@ -18,7 +18,7 @@ module Roguestar.Lib.Core.Monster ...@@ -18,7 +18,7 @@ module Roguestar.Lib.Core.Monster
import Prelude hiding (getContents) import Prelude hiding (getContents)
import Roguestar.Lib.Data.MonsterData import Roguestar.Lib.Data.MonsterData
import Roguestar.Lib.DB import Roguestar.Lib.DB
import Roguestar.Lib.SpeciesData import Roguestar.Lib.Data.SpeciesData
import Roguestar.Lib.Species import Roguestar.Lib.Species
import Roguestar.Lib.Data.FactionData import Roguestar.Lib.Data.FactionData
import Control.Monad.Error import Control.Monad.Error
......
...@@ -18,13 +18,13 @@ module Roguestar.Lib.Core.Plane ...@@ -18,13 +18,13 @@ module Roguestar.Lib.Core.Plane
where where
import Prelude hiding (getContents) import Prelude hiding (getContents)
import Roguestar.Lib.Grids import Roguestar.Lib.Utility.Grids
import Roguestar.Lib.Reference import Roguestar.Lib.Reference
import Roguestar.Lib.DB import Roguestar.Lib.DB
import Roguestar.Lib.TerrainData import Roguestar.Lib.Data.TerrainData
import Roguestar.Lib.PlaneData import Roguestar.Lib.Data.PlaneData
import Roguestar.Lib.PlanetData import Roguestar.Lib.Data.PlanetData
import Roguestar.Lib.ToolData (Tool) import Roguestar.Lib.Data.ToolData (Tool)
import Roguestar.Lib.Data.MonsterData (Monster) import Roguestar.Lib.Data.MonsterData (Monster)
import Control.Monad import Control.Monad
import Control.Monad.Random as Random import Control.Monad.Random as Random
......
...@@ -58,14 +58,14 @@ import Roguestar.Lib.Data.ReferenceTypes ...@@ -58,14 +58,14 @@ import Roguestar.Lib.Data.ReferenceTypes
import Roguestar.Lib.Data.LocationData import Roguestar.Lib.Data.LocationData
import Roguestar.Lib.Reference import Roguestar.Lib.Reference
import Roguestar.Lib.Data.MonsterData import Roguestar.Lib.Data.MonsterData
import Roguestar.Lib.PlaneData import Roguestar.Lib.Data.PlaneData
import Roguestar.Lib.Data.BuildingData import Roguestar.Lib.Data.BuildingData
import Roguestar.Lib.RNG import Roguestar.Lib.RNG
import Data.Map as Map import Data.Map as Map
import Data.List as List import Data.List as List
import qualified Roguestar.Lib.HierarchicalDatabase as HD import qualified Roguestar.Lib.Utility.HierarchicalDatabase as HD
import Data.Maybe import Data.Maybe
import Roguestar.Lib.ToolData import Roguestar.Lib.Data.ToolData
import Control.Monad.State import Control.Monad.State
import Control.Monad.Error import Control.Monad.Error
import Control.Monad.Reader import Control.Monad.Reader
......
...@@ -13,8 +13,8 @@ module Roguestar.Lib.Data.BuildingData ...@@ -13,8 +13,8 @@ module Roguestar.Lib.Data.BuildingData
buildingOccupies) buildingOccupies)
where where
import Roguestar.Lib.PowerUpData import Roguestar.Lib.Data.PowerUpData
import Roguestar.Lib.PersistantData import Roguestar.Lib.Data.PersistantData
basic_stargate :: BuildingPrototype basic_stargate :: BuildingPrototype
basic_stargate = BuildingPrototype (TwoWayStargate NonAlignedRegion) Portal (Just Magnetic) basic_stargate = BuildingPrototype (TwoWayStargate NonAlignedRegion) Portal (Just Magnetic)
......
...@@ -3,7 +3,7 @@ module Roguestar.Lib.Data.CharacterData ...@@ -3,7 +3,7 @@ module Roguestar.Lib.Data.CharacterData
where where
import Roguestar.Lib.Data.MonsterData import Roguestar.Lib.Data.MonsterData
import Roguestar.Lib.PersistantData import Roguestar.Lib.Data.PersistantData
applyCharacterClass :: CharacterClass -> Monster -> Monster applyCharacterClass :: CharacterClass -> Monster -> Monster
applyCharacterClass character_class creature = applyToMonster (CharacterClass character_class : classInfo character_class) creature applyCharacterClass character_class creature = applyToMonster (CharacterClass character_class : classInfo character_class) creature
......
...@@ -32,9 +32,9 @@ module Roguestar.Lib.Data.LocationData ...@@ -32,9 +32,9 @@ module Roguestar.Lib.Data.LocationData
import Roguestar.Lib.Data.FacingData import Roguestar.Lib.Data.FacingData
import Roguestar.Lib.Data.ReferenceTypes import Roguestar.Lib.Data.ReferenceTypes
import Roguestar.Lib.ToolData import Roguestar.Lib.Data.ToolData
import Roguestar.Lib.Data.MonsterData import Roguestar.Lib.Data.MonsterData
import Roguestar.Lib.PlaneData import Roguestar.Lib.Data.PlaneData
import Roguestar.Lib.Data.BuildingData import Roguestar.Lib.Data.BuildingData
import Control.Monad import Control.Monad
import Roguestar.Lib.Position import Roguestar.Lib.Position
......
{-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE FlexibleInstances #-}
--Mechanics --Mechanics
module Roguestar.Lib.MakeData module Roguestar.Lib.Data.MakeData
(PrepareMake(..), (PrepareMake(..),
prepare_make, prepare_make,
isFinished, isFinished,
...@@ -15,7 +15,7 @@ module Roguestar.Lib.MakeData ...@@ -15,7 +15,7 @@ module Roguestar.Lib.MakeData
where where
import Roguestar.Lib.Data.LocationData import Roguestar.Lib.Data.LocationData
import Roguestar.Lib.ToolData import Roguestar.Lib.Data.ToolData
import Roguestar.Lib.Substances import Roguestar.Lib.Substances
-- | Multi-step process for gathering the materials to make something. -- | Multi-step process for gathering the materials to make something.
......
...@@ -13,7 +13,7 @@ module Roguestar.Lib.Data.MonsterData ...@@ -13,7 +13,7 @@ module Roguestar.Lib.Data.MonsterData
empty_creature) empty_creature)
where where
import Roguestar.Lib.PersistantData import Roguestar.Lib.Data.PersistantData
import Data.Ratio import Data.Ratio
import Data.Maybe import Data.Maybe
import Roguestar.Lib.Data.FactionData import Roguestar.Lib.Data.FactionData
...@@ -21,8 +21,8 @@ import Data.Monoid ...@@ -21,8 +21,8 @@ import Data.Monoid
import qualified Data.Map as Map import qualified Data.Map as Map
import qualified Data.Set as Set import qualified Data.Set as Set
import Data.List as List import Data.List as List
import Roguestar.Lib.SpeciesData import Roguestar.Lib.Data.SpeciesData
import Roguestar.Lib.TerrainData import Roguestar.Lib.Data.TerrainData
data Monster = Monster { creature_traits :: Map.Map MonsterTrait Integer, data Monster = Monster { creature_traits :: Map.Map MonsterTrait Integer,
creature_specials :: Set.Set MonsterSpecial, creature_specials :: Set.Set MonsterSpecial,
......
--Data --Data
module Roguestar.Lib.PersistantData module Roguestar.Lib.Data.PersistantData
(CharacterClass(..), (CharacterClass(..),
PowerUpData(..), PowerUpData(..),
PlanetRegion(..), PlanetRegion(..),
......
--Data --Data
module Roguestar.Lib.PlaneData module Roguestar.Lib.Data.PlaneData
(Plane(..)) (Plane(..))
where where
import Roguestar.Lib.TerrainData import Roguestar.Lib.Data.TerrainData
import qualified Data.ByteString.Char8 as B import qualified Data.ByteString.Char8 as B
import Roguestar.Lib.Random as Random import Roguestar.Lib.Random as Random
......
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
--World --World
module Roguestar.Lib.PlanetData module Roguestar.Lib.Data.PlanetData
(PlanetRegion(..), (PlanetRegion(..),
PlanetInfo(..), PlanetInfo(..),
addTown, addTown,
...@@ -9,8 +9,8 @@ module Roguestar.Lib.PlanetData ...@@ -9,8 +9,8 @@ module Roguestar.Lib.PlanetData
cyborg_planets) cyborg_planets)
where where
import Roguestar.Lib.PersistantData import Roguestar.Lib.Data.PersistantData
import Roguestar.Lib.TerrainData import Roguestar.Lib.Data.TerrainData
import Roguestar.Lib.Data.BuildingData import Roguestar.Lib.Data.BuildingData
import qualified Roguestar.Lib.Random as Random import qualified Roguestar.Lib.Random as Random
import Data.Ratio import Data.Ratio
......
...@@ -7,8 +7,8 @@ module Roguestar.Lib.Data.PlayerState ...@@ -7,8 +7,8 @@ module Roguestar.Lib.Data.PlayerState
import Roguestar.Lib.Data.LocationData import Roguestar.Lib.Data.LocationData
import Roguestar.Lib.Data.MonsterData import Roguestar.Lib.Data.MonsterData
import Roguestar.Lib.TravelData import Roguestar.Lib.Data.TravelData
import Roguestar.Lib.PersistantData import Roguestar.Lib.Data.PersistantData
import Data.Maybe import Data.Maybe
data PlayerState = data PlayerState =
......
module Roguestar.Lib.PowerUpData module Roguestar.Lib.Data.PowerUpData
(PowerUpData(..)) (PowerUpData(..))
where where
import Roguestar.Lib.PersistantData import Roguestar.Lib.Data.PersistantData
...@@ -18,13 +18,13 @@ module Roguestar.Lib.Data.ReferenceTypes ...@@ -18,13 +18,13 @@ module Roguestar.Lib.Data.ReferenceTypes
BuildingRef) BuildingRef)
where where
import Roguestar.Lib.HierarchicalDatabase import Roguestar.Lib.Utility.HierarchicalDatabase
import Roguestar.Lib.Data.FacingData import Roguestar.Lib.Data.FacingData
import Roguestar.Lib.Data.MonsterData import Roguestar.Lib.Data.MonsterData
import Roguestar.Lib.ToolData import Roguestar.Lib.Data.ToolData
import Roguestar.Lib.PlaneData import Roguestar.Lib.Data.PlaneData
import Roguestar.Lib.Data.BuildingData import Roguestar.Lib.Data.BuildingData
import Roguestar.Lib.PlanetData import Roguestar.Lib.Data.PlanetData
import Roguestar.Lib.Position import Roguestar.Lib.Position
-- --
......
--Data --Data
module Roguestar.Lib.SpeciesData module Roguestar.Lib.Data.SpeciesData
(Species(..), (Species(..),
all_species) all_species)
where where
......
--Data --Data
module Roguestar.Lib.TerrainData module Roguestar.Lib.Data.TerrainData
(Biome(..), (Biome(..),
Terrain(..), Terrain(..),
MetaTerrain(..), MetaTerrain(..),
...@@ -14,7 +14,7 @@ module Roguestar.Lib.TerrainData ...@@ -14,7 +14,7 @@ module Roguestar.Lib.TerrainData
impassable_terrains) impassable_terrains)
where where
import Roguestar.Lib.Grids import Roguestar.Lib.Utility.Grids
import Data.List as List import Data.List as List
import Data.Map as Map import Data.Map as Map
--import Substances hiding (Water) --import Substances hiding (Water)
......
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
--Data --Data
module Roguestar.Lib.ToolData module Roguestar.Lib.Data.ToolData
(Tool(..), (Tool(..),
toolName, toolName,
fromSphere, fromSphere,
......
--Data --Data
module Roguestar.Lib.TravelData module Roguestar.Lib.Data.TravelData
(ClimbDirection(..)) where (ClimbDirection(..)) where
data ClimbDirection = ClimbUp | ClimbDown data ClimbDirection = ClimbUp | ClimbDown
......
--Data --Data
module Roguestar.Lib.VisibilityData module Roguestar.Lib.Data.VisibilityData
(distanceCostForSight, (distanceCostForSight,
terrainHideMultiplier, terrainHideMultiplier,
terrainOpacity, terrainOpacity,
maximumRangeForSpotCheck) maximumRangeForSpotCheck)
where where
import Roguestar.Lib.TerrainData import Roguestar.Lib.Data.TerrainData
import Data.List import Data.List
import Roguestar.Lib.Data.FacingData import Roguestar.Lib.Data.FacingData
......
...@@ -42,15 +42,15 @@ import Data.Map as Map ...@@ -42,15 +42,15 @@ import Data.Map as Map
import Control.Applicative import Control.Applicative
import Roguestar.Lib.Data.FacingData import Roguestar.Lib.Data.FacingData
import Roguestar.Lib.Position as Position import Roguestar.Lib.Position as Position
import Roguestar.Lib.TerrainData import Roguestar.Lib.Data.TerrainData
import Roguestar.Lib.Data.BuildingData import Roguestar.Lib.Data.BuildingData
import Roguestar.Lib.Core.Building import Roguestar.Lib.Core.Building
import Roguestar.Lib.Core.Plane import Roguestar.Lib.Core.Plane
import Roguestar.Lib.Utility.DetailedLocation import Roguestar.Lib.Utility.DetailedLocation
import Roguestar.Lib.SpeciesData import Roguestar.Lib.Data.SpeciesData
import Roguestar.Lib.Data.MonsterData import Roguestar.Lib.Data.MonsterData
import Roguestar.Lib.Tool import Roguestar.Lib.Tool
import Roguestar.Lib.ToolData import Roguestar.Lib.Data.ToolData
import Roguestar.Lib.Behavior as Behavior import Roguestar.Lib.Behavior as Behavior
import qualified Roguestar.Lib.Utility.DetailedTravel as DT import qualified Roguestar.Lib.Utility.DetailedTravel as DT
......
...@@ -9,15 +9,15 @@ module Roguestar.Lib.PlaneVisibility ...@@ -9,15 +9,15 @@ module Roguestar.Lib.PlaneVisibility
import Prelude hiding (getContents) import Prelude hiding (getContents)
import Roguestar.Lib.Data.FactionData import Roguestar.Lib.Data.FactionData
import Roguestar.Lib.DB import Roguestar.Lib.DB
import Roguestar.Lib.TerrainData import Roguestar.Lib.Data.TerrainData
import Roguestar.Lib.Core.Plane import Roguestar.Lib.Core.Plane
import Roguestar.Lib.PlaneData import Roguestar.Lib.Data.PlaneData
import Control.Monad import Control.Monad
import Roguestar.Lib.Data.MonsterData import Roguestar.Lib.Data.MonsterData
import Data.List as List import Data.List as List
import Roguestar.Lib.Grids import Roguestar.Lib.Utility.Grids
import Roguestar.Lib.GridRayCaster import Roguestar.Lib.Utility.RayCasting
import Roguestar.Lib.VisibilityData import Roguestar.Lib.Data.VisibilityData
import Roguestar.Lib.Data.FacingData import Roguestar.Lib.Data.FacingData
import Data.Ratio import Data.Ratio
import Roguestar.Lib.Core.Building import Roguestar.Lib.Core.Building
......
...@@ -5,11 +5,11 @@ module Roguestar.Lib.Planet ...@@ -5,11 +5,11 @@ module Roguestar.Lib.Planet
generatePlanetInfo) generatePlanetInfo)
where where
import Roguestar.Lib.PlanetData import Roguestar.Lib.Data.PlanetData
import Roguestar.Lib.PlaneData import Roguestar.Lib.Data.PlaneData
import Roguestar.Lib.DB import Roguestar.Lib.DB
import Roguestar.Lib.Core.Plane import Roguestar.Lib.Core.Plane
import Roguestar.Lib.TerrainData import Roguestar.Lib.Data.TerrainData
import Control.Monad import Control.Monad
import Control.Monad.Random import Control.Monad.Random
import Data.Maybe import Data.Maybe
......
...@@ -8,9 +8,9 @@ module Roguestar.Lib.Reference ...@@ -8,9 +8,9 @@ module Roguestar.Lib.Reference
where where
import Roguestar.Lib.Data.ReferenceTypes import Roguestar.Lib.Data.ReferenceTypes
import Roguestar.Lib.PlaneData import Roguestar.Lib.Data.PlaneData
import Roguestar.Lib.Data.BuildingData import Roguestar.Lib.Data.BuildingData
import Roguestar.Lib.ToolData import Roguestar.Lib.Data.ToolData
import Roguestar.Lib.Data.MonsterData import Roguestar.Lib.Data.MonsterData
-- --
......
...@@ -38,12 +38,12 @@ import Roguestar.Lib.DB as DB ...@@ -38,12 +38,12 @@ import Roguestar.Lib.DB as DB
import Control.Concurrent.STM import Control.Concurrent.STM
import Control.Monad import Control.Monad
import Roguestar.Lib.Data.PlayerState import Roguestar.Lib.Data.PlayerState
import Roguestar.Lib.SpeciesData import Roguestar.Lib.Data.SpeciesData
import Roguestar.Lib.Core.Monster import Roguestar.Lib.Core.Monster
import Roguestar.Lib.Data.MonsterData import Roguestar.Lib.Data.MonsterData
import Roguestar.Lib.World.BeginGame as BeginGame import Roguestar.Lib.World.BeginGame as BeginGame
import Roguestar.Lib.Perception import Roguestar.Lib.Perception
import Roguestar.Lib.TerrainData import Roguestar.Lib.Data.TerrainData
import Roguestar.Lib.Data.FacingData import Roguestar.Lib.Data.FacingData
import Roguestar.Lib.Behavior as Behavior import Roguestar.Lib.Behavior as Behavior
import Roguestar.Lib.Turns import Roguestar.Lib.Turns
......
...@@ -6,7 +6,7 @@ module Roguestar.Lib.Species ...@@ -6,7 +6,7 @@ module Roguestar.Lib.Species
--Data --Data
import Roguestar.Lib.Data.MonsterData import Roguestar.Lib.Data.MonsterData
import Roguestar.Lib.SpeciesData import Roguestar.Lib.Data.SpeciesData
data SpeciesData = SpeciesData { data SpeciesData = SpeciesData {
species_traits :: [(MonsterTrait,Integer)], species_traits :: [(MonsterTrait,Integer)],
......
...@@ -18,10 +18,10 @@ import Roguestar.Lib.Utility.DetailedLocation ...@@ -18,10 +18,10 @@ import Roguestar.Lib.Utility.DetailedLocation
import Control.Monad.Error import Control.Monad.Error
import Data.Maybe import Data.Maybe
import Data.List as List import Data.List as List
import Roguestar.Lib.ToolData import Roguestar.Lib.Data.ToolData
import Roguestar.Lib.Substances import Roguestar.Lib.Substances
import Roguestar.Lib.Core.Plane import Roguestar.Lib.Core.Plane
import Roguestar.Lib.PlaneData import Roguestar.Lib.Data.PlaneData
pickupTool :: (DBReadable db) => pickupTool :: (DBReadable db) =>
MonsterRef -> MonsterRef ->
......
...@@ -10,14 +10,14 @@ import Control.Monad.Trans ...@@ -10,14 +10,14 @@ import Control.Monad.Trans
import Roguestar.Lib.DB import Roguestar.Lib.DB
import Roguestar.Lib.Reference import Roguestar.Lib.Reference
import Roguestar.Lib.Data.FactionData import Roguestar.Lib.Data.FactionData
import Roguestar.Lib.SpeciesData import Roguestar.Lib.Data.SpeciesData
import Roguestar.Lib.Data.MonsterData (Monster) import Roguestar.Lib.Data.MonsterData (Monster)
import Roguestar.Lib.Core.Plane import Roguestar.Lib.Core.Plane
import Control.Monad import Control.Monad
import Roguestar.Lib.Core.Monster import Roguestar.Lib.Core.Monster
import Data.Ratio import Data.Ratio
import Roguestar.Lib.Data.FacingData import Roguestar.Lib.Data.FacingData
import Roguestar.Lib.TerrainData import Roguestar.Lib.Data.TerrainData
import Data.Maybe import Data.Maybe
import Roguestar.Lib.Behavior import Roguestar.Lib.Behavior
import qualified Roguestar.Lib.Perception as P import qualified Roguestar.Lib.Perception as P
......
...@@ -12,7 +12,7 @@ import Roguestar.Lib.DB ...@@ -12,7 +12,7 @@ import Roguestar.Lib.DB
import Roguestar.Lib.Data.PlayerState import Roguestar.Lib.Data.PlayerState
import Control.Monad.Reader.Class import Control.Monad.Reader.Class
import Roguestar.Lib.Core.Plane import Roguestar.Lib.Core.Plane
import Roguestar.Lib.TerrainData import Roguestar.Lib.Data.TerrainData
import Roguestar.Lib.Utility.SiteCriteria import Roguestar.Lib.Utility.SiteCriteria
import Roguestar.Lib.Random as Random import Roguestar.Lib.Random as Random
......
...@@ -12,7 +12,7 @@ import Roguestar.Lib.Data.FacingData ...@@ -12,7 +12,7 @@ import Roguestar.Lib.Data.FacingData
import Roguestar.Lib.DB import Roguestar.Lib.DB
import Roguestar.Lib.Data.MonsterData import Roguestar.Lib.Data.MonsterData
import Control.Monad