diff --git a/src/NPC.hs b/src/NPC.hs index 7b83763..4396c3d 100644 --- a/src/NPC.hs +++ b/src/NPC.hs @@ -33,7 +33,7 @@ import Object () getPosBounds :: SystemT Entity - (AffectionState (AffectionData UserData) IO) + (AffectionState AffectionData IO) [(V2 Double, Boundaries Double)] getPosBounds = do efor allEnts $ do @@ -47,10 +47,10 @@ getPosBounds = do updateNPCs :: M.Matrix (Maybe ImgId) -> M.Matrix TileState - -> SystemState Entity (AffectionState (AffectionData UserData) IO) + -> SystemState Entity (AffectionState AffectionData IO) -> V.Vector ReachPoint -> Double - -> SystemT Entity (AffectionState (AffectionData UserData) IO) () + -> SystemT Entity (AffectionState AffectionData IO) () updateNPCs imgmat tsmat ws rrp dt = do updateStats dt posbounds <- getPosBounds @@ -263,7 +263,7 @@ standStill imgmat tsmat pos' rot' ws posbounds rp = do updateStats :: Double - -> SystemT Entity (AffectionState (AffectionData UserData) IO) () + -> SystemT Entity (AffectionState AffectionData IO) () updateStats dt = emap allEnts $ do with npcStats