fix compile errors. Autoquest temporarily broken

Author: DerekGooding

Mythril.Blazor/Services/PersistenceService.cs

@@ -24,11 +24,11 @@ public async Task SaveAsync()
         {
             Inventory = state.Inventory.ToDictionary(k => k.Key, v => v.Value),
             MagicCapacity = state.MagicCapacity,
-            PinnedItems = state.PinnedItems.ToList(),
-            UnlockedCadences = state.UnlockedCadenceNames.ToList(),
-            UnlockedAbilities = state.UnlockedAbilities.ToList(),
-            CompletedQuests = state.CompletedQuests.ToList(),
-            ActiveQuests = state.ActiveQuests.Select(q => new QuestProgressDTO {
+            PinnedItems = [.. state.PinnedItems],
+            UnlockedCadences = [.. state.UnlockedCadenceNames],
+            UnlockedAbilities = [.. state.UnlockedAbilities],
+            CompletedQuests = [.. state.CompletedQuests],
+            ActiveQuests = [.. state.ActiveQuests.Select(q => new QuestProgressDTO {
                 ItemName = q.Name,
                 AbilityName = q.Item is CadenceUnlock cu ? cu.CadenceName : "",
                 ItemType = q.Item is QuestData ? "Quest" : (q.Item is CadenceUnlock ? "CadenceUnlock" : "Refinement"),
@@ -38,20 +38,20 @@ public async Task SaveAsync()
                 SlotIndex = q.SlotIndex,
                 Description = q.Description,
                 DurationSeconds = q.DurationSeconds
-            }).ToList(),
-            Junctions = state.Junctions.Select(j => new JunctionDTO {
+            })],
+            Junctions = [.. state.Junctions.Select(j => new JunctionDTO {
                 CharacterName = j.Character.Name,
                 StatName = j.Stat.Name,
                 MagicName = j.Magic.Name
-            }).ToList(),
-            AssignedCadences = state.AssignedCadences.Where(kvp => kvp.Value != null).Select(kvp => new AssignedCadenceDTO {
+            })],
+            AssignedCadences = [.. state.AssignedCadences.Where(kvp => kvp.Value != null).Select(kvp => new AssignedCadenceDTO {
                 CadenceName = kvp.Key,
                 CharacterName = kvp.Value!
-            }).ToList(),
+            })],
             AutoQuestEnabled = state.AutoQuestEnabled.ToDictionary(k => k.Key, v => v.Value),
-            UnlockedLocations = state.UnlockedLocationNames.ToList(),
-            StarredRecipes = state.StarredRecipes.ToList(),
-            SeenContent = state.SeenContent.ToList(),
+            UnlockedLocations = [.. state.UnlockedLocationNames],
+            StarredRecipes = [.. state.StarredRecipes],
+            SeenContent = [.. state.SeenContent],
             HasUnseenCadence = state.HasUnseenCadence,
             HasUnseenWorkshop = state.HasUnseenWorkshop,
             CurrentTime = state.CurrentTime,
@@ -119,33 +119,29 @@ public async Task LoadAsync()
         double bonusSeconds = (DateTime.Now - saveData.LastSaveTime).TotalSeconds;
         var activeQuestsWithBonus = activeQuests.Select(q => q with { SecondsElapsed = q.SecondsElapsed + Math.Max(0, bonusSeconds) }).ToImmutableList();
 
-        var journal = saveData.Journal.Select(j => new JournalEntry(j.TaskName, j.CharacterName, j.Details, j.CompletedAt, j.IsFirstTime, j.WasCancelled)).ToImmutableList();
-
         var state = new GameState(
             Inventory: inventory,
             MagicCapacity: saveData.MagicCapacity,
             PinnedItems: pinnedItems,
             AssignedCadences: saveData.AssignedCadences.ToImmutableDictionary(x => x.CadenceName, x => (string?)x.CharacterName),
             Junctions: junctions,
             CharacterPermanentStatBoosts: saveData.CharacterStatBoosts.ToImmutableDictionary(k => k.Key, v => v.Value.ToImmutableDictionary()),
-            CompletedQuests: saveData.CompletedQuests.ToImmutableHashSet(),
-            UnlockedAbilities: saveData.UnlockedAbilities.ToImmutableHashSet(),
+            CompletedQuests: [.. saveData.CompletedQuests],
+            UnlockedAbilities: [.. saveData.UnlockedAbilities],
             ActiveQuests: activeQuestsWithBonus,
             AutoQuestEnabled: saveData.AutoQuestEnabled.ToImmutableDictionary(),
-            StarredRecipes: saveData.StarredRecipes.ToImmutableHashSet(),
-            UnlockedLocationNames: saveData.UnlockedLocations.ToImmutableHashSet(),
-            UnlockedCadenceNames: saveData.UnlockedCadences.ToImmutableHashSet(),
-            HighlightedPath: ImmutableHashSet<string>.Empty,
-            Journal: journal,
-            CharacterMiniLogs: saveData.CharacterMiniLogs.ToImmutableDictionary(kvp => kvp.Key, kvp => kvp.Value.ToImmutableList<string>()),
-            EverPerformedActivities: saveData.EverPerformedActivities.ToImmutableHashSet(),
-            SeenContent: saveData.SeenContent.ToImmutableHashSet(),
+            StarredRecipes: [.. saveData.StarredRecipes],
+            UnlockedLocationNames: [.. saveData.UnlockedLocations],
+            UnlockedCadenceNames: [.. saveData.UnlockedCadences],
+            LastFinishedActivity: saveData.LastFinishedActivities.ToImmutableDictionary(),
+            HighlightedPath: [],
+            EverPerformedActivities: [.. saveData.EverPerformedActivities],
+            SeenContent: [.. saveData.SeenContent],
             CurrentTime: saveData.CurrentTime,
             IsTestMode: saveData.IsTestMode,
             HasUnseenCadence: saveData.HasUnseenCadence,
             HasUnseenWorkshop: saveData.HasUnseenWorkshop,
-            ActiveTab: saveData.ActiveTab,
-            ShowMiniLogs: saveData.ShowMiniLogs
+            ActiveTab: saveData.ActiveTab
         );
 
         gameStore.Dispatch(new SetStateAction(state));

Mythril.Data/GameState.cs

@@ -24,34 +24,32 @@ public record GameState(
     bool IsTestMode,
     bool HasUnseenCadence,
     bool HasUnseenWorkshop,
-    string ActiveTab,
-    bool ShowMiniLogs
+    string ActiveTab
 )
 {
     public static GameState Initial => new(
-        Inventory: ImmutableDictionary<string, int>.Empty,
+        Inventory: [],
         MagicCapacity: 30,
-        PinnedItems: ImmutableHashSet<string>.Empty,
-        AssignedCadences: ImmutableDictionary<string, string?>.Empty,
-        Junctions: ImmutableList<Junction>.Empty,
-        CharacterPermanentStatBoosts: ImmutableDictionary<string, ImmutableDictionary<string, int>>.Empty,
-        CompletedQuests: ImmutableHashSet<string>.Empty,
-        UnlockedAbilities: ImmutableHashSet<string>.Empty,
-        ActiveQuests: ImmutableList<QuestProgress>.Empty,
-        AutoQuestEnabled: ImmutableDictionary<string, bool>.Empty,
-        LastFinishedActivity: ImmutableDictionary<string, string?>.Empty,
-        StarredRecipes: ImmutableHashSet<string>.Empty,
-        UnlockedLocationNames: ImmutableHashSet<string>.Empty,
-        UnlockedCadenceNames: ImmutableHashSet<string>.Empty,
-        HighlightedPath: ImmutableHashSet<string>.Empty,
-        EverPerformedActivities: ImmutableHashSet<string>.Empty,
-        SeenContent: ImmutableHashSet<string>.Empty,
+        PinnedItems: [],
+        AssignedCadences: [],
+        Junctions: [],
+        CharacterPermanentStatBoosts: [],
+        CompletedQuests: [],
+        UnlockedAbilities: [],
+        ActiveQuests: [],
+        AutoQuestEnabled: [],
+        LastFinishedActivity: [],
+        StarredRecipes: [],
+        UnlockedLocationNames: [],
+        UnlockedCadenceNames: [],
+        HighlightedPath: [],
+        EverPerformedActivities: [],
+        SeenContent: [],
         CurrentTime: 0,
         IsTestMode: false,
         HasUnseenCadence: false,
         HasUnseenWorkshop: false,
-        ActiveTab: "hand",
-        ShowMiniLogs: false
+        ActiveTab: "hand"
     );
 }
 

Mythril.Data/GameStateStore.cs

@@ -18,7 +18,6 @@ public partial class GameStore
     public GameState State { get; private set; } = GameState.Initial;
     public event Action<GameState>? OnStateChanged;
     public event Action<string, int>? OnItemOverflow;
-    public event Action? OnJournalUpdated;
 
     public string ExportState() => JsonSerializer.Serialize(State, _options);
     public void ImportState(string json)
@@ -42,9 +41,5 @@ public void Dispatch(IGameAction action)
         {
             OnItemOverflow?.Invoke(overflowItem, overflowQty);
         }
-        if (action is AddToJournalAction || action is ClearJournalAction || action is SetStateAction || action is FinishQuestAction)
-        {
-            OnJournalUpdated?.Invoke();
-        }
     }
 }

Mythril.Data/Models.cs

@@ -201,6 +201,8 @@ public class SaveData
     public string ActiveTab { get; set; } = "hand";
     public DateTime LastSaveTime { get; set; }
     public Dictionary<string, Dictionary<string, int>> CharacterStatBoosts { get; set; } = [];
+    public Dictionary<string, string?> LastFinishedActivities {get; set;} = [];
+    public List<string> EverPerformedActivities = [];
 }
 
 public class AssignedCadenceDTO

Mythril.Data/ResourceManager_Logistics.cs

@@ -113,43 +113,45 @@ private void CheckAutoQuestTick()
                 int autoLimit = GetAutoQuestLimit(character);
                 int current = ActiveQuests.Count(p => p.Character.Name == character.Name);
 
+
+                //TODO => Fix autoquest now that journal is gone. Need a new standalone mapping of last tasks
                 if (current < limit)
                 {
-                    // Find the last entry for this character in this session
-                    var lastEntry = Journal.FirstOrDefault(j => j.CharacterName == character.Name);
-                    if (lastEntry?.TaskName != null && !lastEntry.WasCancelled)
-                    {
-                        // Check if we are allowed to restart in the next free slot
-                        // If current = 0, we are filling slot 0. If current = 1, we are filling slot 1.
-                        if (current >= autoLimit) continue;
+                    // // Find the last entry for this character in this session
+                    // var lastEntry = Journal.FirstOrDefault(j => j.CharacterName == character.Name);
+                    // if (lastEntry?.TaskName != null && !lastEntry.WasCancelled)
+                    // {
+                    //     // Check if we are allowed to restart in the next free slot
+                    //     // If current = 0, we are filling slot 0. If current = 1, we are filling slot 1.
+                    //     if (current >= autoLimit) continue;
 
-                        // Check if it's a recurring quest or refinement
-                        var quest = _quests.All.FirstOrDefault(q => q.Name == lastEntry.TaskName);
-                        if (quest.Name != null)
-                        {
-                            var detail = _questDetails[quest];
-                            if (detail.Type == QuestType.Recurring)
-                            {
-                                var questData = new QuestData(quest, detail);
-                                if (CanAfford(questData, character))
-                                {
-                                    // Use -1.5 as initialSecondsElapsed to provide a "preparing" visual delay in the UI
-                                    StartQuest(questData, character, -1.5);
-                                }
-                            }
-                        }
-                        else
-                        {
-                            // Check refinements
-                            var refData = _refinements.ByKey.SelectMany(r => r.Value.Recipes.Select(rec => new RefinementData(r.Key, rec.Key, rec.Value, r.Value.PrimaryStat)))
-                                .FirstOrDefault(rd => rd.Name == lastEntry.TaskName);
+                    //     // Check if it's a recurring quest or refinement
+                    //     var quest = _quests.All.FirstOrDefault(q => q.Name == lastEntry.TaskName);
+                    //     if (quest.Name != null)
+                    //     {
+                    //         var detail = _questDetails[quest];
+                    //         if (detail.Type == QuestType.Recurring)
+                    //         {
+                    //             var questData = new QuestData(quest, detail);
+                    //             if (CanAfford(questData, character))
+                    //             {
+                    //                 // Use -1.5 as initialSecondsElapsed to provide a "preparing" visual delay in the UI
+                    //                 StartQuest(questData, character, -1.5);
+                    //             }
+                    //         }
+                    //     }
+                    //     else
+                    //     {
+                    //         // Check refinements
+                    //         var refData = _refinements.ByKey.SelectMany(r => r.Value.Recipes.Select(rec => new RefinementData(r.Key, rec.Key, rec.Value, r.Value.PrimaryStat)))
+                    //             .FirstOrDefault(rd => rd.Name == lastEntry.TaskName);
 
-                            if (refData.Name != null && CanAfford(refData, character))
-                            {
-                                StartQuest(refData, character, -1.5);
-                            }
-                        }
-                    }
+                    //         if (refData.Name != null && CanAfford(refData, character))
+                    //         {
+                    //             StartQuest(refData, character, -1.5);
+                    //         }
+                    //     }
+                    // }
                 }
             }
         }

Mythril.Data/ResourceManager_Quests.cs

@@ -49,10 +49,10 @@ public void CancelQuest(QuestProgress progress)
         {
             _gameStore.Dispatch(new CancelQuestAction(progress));
             RefundCosts(progress.Item);
-            
-            // Add to journal as cancelled so AutoQuest knows not to repeat it
-            AddToJournal(progress.Name, progress.Character.Name, $"Cancelled {progress.Name}", wasCancelled: true);
         }
+
+        //TODO: Send a singal to whatever is managing autoquest for the character
+        
     }
 
     public bool CanAfford(object item, Character? character = null)

Mythril.Tests/AdditionalUIComponentTests.cs

@@ -237,13 +237,6 @@ public void CharacterDisplay_AutoQuestToggle_RendersWhenUnlocked()
         Assert.IsTrue(ResourceManager.IsAutoQuestEnabled(character));
     }
 
-    [TestMethod]
-    public void JournalPanel_RendersCorrectly()
-    {
-        var cut = RenderComponent<JournalPanel>();
-        Assert.IsTrue(cut.Markup.Contains("journal-panel"));
-    }
-
     [TestMethod]
     public void App_RendersCorrectly()
     {

Mythril.Tests/JournalTests.cs

@@ -209,19 +209,6 @@ public void ResourceManager_Initialize_ClearsJunctions()
         Assert.AreEqual(0, _resourceManager.JunctionManager.Junctions.Count, "Junctions should be cleared on initialization.");
     }
 
-    [TestMethod]
-    public void ResourceManager_Journal_TracksFirstTime()
-    {
-        // Act
-        _resourceManager!.ReceiveRewards(new QuestProgress(new QuestData(_quests!.All[0], _questDetails![_quests.All[0]]), "Test", 0, _resourceManager.Characters[0], 0)).Wait();
-        _resourceManager!.ReceiveRewards(new QuestProgress(new QuestData(_quests!.All[0], _questDetails![_quests.All[0]]), "Test", 0, _resourceManager.Characters[0], 0)).Wait();
-
-        // Assert
-        Assert.AreEqual(2, _resourceManager.Journal.Count);
-        // Note: Journal order is newest first in implementation
-        Assert.IsTrue(_resourceManager.Journal[1].IsFirstTime, "First completion (older) should be marked as first time.");
-        Assert.IsFalse(_resourceManager.Journal[0].IsFirstTime, "Second completion (newer) should NOT be marked as first time.");
-    }
 
     [TestMethod]
     public void Character_Name_ReturnsCorrectValue()

Mythril.Tests/ResourceManagerCoreTests.cs

@@ -8,7 +8,7 @@ namespace Mythril.Tests;
 public class RewardTests : BunitTestBase
 {
     [TestMethod]
-    public async Task ReceiveRewards_Quest_AddsItemsToInventoryAndJournal()
+    public async Task ReceiveRewards_Quest_AddsItemsToInventory()
     {
         // Arrange
         var item = new Item("Stone", "Desc", ItemType.Material);
@@ -26,13 +26,10 @@ public async Task ReceiveRewards_Quest_AddsItemsToInventoryAndJournal()
 
         // Assert
         Assert.AreEqual(5, InventoryManager.GetQuantity(item));
-        Assert.AreEqual(1, ResourceManager.Journal.Count);
-        Assert.AreEqual("Test Quest", ResourceManager.Journal[0].TaskName);
-        Assert.AreEqual("Hero", ResourceManager.Journal[0].CharacterName);
     }
 
     [TestMethod]
-    public async Task ReceiveRewards_CadenceUnlock_AddsAbilityAndJournal()
+    public async Task ReceiveRewards_CadenceUnlock_AddsAbility()
     {
         // Arrange
         var ability = new CadenceAbility("Fire Ball", "Desc");
@@ -47,12 +44,10 @@ public async Task ReceiveRewards_CadenceUnlock_AddsAbilityAndJournal()
 
         // Assert
         Assert.IsTrue(ResourceManager.UnlockedAbilities.Contains("Mage:Fire Ball"));
-        Assert.AreEqual(1, ResourceManager.Journal.Count);
-        Assert.AreEqual("Fire Ball", ResourceManager.Journal[0].TaskName);
     }
 
     [TestMethod]
-    public async Task ReceiveRewards_Refinement_AddsOutputAndJournal()
+    public async Task ReceiveRewards_Refinement_AddsOutput()
     {
         // Arrange
         var ability = new CadenceAbility("Refine", "Desc");
@@ -81,7 +76,6 @@ public async Task ReceiveRewards_Refinement_AddsOutputAndJournal()
 
         // Assert
         Assert.AreEqual(2, InventoryManager.GetQuantity(output));
-        Assert.AreEqual(1, ResourceManager.Journal.Count);
     }
 
     [TestMethod]