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

feat(balance): Make Stylish trait the default behavior, add Unstylish trait #5826

Merged
merged 3 commits into from
Dec 22, 2024

Conversation

RobbieNeko
Copy link
Contributor

Checklist

Required

  • I wrote the PR title in conventional commit format.
  • I ran the code formatter.
  • I linked any relevant issues using github keyword syntax so it can be closed automatically.
  • I have committed my changes to new branch that isn't main so it won't cause conflict when updating main branch later.
  • This is a C++ PR that modifies JSON loading or behavior.
    • I have documented the changes in the appropriate location in the doc/ folder.
  • This is a PR that removes JSON entities.
    • The removed JSON entities have new entries in data/json/obsoletion/ folder or use some other migration process for existing saves.

Purpose of change

It felt a little silly to have to spend two whole points on your character appreciating wearing fancy clothing. Plus, it generally makes more sense for liking fancy clothing to be the default behavior.

Describe the solution

  • Obsoletes Stylish, making its behavior the default state
  • Adds Fashion Deficient, a new negative trait that takes away the morale boost for 1 extra point during character creation.
  • Updates the relevant docs on JSON flags (and comments in the json file itself)
  • Updates the NPC trait generation lists to instead be UNSTYLISH instead of the now-obsolete STYLISH (except No Hope, because it's funny)

Describe alternatives you've considered

  • Do nothing
  • Just reduce the cost of Stylish

Still feels a bit weird to have to spend points on what should be default behavior (and a 0-point trait would just be weird)

  • Increase points gained by Fashion Deficient to 2 to match Stylish's old cost

I just don't think it's particularly worth 2 points, but I'm perfectly happy to change it to be 2 points if that's what's preferred.

Testing

It builds, it functions, it works on my machine.

Additional context

Any suggestions for more starting traits that could use an inversion are appreciated.

Considering at least taking the first step towards making Self Aware default behavior

@github-actions github-actions bot added docs PRs releated to docs page src changes related to source code. JSON related to game datas in JSON format. tests changes related to tests mods PR changes related to mods. labels Dec 22, 2024
Copy link
Contributor

autofix-ci bot commented Dec 22, 2024

Autofix has formatted code style violation in this PR.

I edit commits locally (e.g: git, github desktop) and want to keep autofix
  1. Run git pull. this will merge the automated commit into your local copy of the PR branch.
  2. Continue working.
I do not want the automated commit
  1. Format your code locally, then commit it.
  2. Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
  3. Continue working.

If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT.

Copy link
Collaborator

@RoyalFox2140 RoyalFox2140 left a comment

Choose a reason for hiding this comment

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

Looks great

Copy link
Member

@chaosvolt chaosvolt left a comment

Choose a reason for hiding this comment

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

Compiled and load-tested, messing around as a butler both with an without the trait, seems to work.

@chaosvolt chaosvolt merged commit c21d7d0 into cataclysmbnteam:main Dec 22, 2024
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs PRs releated to docs page JSON related to game datas in JSON format. mods PR changes related to mods. src changes related to source code. tests changes related to tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants