Slay the DynamicData

Author: maddie480

CustomCrystalHeartHelper.cs

@@ -22,21 +22,20 @@ private static void customizeParticles(On.Celeste.HeartGem.orig_Awake orig, Hear
 
             if (!self.IsGhost && LobbyHelper.IsHeartSide(self.SceneAs<Level>().Session.Area.GetSID())) {
                 // we are in a heartside: make the heart particles match the heart sprite.
-                DynData<HeartGem> selfData = new DynData<HeartGem>(self);
-                switch (selfData.Get<Sprite>("sprite").Texture.AtlasPath) {
+                switch (self.sprite.Texture.AtlasPath) {
                     case "collectables/heartGem/1/00":
-                        selfData["shineParticle"] = HeartGem.P_RedShine;
+                        self.shineParticle = HeartGem.P_RedShine;
                         break;
                     case "collectables/heartGem/2/00":
-                        selfData["shineParticle"] = HeartGem.P_GoldShine;
+                        self.shineParticle = HeartGem.P_GoldShine;
                         break;
                     case "CollabUtils2/crystalHeart/expert/00":
-                        selfData["shineParticle"] = new ParticleType(HeartGem.P_BlueShine) {
+                        self.shineParticle = new ParticleType(HeartGem.P_BlueShine) {
                             Color = Color.Orange
                         };
                         break;
                     case "CollabUtils2/crystalHeart/grandmaster/00":
-                        selfData["shineParticle"] = new ParticleType(HeartGem.P_BlueShine) {
+                        self.shineParticle = new ParticleType(HeartGem.P_BlueShine) {
                             Color = Color.DarkViolet
                         };
                         break;
@@ -54,24 +53,23 @@ private static void customizePoemDisplay(On.Celeste.Poem.orig_ctor orig, Poem se
                 self.Heart.Play("spin");
 
                 // and adjust the screen color to the heart.
-                DynData<Poem> selfData = new DynData<Poem>(self);
                 switch (self.Heart.Texture.AtlasPath) {
                     case "collectables/heartgem/1/spin00":
-                        selfData["Color"] = Calc.HexToColor("ff668a");
+                        self.Color = Calc.HexToColor("ff668a");
                         break;
                     case "collectables/heartgem/2/spin00":
-                        selfData["Color"] = Calc.HexToColor("D2AD01");
+                        self.Color = Calc.HexToColor("D2AD01");
                         break;
                     case "CollabUtils2/crystalHeart/expert/spin00":
-                        selfData["Color"] = Color.Orange;
+                        self.Color = Color.Orange;
                         break;
                     case "CollabUtils2/crystalHeart/grandmaster/spin00":
-                        selfData["Color"] = Calc.HexToColor("d9a2ff");
+                        self.Color = Calc.HexToColor("d9a2ff");
                         break;
                     default:
                         Match match = Regex.Match(self.Heart.Texture.AtlasPath, "poemtextcolor_([0-9a-fA-F]{6})");
                         if (match.Success) {
-                            selfData["Color"] = Calc.HexToColor(match.Groups[1].Value);
+                            self.Color = Calc.HexToColor(match.Groups[1].Value);
                         }
                         break;
                 }

Entities/GoldenBerryPlayerRespawnPoint.cs

@@ -23,7 +23,7 @@ internal static void Unload() {
         private static Session onSessionRestart(On.Celeste.Session.orig_Restart orig, Session self, string intoLevel) {
             Session restartSession = orig(self, intoLevel);
 
-            if (intoLevel != null && Engine.Scene is LevelExit exit && new DynData<LevelExit>(exit).Get<LevelExit.Mode>("mode") == LevelExit.Mode.GoldenBerryRestart) {
+            if (intoLevel != null && Engine.Scene is LevelExit exit && exit.mode == LevelExit.Mode.GoldenBerryRestart) {
                 // we are doing a golden berry restart! look for a golden berry player respawn point.
                 LevelData levelData = restartSession.MapData.Levels.Find(level => level.Name == intoLevel);
                 EntityData goldenRespawn = levelData.Entities.FirstOrDefault(entityData => entityData.Name == "CollabUtils2/GoldenBerryPlayerRespawnPoint");

Entities/MiniHeartDoorUnlockCutscene.cs

@@ -34,8 +34,7 @@ private IEnumerator Cutscene(Level level) {
             door.ForceTrigger = true;
 
             // wait for door to be open.
-            DynData<HeartGemDoor> doorData = new DynData<HeartGemDoor>(door);
-            while (doorData.Get<float>("openPercent") < 1f) {
+            while (door.openPercent < 1f) {
                 yield return null;
             }
             yield return 1f;
@@ -56,11 +55,10 @@ public override void OnEnd(Level level) {
                 level.Camera.Position = player.CameraTarget;
 
                 // instant open the door
-                DynData<HeartGemDoor> doorData = new DynData<HeartGemDoor>(door);
-                doorData["openPercent"] = 1f;
-                doorData["Opened"] = true;
-                doorData["Counter"] = door.Requires;
-                float openDistance = doorData.Get<float>("openDistance");
+                door.openPercent = 1f;
+                door.Opened = true;
+                door.Counter = door.Requires;
+                float openDistance = door.openDistance;
                 door.TopSolid.Bottom = door.Y - openDistance;
                 door.BotSolid.Top = door.Y + openDistance;
 

Entities/RainbowBerry.cs

@@ -45,8 +45,7 @@ public override void Added(Scene scene) {
             base.Added(scene);
 
             // fix the bloom to match golden alpha
-            DynData<Strawberry> self = new DynData<Strawberry>(this);
-            self.Get<BloomPoint>("bloom").Alpha = 0.5f;
+            bloom.Alpha = 0.5f;
 
             if (CollabMapDataProcessor.SilverBerries.ContainsKey(levelSet)) {
                 int missingBerries = 0;
@@ -90,7 +89,7 @@ public override void Added(Scene scene) {
                         // make rainbow berry invisible for now...
                         Visible = false;
                         Collidable = false;
-                        self.Get<BloomPoint>("bloom").Visible = (self.Get<VertexLight>("light").Visible = false);
+                        bloom.Visible = (light.Visible = false);
 
                         // now we wait for the player to enter the trigger. filling the HologramForCutscene field will tell the trigger to create the cutscene.
                         HologramForCutscene = hologram;

Entities/SilverBerry.cs

@@ -19,7 +19,7 @@ public class SilverBerry : Strawberry {
         private readonly bool alwaysSpawn;
 
         public SilverBerry(EntityData data, Vector2 offset, EntityID gid) : base(data, offset, gid) {
-            new DynData<Strawberry>(this)["Golden"] = true;
+            Golden = true;
             alwaysSpawn = data.Bool("alwaysSpawn");
 
             if (P_SilverGlow == null) {

Entities/SpeedBerry.cs

@@ -62,7 +62,7 @@ private static void onTransitionEnd(On.Celeste.Player.orig_OnTransition orig, Pl
 
         public SpeedBerry(EntityData data, Vector2 offset, EntityID id, bool restored) : base(data, offset, id) {
             EntityData = data;
-            new DynData<Strawberry>(this)["Golden"] = true;
+            Golden = true;
             BronzeTime = data.Float("bronzeTime", 15f);
             SilverTime = data.Float("silverTime", 10f);
             GoldTime = data.Float("goldTime", 5f);

Entities/StrawberryHooks.cs

@@ -175,6 +175,9 @@ private static string replaceStrawberryGetSound(string orig, Strawberry self) {
         /// </summary>
         private static SpeedBerry storedSpeedBerry;
 
+        private static bool hasSilver;
+        private static bool hasSpeedBerry;
+
         private static PlayerDeadBody onPlayerDie(On.Celeste.Player.orig_Die orig, Player self, Vector2 direction, bool evenIfInvincible, bool registerDeathInStats) {
             bool hasSilver = false;
             SpeedBerry speedBerry = null;
@@ -187,22 +190,23 @@ private static PlayerDeadBody onPlayerDie(On.Celeste.Player.orig_Die orig, Playe
                     speedBerry = (SpeedBerry) speedBerryFollower.Entity;
                     // Don't restart the player to the starting room if there's still time left on the speed berry
                     if (!speedBerry.TimeRanOut) {
-                        DynData<Strawberry> data = new DynData<Strawberry>(speedBerry);
-                        data["Golden"] = false;
+                        speedBerry.Golden = false;
                         // set the starting position to the spawn point
                         Level level = self.SceneAs<Level>();
-                        data["start"] = level.GetSpawnPoint(new Vector2(level.Bounds.Left, level.Bounds.Top)) + new Vector2(8, -16);
+                        speedBerry.start = level.GetSpawnPoint(new Vector2(level.Bounds.Left, level.Bounds.Top)) + new Vector2(8, -16);
                     }
                 }
             }
 
             PlayerDeadBody body = orig(self, direction, evenIfInvincible, registerDeathInStats);
 
             if (body != null) {
-                DynData<PlayerDeadBody> data = new DynData<PlayerDeadBody>(body);
-                data["hasSilver"] = hasSilver;
-                data["hasSpeedBerry"] = (speedBerry != null);
+                StrawberryHooks.hasSilver = hasSilver;
+                StrawberryHooks.hasSpeedBerry = (speedBerry != null);
                 storedSpeedBerry = speedBerry;
+            } else {
+                StrawberryHooks.hasSilver = false;
+                StrawberryHooks.hasSpeedBerry = false;
             }
             return body;
         }
@@ -222,9 +226,6 @@ private static void modDeathSound(ILContext il) {
         }
 
         private static string modGoldenDeathSound(string orig, PlayerDeadBody self) {
-            DynData<PlayerDeadBody> data = new DynData<PlayerDeadBody>(self);
-            bool hasSilver = data.Get<bool>("hasSilver");
-            bool hasSpeedBerry = data.Get<bool>("hasSpeedBerry");
             if (hasSilver && hasSpeedBerry) {
                 return "event:/SC2020_silverTimedBerry_death";
             }

LobbyHelper.cs

@@ -20,6 +20,7 @@
 namespace Celeste.Mod.CollabUtils2 {
     public static class LobbyHelper {
 
+        internal static bool pauseTimerUntilAction = false;
         private static bool unpauseTimerOnNextAction = false;
 
         private static ILHook hookOnOuiFileSelectRenderDisplayName;
@@ -196,6 +197,9 @@ internal static void Load() {
             On.Celeste.OuiFileSelectSlot.Show += onOuiFileSelectSlotShow;
             On.Celeste.OuiChapterPanel.UpdateStats += onChapterPanelUpdateStats;
 
+            On.Monocle.Entity.Removed += onEntityRemoved;
+            On.Celeste.Overworld.End += onOverworldEnd;
+
             hookOnOuiFileSelectRenderDisplayName = new ILHook(typeof(OuiFileSelectSlot).GetMethod("orig_Render"), modSelectSlotLevelSetDisplayName);
             hookOnOuiFileSelectRenderStrawberryStamp = new ILHook(typeof(OuiFileSelectSlot).GetMethod("orig_Render"), modSelectSlotCollectedStrawberries);
             hookOnOuiJournalPoemLines = new ILHook(typeof(OuiJournalPoem).GetNestedType("PoemLine", BindingFlags.NonPublic).GetMethod("Render"), modJournalPoemHeartColors);
@@ -235,6 +239,9 @@ internal static void Unload() {
             On.Celeste.OuiFileSelectSlot.Show -= onOuiFileSelectSlotShow;
             On.Celeste.OuiChapterPanel.UpdateStats -= onChapterPanelUpdateStats;
 
+            On.Monocle.Entity.Removed -= onEntityRemoved;
+            On.Celeste.Overworld.End -= onOverworldEnd;
+
             hookOnOuiFileSelectRenderDisplayName?.Dispose();
             hookOnOuiFileSelectRenderStrawberryStamp?.Dispose();
             hookOnOuiJournalPoemLines?.Dispose();
@@ -317,9 +324,8 @@ public static void OnSessionCreated() {
         private static void onLoadLevel(On.Celeste.Level.orig_LoadLevel orig, Level self, Player.IntroTypes playerIntro, bool isFromLoader) {
             orig(self, playerIntro, isFromLoader);
 
-            DynData<Session> sessionData = new DynData<Session>(self.Session);
-            if (sessionData.Data.ContainsKey("pauseTimerUntilAction") && sessionData.Get<bool>("pauseTimerUntilAction")) {
-                sessionData["pauseTimerUntilAction"] = false;
+            if (pauseTimerUntilAction) {
+                pauseTimerUntilAction = false;
                 self.TimerStopped = true;
                 unpauseTimerOnNextAction = true;
             }
@@ -550,7 +556,7 @@ private static IEnumerator onAssistUnlockRoutine(On.Celeste.OuiChapterSelectIcon
                 // we just assist unlocked the lobbies!
                 LevelSetStats stats = SaveData.Instance.GetLevelSetStatsFor($"{collab}/0-Lobbies");
                 stats.UnlockedAreas = stats.Areas.Count - 1;
-                List<OuiChapterSelectIcon> icons = new DynData<OuiChapterSelect>((self.Scene as Overworld).GetUI<OuiChapterSelect>()).Get<List<OuiChapterSelectIcon>>("icons");
+                List<OuiChapterSelectIcon> icons = (self.Scene as Overworld).GetUI<OuiChapterSelect>().icons;
                 icons[self.Area + 1].AssistModeUnlockable = false;
                 for (int i = self.Area + 2; i <= SaveData.Instance.MaxArea; i++) {
                     icons[i].Show();
@@ -573,6 +579,21 @@ private static void onJournalEnter(OuiJournal journal, Oui from) {
             }
         }
 
+        // those are Everest fields, so they aren't publicized :despair:
+        private static readonly FieldInfo f_totalGoldenStrawberries = typeof(OuiFileSelectSlot).GetField("totalGoldenStrawberries", BindingFlags.NonPublic | BindingFlags.Instance);
+        private static readonly FieldInfo f_totalHeartGems = typeof(OuiFileSelectSlot).GetField("totalHeartGems", BindingFlags.NonPublic | BindingFlags.Instance);
+        private static readonly FieldInfo f_totalCassettes = typeof(OuiFileSelectSlot).GetField("totalCassettes", BindingFlags.NonPublic | BindingFlags.Instance);
+        private static readonly FieldInfo f_maxStrawberryCount = typeof(OuiFileSelectSlot).GetField("maxStrawberryCount", BindingFlags.NonPublic | BindingFlags.Instance);
+        private static readonly FieldInfo f_maxGoldenStrawberryCount = typeof(OuiFileSelectSlot).GetField("maxGoldenStrawberryCount", BindingFlags.NonPublic | BindingFlags.Instance);
+        private static readonly FieldInfo f_maxStrawberryCountIncludingUntracked = typeof(OuiFileSelectSlot).GetField("maxStrawberryCountIncludingUntracked", BindingFlags.NonPublic | BindingFlags.Instance);
+        private static readonly FieldInfo f_maxCassettes = typeof(OuiFileSelectSlot).GetField("maxCassettes", BindingFlags.NonPublic | BindingFlags.Instance);
+        private static readonly FieldInfo f_maxCrystalHearts = typeof(OuiFileSelectSlot).GetField("maxCrystalHearts", BindingFlags.NonPublic | BindingFlags.Instance);
+        private static readonly FieldInfo f_maxCrystalHeartsExcludingCSides = typeof(OuiFileSelectSlot).GetField("maxCrystalHeartsExcludingCSides", BindingFlags.NonPublic | BindingFlags.Instance);
+        private static readonly FieldInfo f_summitStamp = typeof(OuiFileSelectSlot).GetField("false", BindingFlags.NonPublic | BindingFlags.Instance);
+        private static readonly FieldInfo f_farewellStamp = typeof(OuiFileSelectSlot).GetField("false", BindingFlags.NonPublic | BindingFlags.Instance);
+
+        private static readonly Dictionary<OuiFileSelectSlot, List<string>> customHeartsPerSaveFileSlot = new Dictionary<OuiFileSelectSlot, List<string>>();
+
         private static void onOuiFileSelectSlotShow(On.Celeste.OuiFileSelectSlot.orig_Show orig, OuiFileSelectSlot self) {
             // If we are currently in a collab map, display the lobby level set stats instead.
             AreaKey? savedLastArea = null;
@@ -618,24 +639,23 @@ private static void onOuiFileSelectSlotShow(On.Celeste.OuiFileSelectSlot.orig_Sh
                     }
                 }
 
-                DynData<OuiFileSelectSlot> slotData = new DynData<OuiFileSelectSlot>(self);
-                slotData["totalGoldenStrawberries"] = totalGoldenStrawberries;
-                slotData["totalHeartGems"] = totalHeartGems;
-                slotData["totalCassettes"] = totalCassettes;
-                slotData["maxStrawberryCount"] = maxStrawberryCount;
-                slotData["maxGoldenStrawberryCount"] = maxGoldenStrawberryCount;
-                slotData["maxStrawberryCountIncludingUntracked"] = maxStrawberryCountIncludingUntracked;
-                slotData["maxCassettes"] = maxCassettes;
-                slotData["maxCrystalHearts"] = maxCrystalHearts;
-                slotData["maxCrystalHeartsExcludingCSides"] = maxCrystalHeartsExcludingCSides;
-                slotData["summitStamp"] = false;
-                slotData["farewellStamp"] = false;
+                f_totalGoldenStrawberries.SetValue(self, totalGoldenStrawberries);
+                f_totalHeartGems.SetValue(self, totalHeartGems);
+                f_totalCassettes.SetValue(self, totalCassettes);
+                f_maxStrawberryCount.SetValue(self, maxStrawberryCount);
+                f_maxGoldenStrawberryCount.SetValue(self, maxGoldenStrawberryCount);
+                f_maxStrawberryCountIncludingUntracked.SetValue(self, maxStrawberryCountIncludingUntracked);
+                f_maxCassettes.SetValue(self, maxCassettes);
+                f_maxCrystalHearts.SetValue(self, maxCrystalHearts);
+                f_maxCrystalHeartsExcludingCSides.SetValue(self, maxCrystalHeartsExcludingCSides);
+                f_summitStamp.SetValue(self, false);
+                f_farewellStamp.SetValue(self, false);
 
                 self.Strawberries.Amount = totalStrawberries;
                 self.Strawberries.OutOf = maxStrawberryCount;
             }
 
-            // figure out if some hearts are customized, and store it in DynData so that a IL hook can access it later.
+            // figure out if some hearts are customized, and store it in a static variable so that an IL hook can access it later.
             SaveData oldInstance = SaveData.Instance;
             SaveData.Instance = self.SaveData;
             List<string> customJournalHearts = new List<string>();
@@ -654,7 +674,7 @@ private static void onOuiFileSelectSlotShow(On.Celeste.OuiFileSelectSlot.orig_Sh
                     }
                 }
             }
-            new DynData<OuiFileSelectSlot>(self)["collabutils2_customhearts"] = customJournalHearts;
+            customHeartsPerSaveFileSlot[self] = customJournalHearts;
             SaveData.Instance = oldInstance;
 
             // Restore the last area if it was replaced at the beginning of this method.
@@ -668,7 +688,7 @@ private static void onChapterPanelUpdateStats(On.Celeste.OuiChapterPanel.orig_Up
 
             if (IsCollabLobby(self.Area.SID)) {
                 // hide the deaths counter for collab lobbies.
-                new DynData<OuiChapterPanel>(self).Get<DeathsCounter>("deaths").Visible = false;
+                self.deaths.Visible = false;
             }
         }
 
@@ -763,13 +783,23 @@ private static void modOuiFileSelectSlotRender(ILContext il) {
         }
 
         private static MTexture reskinJournalHearts(MTexture orig, OuiFileSelectSlot self, int index) {
-            List<string> customJournalHearts = new DynData<OuiFileSelectSlot>(self).Get<List<string>>("collabutils2_customhearts");
+            List<string> customJournalHearts = customHeartsPerSaveFileSlot.GetValueOrDefault(self);
             if (customJournalHearts != null && customJournalHearts[index] != null) {
                 return MTN.Journal[customJournalHearts[index]]; // "Journal" and not "FileSelect" because it re-uses the setup people made for their custom journals.
             }
             return orig;
         }
 
+        private static void onEntityRemoved(On.Monocle.Entity.orig_Removed orig, Monocle.Entity self, Scene scene) {
+            if (self is OuiFileSelectSlot slot) customHeartsPerSaveFileSlot.Remove(slot);
+            orig(self, scene);
+        }
+
+        private static void onOverworldEnd(On.Celeste.Overworld.orig_End orig, Overworld self) {
+            customHeartsPerSaveFileSlot.Clear();
+            orig(self);
+        }
+
         private static void modJournalPoemHeartColors(ILContext il) {
             ILCursor cursor = new ILCursor(il);