From 53303e97e034d855cca58c31f56e7f186144508f Mon Sep 17 00:00:00 2001
From: Kamejeir <99511880+Kamejeir@users.noreply.github.com>
Date: Fri, 25 Oct 2024 10:39:12 +0200
Subject: [PATCH 1/2] options

and random word choice
---
 .../npcs/tacoma_ranch/NPC_ranch_foreman.json  |  2 +-
 .../tacoma_ranch/NPC_ranch_scavenger.json     | 20 ++++++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json b/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json
index 9077bc011ee7b..bffadb265bb73 100644
--- a/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json
+++ b/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json
@@ -938,7 +938,7 @@
     "followup": "MISSION_RANCH_FOREMAN_17",
     "dialogue": {
       "describe": "We need help…",
-      "offer": "Just flipping through the book, I can tell that one ingredient in most of the alcoholic drinks that we don't have a large supply of is sugar.  What alcohol we have been able to loot isn't going to last us long, so starting our first large batch is a priority.  Could you bring in 80 units of sugar?  That should last us until we can start producing our own supply.",
+      "offer": "Just flipping through the book, I can tell that one ingredient in most of the alcoholic drinks that we don't have a large supply of is sugar.  What alcohol we have been able to loot isn't going to last us long, so starting our first large batch is a priority.  Could you bring in 80 lbs of sugar?  That should last us until we can start producing our own supply.",
       "accepted": "I'm counting on you.",
       "rejected": "Come back when you get a chance.  We need skilled survivors.",
       "advice": "You might get lucky finding it, but you could always boil it out of fruit if you are familiar with the process.  Or go into the cities and look in restaurants and bakeries.",
diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_scavenger.json b/data/json/npcs/tacoma_ranch/NPC_ranch_scavenger.json
index 4bbd5734b15fa..bb7c91ab3fe40 100644
--- a/data/json/npcs/tacoma_ranch/NPC_ranch_scavenger.json
+++ b/data/json/npcs/tacoma_ranch/NPC_ranch_scavenger.json
@@ -85,11 +85,16 @@
     "id": "MISSION_RANCH_SCAVENGER_1",
     "type": "mission_definition",
     "name": { "str": "Make 12 Simple Knife Spears" },
-    "goal": "MGOAL_FIND_ITEM",
+    "goal": "MGOAL_CONDITION",
+    "goal_condition": {
+      "u_has_items_sum": [
+        { "item": "spear_knife", "amount": 12 },
+        { "item": "spear_knife_superior", "amount": 12 },
+        { "item": "spear_knife_proper", "amount": 12 }
+      ]
+    },
     "difficulty": 5,
     "value": 50000,
-    "item": "spear_knife",
-    "count": 12,
     "origins": [ "ORIGIN_SECONDARY" ],
     "followup": "MISSION_RANCH_SCAVENGER_2",
     "dialogue": {
@@ -128,6 +133,15 @@
           ],
           "place_item": [ { "item": "30gal_drum", "x": 8, "y": 19, "faction": "tacoma_commune" } ]
         }
+      ],
+      "effect": [
+        {
+          "u_consume_item_sum": [
+            { "item": "spear_knife", "amount": 12 },
+            { "item": "spear_knife_superior", "amount": 12 },
+            { "item": "spear_knife_proper", "amount": 12 }
+          ]
+        }
       ]
     }
   },

From 925bbc7fec3f39b3f1a42b8e63f5bfed022a225b Mon Sep 17 00:00:00 2001
From: Kamejeir <99511880+Kamejeir@users.noreply.github.com>
Date: Mon, 28 Oct 2024 08:29:36 +0100
Subject: [PATCH 2/2] just spears then

---
 data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json b/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json
index bffadb265bb73..9077bc011ee7b 100644
--- a/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json
+++ b/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json
@@ -938,7 +938,7 @@
     "followup": "MISSION_RANCH_FOREMAN_17",
     "dialogue": {
       "describe": "We need help…",
-      "offer": "Just flipping through the book, I can tell that one ingredient in most of the alcoholic drinks that we don't have a large supply of is sugar.  What alcohol we have been able to loot isn't going to last us long, so starting our first large batch is a priority.  Could you bring in 80 lbs of sugar?  That should last us until we can start producing our own supply.",
+      "offer": "Just flipping through the book, I can tell that one ingredient in most of the alcoholic drinks that we don't have a large supply of is sugar.  What alcohol we have been able to loot isn't going to last us long, so starting our first large batch is a priority.  Could you bring in 80 units of sugar?  That should last us until we can start producing our own supply.",
       "accepted": "I'm counting on you.",
       "rejected": "Come back when you get a chance.  We need skilled survivors.",
       "advice": "You might get lucky finding it, but you could always boil it out of fruit if you are familiar with the process.  Or go into the cities and look in restaurants and bakeries.",