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

smaller things

Browse source
This commit is contained in:
nek0 2018-07-06 17:18:12 +02:00
parent 19476e3fbb
commit 4913b054d8
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/MainGame/MindMap.hs
View file

@ -65,7 +65,7 @@ updateMind dt = do
with player with player
with mmvel with mmvel
with mmpos with mmpos
with mmrot with rot
with anim with anim
pos'@(V2 pr pc) <- query mmpos pos'@(V2 pr pc) <- query mmpos
vel' <- query vel vel' <- query vel

3
src/MainGame/WorldMap.hs
View file

@ -95,7 +95,7 @@ loadMapFork ud future progress = do
_ <- liftIO $ swapMVar progress (13 / loadSteps) _ <- liftIO $ swapMVar progress (13 / loadSteps)
logIO A.Debug ("number of reachpoints: " ++ show (length rps)) logIO A.Debug ("number of reachpoints: " ++ show (length rps))
let nnex = Prelude.filter (\p -> pointType p /= RoomExit) rps let nnex = Prelude.filter (\p -> pointType p /= RoomExit) rps
npcposs <- placeNPCs inter mat rps 50 -- (length nnex) npcposs <- placeNPCs inter mat rps 75 -- (length nnex)
_ <- liftIO $ swapMVar progress (14 / loadSteps) _ <- liftIO $ swapMVar progress (14 / loadSteps)
A.logIO A.Debug $ "number of placed NPCs: " ++ show (length npcposs) A.logIO A.Debug $ "number of placed NPCs: " ++ show (length npcposs)
(mmintmat, mmgraph) <- buildFloorMap . springField <$> (mmintmat, mmgraph) <- buildFloorMap . springField <$>
@ -123,7 +123,6 @@ loadMapFork ud future progress = do
, mmvel = Just (V2 0 0) , mmvel = Just (V2 0 0)
, player = Just () , player = Just ()
, rot = Just SE , rot = Just SE
, mmrot = Just SE
, anim = Just $ AnimState (AnimId 0 "standing" SE) 0 0 , anim = Just $ AnimState (AnimId 0 "standing" SE) 0 0
} }
void $ liftIO $ swapMVar progress (17 / loadSteps) void $ liftIO $ swapMVar progress (17 / loadSteps)

2
src/Types/UserData.hs
View file

@ -56,11 +56,11 @@ data Entity f = Entity
, mmvel :: Component f 'Field (V2 Double) , mmvel :: Component f 'Field (V2 Double)
, velFact :: Component f 'Field Double , velFact :: Component f 'Field Double
, rot :: Component f 'Field Direction , rot :: Component f 'Field Direction
, mmrot :: Component f 'Field Direction
, obstacle :: Component f 'Field (Boundaries Double) , obstacle :: Component f 'Field (Boundaries Double)
, player :: Component f 'Unique () , player :: Component f 'Unique ()
, npcMoveState :: Component f 'Field NPCMoveState , npcMoveState :: Component f 'Field NPCMoveState
, anim :: Component f 'Field AnimState , anim :: Component f 'Field AnimState
, objAccess :: Component f 'Field (V2 Int)
} }
deriving (Generic) deriving (Generic)