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

Various Corrections of Spelling and Clarification of Quests #31216

Merged
merged 5 commits into from
Jun 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/json/npcs/appearance_trait_groups.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
{
"//": "This assigns characters a random appearance based on racial demographics in Massachussets - numbers rounded out a bit.",
"//": "This assigns characters a random appearance based on racial demographics in Massachusetts - numbers rounded out a bit.",
"type": "trait_group",
"id": "Appearance_demographics",
"subtype": "distribution",
Expand Down
10 changes: 5 additions & 5 deletions data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
{
"id": "MISSION_BEGGAR_2_BOX_SMALL",
"type": "mission_definition",
"name": "Bring Dino Dave small cardboard boxes.",
"name": "Bring 40 small cardboard boxes",
"difficulty": 1,
"value": 0,
"goal": "MGOAL_FIND_ITEM",
Expand All @@ -265,7 +265,7 @@
{
"id": "MISSION_BEGGAR_2_DUCT_TAPE",
"type": "mission_definition",
"name": "Bring Dino Dave a roll of duct tape.",
"name": "Bring a roll of duct tape",
"difficulty": 1,
"value": 0,
"goal": "MGOAL_FIND_ITEM",
Expand All @@ -287,7 +287,7 @@
{
"id": "MISSION_BEGGAR_2_BOX_MEDIUM",
"type": "mission_definition",
"name": "Bring Dino Dave medium-sized cardboard boxes",
"name": "Bring 10 medium-sized cardboard boxes",
"difficulty": 1,
"value": 0,
"goal": "MGOAL_FIND_ITEM",
Expand All @@ -310,7 +310,7 @@
{
"id": "MISSION_BEGGAR_2_PLASTIC_SHEET",
"type": "mission_definition",
"name": "Bring Dino Dave some large plastic sheets",
"name": "Bring 10 large plastic sheets",
"difficulty": 1,
"value": 0,
"goal": "MGOAL_FIND_ITEM",
Expand All @@ -333,7 +333,7 @@
{
"id": "MISSION_BEGGAR_2_BOX_LARGE",
"type": "mission_definition",
"name": "Bring Dino Dave large cardboard boxes",
"name": "Bring 5 large cardboard boxes",
"difficulty": 1,
"value": 0,
"goal": "MGOAL_FIND_ITEM",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@
{
"type": "talk_topic",
"id": "TALK_REFUGEE_BEGGAR_3_DOCTORATE",
"dynamic_line": "Yeah, yeah, it's all very glamorous. Sure, I trained in the great ivory tower, got my PhD in mycology. Did my dissertation on signaling pathways in hyphae formation, and a postdoc in plant-fungus communication in rhyzomes. Then I got the job at the bookstore because there wasn't a ton of work for a doctor of mycology, although I'd had a few nibbles before things really got crazy. Now, people are just breaking down my door to get my sweet sweet knowledge of mold to help them fight the incoming zombie threat.",
"dynamic_line": "Yeah, yeah, it's all very glamorous. Sure, I trained in the great ivory tower, got my PhD in mycology. Did my dissertation on signaling pathways in hyphae formation, and a postdoc in plant-fungus communication in rhizomes. Then I got the job at the bookstore because there wasn't a ton of work for a doctor of mycology, although I'd had a few nibbles before things really got crazy. Now, people are just breaking down my door to get my sweet sweet knowledge of mold to help them fight the incoming zombie threat.",
"responses": [
{ "text": "Do you know about the fungal zombies though?", "topic": "TALK_REFUGEE_BEGGAR_3_MYCUS1" },
{ "text": "What was it you were saying before?", "topic": "TALK_NONE" },
Expand All @@ -516,7 +516,7 @@
{
"type": "talk_topic",
"id": "TALK_REFUGEE_BEGGAR_3_DOCTORATE1",
"dynamic_line": "Heh. Yeah, that was a great use of my time. As you can see it really helped my employment prospects. Yeah, I have a PhD in mycology. Did my dissertation on signaling pathways in hyphae formation, and a postdoc in plant-fungus communication in rhyzomes. Then I got the job at the bookstore because there wasn't a ton of work for a doctor of mycology, although I'd had a few nibbles before things really got crazy. Now, people are just breaking down my door to get my sweet sweet knowledge of mold to help them fight the incoming zombie threat.",
"dynamic_line": "Heh. Yeah, that was a great use of my time. As you can see it really helped my employment prospects. Yeah, I have a PhD in mycology. Did my dissertation on signaling pathways in hyphae formation, and a postdoc in plant-fungus communication in rhizomes. Then I got the job at the bookstore because there wasn't a ton of work for a doctor of mycology, although I'd had a few nibbles before things really got crazy. Now, people are just breaking down my door to get my sweet sweet knowledge of mold to help them fight the incoming zombie threat.",
"responses": [
{ "text": "Do you know about the fungal zombies though?", "topic": "TALK_REFUGEE_BEGGAR_3_MYCUS1" },
{ "text": "What was it you were saying before?", "topic": "TALK_NONE" },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
{
"type": "talk_topic",
"id": "TALK_REFUGEE_BEGGAR_5_PAST_RHODE",
"dynamic_line": "You don't know? The governor went nuts, like a lot of people did leading up to the end, only he had a lot more power to work with. One day he just showed up to work with a militia of rowdies and loyalists and staged a coup, taking over the government completely, killing those that opposed him, and moving as many people as he could get behidn him onto the islands. The rumors I've heard is that most of them survived the cataclysm and are still running the show there, but that seems kind of impossible to me.",
"dynamic_line": "You don't know? The governor went nuts, like a lot of people did leading up to the end, only he had a lot more power to work with. One day he just showed up to work with a militia of rowdies and loyalists and staged a coup, taking over the government completely, killing those that opposed him, and moving as many people as he could get behind him onto the islands. The rumors I've heard is that most of them survived the cataclysm and are still running the show there, but that seems kind of impossible to me.",
"responses": [
{ "text": "Do you think you'd go back and look for your family?", "topic": "TALK_REFUGEE_BEGGAR_5_PAST_RETURN" },
{ "text": "What were you saying before?", "topic": "TALK_NONE" },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"Hey there.",
"Oh, hey, it's you again.",
"What's up?",
"You're back, and still alive! Woah.",
"You're back, and still alive! Whoa.",
"Aw hey, look who's back."
],
"no": "Oh, uh... hi. You look new. I'm Aleesha."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
{
"type": "talk_topic",
"id": "TALK_REFUGEE_Fatima_Background",
"dynamic_line": "Before <the_cataclysm> I had just finished welding school actually, and was about to start looking for a job. That was fun, being a young Muslim woman in a Massachussets trade college, let me tell you.",
"dynamic_line": "Before <the_cataclysm> I had just finished welding school actually, and was about to start looking for a job. That was fun, being a young Muslim woman in a Massachusetts trade college, let me tell you.",
"responses": [
{
"text": "Welding seems like a pretty non-traditional occupational choice; is there a story there?",
Expand All @@ -136,7 +136,7 @@
{
"type": "talk_topic",
"id": "TALK_REFUGEE_Fatima_Cataclysm",
"dynamic_line": "I was on my way to visit my parents back in Burlington, waiting at a bus station, when the evacuation notices started sounding. I'd been a little out of touch for a bit and didn't realize how bad the rioting was getting. When my bus arrived it got repurposed into an evacuation vehicle, and took me here. I... I didn't used to be very religious, it's just something I was born to, but since this happened I've been thinking a lot more about God, and how grateful I am for His help in surviving. With things still so difficult, it helps to know He's got some plan for me.\n\nAnyway, mine was the second bus to arrive, and they were just getting some triage and processing stuff set up. I was put in charge of helping with the wounded, along with Uyen. Things went a little strange later on... one of the women doing triage and processing had a bit of a hang-up about particular, um, colors of people being allowed into the center. She claimed to have lost our 'papers', along with a lot of other peoples'. Thankfully because we'd helped so many we were able to argue that they could't leave us out, but there was no space left downstairs by the time we got that sorted, so here we are."
"dynamic_line": "I was on my way to visit my parents back in Burlington, waiting at a bus station, when the evacuation notices started sounding. I'd been a little out of touch for a bit and didn't realize how bad the rioting was getting. When my bus arrived it got repurposed into an evacuation vehicle, and took me here. I... I didn't used to be very religious, it's just something I was born to, but since this happened I've been thinking a lot more about God, and how grateful I am for His help in surviving. With things still so difficult, it helps to know He's got some plan for me.\n\nAnyway, mine was the second bus to arrive, and they were just getting some triage and processing stuff set up. I was put in charge of helping with the wounded, along with Uyen. Things went a little strange later on... one of the women doing triage and processing had a bit of a hang-up about particular, um, colors of people being allowed into the center. She claimed to have lost our 'papers', along with a lot of other peoples'. Thankfully because we'd helped so many we were able to argue that they couldn't leave us out, but there was no space left downstairs by the time we got that sorted, so here we are."
},
{
"type": "talk_topic",
Expand All @@ -146,7 +146,7 @@
{
"id": "MISSION_REFUGEE_Fatima_1",
"type": "mission_definition",
"name": "Find a copy of the Quran for Fatima",
"name": "Find a copy of the Quran",
"goal": "MGOAL_FIND_ITEM",
"difficulty": 2,
"value": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
"id": "TALK_REFUGEE_Garry_1_firstmeet",
"dynamic_line": "Nice to meet you too. Are you staying here, or something?",
"responses": [
{ "text": "No, I'm a traveller. What's your story?", "topic": "TALK_REFUGEE_Garry_2_stub" },
{ "text": "No, I'm a traveler. What's your story?", "topic": "TALK_REFUGEE_Garry_2_stub" },
{ "text": "Nope, in fact I'm leaving right now.", "topic": "TALK_DONE" }
]
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
{
"type": "talk_topic",
"id": "TALK_REFUGEE_JENNY_Refugees1_veryearly",
"dynamic_line": "I don't know the other folks very well yet. There's Boris, Garry, and Stan, they seem to keep to each other. They've gone through something, but I haven't pried. Dana and her husband lost their baby, that was a big deal right when they arrived. There's that counsellor lady with the unusual name, she's nice enough. Fatima just showed up a little while ago, but I've been trying to get to know her better, I think we've at least got our professional stuff in common a bit. I haven't really spoken much to anyone else.",
"dynamic_line": "I don't know the other folks very well yet. There's Boris, Garry, and Stan, they seem to keep to each other. They've gone through something, but I haven't pried. Dana and her husband lost their baby, that was a big deal right when they arrived. There's that counselor lady with the unusual name, she's nice enough. Fatima just showed up a little while ago, but I've been trying to get to know her better, I think we've at least got our professional stuff in common a bit. I haven't really spoken much to anyone else.",
"responses": [
{ "text": "What was that you said about living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_veryearly" },
{ "text": "I'd better get going.", "topic": "TALK_DONE" }
Expand Down Expand Up @@ -263,7 +263,7 @@
{
"type": "talk_topic",
"id": "TALK_REFUGEE_JENNY_FreeMerchants",
"dynamic_line": "They run this place, and they don't run a charity. We get paid for working around the place, maintaining it, what have you, and we trade cash for food. The thing is, supply and demand and all... there's a lot more cash than food around. It's easier to buy a laptop than a piece of beef jerky, and there's no sign of that getting better. The balance is way off right now, a hard day of work barely gets you enough to fill your belly. I shouldn't bitch too much though. I don't know much better way to run it, although rumour is that the folks living downstairs have it a lot easier than we do. I try not to think too much on that.",
"dynamic_line": "They run this place, and they don't run a charity. We get paid for working around the place, maintaining it, what have you, and we trade cash for food. The thing is, supply and demand and all... there's a lot more cash than food around. It's easier to buy a laptop than a piece of beef jerky, and there's no sign of that getting better. The balance is way off right now, a hard day of work barely gets you enough to fill your belly. I shouldn't bitch too much though. I don't know much better way to run it, although rumor is that the folks living downstairs have it a lot easier than we do. I try not to think too much on that.",
"responses": [
{ "text": "Can you tell me about Fatima?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Fatima" },
{
Expand Down Expand Up @@ -297,7 +297,7 @@
{
"type": "talk_topic",
"id": "TALK_REFUGEE_JENNY_Refugees2_Friends",
"dynamic_line": "Well, Dana lost her baby right after <the_cataclysm>, in a bus rollover. She was lucky to make it out alive. She and Pedro had one of the rougher trips here, I guess. We just kinda click as friends, I'm grateful there's someone else here I can really get along with. Her husband, Pedro, is still pretty shellshocked. He doesn't talk much. I like him though, when he opens up he's just hilarious. Draco is just a cantankerous old fart who hasn't actually got old yet, give him twenty years and he'll be there. I like grumpy people. We also have pretty similar taste in music. Aleesha's a sweet kid, and we've all kind of adopted her, but she seems to hang out with me and Dana the most. She's a great artist, and she's full of crazy ideas. I guess I like her because of all of us, she seems to have the most hope that there's a future to be had.",
"dynamic_line": "Well, Dana lost her baby right after <the_cataclysm>, in a bus rollover. She was lucky to make it out alive. She and Pedro had one of the rougher trips here, I guess. We just kinda click as friends, I'm grateful there's someone else here I can really get along with. Her husband, Pedro, is still pretty shell-shocked. He doesn't talk much. I like him though, when he opens up he's just hilarious. Draco is just a cantankerous old fart who hasn't actually got old yet, give him twenty years and he'll be there. I like grumpy people. We also have pretty similar taste in music. Aleesha's a sweet kid, and we've all kind of adopted her, but she seems to hang out with me and Dana the most. She's a great artist, and she's full of crazy ideas. I guess I like her because of all of us, she seems to have the most hope that there's a future to be had.",
"responses": [
{ "text": "Can you tell me about the Free Merchants?", "topic": "TALK_REFUGEE_JENNY_FreeMerchants" },
{ "text": "Can you tell me about Fatima?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Fatima" },
Expand Down Expand Up @@ -374,7 +374,7 @@
{
"id": "MISSION_REFUGEE_Jenny_GET_MOTOR",
"type": "mission_definition",
"name": "Bring Jenny a motor for her compressor.",
"name": "Find an electric motor",
"difficulty": 1,
"value": 0,
"goal": "MGOAL_FIND_ITEM",
Expand All @@ -396,7 +396,7 @@
{
"id": "MISSION_REFUGEE_Jenny_GET_TANK",
"type": "mission_definition",
"name": "Bring Jenny a tank for her compressor.",
"name": "Bring back a 60L metal tank",
"difficulty": 1,
"value": 0,
"goal": "MGOAL_FIND_ITEM",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
"id": "TALK_REFUGEE_Mangalpreet_1_firstmeet",
"dynamic_line": "Yes, I am glad to meet you too. Will you be staying with us? I thought they were taking no more refugees.",
"responses": [
{ "text": "I'm a traveller actually. Just had some questions.", "topic": "TALK_REFUGEE_Mangalpreet_2_stub" },
{ "text": "I'm a traveler actually. Just had some questions.", "topic": "TALK_REFUGEE_Mangalpreet_2_stub" },
{ "text": "Actually I'm just heading out.", "topic": "TALK_DONE" }
]
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"name": "Refugee",
"job_description": "I'm just trying to survive.",
"common": false,
"//": "A counsellor from far away, Rhy can offer a lot of supports to player and survivors if she can get herself sorted a little",
"//": "A counselor from far away, Rhy can offer a lot of supports to player and survivors if she can get herself sorted a little",
"bonus_str": { "rng": [ -1, 1 ] },
"bonus_dex": { "rng": [ -2, 2 ] },
"bonus_int": { "rng": [ 0, 3 ] },
Expand Down Expand Up @@ -101,7 +101,7 @@
"id": "TALK_REFUGEE_Rhyzaea_1_firstmeet",
"dynamic_line": "So, what's your story? We don't see a lot of new people back here.",
"responses": [
{ "text": "Just a curious traveller. What's up with you?", "topic": "TALK_REFUGEE_Rhyzaea_2" },
{ "text": "Just a curious traveler. What's up with you?", "topic": "TALK_REFUGEE_Rhyzaea_2" },
{ "text": "Actually I'm just heading out.", "topic": "TALK_DONE" }
]
},
Expand All @@ -123,7 +123,7 @@
{
"type": "talk_topic",
"id": "TALK_REFUGEE_Rhyzaea_Background2",
"dynamic_line": "I was a counsellor actually, I worked for my band, Gitxsan. Did a lot of mental health and addictions for people that had been through some really tough stuff. Maybe not zombies eating your child level tough, but surprisingly not far off. My people have gone through some real messy crap.",
"dynamic_line": "I was a counselor actually, I worked for my band, Gitxsan. Did a lot of mental health and addictions for people that had been through some really tough stuff. Maybe not zombies eating your child level tough, but surprisingly not far off. My people have gone through some real messy crap.",
"responses": [
{ "text": "Tell me about your family.", "topic": "TALK_REFUGEE_Rhyzaea_Family" },
{ "text": "Tell me about your band.", "topic": "TALK_REFUGEE_Rhyzaea_Band" },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"id": "TALK_REFUGEE_Uyen_1_firstmeet",
"dynamic_line": "What brings you around here? We don't see a lot of new faces.",
"responses": [
{ "text": "Just a traveller. Can I ask you a few things?", "topic": "TALK_REFUGEE_Uyen_2" },
{ "text": "Just a traveler. Can I ask you a few things?", "topic": "TALK_REFUGEE_Uyen_2" },
{ "text": "Actually I'm just heading out.", "topic": "TALK_DONE" }
]
},
Expand Down Expand Up @@ -154,7 +154,7 @@
{
"id": "MISSION_REFUGEE_Uyen_2",
"type": "mission_definition",
"name": "Find 6 bottles of prozac for Uyen",
"name": "Find 6 bottles of Prozac",
"goal": "MGOAL_FIND_ITEM",
"difficulty": 2,
"value": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
{
"id": "MISSION_REFUGEE_Vanessa_1",
"type": "mission_definition",
"name": "Find a haircut kit for Vanessa",
"name": "Make a makeshift haircut kit",
"goal": "MGOAL_FIND_ITEM",
"difficulty": 2,
"value": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@
{
"id": "TALK_EVAC_MERCHANT_RANCH",
"type": "talk_topic",
"dynamic_line": "One of the people that got evacuated here was actually on a charter bus taking him back to his ranch, 'til it was commandeered to be an evacuation vehicle and brought him here. Once the dust shook out we made a deal to get him home and provide him with labour in return for making the ranch into a subsidiary of our dealings here. It worked out pretty well for everyone, most of the people with skills for that kind of work are already out there.",
"dynamic_line": "One of the people that got evacuated here was actually on a charter bus taking him back to his ranch, 'til it was commandeered to be an evacuation vehicle and brought him here. Once the dust shook out we made a deal to get him home and provide him with labor in return for making the ranch into a subsidiary of our dealings here. It worked out pretty well for everyone, most of the people with skills for that kind of work are already out there.",
"responses": [
{
"text": "Didn't that free up some space for the beggars and people stuck upstairs?",
Expand Down
Loading