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
Changes from 1 commit
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
Next Next commit
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
DracoGriffin committed Jun 7, 2019
commit 54cd71c956a2fd1911aaee5575bb412877d9e4e0
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",
14 changes: 7 additions & 7 deletions data/json/npcs/beggars/BEGGAR_2_Dino_Dave.json
Original file line number Diff line number Diff line change
@@ -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",
10 changes: 5 additions & 5 deletions data/json/npcs/beggars/BEGGAR_3_Luo_Meizhen.json
Original file line number Diff line number Diff line change
@@ -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 <the_cataclysm>?", "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" }
]
2 changes: 1 addition & 1 deletion data/json/npcs/beggars/BEGGAR_5_Yusuke_Taylor.json
Original file line number Diff line number Diff line change
@@ -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" },
Original file line number Diff line number Diff line change
@@ -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",
Original file line number Diff line number Diff line change
@@ -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" } ]
},
{