Skip to content

Fix Timecrystals being eaten by pausing #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gregovin wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Fix Timecrystals being eaten by pausing #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46d21da
Upgrade to dotnet 8
gregovin Aug 27, 2025
71ccc84
Make timecrystals not loose time during unpause
gregovin Aug 28, 2025
52d0ca7
Make timecrystals handle the first frame of a pause correctly
gregovin Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Code/TimeCrystal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,12 @@ private static void LightningRenderer_Update(On.Celeste.LightningRenderer.orig_U

public static float stopTimer;

public static float prevTimer;

public static int stopStage;

public static int prevStage;

private Sprite sprite;

private Sprite flash;
Expand Down
58 changes: 32 additions & 26 deletions Code/VitModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,9 +333,18 @@ private static void HookedKeyIceInit()

private void Level_Update(On.Celeste.Level.orig_Update orig, Level self)
{
//timestop crystal
if (!self.Paused)
//time crstal
if (self.Paused) {
//jank because the level becomes "paused" after this update runs, so it's easier to just revert any changes
//that might have happened on the next frame (and we are garunteed to have at least one frame with self.Paused=true)
TimeCrystal.stopStage = TimeCrystal.prevStage;
TimeCrystal.stopTimer = TimeCrystal.prevTimer;
}
if (!(self.FrozenOrPaused || self.unpauseTimer>0))
{
//enable stupid first frame pause reversion
TimeCrystal.prevTimer = TimeCrystal.stopTimer;
TimeCrystal.prevStage = TimeCrystal.stopStage;
if (TimeCrystal.stopTimer > 0f)
{
TimeCrystal.stopTimer -= Engine.DeltaTime;
Expand Down Expand Up @@ -376,11 +385,9 @@ private void Level_Update(On.Celeste.Level.orig_Update orig, Level self)
}
}
}
}


if (TimeCrystal.stopStage > 0)
{
if (!self.Paused)
if (TimeCrystal.stopStage > 0)
{
if (TimeCrystal.timeScaleToSet < 1)
{
Expand All @@ -390,34 +397,33 @@ private void Level_Update(On.Celeste.Level.orig_Update orig, Level self)
{
timeStopScaleTimer -= Engine.DeltaTime;
}
}

float timestop_delta_mult = 1;
if (TimeCrystal.stopStage == 1)
{
timestop_delta_mult = Math.Max(TimeCrystal.timeScaleToSet, 1 - (timeStopScaleTimer / 0.5f));
}
else if (TimeCrystal.stopStage == 2)
{
timestop_delta_mult = Math.Min(1, timeStopScaleTimer / 0.5f);
}
float timestop_delta_mult = 1;
if (TimeCrystal.stopStage == 1)
{
timestop_delta_mult = Math.Max(TimeCrystal.timeScaleToSet, 1 - (timeStopScaleTimer / 0.5f));
}
else if (TimeCrystal.stopStage == 2)
{
timestop_delta_mult = Math.Min(1, timeStopScaleTimer / 0.5f);
}

if (timestop_delta_mult != 1)
{
useTimeStopDelta = true;
timeStopDelta = Engine.DeltaTime * timestop_delta_mult;
timeStopRawDelta = Engine.RawDeltaTime * timestop_delta_mult;
if (timestop_delta_mult != 1)
{
useTimeStopDelta = true;
timeStopDelta = Engine.DeltaTime * timestop_delta_mult;
timeStopRawDelta = Engine.RawDeltaTime * timestop_delta_mult;
}
else
{
useTimeStopDelta = false;
}
}
else
{
useTimeStopDelta = false;
}
}
else
{
useTimeStopDelta = false;
}

//no move trigger
if (NoMoveTrigger.stopTimer > 0f && !self.Paused)
{
Expand Down
2 changes: 1 addition & 1 deletion Code/vitmod.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>vitmod</AssemblyName>
<RootNamespace>vitmod</RootNamespace>
<LangVersion>latest</LangVersion>
Expand Down