Tweaked Events and Normal Battles selection

Events and normal battles are pooled, so neither repeat until the pool has been exhausted.
Added event pool and battle pool to save file.

Author: LifeHckr

Classes/Events/EventDatabase.cs

@@ -6,6 +6,8 @@
 /// </summary>
 public class EventDatabase
 {
+    public const int EventDatabaseSize = 3;
+
     public static readonly EventTemplate[] EventDictionary = new[]
     {
         new EventTemplate(

Globals/SaveSystem.cs

@@ -384,6 +384,8 @@ public class SaveFile
         public int Money { get; init; }
         public int[] NoteIds { get; init; }
         public int[] RelicIds { get; init; }
+        public int[] BattlePool { get; init; }
+        public int[] EventPool { get; init; }
         public int PlayerHealth { get; init; }
         public int Shortcuts { get; init; }
         public int PlayerMaxCombo { get; init; }
@@ -394,6 +396,8 @@ public SaveFile(
             int lastRoomIdx,
             int[] noteIds,
             int[] relicIds,
+            int[] battlePool,
+            int[] eventPool,
             int playerHealth,
             int area,
             int money,
@@ -406,6 +410,8 @@ int playerMaxCombo
             LastRoomIdx = lastRoomIdx;
             NoteIds = noteIds;
             RelicIds = relicIds;
+            BattlePool = battlePool ?? [];
+            EventPool = eventPool ?? [];
             PlayerHealth = playerHealth;
             Area = area;
             Money = money;
@@ -424,6 +430,8 @@ public static void SaveGame()
             StageProducer.CurRoom,
             noteIds,
             relicIds,
+            StageProducer.BattlePool?.ToArray(),
+            EventScene.EventPool?.ToArray(),
             StageProducer.PlayerStats.CurrentHealth,
             StageProducer.CurLevel.Id,
             StageProducer.PlayerStats.Money,

Globals/StageProducer.cs

@@ -1,7 +1,8 @@
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using FunkEngine;
 using Godot;
-using GodotSteam;
 
 /**
  * <summary>StageProducer: Handles scene transitions and persistent gameplay data.</summary>
@@ -14,6 +15,7 @@ public partial class StageProducer : Node
     public static readonly RandomNumberGenerator GlobalRng = new();
 
     public static MapLevels CurLevel { get; private set; }
+    public static List<int> BattlePool { get; private set; }
 
     public static MapGrid Map { get; private set; } = new();
     private Stages _curStage = Stages.Title;
@@ -70,6 +72,8 @@ private void StartNewGame()
         PlayerStats = new PlayerStats();
 
         CurRoom = Map.GetRooms()[0].Idx;
+        BattlePool = null;
+        EventScene.EventPool = null;
         Scribe.InitRelicPools();
         IsInitialized = true;
     }
@@ -84,6 +88,8 @@ private bool LoadGame()
         }
         GlobalRng.Seed = sv.RngSeed;
         CurLevel = MapLevels.GetLevelFromId(sv.Area);
+        BattlePool = sv.BattlePool.ToList();
+        EventScene.EventPool = sv.EventPool.ToList();
         GenerateMapConsistent();
         GlobalRng.State = sv.RngState;
         CurRoom = sv.LastRoomIdx;
@@ -216,6 +222,16 @@ public void TransitionStage(Stages nextStage, int nextRoomIdx = -1)
     }
     #endregion
 
+    private void RefreshBattlePool()
+    {
+        BattlePool = new List<int>(CurLevel.NormalBattles);
+        for (int i = 0; i < BattlePool.Count - 2; i++)
+        {
+            int randIdx = GlobalRng.RandiRange(0, CurLevel.NormalBattles.Length - 1);
+            (BattlePool[i], BattlePool[randIdx]) = (BattlePool[randIdx], BattlePool[i]); //rad
+        }
+    }
+
     private BattleConfig MakeBattleConfig(Stages nextRoom, int nextRoomIdx)
     {
         BattleConfig result = new BattleConfig
@@ -228,11 +244,12 @@ private BattleConfig MakeBattleConfig(Stages nextRoom, int nextRoomIdx)
         switch (nextRoom)
         {
             case Stages.Battle:
-                int songIdx = stageRng.RandiRange(0, CurLevel.NormalBattles.Length - 1);
-                result.CurSong = Scribe.SongDictionary[CurLevel.NormalBattles[songIdx]];
-                result.EnemyScenePath = Scribe
-                    .SongDictionary[CurLevel.NormalBattles[songIdx]]
-                    .EnemyScenePath;
+                if (BattlePool == null || BattlePool.Count == 0)
+                    RefreshBattlePool();
+                int songIdx = stageRng.RandiRange(0, BattlePool.Count - 1);
+                result.CurSong = Scribe.SongDictionary[BattlePool[songIdx]];
+                result.EnemyScenePath = Scribe.SongDictionary[BattlePool[songIdx]].EnemyScenePath;
+                BattlePool.RemoveAt(songIdx);
                 break;
             case Stages.Elite:
                 int elitIdx = stageRng.RandiRange(0, CurLevel.EliteBattles.Length - 1);
@@ -291,6 +308,7 @@ public void ProgressLevels()
         Map = new();
         GenerateMapConsistent();
         CurRoom = Map.GetRooms()[0].Idx;
+        BattlePool = null;
     }
 
     #endregion

Scenes/EventScene/EventScene.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using FunkEngine;
 using Godot;
 
@@ -25,6 +26,8 @@ public partial class EventScene : Node
     [Export]
     private MarginContainer _continueContainer;
 
+    public static List<int> EventPool;
+
     private static readonly Theme ButtonTheme = GD.Load<Theme>(
         "res://Scenes/UI/Assets/GeneralTheme.tres"
     ); // Store the theme
@@ -34,15 +37,18 @@ public partial class EventScene : Node
 
     public override void _Ready()
     {
-        GD.Print("loaded event");
         _player = GD.Load<PackedScene>(PlayerPuppet.LoadPath).Instantiate<PlayerPuppet>();
         PlayerMarker.AddChild(_player);
 
-        int eventIndex = StageProducer.GlobalRng.RandiRange(
-            0,
-            EventDatabase.EventDictionary.Length - 1
-        );
+        if (EventPool == null || EventPool.Count == 0)
+            RefreshPool();
+
+        RandomNumberGenerator stageRng = new RandomNumberGenerator();
+        stageRng.SetSeed(StageProducer.GlobalRng.Seed + (ulong)StageProducer.Config.BattleRoom.Idx);
+        int eventIndex = stageRng.RandiRange(0, EventPool.Count - 1);
         _eventReference = EventDatabase.EventDictionary[eventIndex];
+
+        EventPool.RemoveAt(eventIndex);
         DisplayEvent();
     }
 
@@ -57,6 +63,20 @@ public override void _Process(double delta)
         }
     }
 
+    private void RefreshPool()
+    {
+        EventPool = new List<int>();
+        for (int i = 0; i < EventDatabase.EventDatabaseSize; i++)
+        {
+            EventPool.Add(i);
+        }
+        for (int i = 0; i < EventPool.Count - 2; i++)
+        {
+            int randIdx = StageProducer.GlobalRng.RandiRange(0, EventPool.Count - 1);
+            (EventPool[i], EventPool[randIdx]) = (EventPool[randIdx], EventPool[i]); //rad
+        }
+    }
+
     /// <summary>
     /// Displays the set event.
     /// </summary>
@@ -95,7 +115,6 @@ public void DisplayEvent()
             int capturedIndex = i;
             button.Pressed += () =>
             {
-                GD.Print($"Selected option: {_eventReference.ButtonDescriptions[capturedIndex]}");
                 _eventReference.OptionActions[capturedIndex]?.Invoke(_eventReference, this);
                 AnyButtonPressed(capturedIndex);
             };