1 files changed, 0 insertions, 121 deletions
diff --git a/npc-06_lapin-update.patch b/npc-06_lapin-update.patch
deleted file mode 100644
index 779640a..0000000
--- a/npc-06_lapin-update.patch
+++ /dev/null
@@ -1,121 +0,0 @@
---- a/data/json/npcs/holdouts/Mr_Lapin.json
-+++ b/data/json/npcs/holdouts/Mr_Lapin.json
-@@ -47,6 +47,7 @@
-       { "text": "Heard anything about the outside world?", "topic": "TALK_WARRENER_WORLD" },
-       { "text": "You look different?", "topic": "TALK_WARRENER_MUTATION" },
-       { "text": "Anything I can help with?", "topic": "TALK_MISSION_LIST" },
-+      { "text": "Do you need any resources?", "topic": "TALK_LAPIN_RESOURCES" },
-       { "text": "Well, bye.", "topic": "TALK_DONE" }
-     ]
-   },
-@@ -68,10 +69,37 @@
-     "dynamic_line": "People come to me to learn how to keep rabbits.  They learn and they go.  I like to think I'm making the world better.",
-     "responses": [
-       { "text": "…", "topic": "TALK_WARRENER" },
-+      {
-+        "text": "Anyone nearby I should meet?",
-+        "topic": "TALK_WARRENER_ISHERWOOD",
-+        "condition": { "u_has_var": "u_met_carlos_isherwood", "type": "general", "context": "meeting", "value": "no" }
-+      },
-       { "text": "That sounds optimistic?", "topic": "TALK_WARRENER_WORLD_OPTIMISTIC" }
-     ]
-   },
-   {
-+    "id": "TALK_WARRENER_ISHERWOOD",
-+    "type": "talk_topic",
-+    "dynamic_line": "There is a family of nearby farmers that I trade with.  I'd appreciate it if you could go check on them.",
-+    "responses": [
-+      {
-+        "text": "Seems like a deal to me.",
-+        "topic": "TALK_WARRENER_ISHERWOOD_MISSION_ACCEPTED",
-+        "effect": { "add_mission": "MISSION_Warrener_ISHERWOOD" }
-+      },
-+      { "text": "That seems rather dangerous, I think I'll pass.", "topic": "TALK_EVAC_MERCHANT" }
-+    ]
-+  },
-+  {
-+    "id": "TALK_WARRENER_ISHERWOOD_MISSION_ACCEPTED",
-+    "type": "talk_topic",
-+    "dynamic_line": "It can be quite a hike depending on your transportation.  Lot of bad news between here and there.",
-+    "responses": [
-+      { "text": "Don't worry, I'll be careful.", "topic": "TALK_DONE" },
-+      { "text": "Just a walk in the woods.", "topic": "TALK_DONE" }
-+    ]
-+  },
-+  {
-     "type": "talk_topic",
-     "id": "TALK_WARRENER_WORLD_OPTIMISTIC",
-     "dynamic_line": "If I teach one hundred people how to raise rabbits, that's potentially a hundred communities given food and fur before those people teach anyone else.",
-@@ -106,6 +130,41 @@
-     ]
-   },
-   {
-+    "type": "talk_topic",
-+    "id": "TALK_LAPIN_RESOURCES",
-+    "dynamic_line": "The bunnies and I love adding some diversity to the menu and I always need materials for patching fences.",
-+    "repeat_responses": {
-+      "for_item": [
-+        "log",
-+        "2x4",
-+        "wood_panel",
-+        "wood_sheet",
-+        "material_sand",
-+        "clay_lump",
-+        "nail",
-+        "wire",
-+        "apple",
-+        "banana",
-+        "orange",
-+        "blueberries",
-+        "strawberries",
-+        "raspberries",
-+        "huckleberries",
-+        "mulberries",
-+        "plums",
-+        "carrot",
-+        "cabbage",
-+        "lettuce",
-+        "onion"
-+      ],
-+      "response": { "text": "Delivering <topic_item>.", "topic": "TALK_DELIVER_ASK" }
-+    },
-+    "responses": [
-+      { "text": "That's all for now.  Can we discuss something else?", "topic": "TALK_WARRENER" },
-+      { "text": "That's all for now.  I'd best get going.", "topic": "TALK_DONE" }
-+    ]
-+  },
-+  {
-     "id": "MISSION_Warrener_LOG_1",
-     "type": "mission_definition",
-     "name": { "str": "Timber!" },
-@@ -153,5 +212,30 @@
-       "failure": "It's not a big deal, it isn't that urgent."
-     },
-     "end": { "effect": [ { "u_buy_item": "petpack", "count": 2 } ] }
-+  },
-+  {
-+    "id": "MISSION_Warrener_ISHERWOOD",
-+    "type": "mission_definition",
-+    "name": { "str": "Visit the Isherwoods" },
-+    "description": "There is a family that nearby that I'd like you to check in on. After you talk to all of them come back to me and tell me how they are doing.",
-+    "goal": "MGOAL_CONDITION",
-+    "difficulty": 3,
-+    "start": {
-+      "assign_mission_target": { "om_terrain": "farm_isherwood_2", "om_special": "Isherwood Farms", "reveal_radius": 3, "search_range": 360 }
-+    },
-+    "goal_condition": { "u_has_var": "u_met_carlos_isherwood", "type": "general", "context": "meeting", "value": "yes" },
-+    "value": 5000,
-+    "origins": [ "ORIGIN_SECONDARY" ],
-+    "dialogue": {
-+      "describe": "…",
-+      "offer": "…",
-+      "accepted": "…",
-+      "rejected": "…",
-+      "advice": "…",
-+      "inquire": "Have you checked on them?",
-+      "success": "Good, that's one less thing to worry about.",
-+      "success_lie": "I'm glad to hear they are fine.  Why haven't they been by then?",
-+      "failure": "At least you came back with your life…"
-+    }
-   }
- ]