Skip to content

Fix the wind fix making the wires nearly static when there's no wind #1122

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
SnipUndercover wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix the wind fix making the wires nearly static when there's no wind #1122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 26 additions & 11 deletions Celeste.Mod.mm/Patches/Wire.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ namespace Celeste {
class patch_Wire : Wire {
private bool fixWindBehavior;

// from empirical testing 100f seemed about the right amount to lower the wind amplitude by
private float ReducedVisualWind =>
Scene is Level level ? level.Wind.X / 100f + level.WindSine : 0f;

public patch_Wire(EntityData data, Vector2 offset) : base(data, offset) {
// no-op. MonoMod ignores this - we only need this to make the compiler shut up.
}
Expand Down Expand Up @@ -51,24 +55,35 @@ static partial class MonoModRules {
public static void PatchWireRender(ILContext il, CustomAttribute attrib) {
ILCursor cursor = new ILCursor(il);

// from empirical testing this seemed about the right amount to lower the wind amplitude by
const float windAmplitudeReduction = 100f;
TypeDefinition t_Wire = il.Method.DeclaringType;

// use ReducedVisualWind if necessary
cursor.GotoNext(MoveType.Before,
static instr => instr.MatchLdloc(0),
static instr => instr.MatchCallvirt("Celeste.Level", "get_VisualWind"));
ILLabel needsFix = cursor.DefineLabel();
ILLabel join = cursor.DefineLabel();

// fixWindBehavior ?
cursor.EmitLdarg0();
cursor.EmitLdfld(t_Wire.FindField("fixWindBehavior"));
cursor.EmitBrtrue(needsFix);

// : level.VisualWind
cursor.Index += 2;
cursor.EmitBr(join);

// lower the VisualWind amplitude
cursor.GotoNext(MoveType.After, static instr => instr.MatchCallvirt("Celeste.Level", "get_VisualWind"));
ILLabel noDiv = cursor.DefineLabel();
// ReducedVisualWind :
cursor.MarkLabel(needsFix);
cursor.EmitLdarg0();
cursor.EmitLdfld(il.Method.DeclaringType.FindField("fixWindBehavior"));
cursor.EmitBrfalse(noDiv);
cursor.EmitLdcR4(windAmplitudeReduction);
cursor.EmitDiv();
cursor.MarkLabel(noDiv);
cursor.EmitCallvirt(t_Wire.FindProperty("ReducedVisualWind").GetMethod);
cursor.MarkLabel(join);

// insert culling code after the curve is fully set up.
cursor.GotoNext(MoveType.After, static instr => instr.MatchStfld("Monocle.SimpleCurve", "Control"));

cursor.EmitLdarg0();
cursor.EmitCall(il.Method.DeclaringType.FindMethod("System.Boolean IsVisible()"));
cursor.EmitCall(t_Wire.FindMethod("System.Boolean IsVisible()"));

// return early if IsVisible returned false
ILLabel label = cursor.DefineLabel();
Expand Down
Loading