-
Notifications
You must be signed in to change notification settings - Fork 139
[ENHANCEMENT] Week 7 Cutscenes no longer a video (feat. @CrusherNotDrip) #250
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.
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
base: develop
Are you sure you want to change the base?
[ENHANCEMENT] Week 7 Cutscenes no longer a video (feat. @CrusherNotDrip) #250
Conversation
|
This is also currently on the |
|
@TechnikTil I don't have the ability to change stuff u liar liar pants on fire |
oopsie sorry |
4b2a448 to
c9baff0
Compare
|
this MIGHT get annoying |
|
Just realizing we pushed the commented out story mode check Don't worry about that we were planning on putting that back anyways, we just removed it for convince (better than hitting 1 at least 2 times to see a cutscene) |
|
Ready! |
|
not ready we forgot skipping |
|
should be free of whatever you wanna call it |
preload/scripts/songs/stress.hxc
Outdated
|
|
||
| cutsceneMusic = FunkinSound.load(Paths.music(musicPath, "week7"), 1, false); | ||
|
|
||
| // we will ALL be calling daddy dearest daddy |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
true
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i meant to get rid of this too 😭
go go another commit
AbnormalPoof
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not a bad start! Some notes:
- Camera movements aren't completely accurate, you can reference legacy's code for more accurate camera movements: https://github.com/FunkinCrew/Funkin/tree/legacy/0.2.x
- Dave says the music should fade out instead of abruptly stopping.
- Dave says BF should not bop to the beat. This likely applies to the stage props as well.
- For GF turning demon, you can quickly swap out the atlas for a sparrow, as that animation uses a blend mode that currently doesn't work properly in-game.
preload/scripts/songs/stress.hxc
Outdated
| picoCutscene.anim.addByFrameLabel("gfTurn", "gf turns demon", 24, false); | ||
| picoCutscene.setAnimationOffsets("gfTurn", 0, 0); | ||
| picoCutscene.anim.addByFrameLabel("picoSaves", "obliteration", 24, false); | ||
| picoCutscene.setAnimationOffsets("picoSaves", 0, 0); | ||
| picoCutscene.anim.addByFrameLabel("idle", "pico idle", 24, false); | ||
| picoCutscene.setAnimationOffsets("idle", 0, 0); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should maybe reorder this:
| picoCutscene.anim.addByFrameLabel("gfTurn", "gf turns demon", 24, false); | |
| picoCutscene.setAnimationOffsets("gfTurn", 0, 0); | |
| picoCutscene.anim.addByFrameLabel("picoSaves", "obliteration", 24, false); | |
| picoCutscene.setAnimationOffsets("picoSaves", 0, 0); | |
| picoCutscene.anim.addByFrameLabel("idle", "pico idle", 24, false); | |
| picoCutscene.setAnimationOffsets("idle", 0, 0); | |
| picoCutscene.anim.addByFrameLabel("gfTurn", "gf turns demon", 24, false); | |
| picoCutscene.anim.addByFrameLabel("picoSaves", "obliteration", 24, false); | |
| picoCutscene.anim.addByFrameLabel("idle", "pico idle", 24, false); | |
| picoCutscene.setAnimationOffsets("gfTurn", 0, 0); | |
| picoCutscene.setAnimationOffsets("picoSaves", 0, 0); | |
| picoCutscene.setAnimationOffsets("idle", 0, 0); |
preload/scripts/songs/guns.hxc
Outdated
| }); | ||
|
|
||
| gfSadAnim(); | ||
| PlayState.instance.currentStage.getGirlfriend().animation.onFinish.add(gfSadAnim); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you can just set PlayState.instance.currentStage.getGirlfriend().animation.curAnim.looped instead of doing this
As per the PR description:
Will keep that in mind for the next commit.
Will keep that in mind for next commit, does GF count? She bops her head in the original cutscene.
I'm working with Better TA to fix this issue, as it has a feature to bake the blends inside of the spritemap. |
2497ef4 to
76f9911
Compare
c5b789f to
25a4206
Compare
|
i really gotta squash this sometime soon |
|
also ill keep this as a draft for now |
4ee5c71 to
515c3ed
Compare
e481a43 to
7509aae
Compare
|
someone please remind me to squash this once the PR is ready for review again |
b5aac82 to
c01f25f
Compare
ed99158 to
ebe2c47
Compare
ebe2c47 to
7cff567
Compare
84e91f8 to
569cb58
Compare
569cb58 to
aed9bd8
Compare
aed9bd8 to
fcfa9a1
Compare
|
YESSSSS |
|
LETSS GOOOO |
Commit Names: - Export Tankman and Pico (GF) atlases with Better TA - Ugh & Guns progress made. - goddamn it - Stress Cutscene, and Pico re-export. - TechnikStupid - this dude only fixed it for stress - Clean Up - tiny changes to keep dave happy (and others) - ugh cutscene skipping - Re-export atlases. - Guns + Stress skipping and tiny patch ups - More accurate camera positions and tiny fixes - Subtitles (Work in Progress) - final touch ups, getting ready to squash - shit shit shit shit shit shit shit - destroy subtitles early (since u can see them above `camCutscene`), also run formatter Co-authored-by: CrusherNotDrip <crushernotdrip@tilnotdrip.org> Signed-off-by: TechnikTil <techniktil@tilnotdrip.org>
fcfa9a1 to
198099c
Compare
NOTE: Supersedes #32
What is this pull request?
This Pull Request redoes the Week 7 cutscenes but everything happens in-game instead of as a video.
Here is a video of them (It may look like the mp4 but even poorer quality (had to compress it) but it shows the countdown transition so u can still kinda see what its like in-game):
8mb.video-b4A-5b9wdpoT.mp4
Linked Issues
FunkinCrew/Funkin#3324