diff --git a/src/MainGame/MindMap.hs b/src/MainGame/MindMap.hs index c417085..fbe215c 100644 --- a/src/MainGame/MindMap.hs +++ b/src/MainGame/MindMap.hs @@ -65,7 +65,7 @@ updateMind dt = do with player with mmvel with mmpos - with mmrot + with rot with anim pos'@(V2 pr pc) <- query mmpos vel' <- query vel diff --git a/src/MainGame/WorldMap.hs b/src/MainGame/WorldMap.hs index f9216df..f66649d 100644 --- a/src/MainGame/WorldMap.hs +++ b/src/MainGame/WorldMap.hs @@ -95,7 +95,7 @@ loadMapFork ud future progress = do _ <- liftIO $ swapMVar progress (13 / loadSteps) logIO A.Debug ("number of reachpoints: " ++ show (length 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) A.logIO A.Debug $ "number of placed NPCs: " ++ show (length npcposs) (mmintmat, mmgraph) <- buildFloorMap . springField <$> @@ -123,7 +123,6 @@ loadMapFork ud future progress = do , mmvel = Just (V2 0 0) , player = Just () , rot = Just SE - , mmrot = Just SE , anim = Just $ AnimState (AnimId 0 "standing" SE) 0 0 } void $ liftIO $ swapMVar progress (17 / loadSteps) diff --git a/src/Types/UserData.hs b/src/Types/UserData.hs index ecb150f..9be31f3 100644 --- a/src/Types/UserData.hs +++ b/src/Types/UserData.hs @@ -56,11 +56,11 @@ data Entity f = Entity , mmvel :: Component f 'Field (V2 Double) , velFact :: Component f 'Field Double , rot :: Component f 'Field Direction - , mmrot :: Component f 'Field Direction , obstacle :: Component f 'Field (Boundaries Double) , player :: Component f 'Unique () , npcMoveState :: Component f 'Field NPCMoveState , anim :: Component f 'Field AnimState + , objAccess :: Component f 'Field (V2 Int) } deriving (Generic)