Misc work, going for a towns clone instead

Author: js

Agents.hs

@@ -0,0 +1,12 @@
+module Agents where
+
+import Graphics.UI.SDL as SDL
+import Graphics.UI.SDL.Image as SDLi
+
+import Model 
+
+initAgents :: IO[Agent]
+initAgents = do
+  agentSprite <- SDLi.load "image/agent.png"
+  return [Agent "A" (Position 10 10) agentSprite, Agent "B" (Position 20 20) agentSprite]
+

Draw.hs

@@ -3,9 +3,16 @@ module Draw where
 import Model
 import DrawWorldMap
 import DrawFight
+import DrawMenu
 
-drawGamestate :: GameState -> IO ()
-drawGamestate gs
-  | gameMode gs == Model.Walking = drawWalkingMode gs
-  | gameMode gs == Model.Fight = drawFight gs
-  | gameMode gs == Model.AfterFight = return ()
+drawGamestate :: GameState -> Mode -> IO ()
+drawGamestate gs Model.Walking = do
+  drawWalkingMode gs
+  drawMenu gs (hasMenu gs)
+
+drawGamestate gs Model.AfterFight = do
+  return ()
+
+drawGamestate gs Model.Fight = do
+  drawFight gs
+  drawMenu gs (hasMenu gs)

DrawFight.hs

@@ -34,5 +34,5 @@ drawFight gs = do
   blitAnimations (map curAnimation (enemies gs)) s (Position 0 0)
 
   blitAnimations (animations gs) s (Position 0 0)
-  drawMenu gs s
+  --drawMenu gs s
   SDL.flip s

DrawMenu.hs

@@ -18,8 +18,9 @@ drawLabels (x:xs) pos s fnt = do
   blitSurface title Nothing s (Just (Rect (floor $ xVal pos) (floor $ yVal pos) 200 200))
   drawLabels xs (Position ((xVal pos)) ((yVal pos) + 30)) s fnt
 
-drawMenu :: GameState -> Surface -> IO ()
-drawMenu gs s = do
+drawMenu :: GameState -> Bool -> IO ()
+drawMenu gs True = do
+  s <- getVideoSurface
   let menu' = menu gs
   let pos' = menuPos menu'
   let gx' = gx gs
@@ -28,3 +29,5 @@ drawMenu gs s = do
   drawLabels (labels menu') (Position (((xVal pos') +10.0)) (((yVal pos') + 10.0))) s (fnt gs)
 
   return ()
+
+drawMenu _ _ = return ()

DrawWorldMap.hs

@@ -41,9 +41,20 @@ drawMap m s tileSurface cameraPos = do
   drawTiles coords tileData s tileSurface cameraPos
   return ()
 
+drawAgents :: [Agent] -> Surface -> Position -> IO()
+drawAgents [] _ _ = return ()
+drawAgents (x:xs) s camera = do
+  let xpos = xVal $ agentPos x
+  let ypos = yVal $ agentPos x
+  let x' = floor (xpos - (xVal camera))
+  let y' = floor (ypos - (yVal camera))
+  blitSurface (agentImage x) Nothing s (Just (Rect x' y' 32 32))
+  drawAgents xs s camera
+
 drawWalkingMode :: GameState -> IO ()
 drawWalkingMode gs = do
   s <- getVideoSurface
   drawMap (currentMap gs) s (tileSurface $ gx gs) (cameraPos gs)
   blitAnimations ((animation (player gs)) : animations gs) s (cameraPos gs)
+  drawAgents (agents gs) s (cameraPos gs)
   SDL.flip s

LogicWalking.hs

@@ -0,0 +1,52 @@
+module LogicWalking where
+
+import Model
+import Data.Word
+import Animation
+import System.Random
+
+setUpNextFight :: GameState -> Int -> GameState
+setUpNextFight gs t = gs {rng = rng', nextFight = nextFight'}
+  where (val, rng') = next $ rng gs
+        nextFight' = val `mod` 1000 + t + 2000
+
+nextPlayerPos :: Player -> Word32 -> Position
+nextPlayerPos player dt
+  | speed player == Slow  && moveDirection player == Model.Right = Position (x0 + slowSpeed*(fromIntegral dt)) y0
+  | speed player == Slow  && moveDirection player == Model.Left = Position (x0 - slowSpeed*(fromIntegral dt)) y0
+  | speed player == Slow  && moveDirection player == Model.Up = Position x0 (y0 - slowSpeed*(fromIntegral dt))
+  | speed player == Slow  && moveDirection player == Model.Down = Position x0 (y0 + slowSpeed*(fromIntegral dt))
+  | otherwise = playerPos player
+    where x0 = xVal $ playerPos player
+          y0 = yVal $ playerPos player
+          slowSpeed = 0.2
+
+updatePlayer :: Player -> Word32 -> Word32 ->  Player
+updatePlayer player t dt = player { animation = animation', playerPos = playerPos' }
+  where animation' = (head  (updateAnimations  [animation player] t)) { animPos = playerPos player}
+        playerPos' = nextPlayerPos player dt
+
+posDiff :: Float -> Float -> Float -> Float -> Float
+posDiff minval maxval a b
+  | (b-a) < minval = b - minval
+  | (b-a) > maxval = b - maxval
+  | otherwise = a
+
+updateCamera :: Position -> Position -> Float -> Float -> Position
+updateCamera cameraPos playerPos xdim ydim = Position (min (32*xdim-800)  (max 0 xpos)) (min (32*ydim-600) (max 0 ypos))
+  where xpos = posDiff 200 600 (xVal cameraPos) (xVal playerPos)
+        ypos = posDiff 200 400 (yVal cameraPos) (yVal playerPos)
+
+setupFight :: GameState -> Word32 -> GameState
+setupFight gs t = gs { enemies = enemies' , gameMode = Model.Fight} -- create enemies here
+  where enemies' = genEnemies gs
+
+genEnemies :: GameState ->  [Enemy]
+genEnemies gs = [Enemy "Rat 1" Model.Rat 10 10 1 1 1 animation (Position 10 10)]
+  where animation = Animation (ratSprite $ gx gs) 80 80 2 250 (t gs) 0 (Position 100 100) Nothing
+
+checkForFight :: GameState -> Word32 -> GameState
+checkForFight gs t = gs
+  -- | fromIntegral t > nextFight gs = setupFight gs t
+  -- | otherwise = gs
+

Logics.hs

@@ -3,59 +3,15 @@ module Logics where
 import Graphics.UI.SDL as SDL
 
 import Data.Word
-import Data.Tiled
 import Data.Maybe
+import Data.Tiled
 
 import Model
 import Animation
+import LogicWalking
 
 import System.Random
 
-setUpNextFight :: GameState -> Int -> GameState
-setUpNextFight gs t = gs {rng = rng', nextFight = nextFight'}
-  where (val, rng') = next $ rng gs
-        nextFight' = val `mod` 1000 + t + 2000
-
-nextPlayerPos :: Player -> Word32 -> Position
-nextPlayerPos player dt
-  | speed player == Slow  && moveDirection player == Model.Right = Position (x0 + slowSpeed*(fromIntegral dt)) y0
-  | speed player == Slow  && moveDirection player == Model.Left = Position (x0 - slowSpeed*(fromIntegral dt)) y0
-  | speed player == Slow  && moveDirection player == Model.Up = Position x0 (y0 - slowSpeed*(fromIntegral dt))
-  | speed player == Slow  && moveDirection player == Model.Down = Position x0 (y0 + slowSpeed*(fromIntegral dt))
-  | otherwise = playerPos player
-    where x0 = xVal $ playerPos player
-          y0 = yVal $ playerPos player
-          slowSpeed = 0.2
-
-updatePlayer :: Player -> Word32 -> Word32 ->  Player
-updatePlayer player t dt = player { animation = animation', playerPos = playerPos' }
-  where animation' = (head  (updateAnimations  [animation player] t)) { animPos = playerPos player}
-        playerPos' = nextPlayerPos player dt
-
-posDiff :: Float -> Float -> Float -> Float -> Float
-posDiff minval maxval a b
-  | (b-a) < minval = b - minval
-  | (b-a) > maxval = b - maxval
-  | otherwise = a
-
-updateCamera :: Position -> Position -> Float -> Float -> Position
-updateCamera cameraPos playerPos xdim ydim = Position (min (32*xdim-800)  (max 0 xpos)) (min (32*ydim-600) (max 0 ypos))
-  where xpos = posDiff 200 600 (xVal cameraPos) (xVal playerPos)
-        ypos = posDiff 200 400 (yVal cameraPos) (yVal playerPos)
-
-setupFight :: GameState -> Word32 -> GameState
-setupFight gs t = gs { enemies = enemies' , gameMode = Model.Fight} -- create enemies here
-  where enemies' = genEnemies gs
-
-genEnemies :: GameState ->  [Enemy]
-genEnemies gs = [Enemy "Rat 1" Model.Rat 10 10 1 1 1 animation (Position 10 10)]
-  where animation = Animation (ratSprite $ gx gs) 80 80 2 250 (t gs) 0 (Position 100 100) Nothing
-
-checkForFight :: GameState -> Word32 -> GameState
-checkForFight gs t
-  | fromIntegral t > nextFight gs = setupFight gs t
-  | otherwise = gs
-
 performFightActions :: GameState -> [String] -> Word32 -> IO(GameState)
 performFightActions gs [] _ = return (gs)
 performFightActions gs ("Attack":xs) t = do

Model.hs

@@ -65,10 +65,12 @@ data GameState = GameState{
   nextFight :: Int,
   gx :: Graphics,
   menu :: Menu,
+  hasMenu :: Bool,
   fnt :: Font,
   actions :: [String],
   enemies :: [Enemy],
-  t :: Word32
+  t :: Word32,
+  agents :: [Agent]
 }
 
 data Animation = Animation {
@@ -89,3 +91,9 @@ data Player = Player {
   playerPos :: Position,
   animation :: Animation
 }
+
+data Agent = Agent {
+  agentName :: String,
+  agentPos :: Position,
+  agentImage :: Surface
+}

image/Treasure.png

@@ -10,7 +10,8 @@ import Animation
 import Draw
 import Event
 import Logics
---import MapLoader
+import LogicWalking
+import Agents
 
 import System.Random
 
@@ -45,7 +46,8 @@ main = do
   let player = Player Down Stop (Position 300 300) (Animation sheet 26 70 4 250 t0 0 (Position 0 0) Nothing)
   let gx = Graphics tileSurface fightbg menubg menumarker enemyfire explosion sheet hitSprite ratSprite
   let menu = Menu "Fight" 0 ["Attack", "Run"] (Position 0 340)
-  let gs = (GameState True [] t0 player tiledMap (Position 32 32) Model.Walking rng 0 gx menu fnt [] [] t0)
+  agents <- initAgents
+  let gs = (GameState True [] t0 player tiledMap (Position 32 32) Model.Walking rng 0 gx menu False fnt [] [] t0 agents)
   let gs' = setUpNextFight gs ( fromIntegral (t0+1000) )
 
   gameLoop gs' t0
@@ -58,7 +60,7 @@ gameLoop gs lastTick = do
 
   gs' <- updateGamestate (gameMode gs) (handleEvents events gs) t (t - lastTick)
 
-  drawGamestate gs'
+  drawGamestate gs' (gameMode gs')
 
   if gameActive gs'
     then gameLoop gs'{t = t} t