Fix up imports

PPKFS · Dec 31, 2024 · 4e16e96 · 4e16e96
1 parent 607163c
commit 4e16e96
Show file tree

Hide file tree

Showing 62 changed files with 219 additions and 216 deletions.
diff --git a/yaifl-city/src/Yaifl/Gen/City/ApartmentTower.hs b/yaifl-city/src/Yaifl/Gen/City/ApartmentTower.hs
@@ -12,7 +12,6 @@ import Yaifl.Model.Kinds.Direction
 import Yaifl.Game.Create.RoomConnection
 import Yaifl.Gen.City.Building
 import Yaifl.Text.DynamicText
-import Yaifl.Model.Kinds
 import Yaifl.Core.Entity
 import Yaifl.Model.Rules
 import System.Random.Stateful

diff --git a/yaifl-city/src/Yaifl/Gen/City/Building.hs b/yaifl-city/src/Yaifl/Gen/City/Building.hs
@@ -9,7 +9,6 @@ import Yaifl.Prelude
 import Yaifl.Core.Entity
 import Yaifl.Model.Kinds.Region
 import Yaifl.Model.WorldModel
-import Yaifl.Model.Kinds
 import Yaifl.Core.Effects
 import Yaifl.Model.Rules.RuleEffects
 import Yaifl.Core.HasProperty

diff --git a/yaifl/src/Yaifl.hs b/yaifl/src/Yaifl.hs
@@ -42,7 +42,6 @@ import Yaifl.Game.ObjectSpecifics
 import Yaifl.Model.Kinds.Container
 import Yaifl.Model.Kinds.Door
 import Yaifl.Core.Kinds.Enclosing
-import Yaifl.Core.HasProperty
 import Yaifl.Model.Kinds.Openable
 import Yaifl.Model.WorldModel
 import Yaifl.Model.Rules.RuleEffects
@@ -62,7 +61,6 @@ import Yaifl.Game.EffectHandlers
 import Yaifl.Text.DynamicText
 import Yaifl.Game.Actions.Collection
 import Breadcrumbs
-import Yaifl.Model.Query (failHorriblyIfMissing)
 import Yaifl.Game.Actions.Examining
 import Yaifl.Core.Store
 import Yaifl.Game.Actions.Closing
@@ -87,6 +85,7 @@ import Yaifl.Game.Actions.Exiting (exitingAction)
 import Yaifl.Game.Actions.GettingOff (gettingOffAction)
 import Yaifl.Game.Accessibility
 import Yaifl.Model.Kinds.Person
+import Yaifl.Core.Effects
 
 type PlainWorldModel = 'WorldModel ObjectSpecifics Direction () () ActivityCollection ResponseCollection DynamicText
 
@@ -317,6 +316,7 @@ addOutOfWorld cs e = forM_ cs $ \c ->
 
 runTurnsFromBuffer ::
   RuleEffects wm es
+  => SayableValue (WMText wm) wm
   => State (WorldActions wm) :> es
   => Eff es ()
 runTurnsFromBuffer = do
@@ -326,6 +326,7 @@ runTurnsFromBuffer = do
 runTurn ::
   forall wm es.
   State (WorldActions wm) :> es
+  => SayableValue (WMText wm) wm
   => RuleEffects wm es
   => Eff es ()
 runTurn = do

diff --git a/yaifl/src/Yaifl/Core/Kinds/AnyObject.hs b/yaifl/src/Yaifl/Core/Kinds/AnyObject.hs
@@ -7,6 +7,7 @@ module Yaifl.Core.Kinds.AnyObject
   , TaggedAnyEnclosing
   , EnclosingThing
   , asThingOrRoom
+  , unwrapAny
   ) where
 
 import Yaifl.Prelude

diff --git a/yaifl/src/Yaifl/Core/Query/Enclosing.hs b/yaifl/src/Yaifl/Core/Query/Enclosing.hs
@@ -10,18 +10,15 @@ module Yaifl.Core.Query.Enclosing
   , IsEnclosingObject(..)
   , IsEnclosing(..)
   , getEnclosingObject
-  , getDescribableContents
   , enclosingContains
   , getCommonAncestor
   , getLocation
   ) where
 
 import Yaifl.Prelude
-import Breadcrumbs
 
 import Data.List.NonEmpty as NE (cons)
 
-import Yaifl.Core.Metadata
 import Yaifl.Core.Kinds.Object
 import Yaifl.Core.Effects
 import Yaifl.Core.Entity
@@ -32,12 +29,7 @@ import Yaifl.Core.Kinds.AnyObject
 import Yaifl.Core.Tag
 
 import qualified Data.EnumSet as ES
-import qualified Data.Set as S
-import Yaifl.Model.Kinds.Region
-import Yaifl.Core.HasProperty
 import Yaifl.Core.Kinds.Enclosing
-import Effectful.Error.Static (Error, throwError)
-import Yaifl.Core.Refreshable
 import Yaifl.Model.WorldModel
 import Yaifl.Model.Query
 
@@ -57,15 +49,16 @@ getLocation t = do
 
 getAllObjectsInRoom ::
   RoomLike wm o
+  => WMWithProperty wm Enclosing
   => NoMissingObjects wm es
   => IncludeScenery
   -> IncludeDoors
   -> RecurseAllObjects
   -> o
   -> Eff es [Thing wm]
 getAllObjectsInRoom incScenery incDoors recurse r = do
-  r <- getRoom r
-  getAllObjectsInEnclosing incScenery incDoors recurse (tagRoomEntity r)
+  r' <- getRoom r
+  getAllObjectsInEnclosing incScenery incDoors recurse (coerceTag $ tagRoomEntity r')
 
 getAllObjectsInEnclosing ::
   NoMissingObjects wm es
@@ -75,7 +68,7 @@ getAllObjectsInEnclosing ::
   -> RecurseAllObjects
   -> EnclosingEntity
   -> Eff es [Thing wm]
-getAllObjectsInEnclosing incScenery incDoors _recurse r = do
+getAllObjectsInEnclosing incScenery incDoors recurse r = do
   e <- getEnclosingObject r
   let e' = getEnclosing e
   let allItemIDs = ES.toList $ e' ^. #contents
@@ -84,7 +77,7 @@ getAllObjectsInEnclosing incScenery incDoors _recurse r = do
   recursedThings <- mconcat <$> mapM (\t -> do
     let mbE = getEnclosingMaybe (toAny t)
     case mbE of
-      Just enc' -> getAllObjectsInEnclosing incScenery incDoors (tagEntity enc' t)
+      Just enc' -> getAllObjectsInEnclosing incScenery incDoors recurse (tagEntity enc' t)
       Nothing -> return []) things
   enclosingItself <- getThingMaybe r
   return $ ordNub (maybeToList enclosingItself <> things <> recursedThings)

diff --git a/yaifl/src/Yaifl/Core/Query/Region.hs b/yaifl/src/Yaifl/Core/Query/Region.hs
@@ -2,30 +2,17 @@ module Yaifl.Core.Query.Region
   ( areInRegion
   , isInRegion
   , isSubregionOf
-
+  , modifyRegion
+  , roomsInRegion
   ) where
 
 import Yaifl.Prelude
-import Breadcrumbs
 
-import Yaifl.Core.Metadata
-import Yaifl.Core.Kinds.Object
 import Yaifl.Core.Effects
 import Yaifl.Core.Entity
-import Yaifl.Core.ObjectLike
-import Yaifl.Core.Kinds.Thing
-import Yaifl.Core.Kinds.Room
-import Yaifl.Core.Kinds.AnyObject
-import Yaifl.Core.Tag
 
-import qualified Data.EnumSet as ES
 import qualified Data.Set as S
 import Yaifl.Model.Kinds.Region
-import Yaifl.Core.HasProperty
-import Yaifl.Core.Kinds.Enclosing
-import Effectful.Error.Static (Error, throwError)
-import Yaifl.Core.Refreshable
-import Yaifl.Model.WorldModel
 
 
 areInRegion ::
@@ -43,3 +30,29 @@ isInRegion ::
   -> Eff es ()
 isInRegion r reg = do
   modifyRegion reg (#rooms %~ S.insert r)
+
+modifyRegion ::
+  NoMissingObjects wm es
+  => RegionEntity
+  -> (Region wm -> Region wm)
+  -> Eff es ()
+modifyRegion o u = do
+  r <- lookupRegion o
+  whenRight_ r $ \r' -> setRegion (u r')
+
+isSubregionOf ::
+  NoMissingObjects wm es
+  => RegionEntity
+  -> RegionEntity
+  -> Eff es ()
+isSubregionOf subReg reg = do
+  modifyRegion reg (#subRegions %~ S.insert subReg)
+
+roomsInRegion ::
+  NoMissingObjects wm es
+  => Region wm
+  -> Eff es (S.Set RoomEntity)
+roomsInRegion r = do
+  subRegs <- rights <$> mapM lookupRegion (S.toList $ subRegions r)
+  rs <- mapM roomsInRegion subRegs
+  pure $ S.unions $ rooms r : rs
diff --git a/yaifl/src/Yaifl/Game/Accessibility.hs b/yaifl/src/Yaifl/Game/Accessibility.hs
@@ -7,16 +7,16 @@ module Yaifl.Game.Accessibility
 import Yaifl.Prelude
 
 import Yaifl.Model.Actions.Args
-import Yaifl.Core.Effects
-import Yaifl.Core.HasProperty ( WMWithProperty )
-import Yaifl.Model.Query ( getContainingHierarchy, getCommonAncestor, getThingMaybe )
+import Yaifl.Model.WorldModel ( WMWithProperty )
+import Yaifl.Model.Query ( getThingMaybe )
 import Yaifl.Model.Rules.Rulebook
 import Yaifl.Core.Kinds.Thing
-import Yaifl.Model.Kinds (objectEquals)
 import qualified Data.List.NonEmpty as NE
 import Yaifl.Model.Kinds.Container
 import Yaifl.Text.Say
-import Yaifl.Model.Rules (RuleEffects)
+import Yaifl.Model.Rules.RuleEffects
+import Yaifl.Core.Query.Enclosing
+import Yaifl.Core.Kinds.Object
 
 accessibility ::
   WithPrintingNameOfSomething wm
@@ -44,7 +44,7 @@ insideClosedContainers ::
   => RuleEffects wm es
   => WMWithProperty wm Container
   => Args wm (Thing wm) -> Eff es (Maybe Bool)
-insideClosedContainers a@Args{source=s, variables=v}= do
+insideClosedContainers Args{source=s, variables=v}= do
   commonAncestor <- getCommonAncestor s v
   -- this is everything (which should be nonempty) we may ned to reach through
   hier <- NE.takeWhile (/= commonAncestor) <$> getContainingHierarchy v

diff --git a/yaifl/src/Yaifl/Game/ActionProcessing.hs b/yaifl/src/Yaifl/Game/ActionProcessing.hs
@@ -8,15 +8,17 @@ module Yaifl.Game.ActionProcessing
 import Yaifl.Prelude hiding (runReader, Reader)
 
 import Yaifl.Model.Action
-import Yaifl.Model.Query
 import Yaifl.Model.Rules.Rulebook
 import Yaifl.Model.Rules.Run
 import Effectful.Reader.Static
 import Breadcrumbs
 import Yaifl.Model.Actions.Args
+import Yaifl.Core.Effects
+import Yaifl.Text.Say
+import Yaifl.Model.WorldModel
 
 
-actionProcessingRules :: forall wm. ActionProcessing wm
+actionProcessingRules :: forall wm. SayableValue (WMText wm) wm => ActionProcessing wm
 actionProcessingRules = ActionProcessing $ \aSpan a@((Action{..}) :: Action wm resp goesWith v) u -> do
   wa <- get @(WorldActions wm)
   runReader a $ failHorriblyIfMissing (runRulebook @wm @_ @_ @_ @((:>) (Reader (Action wm resp goesWith v))) (Just aSpan) False (Rulebook @wm

diff --git a/yaifl/src/Yaifl/Game/Actions/Closing.hs b/yaifl/src/Yaifl/Game/Actions/Closing.hs
@@ -4,14 +4,14 @@ module Yaifl.Game.Actions.Closing where
 import Yaifl.Model.Action
 import Yaifl.Prelude
 import Yaifl.Model.Actions.Args
-import Yaifl.Core.HasProperty
 import Yaifl.Model.Kinds.Openable
 import Yaifl.Model.Rules.Rulebook
 import Yaifl.Text.Responses
 import Yaifl.Core.Metadata
 import Yaifl.Text.SayQQ
 import Yaifl.Text.Say
 import Yaifl.Core.Kinds.Thing
+import Yaifl.Model.WorldModel
 
 data ClosingResponses = ReportClosingResponseA
 {- data ClosingResponses wm = OR
@@ -50,7 +50,7 @@ standardClose = makeRule "standard closing rule" [] $ \Args{variables=thing} ->
   closeIt thing
   rulePass
 
-standardReport :: ActionRule wm (ClosingAction wm) (Thing wm)
+standardReport :: SayableValue (WMText wm) wm => ActionRule wm (ClosingAction wm) (Thing wm)
 standardReport = makeRule "standard report closing rule" [] $ \args -> do
   -- if the actor is the player:
   pl <- isPlayer (source args)

diff --git a/yaifl/src/Yaifl/Game/Actions/Entering.hs b/yaifl/src/Yaifl/Game/Actions/Entering.hs
@@ -6,8 +6,6 @@ import Yaifl.Prelude
 import Yaifl.Model.Actions.Args
 import Yaifl.Model.Rules.Rulebook
 import Yaifl.Text.Say
-import Yaifl.Model.Kinds
-import Yaifl.Core.HasProperty
 import Yaifl.Core.Kinds.Enclosing
 import Yaifl.Game.Move
 import Yaifl.Model.Kinds.Container
@@ -22,6 +20,12 @@ import Yaifl.Model.Activity
 import Yaifl.Core.Store
 import Yaifl.Game.Actions.Looking.Locale
 import Yaifl.Game.Activities.PrintingTheLocaleDescription (WithPrintingTheLocaleDescription)
+import Yaifl.Model.WorldModel
+import Yaifl.Core.ObjectLike
+import Yaifl.Core.Kinds.Thing
+import Yaifl.Core.Refreshable
+import Yaifl.Core.Kinds.Object
+import Yaifl.Core.Query.Enclosing
 
 data EnteringResponses wm
 

diff --git a/yaifl/src/Yaifl/Game/Actions/Examining.hs b/yaifl/src/Yaifl/Game/Actions/Examining.hs
@@ -5,10 +5,7 @@ import Yaifl.Prelude
 
 import Yaifl.Model.Action
 import Yaifl.Model.Actions.Args
-import Yaifl.Core.HasProperty (WMWithProperty)
-import Yaifl.Model.Kinds
 import Yaifl.Model.Kinds.Container
-import Yaifl.Model.Query
 import Yaifl.Model.Rules.Rulebook
 import Yaifl.Model.WorldModel
 
@@ -18,6 +15,14 @@ import Yaifl.Text.Responses
 import Yaifl.Text.Say
 import Yaifl.Core.Tag
 import Yaifl.Model.Kinds.Supporter
+import Yaifl.Core.Kinds.Thing
+import Yaifl.Core.Refreshable
+import Yaifl.Core.Query.Enclosing
+import Yaifl.Core.Effects
+import Yaifl.Core.Kinds.Enclosing
+import Yaifl.Core.ObjectLike
+import qualified Data.EnumSet as ES
+import Yaifl.Core.Kinds.Object
 
 data ExaminingResponses =
   ExamineDirectionA
@@ -99,7 +104,7 @@ type ExamineRule wm = ActionRule wm (ExaminingAction wm) (ExaminingActionVariabl
 actionRequiresLight :: ExamineRule wm
 actionRequiresLight = notImplementedRule "action requires light"
 
-examineUndescribed :: ExamineRule wm
+examineUndescribed :: SayableValue (WMText wm) wm => ExamineRule wm
 examineUndescribed = makeRule "examine undescribed things rule" forPlayer' $ \a@Args{..} -> do
   -- if examine text printed is false:
   -- say "[We] [see] nothing special about [the noun]." (A).
@@ -186,3 +191,16 @@ standardExamining = Rule "standard examining rule" forPlayer' $ \a@Args{..} -> d
 
 reportOtherPeopleExamining :: ExamineRule wm
 reportOtherPeopleExamining = notImplementedRule "report others examining rule"
+
+getDescribableContents ::
+  NoMissingObjects wm es
+  => Enclosing
+  -> Eff es [Thing wm]
+getDescribableContents e = do
+  p <- getPlayer'
+  catMaybes <$> mapM (\i -> do
+    item <- getThing i
+    if thingIsScenery item || p `objectEquals` i {- || todo: falsely unoccupied -}
+    then pure Nothing
+    else pure (Just item)
+    ) (ES.toList $ view #contents e)
diff --git a/yaifl/src/Yaifl/Game/Actions/Exiting.hs b/yaifl/src/Yaifl/Game/Actions/Exiting.hs
@@ -6,18 +6,19 @@ import Yaifl.Prelude
 import Yaifl.Model.Actions.Args
 import Yaifl.Model.Rules.Rulebook
 import Yaifl.Text.Say
-import Yaifl.Model.Kinds
-import Yaifl.Core.HasProperty
 import Yaifl.Core.Kinds.Enclosing
 import Yaifl.Model.Kinds.Container
 import Yaifl.Core.Tag
-import Yaifl.Model.Query
 import Yaifl.Core.Kinds.AnyObject
 import Yaifl.Core.Metadata
 import Yaifl.Model.Kinds.Supporter
 import Breadcrumbs
 import Yaifl.Game.Move
 import Yaifl.Core.Entity
+import Yaifl.Model.WorldModel
+import Yaifl.Core.Kinds.Thing
+import Yaifl.Core.Query.Enclosing
+import Yaifl.Core.ObjectLike
 
 data ExitingResponses wm
 
@@ -89,7 +90,7 @@ standardExiting = makeRule "standard exiting" [] $ \a@Args{variables=v} -> do
 
 describeExited ::
   ExitingRule wm
-describeExited = makeRule "describe contents entered into" forPlayer' $ \a@Args{variables=v} -> do
+describeExited = makeRule "describe contents entered into" forPlayer' $ \a@Args{} -> do
   -- TODO: reckon darkness
   parseAction ((actionOptions a) { silently = True }) [ConstantParameter "going"] "look"
   rulePass