Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

More code cleanup.

  • Loading branch information...
commit 5eff417046ec4e7b3eeca469d659379d8c70c1e1 1 parent d9bd0fb
@clanehin authored
Showing with 115 additions and 115 deletions.
  1. +3 −3 Roguestar/Lib/Behavior.hs
  2. +1 −1  Roguestar/Lib/Behavior/Activate.hs
  3. +2 −2 Roguestar/Lib/Behavior/CharacterAdvancement.hs
  4. +1 −1  Roguestar/Lib/Behavior/Combat.hs
  5. +2 −2 Roguestar/Lib/Behavior/Construction.hs
  6. +3 −3 Roguestar/Lib/Behavior/Make.hs
  7. +2 −2 Roguestar/Lib/Behavior/Travel.hs
  8. +3 −3 Roguestar/Lib/Core/Building.hs
  9. +1 −1  Roguestar/Lib/Core/Monster.hs
  10. +5 −5 Roguestar/Lib/Core/Plane.hs
  11. +3 −3 Roguestar/Lib/DB.hs
  12. +2 −2 Roguestar/Lib/Data/BuildingData.hs
  13. +1 −1  Roguestar/Lib/Data/CharacterData.hs
  14. +2 −2 Roguestar/Lib/Data/LocationData.hs
  15. +2 −2 Roguestar/Lib/{ → Data}/MakeData.hs
  16. +3 −3 Roguestar/Lib/Data/MonsterData.hs
  17. +1 −1  Roguestar/Lib/{ → Data}/PersistantData.hs
  18. +2 −2 Roguestar/Lib/{ → Data}/PlaneData.hs
  19. +3 −3 Roguestar/Lib/{ → Data}/PlanetData.hs
  20. +2 −2 Roguestar/Lib/Data/PlayerState.hs
  21. +6 −0 Roguestar/Lib/Data/PowerUpData.hs
  22. +4 −4 Roguestar/Lib/Data/ReferenceTypes.hs
  23. +1 −1  Roguestar/Lib/{ → Data}/SpeciesData.hs
  24. +2 −2 Roguestar/Lib/{ → Data}/TerrainData.hs
  25. +1 −1  Roguestar/Lib/{ → Data}/ToolData.hs
  26. +1 −1  Roguestar/Lib/{ → Data}/TravelData.hs
  27. +2 −2 Roguestar/Lib/{ → Data}/VisibilityData.hs
  28. +3 −3 Roguestar/Lib/Perception.hs
  29. +5 −5 Roguestar/Lib/PlaneVisibility.hs
  30. +3 −3 Roguestar/Lib/Planet.hs
  31. +0 −6 Roguestar/Lib/PowerUpData.hs
  32. +2 −2 Roguestar/Lib/Reference.hs
  33. +2 −2 Roguestar/Lib/Roguestar.hs
  34. +1 −1  Roguestar/Lib/Species.hs
  35. +2 −2 Roguestar/Lib/Tool.hs
  36. +2 −2 Roguestar/Lib/Turns.hs
  37. +1 −1  Roguestar/Lib/UnitTests.hs
  38. +1 −1  Roguestar/Lib/Utility/Contact.hs
  39. +2 −2 Roguestar/Lib/Utility/DetailedLocation.hs
  40. +1 −1  Roguestar/Lib/{ → Utility}/Grids.hs
  41. +7 −7 Roguestar/Lib/{ → Utility}/HierarchicalDatabase.hs
  42. +1 −1  Roguestar/Lib/{GridRayCaster.hs → Utility/RayCasting.hs}
  43. +1 −1  Roguestar/Lib/Utility/SiteCriteria.hs
  44. +3 −3 Roguestar/Lib/World/BeginGame.hs
  45. +3 −3 Roguestar/Server/Main.hs
  46. +14 −14 roguestar.cabal
View
6 Roguestar/Lib/Behavior.hs
@@ -20,19 +20,19 @@ import Control.Monad.Error
import Roguestar.Lib.Behavior.Combat
import Roguestar.Lib.Behavior.Activate
import Roguestar.Lib.Behavior.Travel
-import Roguestar.Lib.TravelData
+import Roguestar.Lib.Data.TravelData
import Roguestar.Lib.Core.Monster
import Roguestar.Lib.Data.MonsterData
import Roguestar.Lib.Core.Plane
import Roguestar.Lib.PlaneVisibility
import Data.List
-import Roguestar.Lib.TerrainData
+import Roguestar.Lib.Data.TerrainData
import Roguestar.Lib.Behavior.Make
import Roguestar.Lib.Behavior.Construction
import Roguestar.Lib.Core.Building
import Roguestar.Lib.Reference
import Roguestar.Lib.Utility.DetailedLocation
-import Roguestar.Lib.PlaneData
+import Roguestar.Lib.Data.PlaneData
data FacingBehavior =
Step
View
2  Roguestar/Lib/Behavior/Activate.hs
@@ -5,7 +5,7 @@ module Roguestar.Lib.Behavior.Activate
where
import Roguestar.Lib.Tool
-import Roguestar.Lib.ToolData
+import Roguestar.Lib.Data.ToolData
import Roguestar.Lib.Core.Monster
import Roguestar.Lib.DB
import Control.Monad.Error
View
4 Roguestar/Lib/Behavior/CharacterAdvancement.hs
@@ -9,8 +9,8 @@ module Roguestar.Lib.Behavior.CharacterAdvancement
import qualified Data.Map as Map
import Roguestar.Lib.Data.MonsterData
-import Roguestar.Lib.PowerUpData
-import Roguestar.Lib.PersistantData
+import Roguestar.Lib.Data.PowerUpData
+import Roguestar.Lib.Data.PersistantData
-- TODO: rename "bump" to more clear language, like "advance" or "advanceCharacterLevel".
View
2  Roguestar/Lib/Behavior/Combat.hs
@@ -12,7 +12,7 @@ import Roguestar.Lib.DB
import Roguestar.Lib.Core.Monster
import Roguestar.Lib.Data.MonsterData
import Roguestar.Lib.Tool
-import Roguestar.Lib.ToolData
+import Roguestar.Lib.Data.ToolData
import Control.Monad.Error
import Roguestar.Lib.Data.FacingData
import Data.Maybe
View
4 Roguestar/Lib/Behavior/Construction.hs
@@ -8,8 +8,8 @@ module Roguestar.Lib.Behavior.Construction
import Roguestar.Lib.DB
import Roguestar.Lib.Core.Plane
-import Roguestar.Lib.PlaneData
-import Roguestar.Lib.TerrainData
+import Roguestar.Lib.Data.PlaneData
+import Roguestar.Lib.Data.TerrainData
import Roguestar.Lib.Data.FacingData
import Control.Monad
import Control.Monad.Maybe
View
6 Roguestar/Lib/Behavior/Make.hs
@@ -1,14 +1,14 @@
module Roguestar.Lib.Behavior.Make
- (module Roguestar.Lib.MakeData,
+ (module Roguestar.Lib.Data.MakeData,
MakeOutcome,
resolveMake,
executeMake)
where
-import Roguestar.Lib.MakeData
+import Roguestar.Lib.Data.MakeData
import Roguestar.Lib.DB
import Roguestar.Lib.Tool
-import Roguestar.Lib.ToolData
+import Roguestar.Lib.Data.ToolData
import Data.List
data MakeOutcome = MakeSuccess MonsterRef Tool [ToolRef] | MakeFailed
View
4 Roguestar/Lib/Behavior/Travel.hs
@@ -20,12 +20,12 @@ import Control.Monad
import Control.Monad.Trans
import Data.Ord
import Roguestar.Lib.Position as Position
-import Roguestar.Lib.TerrainData
+import Roguestar.Lib.Data.TerrainData
import Data.List (minimumBy)
import Roguestar.Lib.Core.Monster
import Roguestar.Lib.Data.MonsterData
import Roguestar.Lib.Logging
-import Roguestar.Lib.TravelData
+import Roguestar.Lib.Data.TravelData
import Roguestar.Lib.Utility.DetailedLocation
import Roguestar.Lib.Utility.DetailedTravel as DetailedTravel
View
6 Roguestar/Lib/Core/Building.hs
@@ -16,12 +16,12 @@ import Roguestar.Lib.Data.FacingData
import Data.Maybe
import Control.Monad.Maybe
import Control.Monad.Random
-import Roguestar.Lib.PlaneData
+import Roguestar.Lib.Data.PlaneData
import Roguestar.Lib.Core.Plane
import Roguestar.Lib.Position
-import Roguestar.Lib.TerrainData
+import Roguestar.Lib.Data.TerrainData
import Control.Monad.Error
-import Roguestar.Lib.PowerUpData
+import Roguestar.Lib.Data.PowerUpData
import Roguestar.Lib.Behavior.CharacterAdvancement
import Roguestar.Lib.Utility.DetailedLocation
import Roguestar.Lib.Data.PlayerState
View
2  Roguestar/Lib/Core/Monster.hs
@@ -18,7 +18,7 @@ module Roguestar.Lib.Core.Monster
import Prelude hiding (getContents)
import Roguestar.Lib.Data.MonsterData
import Roguestar.Lib.DB
-import Roguestar.Lib.SpeciesData
+import Roguestar.Lib.Data.SpeciesData
import Roguestar.Lib.Species
import Roguestar.Lib.Data.FactionData
import Control.Monad.Error
View
10 Roguestar/Lib/Core/Plane.hs
@@ -18,13 +18,13 @@ module Roguestar.Lib.Core.Plane
where
import Prelude hiding (getContents)
-import Roguestar.Lib.Grids
+import Roguestar.Lib.Utility.Grids
import Roguestar.Lib.Reference
import Roguestar.Lib.DB
-import Roguestar.Lib.TerrainData
-import Roguestar.Lib.PlaneData
-import Roguestar.Lib.PlanetData
-import Roguestar.Lib.ToolData (Tool)
+import Roguestar.Lib.Data.TerrainData
+import Roguestar.Lib.Data.PlaneData
+import Roguestar.Lib.Data.PlanetData
+import Roguestar.Lib.Data.ToolData (Tool)
import Roguestar.Lib.Data.MonsterData (Monster)
import Control.Monad
import Control.Monad.Random as Random
View
6 Roguestar/Lib/DB.hs
@@ -58,14 +58,14 @@ import Roguestar.Lib.Data.ReferenceTypes
import Roguestar.Lib.Data.LocationData
import Roguestar.Lib.Reference
import Roguestar.Lib.Data.MonsterData
-import Roguestar.Lib.PlaneData
+import Roguestar.Lib.Data.PlaneData
import Roguestar.Lib.Data.BuildingData
import Roguestar.Lib.RNG
import Data.Map as Map
import Data.List as List
-import qualified Roguestar.Lib.HierarchicalDatabase as HD
+import qualified Roguestar.Lib.Utility.HierarchicalDatabase as HD
import Data.Maybe
-import Roguestar.Lib.ToolData
+import Roguestar.Lib.Data.ToolData
import Control.Monad.State
import Control.Monad.Error
import Control.Monad.Reader
View
4 Roguestar/Lib/Data/BuildingData.hs
@@ -13,8 +13,8 @@ module Roguestar.Lib.Data.BuildingData
buildingOccupies)
where
-import Roguestar.Lib.PowerUpData
-import Roguestar.Lib.PersistantData
+import Roguestar.Lib.Data.PowerUpData
+import Roguestar.Lib.Data.PersistantData
basic_stargate :: BuildingPrototype
basic_stargate = BuildingPrototype (TwoWayStargate NonAlignedRegion) Portal (Just Magnetic)
View
2  Roguestar/Lib/Data/CharacterData.hs
@@ -3,7 +3,7 @@ module Roguestar.Lib.Data.CharacterData
where
import Roguestar.Lib.Data.MonsterData
-import Roguestar.Lib.PersistantData
+import Roguestar.Lib.Data.PersistantData
applyCharacterClass :: CharacterClass -> Monster -> Monster
applyCharacterClass character_class creature = applyToMonster (CharacterClass character_class : classInfo character_class) creature
View
4 Roguestar/Lib/Data/LocationData.hs
@@ -32,9 +32,9 @@ module Roguestar.Lib.Data.LocationData
import Roguestar.Lib.Data.FacingData
import Roguestar.Lib.Data.ReferenceTypes
-import Roguestar.Lib.ToolData
+import Roguestar.Lib.Data.ToolData
import Roguestar.Lib.Data.MonsterData
-import Roguestar.Lib.PlaneData
+import Roguestar.Lib.Data.PlaneData
import Roguestar.Lib.Data.BuildingData
import Control.Monad
import Roguestar.Lib.Position
View
4 Roguestar/Lib/MakeData.hs → Roguestar/Lib/Data/MakeData.hs
@@ -1,6 +1,6 @@
{-# LANGUAGE FlexibleInstances #-}
--Mechanics
-module Roguestar.Lib.MakeData
+module Roguestar.Lib.Data.MakeData
(PrepareMake(..),
prepare_make,
isFinished,
@@ -15,7 +15,7 @@ module Roguestar.Lib.MakeData
where
import Roguestar.Lib.Data.LocationData
-import Roguestar.Lib.ToolData
+import Roguestar.Lib.Data.ToolData
import Roguestar.Lib.Substances
-- | Multi-step process for gathering the materials to make something.
View
6 Roguestar/Lib/Data/MonsterData.hs
@@ -13,7 +13,7 @@ module Roguestar.Lib.Data.MonsterData
empty_creature)
where
-import Roguestar.Lib.PersistantData
+import Roguestar.Lib.Data.PersistantData
import Data.Ratio
import Data.Maybe
import Roguestar.Lib.Data.FactionData
@@ -21,8 +21,8 @@ import Data.Monoid
import qualified Data.Map as Map
import qualified Data.Set as Set
import Data.List as List
-import Roguestar.Lib.SpeciesData
-import Roguestar.Lib.TerrainData
+import Roguestar.Lib.Data.SpeciesData
+import Roguestar.Lib.Data.TerrainData
data Monster = Monster { creature_traits :: Map.Map MonsterTrait Integer,
creature_specials :: Set.Set MonsterSpecial,
View
2  Roguestar/Lib/PersistantData.hs → Roguestar/Lib/Data/PersistantData.hs
@@ -1,5 +1,5 @@
--Data
-module Roguestar.Lib.PersistantData
+module Roguestar.Lib.Data.PersistantData
(CharacterClass(..),
PowerUpData(..),
PlanetRegion(..),
View
4 Roguestar/Lib/PlaneData.hs → Roguestar/Lib/Data/PlaneData.hs
@@ -1,9 +1,9 @@
--Data
-module Roguestar.Lib.PlaneData
+module Roguestar.Lib.Data.PlaneData
(Plane(..))
where
-import Roguestar.Lib.TerrainData
+import Roguestar.Lib.Data.TerrainData
import qualified Data.ByteString.Char8 as B
import Roguestar.Lib.Random as Random
View
6 Roguestar/Lib/PlanetData.hs → Roguestar/Lib/Data/PlanetData.hs
@@ -1,6 +1,6 @@
{-# LANGUAGE OverloadedStrings #-}
--World
-module Roguestar.Lib.PlanetData
+module Roguestar.Lib.Data.PlanetData
(PlanetRegion(..),
PlanetInfo(..),
addTown,
@@ -9,8 +9,8 @@ module Roguestar.Lib.PlanetData
cyborg_planets)
where
-import Roguestar.Lib.PersistantData
-import Roguestar.Lib.TerrainData
+import Roguestar.Lib.Data.PersistantData
+import Roguestar.Lib.Data.TerrainData
import Roguestar.Lib.Data.BuildingData
import qualified Roguestar.Lib.Random as Random
import Data.Ratio
View
4 Roguestar/Lib/Data/PlayerState.hs
@@ -7,8 +7,8 @@ module Roguestar.Lib.Data.PlayerState
import Roguestar.Lib.Data.LocationData
import Roguestar.Lib.Data.MonsterData
-import Roguestar.Lib.TravelData
-import Roguestar.Lib.PersistantData
+import Roguestar.Lib.Data.TravelData
+import Roguestar.Lib.Data.PersistantData
import Data.Maybe
data PlayerState =
View
6 Roguestar/Lib/Data/PowerUpData.hs
@@ -0,0 +1,6 @@
+module Roguestar.Lib.Data.PowerUpData
+ (PowerUpData(..))
+ where
+
+import Roguestar.Lib.Data.PersistantData
+
View
8 Roguestar/Lib/Data/ReferenceTypes.hs
@@ -18,13 +18,13 @@ module Roguestar.Lib.Data.ReferenceTypes
BuildingRef)
where
-import Roguestar.Lib.HierarchicalDatabase
+import Roguestar.Lib.Utility.HierarchicalDatabase
import Roguestar.Lib.Data.FacingData
import Roguestar.Lib.Data.MonsterData
-import Roguestar.Lib.ToolData
-import Roguestar.Lib.PlaneData
+import Roguestar.Lib.Data.ToolData
+import Roguestar.Lib.Data.PlaneData
import Roguestar.Lib.Data.BuildingData
-import Roguestar.Lib.PlanetData
+import Roguestar.Lib.Data.PlanetData
import Roguestar.Lib.Position
--
View
2  Roguestar/Lib/SpeciesData.hs → Roguestar/Lib/Data/SpeciesData.hs
@@ -1,5 +1,5 @@
--Data
-module Roguestar.Lib.SpeciesData
+module Roguestar.Lib.Data.SpeciesData
(Species(..),
all_species)
where
View
4 Roguestar/Lib/TerrainData.hs → Roguestar/Lib/Data/TerrainData.hs
@@ -1,5 +1,5 @@
--Data
-module Roguestar.Lib.TerrainData
+module Roguestar.Lib.Data.TerrainData
(Biome(..),
Terrain(..),
MetaTerrain(..),
@@ -14,7 +14,7 @@ module Roguestar.Lib.TerrainData
impassable_terrains)
where
-import Roguestar.Lib.Grids
+import Roguestar.Lib.Utility.Grids
import Data.List as List
import Data.Map as Map
--import Substances hiding (Water)
View
2  Roguestar/Lib/ToolData.hs → Roguestar/Lib/Data/ToolData.hs
@@ -1,7 +1,7 @@
{-# LANGUAGE OverloadedStrings #-}
--Data
-module Roguestar.Lib.ToolData
+module Roguestar.Lib.Data.ToolData
(Tool(..),
toolName,
fromSphere,
View
2  Roguestar/Lib/TravelData.hs → Roguestar/Lib/Data/TravelData.hs
@@ -1,5 +1,5 @@
--Data
-module Roguestar.Lib.TravelData
+module Roguestar.Lib.Data.TravelData
(ClimbDirection(..)) where
data ClimbDirection = ClimbUp | ClimbDown
View
4 Roguestar/Lib/VisibilityData.hs → Roguestar/Lib/Data/VisibilityData.hs
@@ -1,12 +1,12 @@
--Data
-module Roguestar.Lib.VisibilityData
+module Roguestar.Lib.Data.VisibilityData
(distanceCostForSight,
terrainHideMultiplier,
terrainOpacity,
maximumRangeForSpotCheck)
where
-import Roguestar.Lib.TerrainData
+import Roguestar.Lib.Data.TerrainData
import Data.List
import Roguestar.Lib.Data.FacingData
View
6 Roguestar/Lib/Perception.hs
@@ -42,15 +42,15 @@ import Data.Map as Map
import Control.Applicative
import Roguestar.Lib.Data.FacingData
import Roguestar.Lib.Position as Position
-import Roguestar.Lib.TerrainData
+import Roguestar.Lib.Data.TerrainData
import Roguestar.Lib.Data.BuildingData
import Roguestar.Lib.Core.Building
import Roguestar.Lib.Core.Plane
import Roguestar.Lib.Utility.DetailedLocation
-import Roguestar.Lib.SpeciesData
+import Roguestar.Lib.Data.SpeciesData
import Roguestar.Lib.Data.MonsterData
import Roguestar.Lib.Tool
-import Roguestar.Lib.ToolData
+import Roguestar.Lib.Data.ToolData
import Roguestar.Lib.Behavior as Behavior
import qualified Roguestar.Lib.Utility.DetailedTravel as DT
View
10 Roguestar/Lib/PlaneVisibility.hs
@@ -9,15 +9,15 @@ module Roguestar.Lib.PlaneVisibility
import Prelude hiding (getContents)
import Roguestar.Lib.Data.FactionData
import Roguestar.Lib.DB
-import Roguestar.Lib.TerrainData
+import Roguestar.Lib.Data.TerrainData
import Roguestar.Lib.Core.Plane
-import Roguestar.Lib.PlaneData
+import Roguestar.Lib.Data.PlaneData
import Control.Monad
import Roguestar.Lib.Data.MonsterData
import Data.List as List
-import Roguestar.Lib.Grids
-import Roguestar.Lib.GridRayCaster
-import Roguestar.Lib.VisibilityData
+import Roguestar.Lib.Utility.Grids
+import Roguestar.Lib.Utility.RayCasting
+import Roguestar.Lib.Data.VisibilityData
import Roguestar.Lib.Data.FacingData
import Data.Ratio
import Roguestar.Lib.Core.Building
View
6 Roguestar/Lib/Planet.hs
@@ -5,11 +5,11 @@ module Roguestar.Lib.Planet
generatePlanetInfo)
where
-import Roguestar.Lib.PlanetData
-import Roguestar.Lib.PlaneData
+import Roguestar.Lib.Data.PlanetData
+import Roguestar.Lib.Data.PlaneData
import Roguestar.Lib.DB
import Roguestar.Lib.Core.Plane
-import Roguestar.Lib.TerrainData
+import Roguestar.Lib.Data.TerrainData
import Control.Monad
import Control.Monad.Random
import Data.Maybe
View
6 Roguestar/Lib/PowerUpData.hs
@@ -1,6 +0,0 @@
-module Roguestar.Lib.PowerUpData
- (PowerUpData(..))
- where
-
-import Roguestar.Lib.PersistantData
-
View
4 Roguestar/Lib/Reference.hs
@@ -8,9 +8,9 @@ module Roguestar.Lib.Reference
where
import Roguestar.Lib.Data.ReferenceTypes
-import Roguestar.Lib.PlaneData
+import Roguestar.Lib.Data.PlaneData
import Roguestar.Lib.Data.BuildingData
-import Roguestar.Lib.ToolData
+import Roguestar.Lib.Data.ToolData
import Roguestar.Lib.Data.MonsterData
--
View
4 Roguestar/Lib/Roguestar.hs
@@ -38,12 +38,12 @@ import Roguestar.Lib.DB as DB
import Control.Concurrent.STM
import Control.Monad
import Roguestar.Lib.Data.PlayerState
-import Roguestar.Lib.SpeciesData
+import Roguestar.Lib.Data.SpeciesData
import Roguestar.Lib.Core.Monster
import Roguestar.Lib.Data.MonsterData
import Roguestar.Lib.World.BeginGame as BeginGame
import Roguestar.Lib.Perception
-import Roguestar.Lib.TerrainData
+import Roguestar.Lib.Data.TerrainData
import Roguestar.Lib.Data.FacingData
import Roguestar.Lib.Behavior as Behavior
import Roguestar.Lib.Turns
View
2  Roguestar/Lib/Species.hs
@@ -6,7 +6,7 @@ module Roguestar.Lib.Species
--Data
import Roguestar.Lib.Data.MonsterData
-import Roguestar.Lib.SpeciesData
+import Roguestar.Lib.Data.SpeciesData
data SpeciesData = SpeciesData {
species_traits :: [(MonsterTrait,Integer)],
View
4 Roguestar/Lib/Tool.hs
@@ -18,10 +18,10 @@ import Roguestar.Lib.Utility.DetailedLocation
import Control.Monad.Error
import Data.Maybe
import Data.List as List
-import Roguestar.Lib.ToolData
+import Roguestar.Lib.Data.ToolData
import Roguestar.Lib.Substances
import Roguestar.Lib.Core.Plane
-import Roguestar.Lib.PlaneData
+import Roguestar.Lib.Data.PlaneData
pickupTool :: (DBReadable db) =>
MonsterRef ->
View
4 Roguestar/Lib/Turns.hs
@@ -10,14 +10,14 @@ import Control.Monad.Trans
import Roguestar.Lib.DB
import Roguestar.Lib.Reference
import Roguestar.Lib.Data.FactionData
-import Roguestar.Lib.SpeciesData
+import Roguestar.Lib.Data.SpeciesData
import Roguestar.Lib.Data.MonsterData (Monster)
import Roguestar.Lib.Core.Plane
import Control.Monad
import Roguestar.Lib.Core.Monster
import Data.Ratio
import Roguestar.Lib.Data.FacingData
-import Roguestar.Lib.TerrainData
+import Roguestar.Lib.Data.TerrainData
import Data.Maybe
import Roguestar.Lib.Behavior
import qualified Roguestar.Lib.Perception as P
View
2  Roguestar/Lib/UnitTests.hs
@@ -12,7 +12,7 @@ import Roguestar.Lib.DB
import Roguestar.Lib.Data.PlayerState
import Control.Monad.Reader.Class
import Roguestar.Lib.Core.Plane
-import Roguestar.Lib.TerrainData
+import Roguestar.Lib.Data.TerrainData
import Roguestar.Lib.Utility.SiteCriteria
import Roguestar.Lib.Random as Random
View
2  Roguestar/Lib/Utility/Contact.hs
@@ -12,7 +12,7 @@ import Roguestar.Lib.Data.FacingData
import Roguestar.Lib.DB
import Roguestar.Lib.Data.MonsterData
import Control.Monad
-import Roguestar.Lib.PlaneData
+import Roguestar.Lib.Data.PlaneData
import Data.Ord
import Data.List as List
import Roguestar.Lib.Utility.DetailedLocation
View
4 Roguestar/Lib/Utility/DetailedLocation.hs
@@ -18,9 +18,9 @@ module Roguestar.Lib.Utility.DetailedLocation
where
import Roguestar.Lib.Data.LocationData
-import Roguestar.Lib.PlaneData
+import Roguestar.Lib.Data.PlaneData
import Roguestar.Lib.Data.BuildingData
-import Roguestar.Lib.ToolData
+import Roguestar.Lib.Data.ToolData
import Roguestar.Lib.Data.MonsterData
import Roguestar.Lib.Position
import Data.Maybe
View
2  Roguestar/Lib/Grids.hs → Roguestar/Lib/Utility/Grids.hs
@@ -1,6 +1,6 @@
{-# LANGUAGE ScopedTypeVariables #-}
-- Data
-module Roguestar.Lib.Grids
+module Roguestar.Lib.Utility.Grids
(Grid,
gridAt,
generateGrid,
View
14 Roguestar/Lib/HierarchicalDatabase.hs → ...estar/Lib/Utility/HierarchicalDatabase.hs
@@ -1,17 +1,17 @@
-- Services
-module Roguestar.Lib.HierarchicalDatabase
+module Roguestar.Lib.Utility.HierarchicalDatabase
(HierarchicalDatabase,
HierarchicalRelation(..),
- Roguestar.Lib.HierarchicalDatabase.empty,
- Roguestar.Lib.HierarchicalDatabase.insert,
- Roguestar.Lib.HierarchicalDatabase.delete,
- Roguestar.Lib.HierarchicalDatabase.lookup,
+ Roguestar.Lib.Utility.HierarchicalDatabase.empty,
+ Roguestar.Lib.Utility.HierarchicalDatabase.insert,
+ Roguestar.Lib.Utility.HierarchicalDatabase.delete,
+ Roguestar.Lib.Utility.HierarchicalDatabase.lookup,
lookupChildren,
lookupParent,
parentOf,
childrenOf,
- Roguestar.Lib.HierarchicalDatabase.toList,
- Roguestar.Lib.HierarchicalDatabase.fromList,
+ Roguestar.Lib.Utility.HierarchicalDatabase.toList,
+ Roguestar.Lib.Utility.HierarchicalDatabase.fromList,
insidenessTests)
where
View
2  Roguestar/Lib/GridRayCaster.hs → Roguestar/Lib/Utility/RayCasting.hs
@@ -1,6 +1,6 @@
--Data
-module Roguestar.Lib.GridRayCaster
+module Roguestar.Lib.Utility.RayCasting
(castRays,
castRay,
gridRayCasterTests)
View
2  Roguestar/Lib/Utility/SiteCriteria.hs
@@ -13,7 +13,7 @@ import Data.Ord
import Data.List as List
import Roguestar.Lib.Core.Plane
import Roguestar.Lib.DB
-import Roguestar.Lib.TerrainData
+import Roguestar.Lib.Data.TerrainData
import Control.Monad
import Control.Monad.Random
View
6 Roguestar/Lib/World/BeginGame.hs
@@ -9,11 +9,11 @@ import Roguestar.Lib.Data.MonsterData
import Roguestar.Lib.Data.BuildingData
import Roguestar.Lib.DB
import Roguestar.Lib.Data.FacingData
-import Roguestar.Lib.TerrainData
-import Roguestar.Lib.ToolData
+import Roguestar.Lib.Data.TerrainData
+import Roguestar.Lib.Data.ToolData
import Control.Monad
import Control.Monad.Error
-import Roguestar.Lib.SpeciesData
+import Roguestar.Lib.Data.SpeciesData
import Roguestar.Lib.Data.PlayerState
import Roguestar.Lib.Town
import qualified Data.ByteString.Char8 as B ()
View
6 Roguestar/Server/Main.hs
@@ -22,9 +22,9 @@ import Roguestar.Lib.Roguestar
import Roguestar.Lib.Data.PlayerState
import Roguestar.Lib.Data.ErrorData
import Roguestar.Lib.Perception
-import Roguestar.Lib.SpeciesData
-import Roguestar.Lib.ToolData
-import Roguestar.Lib.TerrainData as TerrainData
+import Roguestar.Lib.Data.SpeciesData
+import Roguestar.Lib.Data.ToolData
+import Roguestar.Lib.Data.TerrainData as TerrainData
import Roguestar.Lib.Data.MonsterData
import Roguestar.Lib.Data.FacingData
import Roguestar.Lib.Logging
View
28 roguestar.cabal
@@ -56,55 +56,55 @@ library
base >=4,
mwc-random >= 0.12.0.1,
streams >= 0.8.2
- other-modules: Roguestar.Lib.TravelData,
- Roguestar.Lib.VisibilityData,
- Roguestar.Lib.PlaneData,
- Roguestar.Lib.Grids,
- Roguestar.Lib.Perception,
+ other-modules: Roguestar.Lib.Perception,
Roguestar.Lib.PlaneVisibility,
Roguestar.Lib.Turns,
Roguestar.Lib.Core.Building,
Roguestar.Lib.Core.Monster,
Roguestar.Lib.Core.Plane,
Roguestar.Lib.Utility.Contact,
+ Roguestar.Lib.Utility.Grids,
+ Roguestar.Lib.Utility.HierarchicalDatabase,
+ Roguestar.Lib.Utility.RayCasting,
Roguestar.Lib.Utility.SiteCriteria,
Roguestar.Lib.Tool,
Roguestar.Lib.Substances,
- Roguestar.Lib.HierarchicalDatabase,
Roguestar.Lib.Behavior.Travel,
- Roguestar.Lib.ToolData,
Roguestar.Lib.RNG,
Roguestar.Lib.Species,
Roguestar.Lib.Position,
- Roguestar.Lib.TerrainData,
Roguestar.Lib.Behavior.Combat,
Roguestar.Lib.Tests,
- Roguestar.Lib.GridRayCaster,
Roguestar.Lib.World.BeginGame,
- Roguestar.Lib.SpeciesData,
Roguestar.Lib.TimeCoordinate,
Roguestar.Lib.DB,
Roguestar.Lib.Town,
Roguestar.Lib.Random,
- Roguestar.Lib.MakeData,
Roguestar.Lib.Behavior,
Roguestar.Lib.Behavior.Activate,
Roguestar.Lib.Behavior.CharacterAdvancement,
Roguestar.Lib.Behavior.Construction,
Roguestar.Lib.Behavior.Make,
Roguestar.Lib.Planet,
- Roguestar.Lib.PlanetData,
Roguestar.Lib.Logging,
- Roguestar.Lib.PersistantData,
- Roguestar.Lib.PowerUpData,
Roguestar.Lib.Data.BuildingData,
Roguestar.Lib.Data.CharacterData,
Roguestar.Lib.Data.FacingData,
Roguestar.Lib.Data.FactionData,
Roguestar.Lib.Data.LocationData,
+ Roguestar.Lib.Data.MakeData,
Roguestar.Lib.Data.MonsterData,
+ Roguestar.Lib.Data.PersistantData,
+ Roguestar.Lib.Data.PlaneData,
+ Roguestar.Lib.Data.PlanetData,
Roguestar.Lib.Data.PlayerState,
+ Roguestar.Lib.Data.PowerUpData,
Roguestar.Lib.Data.ReferenceTypes,
+ Roguestar.Lib.Data.SpeciesData,
+ Roguestar.Lib.Data.TerrainData,
+ Roguestar.Lib.Data.ToolData,
+ Roguestar.Lib.Data.TravelData,
+ Roguestar.Lib.Data.VisibilityData,
Roguestar.Lib.HTML.Mustache
ghc-prof-options: -prof -auto-all
ghc-shared-options: -prof -auto-all
Please sign in to comment.
Something went wrong with that request. Please try again.