Bugfix: More Text Fixes #2722
Merged
Bugfix: More Text Fixes #2722
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
from my other PR!
- lots of formatting fixes - added random_living_status: living to lots of things - some id edits for consistency - merging "daring" and "daring not kit" - editing an instance of "Twoleg's fence" to "Twoleg fence" for consistency - editing "random_living_status: alive" to "random_living_status: living" and editing "random_living_constraint" to "random_living_status"
- formatting fixes (hopefully. the editor is kinda weird) - change some ids for consistency/clarity - sentence flow edits - merge lonesome_gen and lonesome_no_kit (kits can't be lonesome, they're shy instead) - edited/added some status constraints
well i figured out why formatting is weird. turns out what you see is Not what you get and changing the size of the tabs from 8 to 4 does not make them actually 4 spaces. i'll pass over the file one more time to see if i got everything back to normal. sorry!
that should be all of it? hopefully
only a little bit here, thank the stars
guarding/tattletale are up there because the first trait alphabetically in them is attention-seeker, same logic as how in thoughts/alive/general.json, play_pretend_gen being right under charismatic and silly_working_cat and silly_to_living_kit are right under childish
for some reason otherclan4 just isn't in a category? startled me when i used it for a pair of cats and then got a "this should not appear" on their profiles
trans rights! 🏳️⚧️
i committed these to the wrong branch. whoops
altruistic and empathetic no longer exist; replaced them with careful and loving for the purposes of kits choosing to become medicine cats or mediators
wow that took a while. i'll pass over it again tomorrow i think. also, silly way to keep from going stir-crazy while fixing code: read the acronyms as names! app1 and app2? more like Onepaw and Twopaw! s_c can vary depending on skill; FIGHTER s_c can be Statclaw, STORY s_c could be Statvoice, and SENSE s_c can be Statnose!
whoops!!
this is why i made a draft PR honestly
just a change to make a sentence read a little better!
i'm pretty sure that i switched p_l and r_c correctly, considering that "gazes up" doesn't make sense for the cat who fell on top of the other. other than that, just a bit of formatting! i'm going to sleep now it is three am.
wait the last one would make two additional details have an unnecessary comma. glad i caught that this isn't the most elegant code but it should work
kittypets are not viscous :p
pronoun tag go brrrr
don't want those brackets in there
manually merging in official dev updates to edited files so i can auto-merge the rest!
scribblecrumb
requested changes
Sep 23, 2024
i'm hoping i didn't miss anything here!
|
um, the remaining two conflicts are actually corrections that i would like to keep? can the PR still be merged with those conflicts? |
Fixed it for you! PRs can't be merged with conflicts. The solution here was just to use the lines from your PR rather than preserving the ones from development that were conflicting. |
scribblecrumb
approved these changes
Sep 24, 2024
|
btw, what's your discord username? If you'd like the dev role then I can get that for you. |
|
oh that would be really cool! it's lovefulbun. thank you :0 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
lots of different kinds of text fixes: typos, sentence flow improvements, formatting, pronoun tags, etc.!
Linked Issues
#1818 (comment)
#1818 (comment)
Proof of Testing
Changelog/Credits
fixed a bunch of text errors!