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

Big Expansion to dialogue/messages for various categories #74360

Merged
merged 70 commits into from
Oct 5, 2024

Conversation

PandaBlyat
Copy link
Contributor

Summary

Content "Massive expansion of dialogues and messages for various categories"

Purpose of change

To enrich the game experience by adding a diverse and extensive range of dialogues and messages. This includes health messages, schizophrenia dialogues, children's notes, survivor notes, and dreams, making the in-game interactions more immersive and varied.

Describe the solution

The solution involves adding multiple new entries to existing JSON files that contain dialogues and messages. These include:
health_msgs.json: Expanded health status messages.
schizophrenia.json: Expanded dialogues and interactions related to schizophrenia.
children_notes.json: Added more notes from the perspective of children.
dreams.json: Added more diverse and twisted dreams.
survivor_notes.json: Expanded notes left by survivors.

Describe alternatives you've considered

Testing

Loaded the game with the modified JSON files.
Ensured that the new messages and dialogues appear correctly in the game.
Verified that there are no syntax errors in the JSON files.
Checked that the game runs without any crashes or issues related to the new entries.

Additional context

The expansion aims to bring more depth and variety to the in-game text interactions

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding Mods: Xedra Evolved Anything to do with Xedra Evolved labels Jun 7, 2024
@github-actions github-actions bot requested a review from Maleclypse June 7, 2024 02:15
@PandaBlyat PandaBlyat changed the title Expanded dialogues and messages for health, schizophrenia, children's… Big Expansion to dialogue/messages for various categories Jun 7, 2024
Copy link
Member

@Venera3 Venera3 left a comment

Choose a reason for hiding this comment

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

This line count is pretty much unreviewable*, and you don't need to remove the existing snippets before re-adding them.
Break it up into 500-1000 line chunks and submit it as multiple PRs, please.

*Both in the sense of "nobody will review 12K lines of JSON at once" and "my phone nopes out of Firefox when I open the diff"

@Uwuewsky
Copy link
Contributor

Uwuewsky commented Jun 7, 2024

It looks like your IDE changed the indentation from 2 spaces to 4, which is why there is such a huge diff. Before sending PR, you need format the files using a formatter, as described in the docs. Although the GitHub bot should have suggested a fix if the checks had not been stopped.

@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Jun 7, 2024
@PandaBlyat
Copy link
Contributor Author

Member

yeah that's fair, ill try to just make a mod out of it then, sounds like a lot of hassle keep PR'ing and merging etc every 500 lines of dialogue. and takes away time from adding more content. Appreciate the comments tho.

@Procyonae
Copy link
Contributor

Procyonae commented Jun 7, 2024

If you fix the whitespace stuff so it's mergeable period I don't mind reviewing it

@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions and removed json-styled JSON lint passed, label assigned by github actions labels Jun 11, 2024
Copy link
Member

@Maleclypse Maleclypse left a comment

Choose a reason for hiding this comment

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

Still more to do

data/json/snippets/schizophrenia.json Outdated Show resolved Hide resolved
data/json/snippets/schizophrenia.json Outdated Show resolved Hide resolved
data/json/snippets/schizophrenia.json Outdated Show resolved Hide resolved
data/json/snippets/schizophrenia.json Outdated Show resolved Hide resolved
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Copy link
Contributor

github-actions bot commented Oct 4, 2024

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

Click to expand
  • "Dad and I have been living in the woods for a week now. He gives me his pistol when he is out hunting. It wasn't enough to stop the werewolf that attacked me. So I had to hide in a small hole for a whole night where it couldn't reach me. Luckily dad found me and killed it. He also said he will make me a werewolf jacket for my birthday. A WEREWOLF JACKET, IHAVETHECOOLESTDADINTHEWORLD."
  • "I saw Mr. Henderson today, but he didn't say hi back. His eyes were all white and he didn't have his glasses on. He just stood there in the yard staring at the sky."
  • "In case of emergency fill out this form so that you may present it to emergency personnel for identification purposes. Keep this form with your emergency supplies. If You need to request new copies of this form, speak with the school safety office. Remember to keep calm, and stay in one location if possible, this will help emergency personnel to find you. If this form is found please contact Oak Grove Elementary School. Name: Aiden. Parent or Guardian: Mommy Daddy. Phone number where you can be reached: I don't remember I think it has a 5 in it. Teacher: Miss daisy. Current location: I dont no I'm scared, Im hear all alone. Medical Conditions ie diabetes: I dont no what that is. Additional Information: Why is everyone acting so weird?!"
  • "Jessica, if you're reading this, I made it to the old cabin. It's safe here. Please come find me. I need you."
  • "Mommy is behind me forcing me to draw and write notes. I don't know why, but she has been acting weirder everyday, and I think she hurt daddy… I'm scared im scared, someone help, im scared im… (The rest of the note seems to be endless begging for help until it ends in a bloody smear)"
  • "My dearest Emily, I'm sorry I couldn't be there to protect you. I hope you're somewhere safe. I love you so much."
  • "To my dearest Emily, if you're reading this, I want you to know that I never stopped looking for you. Please be safe. I love you more than anything."
  • Alrighty.
  • Bon appétit, apocalypse style!
  • Damn, sounds like a warzone out there. Hope we're not next on the chopping block.
  • Damn, that's a stanky joint.
  • Get to steppin'
  • Goddamn, that's a skunky smell.
  • Hell's bells, what's happening over there? Sounds like a real clusterfuck.
  • How did you endure the beginning of the endxxxxx?
  • I ain't got time to ble-wait, that's a lot of blood. Give me a second while I patch this. Need to keep my focus!
  • I'm off to snoozeville. Keep safe.
  • I'ma cut those fuckin' tentacles off, bitch! You think you can mess with me and get away with it? Think again!
  • Roger wilco.
  • Sometimes I think about those survivalist nutjobs. Bet they're having the last laugh now.
  • Sounds like someone's getting a serious beatdown. Better stay sharp.
  • Well, I'll be damned. Looks like I'm still kickin'.
  • You blazing that kush?
  • blissed out
  • nada
  • nope, ain't happenin'
  • nope, nada, never
  • oh, lordy
  • piss off, you knobhead
  • shitballs
  • you are a colossal fuckwit

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.

@Maleclypse Maleclypse merged commit 96ab1ce into CleverRaven:master Oct 5, 2024
19 of 23 checks passed
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Oct 5, 2024
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 [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mods: Xedra Evolved Anything to do with Xedra Evolved Mods Issues related to mods or modding new contributor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants