Refactor to hide restoration

NetAF.Tests/Assets/Locations/Matrix_Tests.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using NetAF.Assets;
 using NetAF.Serialization.Assets;
+using NetAF.Serialization;
 
 namespace NetAF.Tests.Assets.Locations
 {
@@ -166,8 +167,8 @@ public void GivenVisitedRoomOn1And1VisitedRoomOn3_When_ThenReturnContaining1And3
 
             var serialization = RoomSerialization.FromRoom(roomPositions[2].Room);
             serialization.HasBeenVisited = true;
-            roomPositions[2].Room.RestoreFrom(serialization);
-            roomPositions[4].Room.RestoreFrom(serialization);
+            ((IRestoreFromObjectSerialization<RoomSerialization>)roomPositions[2].Room).RestoreFrom(serialization);
+            ((IRestoreFromObjectSerialization<RoomSerialization>)roomPositions[4].Room).RestoreFrom(serialization);
 
             var matrix = new Matrix([.. roomPositions]);
 

NetAF.Tests/Rendering/Console/AnsiColor_Tests.cs

@@ -49,5 +49,15 @@ public void GivenBlackAndWhite_WhenNotEquality_ThenReturnTrue()
 
             Assert.IsTrue(result);
         }
+
+        [TestMethod]
+        public void GivenR10G15B20_WhenToGray_ThenReturnColorWithR15G15B15()
+        {
+            var result = new AnsiColor(10, 15, 20).ToGray();
+
+            Assert.AreEqual(15, result.R);
+            Assert.AreEqual(15, result.G);
+            Assert.AreEqual(15, result.B);
+        }
     }
 }

NetAF/Assets/Attributes/AttributeManager.cs

@@ -243,7 +243,7 @@ private static int CapValue(int value, int min, int max)
         /// Restore this object from a serialization.
         /// </summary>
         /// <param name="serialization">The serialization to restore from.</param>
-        public void RestoreFrom(AttributeManagerSerialization serialization)
+        void IRestoreFromObjectSerialization<AttributeManagerSerialization>.RestoreFrom(AttributeManagerSerialization serialization)
         {
             RemoveAll();
 

NetAF/Assets/Characters/Character.cs

@@ -143,9 +143,9 @@ public void RemoveItem(Item item)
         /// Restore this object from a serialization.
         /// </summary>
         /// <param name="serialization">The serialization to restore from.</param>
-        public void RestoreFrom(CharacterSerialization serialization)
+        void IRestoreFromObjectSerialization<CharacterSerialization>.RestoreFrom(CharacterSerialization serialization)
         {
-            base.RestoreFrom(serialization);
+            ((IRestoreFromObjectSerialization<ExaminableSerialization>)this).RestoreFrom(serialization);
 
             IsAlive = serialization.IsAlive;
 

NetAF/Assets/Characters/NonPlayableCharacter.cs

@@ -77,11 +77,10 @@ public NonPlayableCharacter(Identifier identifier, IDescription description, boo
         /// Restore this object from a serialization.
         /// </summary>
         /// <param name="serialization">The serialization to restore from.</param>
-        public void RestoreFrom(NonPlayableCharacterSerialization serialization)
+        void IRestoreFromObjectSerialization<NonPlayableCharacterSerialization>.RestoreFrom(NonPlayableCharacterSerialization serialization)
         {
-            base.RestoreFrom(serialization);
-
-            Conversation?.RestoreFrom(serialization.Conversation);
+            ((IRestoreFromObjectSerialization<CharacterSerialization>)this).RestoreFrom(serialization);
+            ((IRestoreFromObjectSerialization<ConversationSerialization>)Conversation)?.RestoreFrom(serialization.Conversation);
         }
 
         #endregion

NetAF/Assets/ExaminableObject.cs

@@ -4,6 +4,7 @@
 using NetAF.Assets.Attributes;
 using NetAF.Commands;
 using NetAF.Extensions;
+using NetAF.Serialization;
 using NetAF.Serialization.Assets;
 using NetAF.Utilities;
 
@@ -12,7 +13,7 @@ namespace NetAF.Assets
     /// <summary>
     /// Represents an object that can be examined.
     /// </summary>
-    public class ExaminableObject : IExaminable
+    public class ExaminableObject : IExaminable, IRestoreFromObjectSerialization<ExaminableSerialization>
     {
         #region StaticProperties
 
@@ -143,15 +144,15 @@ public Examination Examine(ExaminationScene scene)
         /// Restore this object from a serialization.
         /// </summary>
         /// <param name="serialization">The serialization to restore from.</param>
-        public void RestoreFrom(ExaminableSerialization serialization)
+        void IRestoreFromObjectSerialization<ExaminableSerialization>.RestoreFrom(ExaminableSerialization serialization)
         {
             IsPlayerVisible = serialization.IsPlayerVisible;
-            Attributes.RestoreFrom(serialization.AttributeManager);
+            ((IRestoreFromObjectSerialization<AttributeManagerSerialization>)Attributes).RestoreFrom(serialization.AttributeManager);
 
             foreach (var command in serialization.Commands)
             {
                 var match = Array.Find(Commands, x => x.Help.Command.Equals(command.CommandName));
-                match?.RestoreFrom(command);
+                ((IRestoreFromObjectSerialization<CustomCommandSerialization>)match)?.RestoreFrom(command);
             }
         }
 

NetAF/Assets/IExaminable.cs

@@ -1,14 +1,12 @@
 using NetAF.Assets.Attributes;
 using NetAF.Commands;
-using NetAF.Serialization.Assets;
-using NetAF.Serialization;
 
 namespace NetAF.Assets
 {
     /// <summary>
     /// Represents any object that is examinable.
     /// </summary>
-    public interface IExaminable : IPlayerVisible, IRestoreFromObjectSerialization<ExaminableSerialization>
+    public interface IExaminable : IPlayerVisible
     {
         /// <summary>
         /// Get this objects identifier.

NetAF/Assets/Item.cs

@@ -79,9 +79,9 @@ public Interaction Interact(Item item)
         /// Restore this object from a serialization.
         /// </summary>
         /// <param name="serialization">The serialization to restore from.</param>
-        public void RestoreFrom(ItemSerialization serialization)
+        void IRestoreFromObjectSerialization<ItemSerialization>.RestoreFrom(ItemSerialization serialization)
         {
-            base.RestoreFrom(serialization);
+            ((IRestoreFromObjectSerialization<ExaminableSerialization>)this).RestoreFrom(serialization);
         }
 
         #endregion

NetAF/Assets/Locations/Exit.cs

@@ -102,9 +102,9 @@ public Interaction Interact(Item item)
         /// Restore this object from a serialization.
         /// </summary>
         /// <param name="serialization">The serialization to restore from.</param>
-        public void RestoreFrom(ExitSerialization serialization)
+        void IRestoreFromObjectSerialization<ExitSerialization>.RestoreFrom(ExitSerialization serialization)
         {
-            base.RestoreFrom(serialization);
+            ((IRestoreFromObjectSerialization<ExaminableSerialization>)this).RestoreFrom(serialization);
 
             IsLocked = serialization.IsLocked;
         }

NetAF/Assets/Locations/Overworld.cs

@@ -154,9 +154,9 @@ private static Examination ExamineThis(ExaminationRequest request)
         /// Restore this object from a serialization.
         /// </summary>
         /// <param name="serialization">The serialization to restore from.</param>
-        public void RestoreFrom(OverworldSerialization serialization)
+        void IRestoreFromObjectSerialization<OverworldSerialization>.RestoreFrom(OverworldSerialization serialization)
         {
-            base.RestoreFrom(serialization);
+            ((IRestoreFromObjectSerialization<ExaminableSerialization>)this).RestoreFrom(serialization);
 
             foreach (var region in Regions)
             {

NetAF/Assets/Locations/Region.cs

@@ -360,9 +360,9 @@ internal static void NextPosition(Point3D current, Direction direction, out Poin
         /// Restore this object from a serialization.
         /// </summary>
         /// <param name="serialization">The serialization to restore from.</param>
-        public void RestoreFrom(RegionSerialization serialization)
+        void IRestoreFromObjectSerialization<RegionSerialization>.RestoreFrom(RegionSerialization serialization)
         {
-            base.RestoreFrom(serialization);
+            ((IRestoreFromObjectSerialization<ExaminableSerialization>)this).RestoreFrom(serialization);
 
             var rooms = roomPositions.Select(x => x.Room).ToArray();
 

NetAF/Assets/Locations/Room.cs

@@ -520,9 +520,9 @@ public void RemoveItem(Item item)
         /// Restore this object from a serialization.
         /// </summary>
         /// <param name="serialization">The serialization to restore from.</param>
-        public void RestoreFrom(RoomSerialization serialization)
+        void IRestoreFromObjectSerialization<RoomSerialization>.RestoreFrom(RoomSerialization serialization)
         {
-            base.RestoreFrom(serialization);
+            ((IRestoreFromObjectSerialization<ExaminableSerialization>)this).RestoreFrom(serialization);
 
             HasBeenVisited = serialization.HasBeenVisited;
 

NetAF/Commands/CustomCommand.cs

@@ -65,7 +65,7 @@ public Reaction Invoke(Logic.Game game)
         /// Restore this object from a serialization.
         /// </summary>
         /// <param name="serialization">The serialization to restore from.</param>
-        public void RestoreFrom(CustomCommandSerialization serialization)
+        void IRestoreFromObjectSerialization<CustomCommandSerialization>.RestoreFrom(CustomCommandSerialization serialization)
         {
             IsPlayerVisible = serialization.IsPlayerVisible;
         }

NetAF/Conversations/Conversation.cs

@@ -126,7 +126,7 @@ public Reaction Respond(Response response, Game game)
         /// Restore this object from a serialization.
         /// </summary>
         /// <param name="serialization">The serialization to restore from.</param>
-        public void RestoreFrom(ConversationSerialization serialization)
+        void IRestoreFromObjectSerialization<ConversationSerialization>.RestoreFrom(ConversationSerialization serialization)
         {
             if (serialization.CurrentParagraph == ConversationSerialization.NoCurrentParagraph)
                 CurrentParagraph = null;

NetAF/Logic/Game.cs

@@ -13,6 +13,7 @@
 using NetAF.Logic.Configuration;
 using NetAF.Logic.Modes;
 using NetAF.Serialization;
+using NetAF.Serialization.Assets;
 using NetAF.Utilities;
 
 namespace NetAF.Logic
@@ -474,7 +475,7 @@ public static void Execute(GameCreationCallback creator)
         /// Restore this object from a serialization.
         /// </summary>
         /// <param name="serialization">The serialization to restore from.</param>
-        public void RestoreFrom(GameSerialization serialization)
+        void IRestoreFromObjectSerialization<GameSerialization>.RestoreFrom(GameSerialization serialization)
         {
             // resolve asset locations
             AssetArranger.Arrange(this, serialization);
@@ -487,7 +488,7 @@ public void RestoreFrom(GameSerialization serialization)
             foreach (var player in serialization.Players)
             {
                 var match = Array.Find(Catalog.Players, x => x.Identifier.Equals(player.Identifier));
-                match?.RestoreFrom(player);
+                ((IRestoreFromObjectSerialization<CharacterSerialization>)match)?.RestoreFrom(player);
             }
 
             // restore active player

NetAF/Logic/PlayableCharacterLocation.cs

@@ -40,7 +40,7 @@ public class PlayableCharacterLocation(string playerIdentifier, string regionIde
         public static PlayableCharacterLocation FromSerialization(PlayableCharacterLocationSerialization serialization)
         {
             PlayableCharacterLocation location = new(string.Empty, string.Empty, string.Empty);
-            location.RestoreFrom(serialization);
+            ((IRestoreFromObjectSerialization<PlayableCharacterLocationSerialization>)location).RestoreFrom(serialization);
             return location;
         }
 
@@ -52,7 +52,7 @@ public static PlayableCharacterLocation FromSerialization(PlayableCharacterLocat
         /// Restore this object from a serialization.
         /// </summary>
         /// <param name="serialization">The serialization to restore from.</param>
-        public void RestoreFrom(PlayableCharacterLocationSerialization serialization)
+        void IRestoreFromObjectSerialization<PlayableCharacterLocationSerialization>.RestoreFrom(PlayableCharacterLocationSerialization serialization)
         {
             PlayerIdentifier = serialization.PlayerIdentifier;
             RegionIdentifier = serialization.RegionIdentifier;

NetAF/Rendering/Console/AnsiColor.cs

@@ -29,6 +29,20 @@ public struct AnsiColor(byte r, byte g, byte b) : IEquatable<AnsiColor>
 
         #endregion
 
+        #region Methods
+
+        /// <summary>
+        /// Convert this color to the nearest gray.
+        /// </summary>
+        /// <returns>The nearest gray.</returns>
+        public AnsiColor ToGray()
+        {
+            var gray = (byte)((R + B + G) / 3);
+            return new AnsiColor(gray, gray, gray);
+        }
+
+        #endregion
+
         #region Overrides of Object
 
         /// <summary>

NetAF/Rendering/Console/GridVisualFrame.cs

@@ -17,7 +17,7 @@ public sealed class GridVisualFrame(GridVisualBuilder builder) : IFrame
         /// <returns>The color.</returns>
         private AnsiColor GetForegroundColor(int x, int y, bool suppressColor)
         {
-            return !suppressColor ? builder.GetCellForegroundColor(x, y) : AnsiColor.White;
+            return !suppressColor ? builder.GetCellForegroundColor(x, y) : builder.GetCellForegroundColor(x, y).ToGray();
         }
 
         /// <summary>
@@ -29,7 +29,7 @@ private AnsiColor GetForegroundColor(int x, int y, bool suppressColor)
         /// <returns>The color.</returns>
         private AnsiColor GetBackgroundColor(int x, int y, bool suppressColor)
         {
-            return !suppressColor ? builder.GetCellBackgroundColor(x, y) : AnsiColor.White;
+            return !suppressColor ? builder.GetCellBackgroundColor(x, y) : builder.GetCellBackgroundColor(x, y).ToGray();
         }
 
         /// <summary>

NetAF/Serialization/Assets/AttributeManagerSerialization.cs

@@ -48,7 +48,7 @@ public static AttributeManagerSerialization FromAttributeManager(AttributeManage
         /// <param name="attributeManager">The attribute manager to restore.</param>
         public void Restore(AttributeManager attributeManager)
         {
-            attributeManager.RestoreFrom(this);
+            ((IRestoreFromObjectSerialization<AttributeManagerSerialization>)attributeManager).RestoreFrom(this);
         }
 
         #endregion

NetAF/Serialization/Assets/CharacterSerialization.cs

@@ -52,7 +52,7 @@ public static CharacterSerialization FromCharacter(Character character)
         /// <param name="character">The character to restore.</param>
         public void Restore(Character character)
         {
-            character.RestoreFrom(this);
+            ((IRestoreFromObjectSerialization<CharacterSerialization>)character).RestoreFrom(this);
         }
 
         #endregion

NetAF/Serialization/Assets/ConversationSerialization.cs

@@ -51,7 +51,7 @@ public static ConversationSerialization FromConversation(Conversation conversati
         /// <param name="conversation">The conversation to restore.</param>
         public void Restore(Conversation conversation)
         {
-            conversation.RestoreFrom(this);
+            ((IRestoreFromObjectSerialization<ConversationSerialization>)conversation).RestoreFrom(this);
         }
 
         #endregion

NetAF/Serialization/Assets/ExaminableSerialization.cs

@@ -60,7 +60,7 @@ public static ExaminableSerialization FromIExaminable(IExaminable examinable)
         /// <param name="examinable">The examinable to restore.</param>
         public virtual void Restore(IExaminable examinable)
         {
-            examinable.RestoreFrom(this);
+            ((IRestoreFromObjectSerialization<ExaminableSerialization>)examinable).RestoreFrom(this);
         }
 
         #endregion

NetAF/Serialization/Assets/ExitSerialization.cs

@@ -46,7 +46,7 @@ public static ExitSerialization FromExit(Exit exit)
         /// <param name="exit">The exit to restore.</param>
         public void Restore(Exit exit)
         {
-            exit.RestoreFrom(this);
+            ((IRestoreFromObjectSerialization<ExitSerialization>)exit).RestoreFrom(this);
         }
 
         #endregion

NetAF/Serialization/Assets/ItemSerialization.cs

@@ -36,7 +36,7 @@ public static ItemSerialization FromItem(Item item)
         /// <param name="item">The item to restore.</param>
         public void Restore(Item item)
         {
-            item.RestoreFrom(this);
+            ((IRestoreFromObjectSerialization<ItemSerialization>)item).RestoreFrom(this);
         }
 
         #endregion

NetAF/Serialization/Assets/NonPlayableCharacterSerialization.cs

@@ -48,7 +48,7 @@ public static NonPlayableCharacterSerialization FromNonPlayableCharacter(NonPlay
         /// <param name="character">The character to restore.</param>
         public void Restore(NonPlayableCharacter character)
         {
-            character.RestoreFrom(this);
+            ((IRestoreFromObjectSerialization<NonPlayableCharacterSerialization>)character).RestoreFrom(this);
         }
 
         #endregion

NetAF/Serialization/Assets/OverworldSerialization.cs

@@ -52,7 +52,7 @@ public static OverworldSerialization FromOverworld(Overworld overworld)
         /// <param name="overworld">The overworld to restore.</param>
         public void Restore(Overworld overworld)
         {
-            overworld.RestoreFrom(this);
+            ((IRestoreFromObjectSerialization<OverworldSerialization>)overworld).RestoreFrom(this);
         }
 
         #endregion

NetAF/Serialization/Assets/PlayableCharacterLocationSerialization.cs

@@ -53,7 +53,7 @@ public static PlayableCharacterLocationSerialization FromPlayableCharacterLocati
         /// <param name="location">The attribute to restore.</param>
         public void Restore(PlayableCharacterLocation location)
         {
-            location.RestoreFrom(this);
+            ((IRestoreFromObjectSerialization<PlayableCharacterLocationSerialization>)location).RestoreFrom(this);
         }
 
         #endregion

NetAF/Serialization/Assets/RegionSerialization.cs

@@ -58,7 +58,7 @@ public static RegionSerialization FromRegion(Region region)
         /// <param name="region">The region to restore.</param>
         public void Restore(Region region)
         {
-            region.RestoreFrom(this);
+            ((IRestoreFromObjectSerialization<RegionSerialization>)region).RestoreFrom(this);
         }
 
         #endregion

NetAF/Serialization/Assets/RoomSerialization.cs

@@ -64,7 +64,7 @@ public static RoomSerialization FromRoom(Room room)
         /// <param name="room">The room to restore.</param>
         public void Restore(Room room)
         {
-            room.RestoreFrom(this);
+            ((IRestoreFromObjectSerialization<RoomSerialization>)room).RestoreFrom(this);
         }
 
         #endregion

NetAF/Serialization/CustomCommandSerialization.cs

@@ -47,7 +47,7 @@ public static CustomCommandSerialization FromCustomCommand(CustomCommand customC
         /// <param name="command">The command to restore.</param>
         public virtual void Restore(CustomCommand command)
         {
-            command.RestoreFrom(this);
+            ((IRestoreFromObjectSerialization<CustomCommandSerialization>)command).RestoreFrom(this);
         }
 
         #endregion