Cleanup

SOSCSRPG · Sep 29, 2020 · f538073 · f538073
1 parent fdea73e
commit f538073
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 8 deletions.
diff --git a/Engine/GameData/GameDetails.json b/Engine/GameData/GameDetails.json
@@ -1,5 +1,5 @@
 {
-  "Name": "SOSCSRPG",
+  "Name": "Scott's Open Source C# RPG",
   "Version": "0.1.000",
   "PlayerAttributes": [
     {

diff --git a/Engine/Models/Player.cs b/Engine/Models/Player.cs
@@ -8,9 +8,6 @@ public class Player : LivingEntity
     {
         #region Properties
 
-        public ObservableCollection<PlayerAttribute> PlayerAttributes { get; } =
-            new ObservableCollection<PlayerAttribute>();
-
         private string _characterClass;
         private int _experiencePoints;
 

diff --git a/Engine/Services/SaveGameService.cs b/Engine/Services/SaveGameService.cs
@@ -149,7 +149,7 @@ private static void PopulatePlayerRecipes(JObject data, Player player)
 
         private static string FileVersion(JObject data)
         {
-            return (string)data[nameof(GameSession.Version)];
+            return (string)data[nameof(GameSession.GameDetails.Version)];
         }
     }
 }
diff --git a/Engine/ViewModels/GameSession.cs b/Engine/ViewModels/GameSession.cs
@@ -22,8 +22,6 @@ public class GameSession : BaseNotificationClass
         private Monster _currentMonster;
         private Trader _currentTrader;
 
-        public string Version { get; } = "0.1.000";
-
         [JsonIgnore]
         public GameDetails GameDetails
         {

diff --git a/TestEngine/Services/TestSaveGameService.cs b/TestEngine/Services/TestSaveGameService.cs
@@ -16,7 +16,7 @@ public void Test_Restore_0_1_000()
                     .LoadLastSaveOrCreateNew(@".\TestFiles\SavedGames\Game_0_1_000.soscsrpg");
 
             // Game session data
-            Assert.AreEqual("0.1.000", gameSession.Version);
+            Assert.AreEqual("0.1.000", gameSession.GameDetails.Version);
             Assert.AreEqual(0, gameSession.CurrentLocation.XCoordinate);
             Assert.AreEqual(1, gameSession.CurrentLocation.YCoordinate);