Suguivy
/
roguelike
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Now the player can't walk on solid cells

This commit is contained in:
Ivy 2021-02-18 20:00:36 +01:00
parent 7e09931173
commit 5254c8429e
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Dungeon.hs
View File

@ -1,6 +1,7 @@
module Dungeon where module Dungeon where
import Data.Matrix hiding ((<|>)) import Data.Matrix hiding ((<|>))
import Linear.V2
import Data.Tuple import Data.Tuple
import Data.Maybe import Data.Maybe
import Control.Applicative ((<|>)) import Control.Applicative ((<|>))
@ -30,3 +31,6 @@ makeDungeonFromFile f = do
dungeonToLists :: Dungeon -> [[Cell]] dungeonToLists :: Dungeon -> [[Cell]]
dungeonToLists (Dungeon m) = toLists m dungeonToLists (Dungeon m) = toLists m
getCell :: V2 Int -> Dungeon -> Cell
getCell (V2 x y) (Dungeon m) = fromMaybe Solid (safeGet (y+1) (x+1) m)

8
src/Game.hs
View File

@ -20,9 +20,13 @@ makeLenses ''Game
newGame :: IO Game newGame :: IO Game
newGame = do newGame = do
dun <- makeDungeonFromFile "maps/test.map" dun <- makeDungeonFromFile "maps/test.map"
return $ Game dun (Player $ V2 0 0) return $ Game dun (Player $ V2 1 1)
runAction :: Action -> Game -> Maybe Game runAction :: Action -> Game -> Maybe Game
runAction (Move vec) game = Just $ game & player . pos +~ vec runAction (Move vec) game =
if ableToMove then Just $ game & player . pos .~ newPos
else Just game
where ableToMove = getCell newPos (game ^. dungeon) == Empty
newPos = (game ^. player . pos) + vec
runAction None g = Just g runAction None g = Just g
runAction ExitGame _ = Nothing runAction ExitGame _ = Nothing