less usage of generic rewards: Tacoma

data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json

@@ -235,6 +235,7 @@
     "item": "still",
     "count": 2,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_BARTENDER_2",
     "dialogue": {
       "describe": "We need help…",
@@ -269,6 +270,7 @@
     "item": "yeast",
     "count": 20,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_BARTENDER_3",
     "dialogue": {
       "describe": "We need help…",
@@ -304,6 +306,7 @@
     "item": "seed_sugar_beet",
     "count": 10,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_BARTENDER_4",
     "dialogue": {
       "describe": "We need help…",
@@ -344,6 +347,7 @@
     "item": "metal_tank",
     "count": 12,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_BARTENDER_5",
     "dialogue": {
       "describe": "We need help…",
@@ -378,6 +382,7 @@
     "item": "55gal_drum",
     "count": 2,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_NULL",
     "dialogue": {
       "describe": "We need help…",
@@ -391,6 +396,7 @@
       "failure": "It was a lost cause anyways…"
     },
     "end": {
+      "effect": { "u_add_var": "mission_flag_Bartender_rewarded", "value": "no" },
       "update_mapgen": {
         "om_terrain": "ranch_camp_51",
         "place_item": [ { "item": "55gal_drum", "x": 18, "y": 3, "repeat": 2, "faction": "tacoma_commune" } ],

data/json/npcs/tacoma_ranch/NPC_ranch_doctor.json

@@ -232,6 +232,7 @@
     "item": "crutches",
     "count": 1,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_DOCTOR_MEDICAL_GLOVES",
     "dialogue": {
       "describe": "We need help…",
@@ -256,6 +257,7 @@
     "item": "gloves_medical",
     "count": 5,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_DOCTOR_MEDICAL_ANESTHETIC",
     "dialogue": {
       "describe": "We need help…",
@@ -302,6 +304,7 @@
     "end": {
       "update_mapgen": [ { "om_terrain": "ranch_camp_50", "set": [ { "point": "furniture", "id": "f_anesthetic", "x": 19, "y": 19 } ] } ],
       "effect": [
+        { "u_add_var": "mission_flag_Doctor_rewarded", "value": "no" },
         { "u_consume_item": "anesthetic", "count": 3000 },
         { "npc_add_var": "dialogue_tacoma_ranch_provides_surgery", "value": "yes" }
       ]

data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json

@@ -15,11 +15,29 @@
     "id": "TALK_RANCH_FOREMAN",
     "type": "talk_topic",
     "dynamic_line": {
-      "u_is_wearing": "badge_marshal",
-      "yes": "Can I help you, marshal?",
-      "no": { "u_male": true, "yes": "Morning sir, how can I help you?", "no": "Morning ma'am, how can I help you?" }
+      "compare_string": [ "no", { "u_val": "mission_flag_Bartender_rewarded" } ],
+      "yes": "Hello again.  If you have no other business with me, I'd like to talk to you about something.",
+      "no": {
+        "compare_string": [ "no", { "u_val": "mission_flag_Doctor_rewarded" } ],
+        "yes": "Hello again.  If you have no other business with me, I'd like to talk to you about something.",
+        "no": {
+          "u_is_wearing": "badge_marshal",
+          "yes": "Can I help you, marshal?",
+          "no": { "u_male": true, "yes": "Morning sir, how can I help you?", "no": "Morning ma'am, how can I help you?" }
+        }
+      }
     },
     "responses": [
+      {
+        "text": "What is it?",
+        "topic": "TALK_RANCH_FOREMAN_reward",
+        "condition": {
+          "or": [
+            { "compare_string": [ "no", { "u_val": "mission_flag_Bartender_rewarded" } ] },
+            { "compare_string": [ "no", { "u_val": "mission_flag_Doctor_rewarded" } ] }
+          ]
+        }
+      },
       {
         "text": "The merchant at the Refugee Center sent me to get a prospectus from you.",
         "topic": "TALK_RANCH_FOREMAN_PROSPECTUS",
@@ -147,6 +165,38 @@
     "dynamic_line": "we're still in early stages of getting set up, but we're not overly flush for hands, that's for sure.  I don't think we'd turn many people away, of course, but besides strong hands and willing labor, we could really use someone who could cook.  I can't tell you what it'd do for morale.  You could try asking some of the people staying on the surface in the refugee center maybe, I don't think they were part of most of the original discussions about the ranch.",
     "responses": [ { "text": "I'll keep an eye out.", "topic": "TALK_RANCH_FOREMAN" } ]
   },
+  {
+    "type": "talk_topic",
+    "id": "TALK_RANCH_FOREMAN_reward",
+    "dynamic_line": "You've done a lot for the ranch, by generally helping the community with both wellness and trade.  As the project lead, I want to make sure these efforts don't go unnoticed.",
+    "responses": [
+      {
+        "text": "You mean setting up the doctor's office?",
+        "topic": "TALK_RANCH_FOREMAN_Doctor_done",
+        "condition": { "compare_string": [ "no", { "u_val": "mission_flag_Doctor_rewarded" } ] }
+      },
+      {
+        "text": "Is this about bootstrapping the trade relating to the bar?",
+        "topic": "TALK_RANCH_FOREMAN_Bartender_done",
+        "condition": { "compare_string": [ "no", { "u_val": "mission_flag_Bartender_rewarded" } ] }
+      },
+      { "text": "Understood.  Back to business.", "topic": "TALK_RANCH_FOREMAN" }
+    ]
+  },
+  {
+    "type": "talk_topic",
+    "id": "TALK_RANCH_FOREMAN_Bartender_done",
+    "dynamic_line": "Ever since you got the bartender set up, our liquor business has been running so much better!  As thanks for your efforts, I wanted to reward you with a portion of recent profits.",
+    "speaker_effect": { "effect": [ { "u_spawn_item": "FMCNote", "count": 75 }, { "u_lose_var": "mission_flag_Bartender_rewarded" } ] },
+    "responses": [ { "text": "Thanks.", "topic": "TALK_RANCH_FOREMAN_reward" } ]
+  },
+  {
+    "type": "talk_topic",
+    "id": "TALK_RANCH_FOREMAN_Doctor_done",
+    "dynamic_line": "I heard you helped jumpstart our local medical services.  With that basic need covered, everyone has been able to focus on their work a lot more, so to thank you for your efforts, I wanted to reward you.",
+    "speaker_effect": { "effect": [ { "u_spawn_item": "FMCNote", "count": 25 }, { "u_lose_var": "mission_flag_Doctor_rewarded" } ] },
+    "responses": [ { "text": "Thanks.", "topic": "TALK_RANCH_FOREMAN_reward" } ]
+  },
   {
     "id": "MISSION_RANCH_FOREMAN_1",
     "type": "mission_definition",
@@ -157,6 +207,7 @@
     "item": "2x4",
     "count": 200,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_FOREMAN_2",
     "dialogue": {
       "describe": "We need help…",
@@ -219,6 +270,7 @@
     "difficulty": 5,
     "value": 50000,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_FOREMAN_3",
     "dialogue": {
       "describe": "We need help…",
@@ -294,6 +346,7 @@
     "item": "nail",
     "count": 2500,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_FOREMAN_4",
     "dialogue": {
       "describe": "We need help…",
@@ -352,6 +405,7 @@
     "item": "salt",
     "count": 3888,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_FOREMAN_5",
     "dialogue": {
       "describe": "We need help…",
@@ -419,6 +473,7 @@
     "item": "fertilizer_liquid",
     "count": 120,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_FOREMAN_6",
     "dialogue": {
       "describe": "We need help…",
@@ -464,6 +519,7 @@
     "item": "rock",
     "count": 75,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_FOREMAN_7",
     "dialogue": {
       "describe": "We need help…",
@@ -511,6 +567,7 @@
     "item": "pipe",
     "count": 50,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_FOREMAN_8",
     "dialogue": {
       "describe": "We need help…",
@@ -561,6 +618,7 @@
     "item": "motor",
     "count": 2,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_FOREMAN_9",
     "dialogue": {
       "describe": "We need help…",
@@ -624,6 +682,7 @@
     "item": "bleach",
     "count": 150,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_FOREMAN_10_1",
     "dialogue": {
       "describe": "We need help…",
@@ -663,6 +722,7 @@
     "item": "bandages",
     "count": 36,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_FOREMAN_10",
     "dialogue": {
       "describe": "We need help…",
@@ -691,6 +751,7 @@
     "item": "disinfectant",
     "count": 60,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_FOREMAN_11",
     "dialogue": {
       "describe": "We need help…",
@@ -723,6 +784,7 @@
     "item": "welder",
     "count": 2,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_FOREMAN_12",
     "dialogue": {
       "describe": "We need help…",
@@ -784,6 +846,7 @@
     "item": "battery_car",
     "count": 12,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_FOREMAN_13",
     "dialogue": {
       "describe": "We need help…",
@@ -824,6 +887,7 @@
     "item": "two_way_radio",
     "count": 2,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_FOREMAN_14",
     "dialogue": {
       "describe": "We need help…",
@@ -862,6 +926,7 @@
     "item": "backpack",
     "count": 5,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_FOREMAN_15",
     "dialogue": {
       "describe": "We need help…",
@@ -902,6 +967,7 @@
     "item": "brewing_cookbook",
     "count": 1,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_FOREMAN_16",
     "dialogue": {
       "describe": "We need help…",
@@ -935,6 +1001,7 @@
     "item": "sugar",
     "count": 10000,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_FOREMAN_17",
     "dialogue": {
       "describe": "We need help…",
@@ -967,6 +1034,7 @@
     "item": "glass_sheet",
     "count": 30,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_NULL",
     "dialogue": {
       "describe": "We need help…",

data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json

@@ -119,6 +119,7 @@
     "item": "aspirin",
     "count": 100,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_NURSE_2",
     "dialogue": {
       "describe": "We need help…",
@@ -161,6 +162,7 @@
     "item": "hotplate",
     "count": 3,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_NURSE_3",
     "dialogue": {
       "describe": "We need help…",
@@ -200,6 +202,7 @@
     "item": "vitamins",
     "count": 200,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_NURSE_4",
     "dialogue": {
       "describe": "We need help…",
@@ -243,6 +246,7 @@
     "item": "char_purifier",
     "count": 4,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_NURSE_5",
     "dialogue": {
       "describe": "We need help…",
@@ -275,6 +279,7 @@
     "value": 50000,
     "item": "chemistry_set",
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_NURSE_6",
     "dialogue": {
       "describe": "We need help…",
@@ -318,6 +323,7 @@
     "item": "mask_filter",
     "count": 10,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_NURSE_7",
     "dialogue": {
       "describe": "We need help…",
@@ -369,6 +375,7 @@
     "item": "gloves_rubber",
     "count": 4,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_NURSE_8",
     "dialogue": {
       "describe": "We need help…",
@@ -418,6 +425,7 @@
     "item": "scalpel",
     "count": 2,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_NURSE_9",
     "dialogue": {
       "describe": "We need help…",
@@ -474,6 +482,7 @@
     "value": 50000,
     "item": "emergency_book",
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_RANCH_NURSE_11",
     "dialogue": {
       "describe": "We need help…",
@@ -519,6 +528,7 @@
     "item": "syringe",
     "count": 10,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "followup": "MISSION_NULL",
     "dialogue": {
       "describe": "We need help…",

data/json/npcs/tacoma_ranch/Nunez/NPC_Pablo_Tacoma.json

@@ -278,6 +278,7 @@
     "difficulty": 2,
     "value": 1000,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "item": "fire_brick",
     "count": 20,
     "dialogue": {
@@ -300,6 +301,7 @@
     "difficulty": 2,
     "value": 1000,
     "origins": [ "ORIGIN_SECONDARY" ],
+    "has_generic_rewards": false,
     "dialogue": {
       "describe": "Ask Jenny Forcette if she can help Pablo Nunez with his mill designs.",
       "offer": "n/a",