Skip to content

Conversation

@AnimatingLegend
Copy link

@AnimatingLegend AnimatingLegend commented Feb 5, 2026

Associated Funkin PR

Linked Issues

Closes #6749 (Girlfriend's hairFall animation plays after restarting in Philly Train stages)

Description

This PR addresses a visual bug where GF's hairFall animation would trigger immediately upon restarting the song in PhillyTrain.hxc

Changes

  • Added a check in trainReset() so hairFall only plays if startedMoving is true.
  • Added getGirlfriend.dance(true) to onSongRetry to force a clean transition when restarting.
  • Included atrainSound.stop() call in the retry sequence to prevent the train whistle from carrying over into the next attempt.
  • Ensured all train-related variables are fully cleared during the restart process.

Screenshots/Videos

Original Bug Report

StickyHair_BUG_REPORT.mp4

Bug Fix

StickyHair_BUG_FIX.mp4

Applied these fixes to the erect stages also:

StickyHairErect_BUG_FIX.mp4

- Animation Reset: Added `playAnimation('danceLeft', true)` to onSongRetry to force a clean transition when restarting.

- Audio Cleanup: Included a `trainSound.stop()` call in the retry sequence to prevent the train whistle from carrying over into the next attempt.
@github-actions github-actions bot added status: pending triage Awaiting review. size: medium A medium pull request with 100 or fewer changes. pr: hscript PR modifies game scripts. and removed status: pending triage Awaiting review. size: medium A medium pull request with 100 or fewer changes. labels Feb 5, 2026
@Keoiki
Copy link
Contributor

Keoiki commented Feb 5, 2026

chatgpt ass description

@AnimatingLegend AnimatingLegend changed the base branch from main to develop February 5, 2026 12:20
// Force GF to reset to her idle dance immediately.
if (getGirlfriend() != null)
{
getGirlfriend().playAnimation('danceLeft', true);
Copy link
Contributor

Choose a reason for hiding this comment

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

Why not use getGirlfriend().dance(true) instead of playing specifically the danceLeft animation

Copy link
Author

Choose a reason for hiding this comment

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

idk why i didnt think of that. im so used to the old source code i just stuck with that instead

@Hundrec Hundrec added type: minor bug Involves a minor bug or issue. size: medium A medium pull request with 100 or fewer changes. topic: art and animation Related to visual details and errors in the game. status: pending triage Awaiting review. labels Feb 6, 2026
Softcoded GF's dance anims
Applied the same sticky-hair fixes to erect stages.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr: hscript PR modifies game scripts. size: medium A medium pull request with 100 or fewer changes. status: pending triage Awaiting review. topic: art and animation Related to visual details and errors in the game. type: minor bug Involves a minor bug or issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Bug Report: Girlfriend's hairFall animation plays after restarting in Philly Train stages

4 participants