Add descriptions for all the Free Merchant NPC missions. (#33325)

CleverRaven · Aug 21, 2019 · 406dd4d · 406dd4d
1 parent 94aac50
commit 406dd4d
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 27 deletions.
diff --git a/data/json/npcs/missiondef.json b/data/json/npcs/missiondef.json
@@ -690,28 +690,6 @@
       "failure": "Oh no!  My poor puppy..."
     }
   },
-  {
-    "id": "MISSION_EVAC_SMOKER_GET_CIGARETTES",
-    "type": "mission_definition",
-    "name": "Find 100 Cigarettes",
-    "goal": "MGOAL_FIND_ITEM",
-    "difficulty": 2,
-    "value": 800,
-    "item": "cig",
-    "count": 100,
-    "origins": [ "ORIGIN_SECONDARY" ],
-    "dialogue": {
-      "describe": "Come on man, I just need a smoke.",
-      "offer": "With all that's been going on, it's been more and more difficult to find a smoke.  My stash has been running low for a while now.  Think you could help me out here?  A few packs is all I need.",
-      "accepted": "Thanks, it's great to see someone willing to help a guy out.",
-      "rejected": "Well, I'll find someone else to do it for me.",
-      "advice": "Plenty of smokers in towns.  Gotta be some left over cigs in some of them houses.",
-      "inquire": "Got the smokes?",
-      "success": "Thanks! I'll be sure to put in a good word for you around the center.",
-      "success_lie": "OK, then hand it over.",
-      "failure": "Shit happens."
-    }
-  },
   {
     "id": "MISSION_GET_CITY_COP_MOMENTO",
     "type": "mission_definition",

diff --git a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json
@@ -194,8 +194,9 @@
   {
     "id": "MISSION_BROKER_1",
     "type": "mission_definition",
-    "name": "Find 50 3L jars",
-    "goal": "MGOAL_FIND_ITEM_GROUP",
+    "name": "In a Pickle Pt. 2",
+    "description": "Deliver 50 large three-liter jars in exchange for <reward_count:FMCNote> certified notes.",
+    "goal": "MGOAL_FIND_ITEM",
     "difficulty": 3,
     "value": 20000,
     "item": "jar_3l_glass",

diff --git a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard1.json b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard1.json
@@ -106,5 +106,28 @@
     "id": "TALK_EVAC_GUARD1_BYE",
     "dynamic_line": "Stay safe out there.  Hate to have to kill you after you've already died.",
     "responses": [ { "text": "...", "topic": "TALK_DONE" } ]
+  },
+  {
+    "id": "MISSION_EVAC_SMOKER_GET_CIGARETTES",
+    "type": "mission_definition",
+    "name": "Smokes, let's go.",
+    "description": "Make a friend at the refugee center by handing over around five packs - 100 cigarettes.",
+    "goal": "MGOAL_FIND_ITEM",
+    "difficulty": 2,
+    "value": 800,
+    "item": "cig",
+    "count": 100,
+    "origins": [ "ORIGIN_SECONDARY" ],
+    "dialogue": {
+      "describe": "Come on man, I just need a smoke.",
+      "offer": "With all that's been going on, it's been more and more difficult to find a smoke.  My stash has been running low for a while now.  Think you could help me out here?  A few packs is all I need.",
+      "accepted": "Thanks, it's great to see someone willing to help a guy out.",
+      "rejected": "Well, I'll find someone else to do it for me.",
+      "advice": "Plenty of smokers in towns.  Gotta be some left over cigs in some of them houses.",
+      "inquire": "Got the smokes?",
+      "success": "Thanks! I'll be sure to put in a good word for you around the center.",
+      "success_lie": "OK, then hand it over.",
+      "failure": "Shit happens."
+    }
   }
 ]
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
@@ -409,6 +409,7 @@
     "id": "MISSION_FREE_MERCHANTS_EVAC_1",
     "type": "mission_definition",
     "name": "Clear Back Bay",
+    "description": "Clear out the barricaded back area in the refugee center and lay the former leader of the Free Merchants to rest, in exchange for the local currency: Free Merchant certified notes.",
     "goal": "MGOAL_KILL_MONSTER",
     "difficulty": 2,
     "value": 50000,
@@ -444,6 +445,7 @@
     "id": "MISSION_FREE_MERCHANTS_EVAC_2",
     "type": "mission_definition",
     "name": "Missing Caravan",
+    "description": "Investigate the last known location of a disappeared scavenger trading party, and eliminate any bandits or raiders in the vicinity in exchange for <reward_count:FMCNote> certified notes.",
     "goal": "MGOAL_ASSASSINATE",
     "difficulty": 5,
     "value": 5000,
@@ -529,6 +531,7 @@
     "id": "MISSION_FREE_MERCHANTS_EVAC_3",
     "type": "mission_definition",
     "name": "Retrieve Prospectus",
+    "description": "Visit the farming commune and bring the foreman's prospectus back to the refugee center, for <reward_count:FMCNote> certified notes.",
     "goal": "MGOAL_FIND_ITEM",
     "difficulty": 5,
     "value": 50000,
@@ -566,7 +569,8 @@
   {
     "id": "MISSION_FREE_MERCHANTS_EVAC_4",
     "type": "mission_definition",
-    "name": "Find 10 solar panels",
+    "name": "Solar Power",
+    "description": "Deliver 10 solar panels to help the Free Merchants set up a renewable power grid, in exchange for a handsome reward.",
     "goal": "MGOAL_FIND_ITEM",
     "difficulty": 5,
     "value": 400000,
@@ -595,8 +599,9 @@
   {
     "id": "MISSION_FREE_MERCHANTS_EVAC_5",
     "type": "mission_definition",
-    "name": "Find 100 canning jars",
-    "goal": "MGOAL_FIND_ITEM_GROUP",
+    "name": "In a Pickle",
+    "description": "Deliver 100 half-liter glass canning jars to the Free Merchants to kickstart their food storage plans.",
+    "goal": "MGOAL_FIND_ITEM",
     "difficulty": 3,
     "value": 400000,
     "item": "jar_glass",