Drezil/pioneers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'Mapping' into tessallation

Browse Source
This commit is contained in:
Nicole Dresselhaus 2014-05-13 13:04:26 +02:00
commit 527d620da6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Map/Creation.hs
View File

@ -72,9 +72,9 @@ mnh2D (a,b) (c,d) = abs (a-c) + abs (b-d)
heightToTerrain :: MapType -> YCoord -> TileType heightToTerrain :: MapType -> YCoord -> TileType
heightToTerrain GrassIslandMap y heightToTerrain GrassIslandMap y
| y < 0.1 = Ocean | y < 0.1 = Ocean
| y < 1 = Beach | y < 0.2 = Beach
| y < 5 = Grass | y < 1 = Grass
| y < 10 = Hill | y < 3 = Hill
| otherwise = Mountain | otherwise = Mountain
heightToTerrain _ _ = undefined heightToTerrain _ _ = undefined
@ -87,16 +87,16 @@ river = undefined
mnt :: IO [PlayMap -> PlayMap] mnt :: IO [PlayMap -> PlayMap]
mnt = do g <- newStdGen mnt = do g <- newStdGen
let seeds = take 10 $ randoms g let seeds = take 50 $ randoms g
return $ map (gaussMountain) seeds return $ map gaussMountain seeds
gaussMountain :: Int -> PlayMap -> PlayMap gaussMountain :: Int -> PlayMap -> PlayMap
gaussMountain seed mp = aplByPlace (liftUp c) (\(_,_) -> True) mp gaussMountain seed mp = aplByPlace (liftUp c) (\(_,_) -> True) mp
where where
g = mkStdGen seed g = mkStdGen seed
c = let ((a,b), (x,y)) = bounds mp in (head (randomRs (a,x) g), (head (randomRs (b,y) g))) c = let ((a,b), (x,y)) = bounds mp in (head (randomRs (a,x) g), (head (randomRs (b,y) g)))
amp = head $ randomRs (5.0, 20.0) g amp = head $ randomRs (2.0, 5.0) g
sig = head $ randomRs (5.0, 25.0) g sig = head $ randomRs (1.0, 5.0) g
fi = fromIntegral fi = fromIntegral
htt = heightToTerrain htt = heightToTerrain