Skip to content

Commit 6b8499e

Browse files
committed
v3.27.10
support LocksmithHelper
1 parent 32aec13 commit 6b8499e

File tree

8 files changed

+46
-53
lines changed

8 files changed

+46
-53
lines changed

SpeedrunTool/Source/MoreSaveSlotsUI/Snapshot.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ private static void Initialize() {
211211

212212
private static float easeY = 0f;
213213

214-
private static readonly float DeltaY = Engine.RawDeltaTime * 2f;
214+
private static float DeltaY => Engine.RawDeltaTime * 2f;
215215

216216
private static float alpha = 1f;
217217

@@ -237,6 +237,8 @@ private static void Initialize() {
237237

238238
private static float yWiggleTimer;
239239

240+
private static float WiggleSpeed => Engine.RawDeltaTime * 10f;
241+
240242
private static bool focusOnItem;
241243

242244
private static int itemOptionIndex;
@@ -325,7 +327,7 @@ private static void Update() {
325327

326328
private static void UpdateFullOpen() {
327329
if (!focusOnItem) {
328-
yWiggleTimer += Engine.RawDeltaTime * 10;
330+
yWiggleTimer += WiggleSpeed;
329331
if (Input.MenuCancel.Pressed || Input.ESC.Pressed) {
330332
ToggleTab();
331333
return;

SpeedrunTool/Source/SaveLoad/SaveLoadAction.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -333,18 +333,14 @@ private static void InitActions() {
333333

334334
// mod support
335335
SupportModSessionAndSaveData();
336-
MaxHelpingHandUtils.Support();
337-
PandorasBoxUtils.Support();
338-
CrystallineHelperUtils.Support();
336+
EasyMods.Support();
337+
PandorasBoxUtils.Support();
339338
SpringCollab2020Utils.Support();
340339
ExtendedVariantsUtils.Support();
341-
XaphanHelperUtils.Support();
342340
IsaGrabBagUtils.Support();
343341
SpirialisHelperUtils.Support();
344342
DeathTrackerHelperUtils.Support();
345-
CommunalHelperUtils.Support();
346-
BrokemiaHelperUtils.Support();
347-
VivHelperUtils.Support();
343+
BrokemiaHelperUtils.Support();
348344

349345
// 放最后,确保收集了所有克隆的 VirtualAssets 与 EventInstance
350346
contextOrder = Order_ExecuteAtLast;

SpeedrunTool/Source/SaveLoad/ThirdPartySupport/CommunalHelperUtils.cs

Lines changed: 0 additions & 15 deletions
This file was deleted.

SpeedrunTool/Source/SaveLoad/ThirdPartySupport/CrystallineHelperUtils.cs

Lines changed: 0 additions & 9 deletions
This file was deleted.

SpeedrunTool/Source/SaveLoad/ThirdPartySupport/VivHelperUtils.cs renamed to SpeedrunTool/Source/SaveLoad/ThirdPartySupport/EasyMods.cs

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,39 @@
1+
12
using Celeste.Mod.SpeedrunTool.Utils;
23

34
namespace Celeste.Mod.SpeedrunTool.SaveLoad.ThirdPartySupport;
4-
internal static class VivHelperUtils {
5+
6+
internal static class EasyMods {
57

68
internal static void Support() {
9+
CommunalHelperSupport();
10+
CrystallineHelperSupport();
11+
MaxHelpingHandSupport();
12+
VivHelperSupport();
13+
XaphanHelperSupport();
14+
LocksmithHelperSupport();
15+
}
16+
17+
[Obsolete("these partially exist in CommunalHelper, we plan to remove it from SRT")]
18+
private static void CommunalHelperSupport() {
19+
20+
SaveLoadAction.CloneModTypeFields("CommunalHelper", "Celeste.Mod.CommunalHelper.DashStates.SeekerDash",
21+
"hasSeekerDash",
22+
"seekerDashAttacking",
23+
"seekerDashTimer",
24+
"seekerDashLaunched",
25+
"launchPossible");
26+
}
27+
private static void CrystallineHelperSupport() {
28+
SaveLoadAction.CloneModTypeFields("CrystallineHelper", "vitmod.VitModule", "timeStopScaleTimer", "timeStopType", "noMoveScaleTimer");
29+
SaveLoadAction.CloneModTypeFields("CrystallineHelper", "vitmod.TriggerTrigger", "collidedEntities");
30+
}
31+
private static void MaxHelpingHandSupport() {
32+
33+
SaveLoadAction.CloneModTypeFields("MaxHelpingHand", "Celeste.Mod.MaxHelpingHand.Effects.BlackholeCustomColors", "colorsMild");
34+
35+
}
36+
private static void VivHelperSupport() {
737
if (ModUtils.GetAssembly("VivHelper") is not { } vivHelper) {
838
return;
939
}
@@ -21,4 +51,10 @@ internal static void Support() {
2151
SaveLoadAction.CloneModTypeFields("VivHelper", "VivHelper.HelperEntities", "AllUpdateHelperEntity");
2252
SaveLoadAction.CloneModTypeFields("VivHelper", "VivHelper.Module__Extensions__Etc.TeleportV2Hooks", "HackedFocusPoint");
2353
}
54+
private static void XaphanHelperSupport() {
55+
SaveLoadAction.CloneModTypeFields("XaphanHelper", "Celeste.Mod.XaphanHelper.Upgrades.SpaceJump", "jumpBuffer");
56+
}
57+
private static void LocksmithHelperSupport() {
58+
SaveLoadAction.CloneModTypeFields("LocksmithHelper", "Celeste.Mod.LocksmithHelper.Entities.Key", "Inventory");
59+
}
2460
}

SpeedrunTool/Source/SaveLoad/ThirdPartySupport/MaxHelpingHandUtils.cs

Lines changed: 0 additions & 9 deletions
This file was deleted.

SpeedrunTool/Source/SaveLoad/ThirdPartySupport/XaphanHelperUtils.cs

Lines changed: 0 additions & 8 deletions
This file was deleted.

SpeedrunTool/everest.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
- Name: SpeedrunTool
2-
Version: 3.27.9
2+
Version: 3.27.10
33
DLL: SpeedrunTool.dll
44
Dependencies:
55
- Name: Everest
6-
Version: 1.5935
6+
Version: 1.5986

0 commit comments

Comments
 (0)