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

Life and death update #2719

Merged

Conversation

Yzzuwyzzuf
Copy link
Contributor

About The Pull Request

adds new thoughts for categories like leaders losing lives, pregnancy, on death thoughts, and another rework of dark forest thoughts

Why This Is Good For ClanGen

many categories I've edited only have one possibility which gets old especially for things you see often like announcing pregnancies or leaders losing lives plus dark forest thoughts being reworked for traits cause a nervous o compassionate cat wouldnt be suddenly evil as soon as they get to the dark forest, plus, the way it currently is, it feels a bit like whiplash for, say, a bloodthirsty cat to regret and be sobbing, then regret nothing, then back to crying and sad and regretting things

Proof of Testing

20240922_015232
20240922_014242
20240922_015224
20240922_015153
20240913_095415-1
20240922_015139
20240922_014303

Changelog/Credits

reworked dark forest thoughts
added pregnancy content
added death content
-Fuzzy

resources/dicts/conditions/pregnancy.json Outdated Show resolved Hide resolved
resources/dicts/conditions/pregnancy.json Outdated Show resolved Hide resolved
resources/dicts/conditions/pregnancy.json Outdated Show resolved Hide resolved
resources/dicts/conditions/pregnancy.json Outdated Show resolved Hide resolved
resources/dicts/conditions/pregnancy.json Outdated Show resolved Hide resolved
resources/dicts/thoughts/dead/starclan/general.json Outdated Show resolved Hide resolved
resources/dicts/thoughts/dead/starclan/general.json Outdated Show resolved Hide resolved
resources/dicts/thoughts/dead/starclan/general.json Outdated Show resolved Hide resolved
resources/dicts/thoughts/dead/starclan/general.json Outdated Show resolved Hide resolved
Copy link
Contributor

@keplerstelescope keplerstelescope left a comment

Choose a reason for hiding this comment

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

edits! there's some formatting issues i'd like to solve but it'd be near-impossible to do in a review like this -.-

resources/dicts/conditions/pregnancy.json Outdated Show resolved Hide resolved
resources/dicts/conditions/pregnancy.json Outdated Show resolved Hide resolved
resources/dicts/conditions/pregnancy.json Outdated Show resolved Hide resolved
resources/dicts/conditions/pregnancy.json Outdated Show resolved Hide resolved
resources/dicts/conditions/pregnancy.json Outdated Show resolved Hide resolved
resources/dicts/thoughts/dead/starclan/general.json Outdated Show resolved Hide resolved
resources/dicts/thoughts/dead/starclan/general.json Outdated Show resolved Hide resolved
resources/dicts/thoughts/ondeath/darkforest/general.json Outdated Show resolved Hide resolved
Yzzuwyzzuf and others added 2 commits September 22, 2024 22:01
edit made with all suggested changes in mind
Copy link
Contributor

@keplerstelescope keplerstelescope left a comment

Choose a reason for hiding this comment

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

found a big whoops!

resources/dicts/conditions/pregnancy.json Outdated Show resolved Hide resolved
resources/dicts/conditions/pregnancy.json Outdated Show resolved Hide resolved
Copy link
Contributor Author

@Yzzuwyzzuf Yzzuwyzzuf left a comment

Choose a reason for hiding this comment

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

I believe I've fixed all issues but please let me know if I missed anything! ^-^

@scribblecrumb
Copy link
Collaborator

Go ahead and resolve all conversations that you've addressed! Makes it easier for me to navigate things.

resources/dicts/thoughts/dead/starclan/general.json Outdated Show resolved Hide resolved
resources/dicts/thoughts/dead/starclan/general.json Outdated Show resolved Hide resolved
resources/dicts/thoughts/dead/starclan/general.json Outdated Show resolved Hide resolved
resources/dicts/thoughts/dead/starclan/general.json Outdated Show resolved Hide resolved
resources/dicts/conditions/pregnancy.json Outdated Show resolved Hide resolved
resources/dicts/conditions/pregnancy.json Outdated Show resolved Hide resolved
resources/dicts/conditions/pregnancy.json Outdated Show resolved Hide resolved
resources/dicts/conditions/pregnancy.json Outdated Show resolved Hide resolved
resources/dicts/conditions/pregnancy.json Outdated Show resolved Hide resolved
resources/dicts/conditions/pregnancy.json Outdated Show resolved Hide resolved
Yzzuwyzzuf and others added 3 commits September 23, 2024 14:38
moved a thing I placed in the wrong category. did not change the medicine cat den thing. reasoning in comment left on suggestion
fixed med cat den thing!
@scribblecrumb scribblecrumb merged commit cebed3d into ClanGenOfficial:development Sep 23, 2024
7 checks passed
@Yzzuwyzzuf Yzzuwyzzuf deleted the life-and-death-update branch September 29, 2024 05:47
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.

5 participants