Skip to content

Commit 3190df8

Browse files
committed
tweak: Validate seed provided to 'SeedRandom' is correct
1 parent df0d81d commit 3190df8

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

CelesteTAS-EverestInterop/Source/Gameplay/DesyncFix/SeededRandomness.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,8 +547,13 @@ public override void Reset() {
547547
public override void PreUpdate() {
548548
if (ModUtils.GetModule("AurorasHelper") is { } ahModule && f_currentSeed != null && f_random != null && NextSeed(out int seed)) {
549549
// Seed values are limited to positive integers https://github.com/AuroraKy/AuroraHelper/blob/4a5344bf2ae10d22471a8d402b5e2b466d062313/AurorasHelperModule.cs#L92-L93
550-
f_currentSeed.SetValue(null, seed & 0x7FFFFFFF);
551-
f_random.SetValue(ahModule, new Random(seed & 0x7FFFFFFF));
550+
int actualSeed = seed & 0x7FFFFFFF;
551+
if (seed != actualSeed) {
552+
Manager.Controller.ReportWarning(SeedSource, $"Target '{Name}' was provided a negative seed '{seed}', consider using '{actualSeed}' instead");
553+
}
554+
555+
f_currentSeed.SetValue(null, actualSeed);
556+
f_random.SetValue(ahModule, new Random(actualSeed));
552557
AssertNoSeedsRemaining();
553558
}
554559
}
@@ -567,6 +572,11 @@ public override void Reset() {
567572
}
568573
public override void PreUpdate() {
569574
if (ModUtils.GetModule("BossesHelper") is { } bossModule && f_TASSeed != null && NextSeed(out int seed)) {
575+
if (seed < 0) {
576+
Manager.Controller.ReportError(SeedSource, $"Target '{Name}' was provided a negative seed '{seed}', which it doesn't support");
577+
return;
578+
}
579+
570580
f_TASSeed.SetValue(bossModule, seed);
571581
AssertNoSeedsRemaining();
572582
}

Studio/CelesteStudio/Dialog/ChangelogDialog.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ private ChangelogDialog(VersionHistory versionHistory, List<Page> pages, Diction
108108

109109
using var fs = File.OpenRead(srcPath);
110110
var view = new ImageView { Image = new Bitmap(fs), Width = image.Width, Height = image.Height };
111-
Console.WriteLine(image.Source);
112111

113112
return (pages[currIdx].Image!.Value.Align switch {
114113
Alignment.Left => new StackLayout { Orientation = Orientation.Horizontal, VerticalContentAlignment = VerticalAlignment.Center, Spacing = PaddingSize, Items = { view, scrollable } },

0 commit comments

Comments
 (0)