Merge pull request #56188 from haveric/tacoma-grammar

Tacoma grammar updates. Change knife spear to simple knife spear

data/json/npcs/tacoma_ranch/NPC_ranch_barber.json

@@ -18,13 +18,13 @@
       { "text": "What is your job here?", "topic": "TALK_RANCH_BARBER_JOB" },
       { "text": "Do you need any help?", "topic": "TALK_RANCH_BARBER_HIRE" },
       {
-        "text": "[3 merch] I'll have a shave",
+        "text": "[3 merch] I'll have a shave.",
         "topic": "TALK_RANCH_BARBER_CUT",
         "condition": { "u_has_items": { "item": "FMCNote", "count": 3 } },
         "effect": [ "buy_shave", { "u_sell_item": "FMCNote", "count": 3 }, "barber_beard" ]
       },
       {
-        "text": "[6 merch] I'll get a haircut",
+        "text": "[6 merch] I'll get a haircut.",
         "topic": "TALK_RANCH_BARBER_CUT",
         "condition": { "u_has_items": { "item": "FMCNote", "count": 6 } },
         "effect": [ "buy_haircut", { "u_sell_item": "FMCNote", "count": 6 }, "barber_hair" ]

data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json

@@ -81,7 +81,7 @@
     "followup": "MISSION_RANCH_BARTENDER_2",
     "dialogue": {
       "describe": "We need help…",
-      "offer": "The wine and beer we can brew are sufficient to attract most patrons but we need something a bit stronger to get them to forget their misery.  Could you build me a pair of stills?",
+      "offer": "The wine and beer we can brew are sufficient to attract most patrons, but we need something a bit stronger to get them to forget their misery.  Could you build me a pair of stills?",
       "accepted": "This should let us start producing whiskey, rum, and brandy when we get access to the ingredients.",
       "rejected": "Come back when you get a chance.  We need skilled survivors.",
       "advice": "I'm sure you could find the design for the stills in home brewing books.",
@@ -140,7 +140,7 @@
     "followup": "MISSION_RANCH_BARTENDER_4",
     "dialogue": {
       "describe": "We need help…",
-      "offer": "Sugar and molasses remains in short supply.  I've put in a request for more but it is unlikely that I'm going to see a reliable source for some time.  If you are interested, we are going to need sugar beet seeds to meet future demand regardless of what the scavengers can find.  Could you bring me at least enough seeds to plant a small 10 meter long patch?",
+      "offer": "Sugar and molasses remains in short supply.  I've put in a request for more, but it is unlikely that I'm going to see a reliable source for some time.  If you are interested, we are going to need sugar beet seeds to meet future demand regardless of what the scavengers can find.  Could you bring me at least enough seeds to plant a small 10 meter long patch?",
       "accepted": "Thank you for your assistance.",
       "rejected": "Come back when you get a chance.  We need skilled survivors.",
       "advice": "Farms or supply stores might have a few seeds…",
@@ -160,7 +160,7 @@
   {
     "id": "MISSION_RANCH_BARTENDER_4",
     "type": "mission_definition",
-    "name": { "str": "Find 12 Metal Tanks" },
+    "name": { "str": "Find 12 60-Liter Metal Tanks" },
     "goal": "MGOAL_FIND_ITEM",
     "difficulty": 5,
     "value": 50000,
@@ -170,11 +170,11 @@
     "followup": "MISSION_RANCH_BARTENDER_5",
     "dialogue": {
       "describe": "We need help…",
-      "offer": "The drinks we brew here have become a major draw for visitors and the occasional trader.  Our batches have become larger but we are still running out of storage space between trading runs.  I've been able to get a few volunteers to help me build a set of standing tanks but I still need 12 metal tanks to build them.  I've talked with the scrappers but we are a low priority at the moment.",
+      "offer": "The drinks we brew here have become a major draw for visitors and the occasional trader.  Our batches have become larger, but we are still running out of storage space between trading runs.  I've been able to get a few volunteers to help me build a set of standing tanks, but I still need 12 60-liter metal tanks to build them.  I've talked with the scrappers, but we are a low priority at the moment.",
       "accepted": "Thank you for your assistance.",
       "rejected": "Come back when you get a chance.  We need skilled survivors.",
       "advice": "Scrapping vehicles might be your best bet.",
-      "inquire": "Do you have the metal tanks?",
+      "inquire": "Do you have the 60-liter metal tanks?",
       "success": "Thank you for the delivery.",
       "success_lie": "What good does this do us?",
       "failure": "It was a lost cause anyways…"
@@ -200,7 +200,7 @@
     "followup": "MISSION_NULL",
     "dialogue": {
       "describe": "We need help…",
-      "offer": "The other survivor outposts that we have contact with have been more than eager to trade for beer or other drinks.  Transporting the drinks to them has presented a number of challenges though.  If you could locate a pair of 200-liter drums we should be able to keep them supplied while turning a significant profit.",
+      "offer": "The other survivor outposts that we have contact with have been more than eager to trade for beer or other drinks.  Transporting the drinks to them has presented a number of challenges though.  If you could locate a pair of 200-liter drums, we should be able to keep them supplied while turning a significant profit.",
       "accepted": "Thank you for your assistance.",
       "rejected": "Come back when you get a chance.  We need skilled survivors.",
       "advice": "Factories or junk yards are the only places I know where to look.",

data/json/npcs/tacoma_ranch/NPC_ranch_carpenter2.json

@@ -22,7 +22,7 @@
   {
     "type": "talk_topic",
     "id": "TALK_RANCH_CONSTRUCTION_2_JOB",
-    "dynamic_line": "I was among one of the first groups of immigrants sent here to fortify the outpost.  I might have exaggerated my construction skills to get the hell out of the refugee center.  Unless you are a trader there isn't much work there and food was really becoming scarce when I left.",
+    "dynamic_line": "I was among one of the first groups of immigrants sent here to fortify the outpost.  I might have exaggerated my construction skills to get the hell out of the refugee center.  Unless you are a trader, there isn't much work there and food was really becoming scarce when I left.",
     "responses": [ { "text": "I see.", "topic": "TALK_RANCH_CONSTRUCTION_2" } ]
   }
 ]

data/json/npcs/tacoma_ranch/NPC_ranch_crop_overseer.json

@@ -28,7 +28,7 @@
   {
     "type": "talk_topic",
     "id": "TALK_RANCH_CROP_OVERSEER_JOB",
-    "dynamic_line": "My job is to manage our outpost's agricultural production.  I'm constantly searching for trade partners and investors to increase our capacity.  If you are interested I typically have tasks that I need assistance with.",
+    "dynamic_line": "My job is to manage our outpost's agricultural production.  I'm constantly searching for trade partners and investors to increase our capacity.  If you are interested, I typically have tasks that I need assistance with.",
     "responses": [ { "text": "I'll keep that in mind.", "topic": "TALK_RANCH_CROP_OVERSEER" } ]
   }
 ]

data/json/npcs/tacoma_ranch/NPC_ranch_farmer1.json

@@ -23,13 +23,13 @@
   {
     "type": "talk_topic",
     "id": "TALK_RANCH_FARMER_1_JOB",
-    "dynamic_line": "I was sent here to assist in setting-up the farm.  Most of us have no real skills that transfer from before the Cataclysm so things are a bit of trial and error.",
+    "dynamic_line": "I was sent here to assist in setting up the farm.  Most of us have no real skills that transfer from before the Cataclysm, so things are a bit of trial and error.",
     "responses": [ { "text": "…", "topic": "TALK_RANCH_FARMER_1" } ]
   },
   {
     "type": "talk_topic",
     "id": "TALK_RANCH_FARMER_1_HIRE",
-    "dynamic_line": "I'm sorry, I don't have anything to trade.  The work program here splits what we produce between the refugee center, the farm, and ourselves.  If you are a skilled laborer then you can trade your time for a bit of extra income on the side.  Not much I can do to assist you as a farmer though.",
+    "dynamic_line": "I'm sorry, I don't have anything to trade.  The work program here splits what we produce between the refugee center, the farm, and ourselves.  If you are a skilled laborer, then you can trade your time for a bit of extra income on the side.  Not much I can do to assist you as a farmer though.",
     "responses": [ { "text": "Oh.", "topic": "TALK_RANCH_FARMER_1" } ]
   }
 ]

data/json/npcs/tacoma_ranch/NPC_ranch_farmer2.json

@@ -23,13 +23,13 @@
   {
     "type": "talk_topic",
     "id": "TALK_RANCH_FARMER_2_JOB",
-    "dynamic_line": "I'm just a lucky guy that went from being chased by the undead to the noble life of a dirt farmer.  We get room and board but won't see a share of our labor unless the crop is a success.",
+    "dynamic_line": "I'm just a lucky guy that went from being chased by the undead to the noble life of a dirt farmer.  We get room and board, but won't see a share of our labor unless the crop is a success.",
     "responses": [ { "text": "It could be worse…", "topic": "TALK_RANCH_FARMER_2" } ]
   },
   {
     "type": "talk_topic",
     "id": "TALK_RANCH_FARMER_2_HIRE",
-    "dynamic_line": "I've got no time for you.  If you want to make a trade or need a job look for the foreman or crop overseer.",
+    "dynamic_line": "I've got no time for you.  If you want to make a trade or need a job, look for the foreman or crop overseer.",
     "responses": [ { "text": "I'll talk with them then…", "topic": "TALK_RANCH_FARMER_2" } ]
   }
 ]