Merge branch 'breaking-out-frames'

benpollarduk · Nov 12, 2024 · 5b7a202 · 5b7a202
2 parents 9a47af2 + 6b039a7
commit 5b7a202
Show file tree

Hide file tree

Showing 89 changed files with 534 additions and 452 deletions.
diff --git a/.nuget/README.md b/.nuget/README.md
@@ -138,7 +138,7 @@ var gameCreator = Game.Create(
     "Dave awakes to find himself in a cavern...",
     AssetGenerator.Retained(overworldMaker.Make(), player),
     GameEndConditions.NoEnd,
-    GameConfiguration.Default);
+    ConsoleGameConfiguration.Default);
 
 // begin the execution of the game
 Game.Execute(gameCreator);

diff --git a/NetAF.Examples/Program.cs b/NetAF.Examples/Program.cs
@@ -115,14 +115,14 @@ static Overworld overworldCreator()
                 }
 
                 var about = "This is a short demo of NetAF made up from test chunks of games that were build to test different features during development.";
-                var creator = Game.Create(new("NetAF Demo", about, "NetAF"), about, AssetGenerator.Custom(overworldCreator, new Player().Instantiate), new GameEndConditions(DetermineIfGameHasCompleted, DetermineIfGameOver), GameConfiguration.Default);
+                var creator = Game.Create(new("NetAF Demo", about, "NetAF"), about, AssetGenerator.Custom(overworldCreator, new Player().Instantiate), new GameEndConditions(DetermineIfGameHasCompleted, DetermineIfGameOver), ConsoleGameConfiguration.Default);
 
                 Game.Execute(creator);
             }
             catch (Exception e)
             {
-                Console.WriteLine($"Exception caught running demo: {e.Message}");
-                Console.ReadKey();
+                System.Console.WriteLine($"Exception caught running demo: {e.Message}");
+                System.Console.ReadKey();
             }
         }
     }

diff --git a/NetAF.Tests/Assets/ExaminationRequest_Tests.cs b/NetAF.Tests/Assets/ExaminationRequest_Tests.cs
@@ -18,7 +18,7 @@ public void GivenCreate_WhenGameSpecified_ThenExaminerSetFromPlayer()
             var overworld = new Overworld(string.Empty, string.Empty);
             region.AddRoom(room, 0, 0, 0);
             overworld.AddRegion(region);
-            var gameCreator = Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(overworld, player), GameEndConditions.NoEnd, GameConfiguration.Default);
+            var gameCreator = Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(overworld, player), GameEndConditions.NoEnd, ConsoleGameConfiguration.Default);
 
             var result = new ExaminationRequest(player, gameCreator());
 
@@ -34,7 +34,7 @@ public void GivenCreate_WhenGameSpecified_ThenRoomSetFromPlayer()
             var overworld = new Overworld(string.Empty, string.Empty);
             region.AddRoom(room, 0, 0, 0);
             overworld.AddRegion(region);
-            var gameCreator = Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(overworld, player), GameEndConditions.NoEnd, GameConfiguration.Default);
+            var gameCreator = Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(overworld, player), GameEndConditions.NoEnd, ConsoleGameConfiguration.Default);
 
             var result = new ExaminationRequest(player, gameCreator());
 

diff --git a/NetAF.Tests/Commands/Conversation/End_Tests.cs b/NetAF.Tests/Commands/Conversation/End_Tests.cs
@@ -21,7 +21,7 @@ public void GivenNullGame_WhenInvoke_ThenError()
         [TestMethod]
         public void GivenValidGame_WhenInvoke_ThenOK()
         {
-            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), null, GameConfiguration.Default).Invoke();
+            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), null, ConsoleGameConfiguration.Default).Invoke();
             var command = new End();
 
             var result = command.Invoke(game);

diff --git a/NetAF.Tests/Commands/Conversation/Next_Tests.cs b/NetAF.Tests/Commands/Conversation/Next_Tests.cs
@@ -23,7 +23,7 @@ public void GivenNullGame_WhenInvoke_ThenError()
         [TestMethod]
         public void GivenNoConverser_WhenInvoke_ThenError()
         {
-            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), GameEndConditions.NoEnd, GameConfiguration.Default).Invoke();
+            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), GameEndConditions.NoEnd, ConsoleGameConfiguration.Default).Invoke();
             var command = new Next();
 
             var result = command.Invoke(game);
@@ -34,7 +34,7 @@ public void GivenNoConverser_WhenInvoke_ThenError()
         [TestMethod]
         public void GivenValidGameAndConverser_WhenInvoke_ThenInternal()
         {
-            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), GameEndConditions.NoEnd, GameConfiguration.Default).Invoke();
+            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), GameEndConditions.NoEnd, ConsoleGameConfiguration.Default).Invoke();
             var converser = new NonPlayableCharacter(string.Empty, string.Empty, conversation: new(new Paragraph(string.Empty)));
             game.StartConversation(converser);
             var command = new Next();

diff --git a/NetAF.Tests/Commands/Conversation/Respond_Tests.cs b/NetAF.Tests/Commands/Conversation/Respond_Tests.cs
@@ -23,7 +23,7 @@ public void GivenNullGame_WhenInvoke_ThenError()
         [TestMethod]
         public void GivenNullResponse_WhenInvoke_ThenError()
         {
-            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), GameEndConditions.NoEnd, GameConfiguration.Default).Invoke();
+            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), GameEndConditions.NoEnd, ConsoleGameConfiguration.Default).Invoke();
             var command = new Respond(null);
 
             var result = command.Invoke(game);
@@ -34,7 +34,7 @@ public void GivenNullResponse_WhenInvoke_ThenError()
         [TestMethod]
         public void GivenNoConverser_WhenInvoke_ThenError()
         {
-            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), GameEndConditions.NoEnd, GameConfiguration.Default).Invoke();
+            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), GameEndConditions.NoEnd, ConsoleGameConfiguration.Default).Invoke();
             var response = new Response("");
             var command = new Respond(response);
 
@@ -46,7 +46,7 @@ public void GivenNoConverser_WhenInvoke_ThenError()
         [TestMethod]
         public void GivenValidGame_WhenInvoke_ThenInternal()
         {
-            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), GameEndConditions.NoEnd, GameConfiguration.Default).Invoke();
+            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), GameEndConditions.NoEnd, ConsoleGameConfiguration.Default).Invoke();
             var response = new Response("");
             var paragraph = new Paragraph(string.Empty) { Responses = [response] };
             var conversation = new NetAF.Conversations.Conversation(paragraph);

diff --git a/NetAF.Tests/Commands/Frame/CommandsOff_Tests.cs b/NetAF.Tests/Commands/Frame/CommandsOff_Tests.cs
@@ -21,7 +21,7 @@ public void GivenNullGame_WhenInvoke_ThenError()
         [TestMethod]
         public void GivenValidGame_WhenInvoke_ThenOK()
         {
-            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), GameEndConditions.NoEnd, GameConfiguration.Default).Invoke();
+            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), GameEndConditions.NoEnd, ConsoleGameConfiguration.Default).Invoke();
             var command = new CommandsOff();
 
             var result = command.Invoke(game);

diff --git a/NetAF.Tests/Commands/Frame/CommandsOn_Tests.cs b/NetAF.Tests/Commands/Frame/CommandsOn_Tests.cs
@@ -21,7 +21,7 @@ public void GivenNullGame_WhenInvoke_ThenError()
         [TestMethod]
         public void GivenValidGame_WhenInvoke_ThenOK()
         {
-            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), GameEndConditions.NoEnd, GameConfiguration.Default).Invoke();
+            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), GameEndConditions.NoEnd, ConsoleGameConfiguration.Default).Invoke();
             var command = new CommandsOn();
 
             var result = command.Invoke(game);

diff --git a/NetAF.Tests/Commands/Frame/KeyOff_Tests.cs b/NetAF.Tests/Commands/Frame/KeyOff_Tests.cs
@@ -21,7 +21,7 @@ public void GivenNullGame_WhenInvoke_ThenError()
         [TestMethod]
         public void GivenValidGame_WhenInvoke_ThenOK()
         {
-            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), GameEndConditions.NoEnd, GameConfiguration.Default).Invoke();
+            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), GameEndConditions.NoEnd, ConsoleGameConfiguration.Default).Invoke();
             var command = new KeyOff();
 
             var result = command.Invoke(game);

diff --git a/NetAF.Tests/Commands/Frame/KeyOn_Tests.cs b/NetAF.Tests/Commands/Frame/KeyOn_Tests.cs
@@ -21,7 +21,7 @@ public void GivenNullGame_WhenInvoke_ThenError()
         [TestMethod]
         public void GivenValidGame_WhenInvoke_ThenOK()
         {
-            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), GameEndConditions.NoEnd, GameConfiguration.Default).Invoke();
+            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), GameEndConditions.NoEnd, ConsoleGameConfiguration.Default).Invoke();
             var command = new KeyOn();
 
             var result = command.Invoke(game);

diff --git a/NetAF.Tests/Commands/Game/Drop_Tests.cs b/NetAF.Tests/Commands/Game/Drop_Tests.cs
@@ -14,7 +14,7 @@ public class Drop_Tests
         [TestMethod]
         public void GivenNoCharacter_WhenInvoke_ThenError()
         {
-            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), GameEndConditions.NoEnd, GameConfiguration.Default).Invoke();
+            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), GameEndConditions.NoEnd, ConsoleGameConfiguration.Default).Invoke();
             var command = new Drop(null);
 
             var result = command.Invoke(game);
@@ -26,7 +26,7 @@ public void GivenNoCharacter_WhenInvoke_ThenError()
         public void GivenNoItem_WhenInvoke_ThenError()
         {
             var character = new PlayableCharacter(Identifier.Empty, Description.Empty);
-            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, character), GameEndConditions.NoEnd, GameConfiguration.Default).Invoke();
+            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, character), GameEndConditions.NoEnd, ConsoleGameConfiguration.Default).Invoke();
             var command = new Drop(null);
 
             var result = command.Invoke(game);
@@ -44,7 +44,7 @@ public void GivenPlayerDoesNotHaveItem_WhenInvoke_ThenError()
             overworld.AddRegion(region);
             var character = new PlayableCharacter(Identifier.Empty, Description.Empty);
             var item = new Item(new Identifier("A"), Description.Empty, true);
-            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, character), GameEndConditions.NoEnd, GameConfiguration.Default).Invoke();
+            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, character), GameEndConditions.NoEnd, ConsoleGameConfiguration.Default).Invoke();
             var command = new Drop(item);
 
             var result = command.Invoke(game);
@@ -63,7 +63,7 @@ public void GivenItemIsDroppable_WhenInvoke_ThenOK()
             var character = new PlayableCharacter(Identifier.Empty, Description.Empty);
             var item = new Item(new Identifier("A"), Description.Empty, true);
             character.AddItem(item);
-            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(overworld, character), GameEndConditions.NoEnd, GameConfiguration.Default).Invoke();
+            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(overworld, character), GameEndConditions.NoEnd, ConsoleGameConfiguration.Default).Invoke();
             var command = new Drop(item);
 
             var result = command.Invoke(game);

diff --git a/NetAF.Tests/Commands/Game/Examine_Tests.cs b/NetAF.Tests/Commands/Game/Examine_Tests.cs
@@ -23,7 +23,7 @@ public void GivenNothingToExamine_WhenInvoke_ThenError()
         [TestMethod]
         public void GivenSomethingToExamine_WhenInvoke_ThenOK()
         {
-            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), GameEndConditions.NoEnd, GameConfiguration.Default).Invoke();
+            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(null, null), GameEndConditions.NoEnd, ConsoleGameConfiguration.Default).Invoke();
             var region = new Region(Identifier.Empty, Description.Empty);
             var command = new Examine(region);
 

diff --git a/NetAF.Tests/Commands/Game/Move_Tests.cs b/NetAF.Tests/Commands/Game/Move_Tests.cs
@@ -18,7 +18,7 @@ public void GivenCantMove_WhenInvoke_ThenError()
             region.AddRoom(new Room(Identifier.Empty, Description.Empty, [new Exit(Direction.South)]), 0, 1, 0);
             var overworld = new Overworld(string.Empty, string.Empty);
             overworld.AddRegion(region);
-            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(overworld, null), GameEndConditions.NoEnd, GameConfiguration.Default).Invoke();
+            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(overworld, null), GameEndConditions.NoEnd, ConsoleGameConfiguration.Default).Invoke();
             var command = new Move(Direction.East);
 
             var result = command.Invoke(game);
@@ -34,7 +34,7 @@ public void GivenCanMove_WhenInvoke_ThenOK()
             region.AddRoom(new Room(Identifier.Empty, Description.Empty, [new Exit(Direction.South)]), 0, 1, 0);
             var overworld = new Overworld(string.Empty, string.Empty);
             overworld.AddRegion(region);
-            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(overworld, null), GameEndConditions.NoEnd, GameConfiguration.Default).Invoke();
+            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(overworld, null), GameEndConditions.NoEnd, ConsoleGameConfiguration.Default).Invoke();
             var command = new Move(Direction.North);
 
             var result = command.Invoke(game);

diff --git a/NetAF.Tests/Commands/Game/TakeAll_Tests.cs b/NetAF.Tests/Commands/Game/TakeAll_Tests.cs
@@ -20,7 +20,7 @@ public void GivenNoItem_WhenInvoke_ThenError()
             region.AddRoom(room, 0, 0, 0);
             var overworld = new Overworld(string.Empty, string.Empty);
             overworld.AddRegion(region);
-            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(overworld, character), GameEndConditions.NoEnd, GameConfiguration.Default).Invoke();
+            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(overworld, character), GameEndConditions.NoEnd, ConsoleGameConfiguration.Default).Invoke();
             var command = new TakeAll();
 
             var result = command.Invoke(game);
@@ -39,7 +39,7 @@ public void GivenNoItemsAreTakeable_WhenInvoke_ThenError()
             region.AddRoom(room, 0, 0, 0);
             var overworld = new Overworld(string.Empty, string.Empty);
             overworld.AddRegion(region);
-            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(overworld, character), GameEndConditions.NoEnd, GameConfiguration.Default).Invoke();
+            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(overworld, character), GameEndConditions.NoEnd, ConsoleGameConfiguration.Default).Invoke();
             var command = new TakeAll();
 
             var result = command.Invoke(game);
@@ -58,7 +58,7 @@ public void GivenItemsAreTakeable_WhenInvoke_ThenOK()
             region.AddRoom(room, 0, 0, 0);
             var overworld = new Overworld(string.Empty, string.Empty);
             overworld.AddRegion(region);
-            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(overworld, character), GameEndConditions.NoEnd, GameConfiguration.Default).Invoke();
+            var game = NetAF.Logic.Game.Create(new GameInfo(string.Empty, string.Empty, string.Empty), string.Empty, AssetGenerator.Retained(overworld, character), GameEndConditions.NoEnd, ConsoleGameConfiguration.Default).Invoke();
             var command = new TakeAll();
 
             var result = command.Invoke(game);