Skip to content
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

Issue 113 + Other Small Fixes #176

Merged
merged 11 commits into from
Feb 25, 2025
Merged

Issue 113 + Other Small Fixes #176

merged 11 commits into from
Feb 25, 2025

Conversation

WilsonGoins
Copy link
Collaborator

This is a monster PR, so I will clarify in detail everything that was changed here. The PR includes work from my previous PR (issue 116) so that should be merged before this is reviewed.

In the DoorDash option of w0_d1 (the night before) I fixed a scriptwriting issue.

The rest of the work pertains to w0_d3 (the second full day of orientation). I went through and I added animations and fixed script writing bugs/typos for the entirety of the day (mostly). This means I made a lot of changes to w0_d3 and then all of the options you have throughout that day (in the w0_d3_choices directory). There are a lot of different branches to go down here, so have fun reviewing that. I went through my work so hopefully it is all good, though.

The only things that are left to do in w0_d3 are to add animations for the conversation with Python at the end of the day (issue #167 and PR #169), add animations for the advisor (currently blocked bc we are waiting on art but it's issue #172), and to add animations for the breakout leader (issues #175 & #174). So there is work assigned to issues for the rest of w0_d3 after this PR goes through.

I also made some issues for other small stuff that I noticed needed fixing (issues #170, #171, & #173). I'll decide what I want to do next for development on Tuesday.

addresses issue 116 and also makes a change to the vending machine animations in w0_d1
This reverts commit b53bb13.
removed the .idea and .iml files that were mistakenly pushed. update the .gitignore to protect from this in the future. copy and pasted old changes and added in new changes from nick's feedback
finished animations for base choice in Pay Attention option. Next is to do animations for the 3 options in this branch. Then need to finish the rest of the animations in w0_d3.
worked on issue 113 a lot more. got all of the side conversation animations done. next is to go through them all again in ren'py to make sure I didn't miss anything (because I did a lot at once, very late) and then to do animations for the registration scene
Just pushing this to write my updated Todo because I thought of something new. We need to go through the images folder in google drive and look at all the characters we have available. If anyone has been added for which animations are currently missing, make an issue for it. Off the dome, I think this is just possibly the Delivery Driver in w0_d0 and definitely the advisor throughout the orientation. after creating issues and updating my animations proceed to todo list in previous commit
was doing a quality check on the game and noticed some things that could be improved in meetingRust so I did those
Pushing fixes to the work I did last night and throughout the week. Now I can guarantee that everything in w0_d3 is good (except for advisor not being in game) up until registration. that is what I will work on next
doordash option indicated that 15 minutes passed, and then said it had been 30 minutes in the next dialogue. Fixed this so they both say 30 minutes
I forgot to change this back to the original jump
rest will be animated in issue 167
Copy link
Collaborator

@nickv779 nickv779 left a comment

Choose a reason for hiding this comment

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

lgtm most definitely

@nickv779 nickv779 merged commit 40daa20 into ufosc:main Feb 25, 2025
1 check passed
@WilsonGoins WilsonGoins deleted the issue_113 branch February 27, 2025 22:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants