Skip to content

Re-Implement V-slice like holds #317

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
DerpyTheHedgeone wants to merge 21 commits into
base: master-dev
Choose a base branch
from
Open

Re-Implement V-slice like holds #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
53d40bc
Re-Implement V-slice like holds
DerpyTheHedgeone Jul 5, 2025
db6b631
Merge branch 'Psych-Slice:master-dev' into master-dev
DerpyTheHedgeone Jul 18, 2025
ae5c7b2
Merge branch 'Psych-Slice:master-dev' into master-dev
DerpyTheHedgeone Jul 25, 2025
41b6dc6
Merge branch 'Psych-Slice:master-dev' into master-dev
DerpyTheHedgeone Aug 16, 2025
5c92509
Merge branch 'Psych-Slice:master-dev' into master-dev
DerpyTheHedgeone Aug 23, 2025
e82e3a6
fix roses dialogue bleep
DerpyTheHedgeone Aug 23, 2025
78d75f2
fix roses dialogue bleep (safe)
DerpyTheHedgeone Aug 23, 2025
b3bba94
make monster v-slice accurate
DerpyTheHedgeone Aug 23, 2025
dafb4ba
woops forgot about this
DerpyTheHedgeone Aug 23, 2025
74ae760
revert v-slice hold notes
DerpyTheHedgeone Aug 27, 2025
80c1e21
Re-Implement V-slice like holds
DerpyTheHedgeone Aug 27, 2025
76fc353
revert dialogue changes
DerpyTheHedgeone Aug 27, 2025
a167e43
revert dialogue changes
DerpyTheHedgeone Aug 27, 2025
f217ae2
revert monster changes
DerpyTheHedgeone Aug 27, 2025
6a1ecd5
i said revert monster changes
DerpyTheHedgeone Aug 27, 2025
1d3573c
i said revert monster changes
DerpyTheHedgeone Aug 27, 2025
05ef8aa
REVERT MONSTER CHRISTMAS CHANGES
DerpyTheHedgeone Aug 27, 2025
85fbbbd
actually revert monster changes
DerpyTheHedgeone Aug 27, 2025
8356315
WHY CAN I NOT DELETE LINE 154
DerpyTheHedgeone Aug 27, 2025
8b090e0
remove this
DerpyTheHedgeone Apr 10, 2026
77e2196
add this
DerpyTheHedgeone Apr 10, 2026
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: 1 addition & 1 deletion assets/base_game/shared/characters/monster-christmas.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,4 +150,4 @@
],
"sing_duration": 4,
"scale": 1
}
}
2 changes: 1 addition & 1 deletion assets/base_game/shared/characters/monster.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,4 +150,4 @@
],
"sing_duration": 4,
"scale": 1
}
}
3 changes: 3 additions & 0 deletions source/objects/Note.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,9 @@ class Note extends FlxSprite

this.prevNote = prevNote;
isSustainNote = sustainNote;
if (isSustainNote) {
noAnimation = true;
}
this.inEditor = inEditor;
this.moves = false;

Expand Down
12 changes: 12 additions & 0 deletions source/states/PlayState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3323,6 +3323,12 @@ class PlayState extends MusicBeatState
spawnHoldSplashOnNote(note);

if (!note.isSustainNote) invalidateNote(note);

if (note.gfNote || note.noteType == 'GF Sing') {
gf.holdTimer = 0;
} else {
dad.holdTimer = 0;
}
}

public function goodNoteHit(note:Note):Void
Expand Down Expand Up @@ -3431,6 +3437,12 @@ class PlayState extends MusicBeatState
if(result != LuaUtils.Function_Stop && result != LuaUtils.Function_StopHScript && result != LuaUtils.Function_StopAll) callOnHScript('goodNoteHit', [note]);
spawnHoldSplashOnNote(note);
if(!note.isSustainNote) invalidateNote(note);

if (note.gfNote || note.noteType == 'GF Sing') {
gf.holdTimer = 0;
} else {
boyfriend.holdTimer = 0;
}
}

public function invalidateNote(note:Note):Void {
Expand Down