From 54cd71c956a2fd1911aaee5575bb412877d9e4e0 Mon Sep 17 00:00:00 2001 From: DracoGriffin Date: Fri, 7 Jun 2019 09:49:28 -0600 Subject: [PATCH 1/3] Various corrections - Correct typos - Reformat quest names to be clearly identify what is required and remove questgiver (quests already specify the questgiver - "Bring items to John Doe for John Doe") - Replace UK English with US English as specified by MANUAL_OF_STYLE.md --- data/json/npcs/appearance_trait_groups.json | 2 +- data/json/npcs/beggars/BEGGAR_2_Dino_Dave.json | 14 +++++++------- data/json/npcs/beggars/BEGGAR_3_Luo_Meizhen.json | 10 +++++----- data/json/npcs/beggars/BEGGAR_5_Yusuke_Taylor.json | 2 +- .../surface_refugees/NPC_Jenny_Forcette.json | 4 ++-- .../surface_visitors/NPC_arsonist.json | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/data/json/npcs/appearance_trait_groups.json b/data/json/npcs/appearance_trait_groups.json index e17004634adf8..c4c7a36542022 100644 --- a/data/json/npcs/appearance_trait_groups.json +++ b/data/json/npcs/appearance_trait_groups.json @@ -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", diff --git a/data/json/npcs/beggars/BEGGAR_2_Dino_Dave.json b/data/json/npcs/beggars/BEGGAR_2_Dino_Dave.json index cda532aa49fe1..7979800dfdb5b 100644 --- a/data/json/npcs/beggars/BEGGAR_2_Dino_Dave.json +++ b/data/json/npcs/beggars/BEGGAR_2_Dino_Dave.json @@ -264,7 +264,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", @@ -273,8 +273,8 @@ "followup": "MISSION_BEGGAR_2_DUCT_TAPE", "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { - "describe": "Gotta start small right? Litle ones for keeping little things safe. I could use 'em.", - "offer": "Gotta start small right? Litle ones for keeping little things safe. I could use 'em. I need a bunch of 'em. Little ones, you know? Can you bring me like... like... forty?", + "describe": "Gotta start small right? Little ones for keeping little things safe. I could use 'em.", + "offer": "Gotta start small right? Little ones for keeping little things safe. I could use 'em. I need a bunch of 'em. Little ones, you know? Can you bring me like... like... forty?", "accepted": "Oh man, thanks so much my friend. You won't regret it.", "rejected": "I didn't think so.", "advice": "Watch out, he's looking for it too.", @@ -287,7 +287,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", @@ -309,7 +309,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", @@ -332,7 +332,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", @@ -355,7 +355,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", diff --git a/data/json/npcs/beggars/BEGGAR_3_Luo_Meizhen.json b/data/json/npcs/beggars/BEGGAR_3_Luo_Meizhen.json index 26d402a975e10..60d836a28a196 100644 --- a/data/json/npcs/beggars/BEGGAR_3_Luo_Meizhen.json +++ b/data/json/npcs/beggars/BEGGAR_3_Luo_Meizhen.json @@ -293,7 +293,7 @@ { "type": "talk_topic", "id": "TALK_REFUGEE_BEGGAR_3_JOIN", - "dynamic_line": "That's awful kind of you, but look at me. I'm not travelling material, I've managed to stay fifty pounds overweight on a diet of pine nuts and wilted rhubarb, and I scream and shake uncontrollably at the sight of blood.", + "dynamic_line": "That's awful kind of you, but look at me. I'm not traveling material, I've managed to stay fifty pounds overweight on a diet of pine nuts and wilted rhubarb, and I scream and shake uncontrollably at the sight of blood.", "responses": [ { "text": "Why stay out here then?", "topic": "TALK_REFUGEE_BEGGAR_3_WHYSTAY" }, { "text": "What did you do before ?", "topic": "TALK_REFUGEE_BEGGAR_3_EXPERTISE" }, @@ -495,7 +495,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 signalling 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" }, @@ -505,7 +505,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 signalling 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" }, @@ -579,14 +579,14 @@ { "type": "talk_topic", "id": "TALK_REFUGEE_BEGGAR_3_MYCUS4_RECRUIT", - "dynamic_line": "Well. Well, well, well. This is really interesting. Look, you can see reticulations here, it looks sort of like an enlarged piece of a stipe from a basidiocarp... but look at this, these fibres are clearly unlike anything I've seen before. I wonder if they're motile?\n\nOkay, listen: you've got yourself a deal. I'll come to your base, but you've gotta get me hooked up with a microscope as soon as you can. This could be the beginning of something really cool. Oh, and it should go without saying that I'm not coming unless you can find a place for my friends here in your base. I'm sure you anticipated that. Talk them into going and I'm in. It should be easy, they're a bunch of sweet hearted saps.", + "dynamic_line": "Well. Well, well, well. This is really interesting. Look, you can see reticulations here, it looks sort of like an enlarged piece of a stipe from a basidiocarp... but look at this, these fibers are clearly unlike anything I've seen before. I wonder if they're motile?\n\nOkay, listen: you've got yourself a deal. I'll come to your base, but you've gotta get me hooked up with a microscope as soon as you can. This could be the beginning of something really cool. Oh, and it should go without saying that I'm not coming unless you can find a place for my friends here in your base. I'm sure you anticipated that. Talk them into going and I'm in. It should be easy, they're a bunch of sweet hearted saps.", "speaker_effect": [ { "effect": { "u_add_var": "luo_recruited", "type": "general", "context": "recruit", "value": "yes" } } ], "responses": [ { "text": "Great! I'll go see what I can do about that.", "topic": "TALK_DONE" } ] }, { "type": "talk_topic", "id": "TALK_REFUGEE_BEGGAR_3_MYCUS4_NOTREADY", - "dynamic_line": "Well. Well, well, well. This is really interesting. Look, you can see reticulations here, it looks sort of like an enlarged piece of a stipe from a basidiocarp... but look at this, these fibres are clearly unlike anything I've seen before. I wonder if they're motile?\n\nSorry. I could stare at this all day. I owe you one, a big one. Thanks for this. Let me know if you ever need a favour from a chubby beggar woman.", + "dynamic_line": "Well. Well, well, well. This is really interesting. Look, you can see reticulations here, it looks sort of like an enlarged piece of a stipe from a basidiocarp... but look at this, these fibers are clearly unlike anything I've seen before. I wonder if they're motile?\n\nSorry. I could stare at this all day. I owe you one, a big one. Thanks for this. Let me know if you ever need a favor from a chubby beggar woman.", "responses": [ { "text": "Glad you like it. If I think of something you can do in return, I'll let you know.", "topic": "TALK_DONE" } ] diff --git a/data/json/npcs/beggars/BEGGAR_5_Yusuke_Taylor.json b/data/json/npcs/beggars/BEGGAR_5_Yusuke_Taylor.json index f4b61227391e6..d940ba88e4659 100644 --- a/data/json/npcs/beggars/BEGGAR_5_Yusuke_Taylor.json +++ b/data/json/npcs/beggars/BEGGAR_5_Yusuke_Taylor.json @@ -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 rumours 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" }, diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json index 0608706a89f86..68c0e3928bfc4 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json @@ -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" }, { @@ -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", diff --git a/data/json/npcs/refugee_center/surface_visitors/NPC_arsonist.json b/data/json/npcs/refugee_center/surface_visitors/NPC_arsonist.json index 7d7684a537c93..41354c7327a33 100644 --- a/data/json/npcs/refugee_center/surface_visitors/NPC_arsonist.json +++ b/data/json/npcs/refugee_center/surface_visitors/NPC_arsonist.json @@ -34,7 +34,7 @@ { "type": "talk_topic", "id": "TALK_ARSONIST_NEW", - "dynamic_line": "Guess that makes two of us. Well, kind of. I don't think we're open, though. Full up as hell; it's almost a crowd downstairs. Did you see the trader at the enterance? There's the one to ask.", + "dynamic_line": "Guess that makes two of us. Well, kind of. I don't think we're open, though. Full up as hell; it's almost a crowd downstairs. Did you see the trader at the entrance? There's the one to ask.", "responses": [ { "text": "Sucks...", "topic": "TALK_ARSONIST" } ] }, { From eff1f00a1b97c71066bd46b62de7dd4126e155fb Mon Sep 17 00:00:00 2001 From: DracoGriffin Date: Fri, 7 Jun 2019 10:52:52 -0600 Subject: [PATCH 2/3] More corrections - Format quests so they don't read as "Do X for NPC Y for NPC Y", and now properly read as "Do X for NPC Y" - Update UK English with US English - Clarified quest items in quest for actual item needed rather than being unclear --- .../npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json | 2 +- .../refugee_center/surface_refugees/NPC_Aleesha_Seward.json | 2 +- .../surface_refugees/NPC_Fatima_Al_Jadir.json | 6 +++--- .../surface_refugees/NPC_Garry_Villeneuve.json | 2 +- .../refugee_center/surface_refugees/NPC_Jenny_Forcette.json | 6 +++--- .../surface_refugees/NPC_Mangalpreet_Singh.json | 2 +- .../refugee_center/surface_refugees/NPC_Rhyzaea_Johnny.json | 6 +++--- .../npcs/refugee_center/surface_refugees/NPC_Uyen_Tran.json | 4 ++-- .../refugee_center/surface_refugees/NPC_Vanessa_Toby.json | 2 +- .../surface_staff/NPC_free_merchant_shopkeep.json | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json b/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json index 7979800dfdb5b..3fde85473393f 100644 --- a/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json +++ b/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json @@ -242,7 +242,7 @@ { "id": "MISSION_BEGGAR_2_BOX_SMALL", "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", diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Aleesha_Seward.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Aleesha_Seward.json index 0cfacc9d3d92c..e5e2436d7e2b1 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Aleesha_Seward.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Aleesha_Seward.json @@ -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." diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Fatima_Al_Jadir.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Fatima_Al_Jadir.json index 5c72c8c673a37..5acb66a9b16c9 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Fatima_Al_Jadir.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Fatima_Al_Jadir.json @@ -120,7 +120,7 @@ { "type": "talk_topic", "id": "TALK_REFUGEE_Fatima_Background", - "dynamic_line": "Before 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 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?", @@ -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", @@ -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, diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Garry_Villeneuve.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Garry_Villeneuve.json index 9b282d2ed3b9b..1e6212e6941f6 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Garry_Villeneuve.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Garry_Villeneuve.json @@ -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" } ] }, diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json index 68c0e3928bfc4..f54790cf3f2a2 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json @@ -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" } @@ -297,7 +297,7 @@ { "type": "talk_topic", "id": "TALK_REFUGEE_JENNY_Refugees2_Friends", - "dynamic_line": "Well, Dana lost her baby right after , 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 , 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" }, @@ -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", diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Mangalpreet_Singh.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Mangalpreet_Singh.json index 37f5fec525a77..3d10182337b16 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Mangalpreet_Singh.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Mangalpreet_Singh.json @@ -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" } ] }, diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Rhyzaea_Johnny.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Rhyzaea_Johnny.json index b92fd7046c213..3656520dd08d6 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Rhyzaea_Johnny.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Rhyzaea_Johnny.json @@ -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 ] }, @@ -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" } ] }, @@ -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" }, diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Uyen_Tran.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Uyen_Tran.json index 6cb63a82394e2..1fe00fc3d0ab5 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Uyen_Tran.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Uyen_Tran.json @@ -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" } ] }, @@ -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, diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Vanessa_Toby.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Vanessa_Toby.json index fd53cc108dcc4..b62abecd2af5f 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Vanessa_Toby.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Vanessa_Toby.json @@ -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, diff --git a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json index 767b1e7822809..50908c863fa37 100644 --- a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json +++ b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json @@ -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?", From 79e02c1af45ee1453e85f91a4e9c8ac44cfb1e1b Mon Sep 17 00:00:00 2001 From: DracoGriffin Date: Fri, 7 Jun 2019 17:27:22 -0600 Subject: [PATCH 3/3] Resolve conflicts --- .../beggars/BEGGAR_2_Dino_Dave.json | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json b/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json index 3fde85473393f..2849caa2ee17d 100644 --- a/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json +++ b/data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json @@ -239,28 +239,6 @@ "dynamic_line": "No! I just got everything together. I am not leaving, not now. Everything's finally coming together!", "responses": [ { "text": "Well. No problem, glad to be of service. Talk to you later.", "topic": "TALK_DONE" } ] }, - { - "id": "MISSION_BEGGAR_2_BOX_SMALL", - "type": "mission_definition", - "name": "Bring a roll of duct tape", - "difficulty": 1, - "value": 0, - "goal": "MGOAL_FIND_ITEM", - "item": "duct_tape", - "followup": "MISSION_BEGGAR_2_DUCT_TAPE", - "origins": [ "ORIGIN_SECONDARY" ], - "dialogue": { - "describe": "These ones are good, good ones. They need something to, you know, bind them together. Surround them, light side, dark side.", - "offer": "Bring me the Force!", - "accepted": "Oh man, thanks so much my friend. You won't regret it.", - "rejected": "I didn't think so.", - "advice": "Watch out, he's looking for it too.", - "inquire": "... eh?", - "success": "Oh this is so great, so great!", - "success_lie": "Oh this is so great, so great!", - "failure": "Oh, that's too bad. Guess they're eating it all." - } - }, { "id": "MISSION_BEGGAR_2_BOX_SMALL", "type": "mission_definition",