sloukit / pydew-valley-uzh

Mod of Pydew Valley for an experimental study in Psychology
Creative Commons Zero v1.0 Universal
32 stars 61 forks source link

plants assets, image folder refactor, removed drops, started level system #206

Closed ylhs-262912 closed 1 month ago

ylhs-262912 commented 1 month ago

Please go the the Preview tab and select the appropriate sub-template:

added assets from asset pack Refactored image folder removed drop functionality started level level system framework

I removed the existing drop system. this means trees no longer drop items on to the ground. Instead, when destroyed, they directly appear in the player's inventory. Video Demonstration: https://github.com/user-attachments/assets/49fa737b-49df-44ba-a3a8-587dfe5bdf0d

I created the skeleton of the level system: the main has a image variable. this is used by the following three functions in the main: image -for updating of round variable through debug triggers: image -for normal updating of the round variable: image these functions can be used as parameters in classes to be called outside of main. Right now, the round increments with the round end menu and updates the earthquake effect. Video Demonstration: https://github.com/user-attachments/assets/5fe7c857-af94-4fb7-a632-e899b342c31d image

Note: all changes were approved by sophie before this PR was made. If you want the full DMs between me and sophie regarding this PR just ask.

sloukit commented 1 month ago

Can you please fetch this branch? There are some conflicts with older merges. Thanks!

ylhs-262912 commented 1 month ago

image can't start merge conflict process yet

ylhs-262912 commented 1 month ago

image it's still giving me an error, so its possible that the image folder refactor stops github's built in merge conflict resolver from working.

ylhs-262912 commented 1 month ago

got it

DangerousVanilla commented 1 month ago

Thanks @ylhs-262912, looks great! I'll see if I can figure out it's conflict issues.

DangerousVanilla commented 1 month ago

@ylhs-262912, @sloukit, my apologies, I can't believe I still missed this after so many reviews of this... This PR looks like it caused an issue for the fruit images on trees and bushes. image @ylhs-262912, do you think you could address this? I'm not sure if there are other images needing created or if it's just a matter of pointing these to the right ones, but it obviously doesn't look right anymore.

ylhs-262912 commented 1 month ago

don't worry about it, sloukit said it was fine image if it really bothers you, you can put it as a new issue or change it directly.

sloukit commented 1 month ago

See this issue created by @13-Sonja. We don't rescale the fruit on trees and bushes because it shouldn't affect gameplay