Skip to content

Input Improvements & Fixes #837

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
HEIHUAa wants to merge 19 commits into
base: main
Choose a base branch
from
Open

Input Improvements & Fixes #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4e27304
Input
HEIHUAa Nov 26, 2025
6a3d1da
Health
HEIHUAa Nov 26, 2025
ca4611f
optimize
HEIHUAa Nov 27, 2025
5bc6acb
Update StrumLine.hx
HEIHUAa Nov 27, 2025
c20b115
Update StrumLine.hx
HEIHUAa Nov 27, 2025
46c9ef8
Delete directly?
HEIHUAa Nov 27, 2025
a5049f0
Update StrumLine.hx
HEIHUAa Nov 27, 2025
3118979
Merge branch 'CodenameCrew:main' into Input
HEIHUAa Nov 28, 2025
2788281
Merge branch 'CodenameCrew:main' into Input
HEIHUAa Nov 29, 2025
702de1d
Merge branch 'CodenameCrew:main' into Input
HEIHUAa Nov 30, 2025
65779ea
Merge branch 'CodenameCrew:main' into Input
HEIHUAa Nov 30, 2025
f770023
optimize
HEIHUAa Nov 30, 2025
0c8c908
Update StrumLine.hx
HEIHUAa Nov 30, 2025
3c8bdeb
Merge branch 'CodenameCrew:main' into Input
HEIHUAa Dec 13, 2025
343063a
Options.sustainsAsOneNote
HEIHUAa Dec 13, 2025
7987034
languages
HEIHUAa Dec 13, 2025
a6250f1
Update Options.xml
HEIHUAa Dec 13, 2025
27a1705
Update PlayState.hx
HEIHUAa Dec 13, 2025
3cc7b5c
Flags
HEIHUAa Dec 13, 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
2 changes: 2 additions & 0 deletions source/funkin/backend/system/Flags.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ class Flags {
public static var DEFAULT_MODCHART_HOLD_SUBDIVISIONS:Int = 4;
#end

public static var SUSTAINS_AS_ONE_NOTE:Bool = true;

@:also(funkin.game.Character.FALLBACK_DEAD_CHARACTER)
public static var DEFAULT_GAMEOVER_CHARACTER:String = "bf-dead";

Expand Down
9 changes: 8 additions & 1 deletion source/funkin/game/PlayState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1837,7 +1837,14 @@ class PlayState extends MusicBeatState
var directionID:Null<Int> = note == null ? direction : note.strumID;
if (playerID == null || directionID == null || playerID == -1) return;

var event:NoteMissEvent = gameAndCharsEvent("onPlayerMiss", EventManager.get(NoteMissEvent).recycle(note, -10, 1, muteVocalsOnMiss, note != null ? -0.0475 : -0.04, Paths.sound(FlxG.random.getObject(Flags.DEFAULT_MISS_SOUNDS)), FlxG.random.float(0.1, 0.2), note == null, combo > 5, "sad", true, true, "miss", strumLines.members[playerID].characters, playerID, note != null ? note.noteType : null, directionID, 0));
if (Flags.SUSTAINS_AS_ONE_NOTE) {
if (note != null ? (note.isSustainNote && note.prevNote != null && note.prevNote.isSustainNote && !note.prevNote.wasGoodHit) : false) {
strumLine.deleteNote(note);
return;
}
}

var event:NoteMissEvent = gameAndCharsEvent("onPlayerMiss", EventManager.get(NoteMissEvent).recycle(note, -10, 1, muteVocalsOnMiss, note != null ? ((note.isSustainNote && Flags.SUSTAINS_AS_ONE_NOTE) ? -0.1425 : -0.0475) : -0.04, Paths.sound(FlxG.random.getObject(Flags.DEFAULT_MISS_SOUNDS)), FlxG.random.float(0.1, 0.2), note == null, combo > 5, "sad", true, true, "miss", strumLines.members[playerID].characters, playerID, note != null ? note.noteType : null, directionID, 0));
strumLine.onMiss.dispatch(event);
if (event.cancelled) {
gameAndCharsEvent("onPostPlayerMiss", event);
Expand Down
46 changes: 25 additions & 21 deletions source/funkin/game/StrumLine.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,14 +258,19 @@ class StrumLine extends FlxTypedGroup<Strum> {
}
}

var __funcsToExec:Array<Note->Void> = [];
var __pressed:Array<Bool> = [];
var __justPressed:Array<Bool> = [];
var __justReleased:Array<Bool> = [];
var __notePerStrum:Array<Note> = [];

function __inputProcessPressed(note:Note) {
if (__pressed[note.strumID] && note.isSustainNote && note.sustainParent != null && note.sustainParent.wasGoodHit && note.strumTime < __updateNote_songPos && !note.wasGoodHit) {
if (__pressed[note.strumID] && note.isSustainNote && note.strumTime < __updateNote_songPos && !note.wasGoodHit) {
note.tripTimer = 1;
PlayState.instance.goodNoteHit(this, note);
}
}
function __inputProcessPressedOne(note:Note) {
if (__pressed[note.strumID] && note.isSustainNote && note.sustainParent != null && note.prevNote != null && note.prevNote.wasGoodHit && note.strumTime < __updateNote_songPos && !note.wasGoodHit) {
note.tripTimer = 1;
PlayState.instance.goodNoteHit(this, note);
}
Expand Down Expand Up @@ -297,12 +302,11 @@ class StrumLine extends FlxTypedGroup<Strum> {

if (cpu) return;

__funcsToExec.clear();
__pressed.resize(members.length);
__justPressed.resize(members.length);
__justReleased.resize(members.length);

for(i in 0...members.length) {
for (i in 0...members.length) {
__pressed[i] = members[i].__getPressed(this);
__justPressed[i] = members[i].__getJustPressed(this);
__justReleased[i] = members[i].__getJustReleased(this);
Expand All @@ -316,34 +320,34 @@ class StrumLine extends FlxTypedGroup<Strum> {
__justPressed = CoolUtil.getDefault(event.justPressed, []);
__justReleased = CoolUtil.getDefault(event.justReleased, []);

__notePerStrum = cast new haxe.ds.Vector(members.length);//[for(_ in 0...members.length) null];
__notePerStrum = cast new haxe.ds.Vector(members.length); // [for(_ in 0...members.length) null];

if (__justPressed.contains(true)) {
notes.forEachAlive(__inputProcessJustPressed);

if (!ghostTapping) for (k => pr in __justPressed) if (pr && __notePerStrum[k] == null)
PlayState.instance.noteMiss(this, null, k, ID); // FUCK YOU
}

if (__pressed.contains(true)) {
for(c in characters)
for (e in __notePerStrum)
if (e != null)
PlayState.instance.goodNoteHit(this, e);

for (c in characters)
if (c.lastAnimContext != DANCE)
c.__lockAnimThisFrame = true;

__funcsToExec.push(__inputProcessPressed);
}
if (__justPressed.contains(true))
__funcsToExec.push(__inputProcessJustPressed);

if (__funcsToExec.length > 0) {
notes.forEachAlive(function(note:Note) {
for(e in __funcsToExec) if (e != null) e(note);
});
if (Flags.SUSTAINS_AS_ONE_NOTE)
notes.forEachAlive(__inputProcessPressedOne);
else
notes.forEachAlive(__inputProcessPressed);
}

if (!ghostTapping) for(k=>pr in __justPressed) if (pr && __notePerStrum[k] == null) {
// FUCK YOU
PlayState.instance.noteMiss(this, null, k, ID);
}
for(e in __notePerStrum) if (e != null) PlayState.instance.goodNoteHit(this, e);

forEach(function(str:Strum) {
str.updatePlayerInput(str.__getPressed(this), str.__getJustPressed(this), str.__getJustReleased(this));
});

PlayState.instance.gameAndCharsCall("onPostInputUpdate");
}

Expand Down