From 83894b56acb109429b5228a68594570e00e41653 Mon Sep 17 00:00:00 2001 From: LozenChen <865466388@qq.com> Date: Sun, 10 Mar 2024 21:37:37 +0800 Subject: [PATCH 1/2] bugfix: make dash through spikes render normally when simplifying graphics --- .../Source/EverestInterop/SimplifiedGraphicsFeature.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CelesteTAS-EverestInterop/Source/EverestInterop/SimplifiedGraphicsFeature.cs b/CelesteTAS-EverestInterop/Source/EverestInterop/SimplifiedGraphicsFeature.cs index 4f3a4b700..5f57d5184 100644 --- a/CelesteTAS-EverestInterop/Source/EverestInterop/SimplifiedGraphicsFeature.cs +++ b/CelesteTAS-EverestInterop/Source/EverestInterop/SimplifiedGraphicsFeature.cs @@ -629,6 +629,7 @@ private static EventInstance AudioOnPlay_string(On.Celeste.Audio.orig_Play_strin return result; } + private static void SpikesOnAdded(On.Celeste.Spikes.orig_Added orig, Spikes self, Scene scene) { if (TasSettings.SimplifiedGraphics && TasSettings.SimplifiedSpikes) { string spikeType = AreaData.Get(scene).Spike; @@ -639,6 +640,10 @@ private static void SpikesOnAdded(On.Celeste.Spikes.orig_Added orig, Spikes self if (spikeType != "tentacles" && self.GetType().FullName != "VivHelper.Entities.AnimatedSpikes") { self.overrideType = "outline"; } + + if (self.GetType().FullName == "Celeste.Mod.NerdHelper.Entities.DashThroughSpikes") { + self.overrideType = "Kalobi/NerdHelper/dashthroughspike"; + } } orig(self, scene); From 5b9a98c193749d50053d9ca4d7cb19d02d35ab0c Mon Sep 17 00:00:00 2001 From: DemoJameson Date: Mon, 11 Mar 2024 14:34:46 +0800 Subject: [PATCH 2/2] Update SimplifiedGraphicsFeature.cs --- .../Source/EverestInterop/SimplifiedGraphicsFeature.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CelesteTAS-EverestInterop/Source/EverestInterop/SimplifiedGraphicsFeature.cs b/CelesteTAS-EverestInterop/Source/EverestInterop/SimplifiedGraphicsFeature.cs index 5f57d5184..2895a7580 100644 --- a/CelesteTAS-EverestInterop/Source/EverestInterop/SimplifiedGraphicsFeature.cs +++ b/CelesteTAS-EverestInterop/Source/EverestInterop/SimplifiedGraphicsFeature.cs @@ -629,7 +629,6 @@ private static EventInstance AudioOnPlay_string(On.Celeste.Audio.orig_Play_strin return result; } - private static void SpikesOnAdded(On.Celeste.Spikes.orig_Added orig, Spikes self, Scene scene) { if (TasSettings.SimplifiedGraphics && TasSettings.SimplifiedSpikes) { string spikeType = AreaData.Get(scene).Spike; @@ -783,4 +782,4 @@ public override void Update() { Entity?.RemoveSelf(); RemoveSelf(); } -} \ No newline at end of file +}