diff --git a/src/Map/Creation.hs b/src/Map/Creation.hs index 38a49a6..283aa75 100644 --- a/src/Map/Creation.hs +++ b/src/Map/Creation.hs @@ -85,7 +85,3 @@ gaussMountain seed mp = aplByPlace (liftUp c) (\(_,_) -> True) mp liftUp (gx,gz) (Node (x,z) (rx,rz,y) _ b pl pa r s) = let y_neu = max y e in Node (x,z) (rx, rz, y_neu) (htt GrassIslandMap y_neu) b pl pa r s where e = gauss3Dgeneral amp (fromIntegral gx) (fromIntegral gz) sig sig rx rz - --- | Makes sure the edges of the Map are mountain-free -makeIsland :: PlayMap -> PlayMap -makeIsland = undefined -- tomorrow.... diff --git a/src/Map/Types.hs b/src/Map/Types.hs index 2ca5d61..9bdcc8e 100644 --- a/src/Map/Types.hs +++ b/src/Map/Types.hs @@ -11,6 +11,16 @@ type XCoord = Double type ZCoord = Double type YCoord = Double +data Node = Node { mapCoordinates :: (Xindex, Zindex) + , actualCoordinates :: (XCoord, ZCoord, YCoord) + , tiletype :: TileType + , buildinfo :: BuildInfo + , playerinfo :: PlayerInfo + , pathinfo :: PathInfo + , resinfo :: ResInfo + , storinfo :: StorInfo + } deriving (Show) + data MapType = GrassIslandMap | DesertMap @@ -66,10 +76,6 @@ data TileType = Ocean | Mountain -- ^ Not accessible deriving (Show, Eq) --- TODO: Record Syntax? -data Node = Node (Xindex, Zindex) (XCoord, ZCoord, YCoord) TileType BuildInfo PlayerInfo PathInfo ResInfo StorInfo - deriving (Show) - data Structure = Flag -- Flag | Woodcutter -- Huts | Forester