Added narrative end callback

Author: benpollarduk

NetAF/Logic/Callbacks/NarrativeEndCallback.cs

@@ -0,0 +1,8 @@
+namespace NetAF.Logic.Callbacks
+{
+    /// <summary>
+    /// Represents the callback used for when a narrative ends.
+    /// </summary>
+    /// <param name="game">The executing game.</param>
+    public delegate void NarrativeEndCallback(Game game);
+}

NetAF/Logic/Game.cs

@@ -587,14 +587,14 @@ private static UpdateResult UpdateWhenActive(Game game, string input)
             // handle the reaction
             game.HandleReaction(reaction);
 
-            // check if the game has ended, and if so end
-            if (game.CheckForGameEnd(game.EndConditions, out game.endMode))
-                game.State = GameState.EndConditionMet;
-
-            // providing the game hasn't finished render
+            // providing the game hasn't finished render it
             if (game.State != GameState.Finished)
                 game.Mode.Render(game);
 
+            // also if the game is still active, check if the game has ended, and if so end
+            if (game.State == GameState.Active && game.CheckForGameEnd(game.EndConditions, out game.endMode))
+                game.State = GameState.EndConditionMet;
+
             return new(true);
         }
 

NetAF/Logic/Modes/NarrativeMode.cs

@@ -1,4 +1,5 @@
 using NetAF.Interpretation;
+using NetAF.Logic.Callbacks;
 using NetAF.Narratives;
 using NetAF.Rendering.FrameBuilders;
 
@@ -8,7 +9,8 @@ namespace NetAF.Logic.Modes
     /// Provides a display mode for narrative.
     /// </summary>
     /// <param name="narrative">The narrative.</param>
-    public sealed class NarrativeMode(Narrative narrative) : IGameMode
+    /// <param name="endCallback">An optional callback to invoke when the narrative ends.</param>
+    public sealed class NarrativeMode(Narrative narrative, NarrativeEndCallback endCallback = null) : IGameMode
     {
         #region Fields
 
@@ -44,6 +46,9 @@ public void Render(Game game)
                 var frame = game.Configuration.FrameBuilders.GetFrameBuilder<INarrativeFrameBuilder>().Build(narrative, game.Configuration.DisplaySize);
                 game.Configuration.Adapter.RenderFrame(frame);
                 isComplete = narrative.IsComplete;
+                
+                if (isComplete)
+                    endCallback?.Invoke(game);
             }
         }
 

NetAF/Narratives/Narrative.cs

@@ -53,9 +53,7 @@ public string Next()
             if ((sections?[index].IsComplete ?? false) && index < sections.Length - 1)
                 index++;
 
-            var entry = sections?[index].Next() ?? string.Empty;
-
-            return entry;
+            return sections?[index].Next() ?? string.Empty;
         }
 
         /// <summary>