From f53807327d3f0f542732086106b42e4269359cf3 Mon Sep 17 00:00:00 2001 From: Scott Lilly Date: Tue, 29 Sep 2020 17:46:34 -0500 Subject: [PATCH] Cleanup --- Engine/GameData/GameDetails.json | 2 +- Engine/Models/Player.cs | 3 --- Engine/Services/SaveGameService.cs | 2 +- Engine/ViewModels/GameSession.cs | 2 -- TestEngine/Services/TestSaveGameService.cs | 2 +- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Engine/GameData/GameDetails.json b/Engine/GameData/GameDetails.json index d77d359..2dda46f 100644 --- 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 index 5c21ec8..3e16aec 100644 --- a/Engine/Models/Player.cs +++ b/Engine/Models/Player.cs @@ -8,9 +8,6 @@ public class Player : LivingEntity { #region Properties - public ObservableCollection PlayerAttributes { get; } = - new ObservableCollection(); - private string _characterClass; private int _experiencePoints; diff --git a/Engine/Services/SaveGameService.cs b/Engine/Services/SaveGameService.cs index 1a3bee2..6a75d08 100644 --- 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)]; } } } \ No newline at end of file diff --git a/Engine/ViewModels/GameSession.cs b/Engine/ViewModels/GameSession.cs index 9dde558..60a62d0 100644 --- 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 index e51a029..1ff8f3a 100644 --- 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);