Skip to content

Conversation

totallyzai
Copy link

@totallyzai totallyzai commented Jun 10, 2025

Description

During Pico's DJ AFK and Confirm animations, the spark the gun makes is still present even after the gun leaves the turntable. This gets rid of it when it does!

I don't know if I was supposed to replace all 3 files but I did anyway and it works just fine
fla is here

if i did anything wrong then mb, this is my first pr on github ever 😨
Fixes FunkinCrew/Funkin#5382

Screenshots/Videos

freeplay-pico.afk.fix.mp4

@github-actions github-actions bot added status: pending triage Awaiting review. pr: art PR modifies art or animations. labels Jun 10, 2025
@Hundrec Hundrec added size: large A large pull request with more than 100 changes. topic: art and animation Related to visual details and errors in the game. type: minor bug Involves a minor bug or issue. labels Jun 10, 2025
@Lasercar
Copy link
Contributor

Lasercar commented Jun 11, 2025

Might as well remove it from bit in the confirm animation too while you're at it.

Also, next time, create a new branch based off the one you're merging into, that way you can easily update it when there's merge conflicts and have more than one pending PR.

@totallyzai
Copy link
Author

totallyzai commented Jun 14, 2025

Might as well remove it from bit in the confirm animation too while you're at it.

ah true true, didn't notice. should be updated i think

Also, next time, create a new branch based off the one you're merging into, that way you can easily update it when there's merge conflicts and have more than one pending PR.

i COMPLETELY skipped over it omg 😭 mb

@totallyzai totallyzai changed the title [ENHANCEMENT] Removes DJ Pico's gun spark when AFK Removes DJ Pico's gun spark during AFK + Confirm anims Jun 14, 2025
@Lasercar
Copy link
Contributor

Lasercar commented Jun 15, 2025

screenshot-2025-06-15-17-49-52

I thought that new sprite map was a little too small, and I was right!

If you want to avoid another commit, try amending the previous one with a properly exported spritemap.

@totallyzai
Copy link
Author

screenshot-2025-06-15-17-49-52

I thought that new sprite map was a little too small, and I was right!

If you want to avoid another commit, try amending the previous one with a properly exported spritemap.

alr, it SHOULD work now hopefully maybe, i had to install github desktop to amend but im like 70% sure i did it correctly(?)

@Lasercar
Copy link
Contributor

alr, it SHOULD work now hopefully maybe, i had to install github desktop to amend but im like 70% sure i did it correctly(?)

.........Did you push the new changes? You'll have to use the force since you're amending the previous commit.

@totallyzai
Copy link
Author

alr, it SHOULD work now hopefully maybe, i had to install github desktop to amend but im like 70% sure i did it correctly(?)

.........Did you push the new changes? You'll have to use the force since you're amending the previous commit.

AH ok i see, should be there now

@Hundrec Hundrec added size: huge A huge pull request with more than 500 changes. and removed size: large A large pull request with more than 100 changes. labels Jun 18, 2025
@Hundrec Hundrec changed the title Removes DJ Pico's gun spark during AFK + Confirm anims Remove DJ Pico's gun spark during AFK + Confirm anims Jul 16, 2025
@AbnormalPoof AbnormalPoof force-pushed the main branch 2 times, most recently from 34fd992 to c371066 Compare August 2, 2025 16:59
@AbnormalPoof
Copy link
Member

I ended up doing this one myself internally, apologies!!!

@AbnormalPoof AbnormalPoof added status: rejected PR did not pass review or cannot be approved. and removed type: minor bug Involves a minor bug or issue. status: pending triage Awaiting review. pr: art PR modifies art or animations. topic: art and animation Related to visual details and errors in the game. labels Sep 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size: huge A huge pull request with more than 500 changes. status: rejected PR did not pass review or cannot be approved.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Bug Report: DJ Pico's gun sparks don't disappear during AFK animation

4 participants