nek0/tracer
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

initial state

Browse source
This commit is contained in:
nek0 2018-08-10 22:45:32 +02:00
parent 56eac65266
commit 2911514578
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/NPC.hs
View file

@ -6,7 +6,7 @@ import Affection as A
import qualified Data.Matrix as M import qualified Data.Matrix as M
import Data.Ecstasy as E import Data.Ecstasy as E
import Data.Maybe (fromMaybe) import Data.Maybe (fromMaybe, fromJust)
import Data.List (find) import Data.List (find)
import Control.Monad.IO.Class (MonadIO(..)) import Control.Monad.IO.Class (MonadIO(..))
@ -83,7 +83,7 @@ updateNPCs imgmat rp dt = do
return (e, pos', rot', mdir) return (e, pos', rot', mdir)
mapM_ (\(e, pos', rot', mdir) -> do mapM_ (\(e, pos', rot', mdir) -> do
accessibles <- getObjects pos' accessibles <- getObjects pos'
moent <- eover (anEnt e) $ do moent <- runQueryT e $ do
npcState' <- query npcMoveState npcState' <- query npcMoveState
case npcState' of case npcState' of
NPCStanding ttl future -> do NPCStanding ttl future -> do
@ -165,21 +165,24 @@ updateNPCs imgmat rp dt = do
} }
} }
}) })
mapM_ (\smoent -> maybe (return()) (\(oent, npcent) -> do (\(_, ent) ->
[(t, s)] <- efor (anEnt oent) $ do setEntity e ent
) (fromJust moent)
maybe (return()) (\(oent, npcent) -> do
Just (t, s) <- runQueryT oent $ do
with objType with objType
with objState with objState
otyp <- query objType otyp <- query objType
ostat <- query objState ostat <- query objState
return (otyp, ostat) return (otyp, ostat)
setEntity oent =<< objectTransition t s False oent setEntity oent =<< objectTransition t s False oent
[(nt, ns)] <- efor (anEnt oent) $ do Just (nt, ns) <- runQueryT oent $ do
with objType with objType
with objState with objState
otyp <- query objType otyp <- query objType
ostat <- query objState ostat <- query objState
return (otyp, ostat) return (otyp, ostat)
emap (anEnt npcent) $ do Just npc <- runQueryT npcent $ do
let ttl = actionTime nt ns let ttl = actionTime nt ns
future <- liftIO $ newEmptyMVar future <- liftIO $ newEmptyMVar
_ <- liftIO $ forkIO $ _ <- liftIO $ forkIO $
@ -188,7 +191,8 @@ updateNPCs imgmat rp dt = do
{ npcMoveState = Set $ NPCStanding ttl future { npcMoveState = Set $ NPCStanding ttl future
, vel = Set $ V2 0 0 , vel = Set $ V2 0 0
} }
) smoent) moent setEntity npcent npc
) (fromJust (fst <$> moent))
) npcs ) npcs
getObjects npos = do getObjects npos = do

4
src/Object.hs
View file

@ -3,7 +3,7 @@
{-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE FlexibleInstances #-}
module Object where module Object where
import Affection import Affection as A
import Control.Monad (when) import Control.Monad (when)
@ -67,4 +67,4 @@ instance ObjectAction ObjType ObjState where
instance ActionTime ObjType ObjState where instance ActionTime ObjType ObjState where
actionTime ObjCopier "copying" = 5 actionTime ObjCopier "copying" = 5
actionTime o s = error (show o ++ ": " ++ s ++ ": has not time") actionTime o s = A.log Error (show o ++ ": " ++ s ++ ": has not time") 0