Skip to content

Conversation

@TechnikTil
Copy link
Contributor

@TechnikTil TechnikTil commented Sep 8, 2025

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

@github-actions github-actions bot added size: huge A huge pull request with more than 500 changes. status: pending triage Awaiting review. pr: hscript PR modifies game scripts. pr: art PR modifies art or animations. and removed status: pending triage Awaiting review. labels Sep 8, 2025
@TechnikTil
Copy link
Contributor Author

This is also currently on the main branch, since I need at least one commit before I can change it.

@TechnikTil TechnikTil changed the base branch from main to develop September 8, 2025 16:24
@CrusherNotDrip
Copy link

CrusherNotDrip commented Sep 8, 2025

@TechnikTil I don't have the ability to change stuff u liar liar pants on fire

@TechnikTil TechnikTil changed the title [ENHANCEMENT] Week 7 Cutscenes no longer a video [ENHANCEMENT] Week 7 Cutscenes no longer a video (feat. @CrusherNotDrip) Sep 8, 2025
@TechnikTil
Copy link
Contributor Author

@TechnikTil I don't have the ability to change stuff u liar liar pants on fire

oopsie sorry

@TechnikTil TechnikTil changed the base branch from develop to feat/flixel-animate September 8, 2025 20:39
@TechnikTil TechnikTil force-pushed the feat/week7-realtime-cutscenes branch from 4b2a448 to c9baff0 Compare September 8, 2025 20:43
@github-actions github-actions bot removed the pr: hscript PR modifies game scripts. label Sep 8, 2025
@TechnikTil
Copy link
Contributor Author

this MIGHT get annoying

@github-actions github-actions bot added pr: hscript PR modifies game scripts. pr: audio PR modifies sound or music. labels Sep 9, 2025
@CrusherNotDrip
Copy link

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)

@TechnikTil TechnikTil marked this pull request as ready for review September 11, 2025 03:11
@TechnikTil
Copy link
Contributor Author

Ready!

@CrusherNotDrip
Copy link

not ready we forgot skipping

@TechnikTil
Copy link
Contributor Author

should be free of whatever you wanna call it


cutsceneMusic = FunkinSound.load(Paths.music(musicPath, "week7"), 1, false);

// we will ALL be calling daddy dearest daddy
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

true

Copy link
Contributor Author

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

Copy link
Member

@AbnormalPoof AbnormalPoof left a 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.

Comment on lines 146 to 151
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);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should maybe reorder this:

Suggested change
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);

});

gfSadAnim();
PlayState.instance.currentStage.getGirlfriend().animation.onFinish.add(gfSadAnim);
Copy link
Member

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

@AbnormalPoof AbnormalPoof added type: enhancement Provides an enhancement or new feature. status: needs revision Cannot be approved because it is awaiting some work by the contributor. labels Sep 11, 2025
@TechnikTil
Copy link
Contributor Author

TechnikTil commented Sep 11, 2025

  • Camera movements aren't completely accurate

As per the PR description:

NOTE: The cutscenes are not 100% accurate, since I used the camera follow points instead.

  • Dave says the music should fade out instead of abruptly stopping.

Will keep that in mind for the next commit.

  • Dave says BF should not bop to the beat. This likely applies to the stage props as well.

Will keep that in mind for next commit, does GF count? She bops her head in the original cutscene.

  • 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.

I'm working with Better TA to fix this issue, as it has a feature to bake the blends inside of the spritemap.

@TechnikTil TechnikTil force-pushed the feat/week7-realtime-cutscenes branch from c5b789f to 25a4206 Compare September 25, 2025 23:59
@TechnikTil
Copy link
Contributor Author

i really gotta squash this sometime soon

@TechnikTil
Copy link
Contributor Author

also ill keep this as a draft for now

@TechnikTil TechnikTil marked this pull request as draft September 26, 2025 00:01
@AbnormalPoof AbnormalPoof force-pushed the feat/flixel-animate branch 3 times, most recently from 4ee5c71 to 515c3ed Compare October 11, 2025 05:27
@TechnikTil TechnikTil force-pushed the feat/week7-realtime-cutscenes branch from e481a43 to 7509aae Compare October 11, 2025 22:44
@TechnikTil
Copy link
Contributor Author

someone please remind me to squash this once the PR is ready for review again

@github-actions github-actions bot added the pr: chart PR modifies charts, metadata, and note placement. label Oct 14, 2025
@TechnikTil TechnikTil force-pushed the feat/week7-realtime-cutscenes branch 2 times, most recently from ed99158 to ebe2c47 Compare October 21, 2025 01:08
@TechnikTil TechnikTil marked this pull request as ready for review October 21, 2025 01:09
@TechnikTil TechnikTil force-pushed the feat/week7-realtime-cutscenes branch from ebe2c47 to 7cff567 Compare October 21, 2025 01:13
@TechnikTil TechnikTil force-pushed the feat/week7-realtime-cutscenes branch from 84e91f8 to 569cb58 Compare October 21, 2025 17:19
@TechnikTil TechnikTil force-pushed the feat/week7-realtime-cutscenes branch from 569cb58 to aed9bd8 Compare November 22, 2025 03:25
@TechnikTil TechnikTil changed the base branch from feat/flixel-animate to develop November 22, 2025 03:26
@TechnikTil TechnikTil force-pushed the feat/week7-realtime-cutscenes branch from aed9bd8 to fcfa9a1 Compare November 22, 2025 03:28
@AbnormalPoof AbnormalPoof added status: pending triage Awaiting review. and removed status: needs revision Cannot be approved because it is awaiting some work by the contributor. labels Nov 22, 2025
@TechnikTil
Copy link
Contributor Author

YESSSSS

@TechnikTil
Copy link
Contributor Author

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>
@TechnikTil TechnikTil force-pushed the feat/week7-realtime-cutscenes branch from fcfa9a1 to 198099c Compare November 22, 2025 03:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr: art PR modifies art or animations. pr: audio PR modifies sound or music. pr: chart PR modifies charts, metadata, and note placement. pr: hscript PR modifies game scripts. size: huge A huge pull request with more than 500 changes. status: pending triage Awaiting review. type: enhancement Provides an enhancement or new feature.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants