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

Add new hairstyles from Mawranth's Hair Salon #73465

Merged
merged 4 commits into from
May 5, 2024

Conversation

BalthazarArgall
Copy link
Contributor

@BalthazarArgall BalthazarArgall commented May 2, 2024

Summary

Features "Add new hairstyles from Mawranth's Hair Salon"

Purpose of change

@Mawranth posted a few gorgeous sprites in the form of a mod. Those absolutely deserve to be in the base game but they need the data to host them first, this PR aims to add it.

Describe the solution

Checked Mawranth's implementation fixed it a little, formatted it correctly, added bells and whistles such as integration into the new hair growth system and npc distribution.

Describe alternatives you've considered

I am a bit torn on the pop references hairstyles (super princess, detective and twintails), for the time being they're being added as "normal" hairstyles but maybe they should be restricted to haircutting only, maybe they shouldn't spawn on npcs. I'll add them in a single commit so we can revert it just in case. Feel free to help me decide on the way they should be implemented, I need higher-up input here.

Testing

Spawned in game, mutated the different hair styles, seems to work fine.

Additional context

ALL CREDITS SHOULD GO TO @Mawranth. They wrote the descriptions, the names, had the original idea and everything, I am merely making the implementation easier on them.

The PR for the sprites can be found there.

I aim to do in this PR the same thing done in #61940 basically.

Co-authored-by: Mawranth <168459051+Mawranth@users.noreply.github.com>
@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies EOC: Effects On Condition Anything concerning Effects On Condition <Enhancement / Feature> New features, or enhancements on existing json-styled JSON lint passed, label assigned by github actions labels May 2, 2024
Copy link
Contributor

github-actions bot commented May 2, 2024

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • You are rockin' with these long black locks.
  • You are rockin' with these long blond locks.
  • You are rockin' with these long blue locks.
  • You are rockin' with these long brown locks.
  • You are rockin' with these long gray locks.
  • You are rockin' with these long green locks.
  • You are rockin' with these long locks.
  • You are rockin' with these long pink locks.
  • You are rockin' with these long purple locks.
  • You are rockin' with these long red locks.
  • You are rockin' with these long white locks.

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

Hints for adding a new word to the dictionary
  • If the word is normally in all lowercase, such as the noun word or the verb does, add it in its lower-case form; if the word is a proper noun, such as the surname George, add it in its initial-caps form; if the word is an acronym or has special letter case, such as the acronym CDDA or the unit mW, add it by preserving the case of all the letters. A word in the dictionary will also match its initial-caps form (if the word is in all lowercase) and all-uppercase form, so a word should be added to the dictionary in its normal letter case even if used in a different letter case in a sentence.
  • For a word to be added to the dictionary, it should either be a real, properly-spelled modern American English word, a foreign loan word (including romanized foreign names), or a foreign or made-up word that is used consistently and commonly enough in the game. Intentional misspelling (including eye dialect) of a word should not be added unless it has become a common terminology in the game, because while someone may have a legitimate use for it, another person may spell it that way accidentally.

@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label May 2, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label May 3, 2024
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label May 3, 2024
@fairyarmadillo
Copy link
Contributor

I am a bit torn on the pop references hairstyles (super princess, detective and twintails)

Out of scope here, but I'm wondering if access to this isn't something that could be tied to the Boston Anime Con magazine. At the very least it could be something you bring to the refugee center hairstylist to unlock those styles.

@anoobindisguise
Copy link
Contributor

hairstyles are entirely cosmetic, so there's no reason to limit what hairstyles you can have by specific prerequisites. If you can start the game with purple or green hair, anime styles themselves also aren't really that much of a leap. Limiting their spawns on npcs is fine though, that way it's all opt in for the player and their followers.

@fairyarmadillo
Copy link
Contributor

I don't see how them being cosmetic necessarily prevents making them interact with systems. If you want them available at chargen you could for instance hook them into the cosplay background or the otaku profession.

@BalthazarArgall BalthazarArgall marked this pull request as ready for review May 4, 2024 09:59
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label May 4, 2024
@Maleclypse Maleclypse merged commit a265fae into CleverRaven:master May 5, 2024
20 of 24 checks passed
@BalthazarArgall BalthazarArgall deleted the MawranthHair branch June 28, 2024 15:22
@BalthazarArgall BalthazarArgall restored the MawranthHair branch June 28, 2024 15:22
@BalthazarArgall BalthazarArgall deleted the MawranthHair branch June 28, 2024 15:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Enhancement / Feature> New features, or enhancements on existing EOC: Effects On Condition Anything concerning Effects On Condition [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants