Port DDA updates for Isherwood, Tacoma, and Godco.

Remove two patches made obsolete by these changes.

1 files changed, 425 insertions, 0 deletions

diff --git a/npc-01_isherwood-update.patch b/npc-01_isherwood-update.patch
new file mode 100644
index 0000000..6e34964
--- /dev/null
+++ b/npc-01_isherwood-update.patch
@@ -0,0 +1,425 @@
+--- a/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json
++++ b/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json
+@@ -64,7 +64,7 @@
+   {
+     "type": "talk_topic",
+     "id": "TALK_ISHERWOOD_BARRY_TOWER",
+-    "dynamic_line": [ "Yeah, I think we need to talk about it, but I'm not ready yet.  Let me reclaim my life for a while. " ],
++    "dynamic_line": [ "Yeah, I think we need to talk about it, but I'm not ready yet.  Let me reclaim my life for a while." ],
+     "responses": [ { "text": "Sounds good, Barry.", "topic": "TALK_DONE" } ]
+   },
+   {
+@@ -77,7 +77,7 @@
+     "destination": "dairy_farm_isherwood_W",
+     "start": {
+       "effect": [ { "u_add_var": "u_have_barry_escape", "type": "general", "context": "meeting", "value": "yes" } ],
+-      "assign_mission_target": { "om_terrain": "dairy_farm_isherwood_W", "reveal_radius": 3 }
++      "assign_mission_target": { "om_terrain": "dairy_farm_isherwood_W", "om_special": "Isherwood Farm", "reveal_radius": 3, "search_range": 240 }
+     },
+     "end": {
+       "opinion": { "trust": 5, "value": 5 },
+--- a/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json
++++ b/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json
+@@ -28,7 +28,7 @@
+         "skill": "ALL",
+         "level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "constant": -2 }, { "one_in": 4 } ] } ] }
+       },
+-      { "skill": "barter", "bonus": { "rng": [ 2, 4 ] } },
++      { "skill": "speech", "bonus": { "rng": [ 2, 4 ] } },
+       { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } },
+       { "skill": "survival", "bonus": { "rng": [ 7, 10 ] } },
+       { "skill": "gun", "bonus": { "rng": [ 4, 8 ] } },
+@@ -47,14 +47,14 @@
+     "responses": [
+       {
+         "text": "Yeah, I'm a Marshal, what are you going to do about it?",
+-        "topic": "TALK_LEAVE_NOW",
++        "topic": "TALK_LEAVE_NOW_MARSHAL",
+         "effect": "hostile",
+         "opinion": { "trust": -20, "value": -20 },
+         "condition": { "u_is_wearing": "badge_marshal" }
+       },
+       {
+         "text": "…",
+-        "topic": "TALK_LEAVE_NOW",
++        "topic": "TALK_LEAVE_NOW_MARSHAL",
+         "opinion": { "trust": -20, "value": -20 },
+         "condition": { "u_is_wearing": "badge_marshal" }
+       },
+@@ -144,14 +144,8 @@
+   },
+   {
+     "type": "talk_topic",
+-    "id": "TALK_LEAVE_NOW",
+-    "dynamic_line": "You should get off my farm, I won't deal with a government stooge.",
+-    "responses": [ { "text": "…", "topic": "TALK_DONE" } ]
+-  },
+-  {
+-    "type": "talk_topic",
+     "id": "TALK_ISHERWOOD_CARLOS_TOPICS",
+-    "dynamic_line": "Go on...",
++    "dynamic_line": "Go on…",
+     "responses": [
+       {
+         "text": "I heard about Barry, can you tell me what captured him?",
+--- a/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json
++++ b/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json
+@@ -28,7 +28,7 @@
+         "skill": "ALL",
+         "level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "constant": -2 }, { "one_in": 4 } ] } ] }
+       },
+-      { "skill": "barter", "bonus": { "rng": [ 2, 4 ] } },
++      { "skill": "speech", "bonus": { "rng": [ 2, 4 ] } },
+       { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } },
+       { "skill": "survival", "bonus": { "rng": [ 7, 10 ] } },
+       { "skill": "gun", "bonus": { "rng": [ 4, 8 ] } },
+@@ -47,7 +47,7 @@
+     "responses": [
+       {
+         "text": "…",
+-        "topic": "TALK_LEAVE_NOW",
++        "topic": "TALK_LEAVE_NOW_MARSHAL_CHRIS",
+         "opinion": { "trust": -20, "value": -20 },
+         "condition": { "u_is_wearing": "badge_marshal" }
+       },
+@@ -137,14 +137,14 @@
+   },
+   {
+     "type": "talk_topic",
+-    "id": "TALK_LEAVE_NOW",
++    "id": "TALK_LEAVE_NOW_MARSHAL_CHRIS",
+     "dynamic_line": "You should leave before my family sees you.",
+     "responses": [ { "text": "…", "topic": "TALK_DONE" } ]
+   },
+   {
+     "type": "talk_topic",
+     "id": "TALK_ISHERWOOD_CHRIS_TOPICS",
+-    "dynamic_line": "Go on...",
++    "dynamic_line": "Go on…",
+     "responses": [
+       {
+         "text": "Your dad asked me to come find you, said you've been looking for your uncle.",
+--- a/data/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json
++++ b/data/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json
+@@ -28,7 +28,7 @@
+         "skill": "ALL",
+         "level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "constant": -2 }, { "one_in": 4 } ] } ] }
+       },
+-      { "skill": "barter", "bonus": { "rng": [ 2, 4 ] } },
++      { "skill": "speech", "bonus": { "rng": [ 2, 4 ] } },
+       { "skill": "cooking", "bonus": { "rng": [ 4, 8 ] } },
+       { "skill": "firstaid", "bonus": { "rng": [ 3, 6 ] } },
+       { "skill": "survival", "bonus": { "rng": [ 3, 6 ] } },
+@@ -113,13 +113,13 @@
+     "responses": [
+       {
+         "text": "Yes, I'm a marshal.",
+-        "topic": "TALK_LEAVE_NOW",
++        "topic": "TALK_LEAVE_NOW_MARSHAL_CLAIRE",
+         "opinion": { "trust": -20, "value": -20 },
+         "condition": { "u_is_wearing": "badge_marshal" }
+       },
+       {
+         "text": "…",
+-        "topic": "TALK_LEAVE_NOW",
++        "topic": "TALK_LEAVE_NOW_MARSHAL_CLAIRE",
+         "opinion": { "trust": -20, "value": -20 },
+         "condition": { "u_is_wearing": "badge_marshal" }
+       },
+@@ -251,7 +251,7 @@
+   },
+   {
+     "type": "talk_topic",
+-    "id": "TALK_LEAVE_NOW",
++    "id": "TALK_LEAVE_NOW_MARSHAL_CLAIRE",
+     "dynamic_line": "You should get off our land, you have no business here.",
+     "responses": [ { "text": "…", "topic": "TALK_DONE" } ]
+   },
+--- a/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json
++++ b/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json
+@@ -29,7 +29,7 @@
+         "skill": "ALL",
+         "level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "constant": -2 }, { "one_in": 4 } ] } ] }
+       },
+-      { "skill": "barter", "bonus": { "rng": [ 2, 4 ] } },
++      { "skill": "speech", "bonus": { "rng": [ 2, 4 ] } },
+       { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } },
+       { "skill": "survival", "bonus": { "rng": [ 3, 6 ] } },
+       { "skill": "gun", "bonus": { "rng": [ 3, 6 ] } },
+@@ -61,14 +61,14 @@
+     "responses": [
+       {
+         "text": "Yeah, I'm a Marshal, what are you going to do about it?",
+-        "topic": "TALK_LEAVE_NOW",
++        "topic": "TALK_LEAVE_NOW_MARSHAL",
+         "effect": "hostile",
+         "opinion": { "trust": -20, "value": -20 },
+         "condition": { "u_is_wearing": "badge_marshal" }
+       },
+       {
+         "text": "…",
+-        "topic": "TALK_LEAVE_NOW",
++        "topic": "TALK_LEAVE_NOW_MARSHAL",
+         "opinion": { "trust": -20, "value": -20 },
+         "condition": { "u_is_wearing": "badge_marshal" }
+       },
+@@ -174,14 +174,8 @@
+   },
+   {
+     "type": "talk_topic",
+-    "id": "TALK_LEAVE_NOW",
+-    "dynamic_line": "You should get off my farm, I won't deal with a government stooge.",
+-    "responses": [ { "text": "…", "topic": "TALK_DONE" } ]
+-  },
+-  {
+-    "type": "talk_topic",
+     "id": "TALK_ISHERWOOD_EDDIE_TOPICS",
+-    "dynamic_line": "Go on...",
++    "dynamic_line": "Go on…",
+     "responses": [
+       { "text": "Your son helps with the dairy?", "topic": "TALK_EDDIE_LUKE" },
+       { "text": "So, Jesse runs the horse farm?", "topic": "TALK_EDDIE_JESSE" },
+--- a/data/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json
++++ b/data/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json
+@@ -29,7 +29,7 @@
+         "skill": "ALL",
+         "level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "constant": -2 }, { "one_in": 4 } ] } ] }
+       },
+-      { "skill": "barter", "bonus": { "rng": [ 2, 4 ] } },
++      { "skill": "speech", "bonus": { "rng": [ 2, 4 ] } },
+       { "skill": "gun", "bonus": { "rng": [ 4, 8 ] } },
+       { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } },
+       { "skill": "survival", "bonus": { "rng": [ 3, 6 ] } },
+@@ -67,7 +67,8 @@
+       { "item": "crossbow", "prob": 20 },
+       { "item": "shortbow", "prob": 5 },
+       { "item": "compbow", "prob": 15 },
+-      { "item": "compositebow", "prob": 15 },
++      { "item": "recurbow", "prob": 15 },
++      { "item": "reflexbow", "prob": 10 },
+       { "item": "longbow", "prob": 10 },
+       { "item": "hand_crossbow", "prob": 15 },
+       { "item": "selfbow", "prob": 5 }
+@@ -96,7 +97,7 @@
+       { "item": "cheese_hard", "prob": 50 },
+       { "item": "vinegar", "prob": 55 },
+       { "item": "veggy_pickled", "prob": 50, "charges": 2, "container-item": "jar_glass_sealed" },
+-      { "item": "jar_sauerkraut_pickled", "prob": 50 },
++      { "item": "sauerkraut", "prob": 50, "charges": 4, "container-item": "jar_glass_sealed" },
+       { "item": "meat_pickled", "prob": 50, "charges": 2, "container-item": "jar_glass_sealed" },
+       { "item": "fish_pickled", "prob": 60, "charges": 2, "container-item": "jar_glass_sealed" },
+       { "item": "meat_canned", "prob": 40, "charges": 12, "container-item": "jar_3l_glass_sealed" },
+@@ -122,14 +123,14 @@
+     "responses": [
+       {
+         "text": "Yes, I'm a marshal.",
+-        "topic": "TALK_LEAVE_NOW",
++        "topic": "TALK_LEAVE_NOW_MARSHAL_JACK",
+         "effect": "hostile",
+         "opinion": { "trust": -20, "value": -20 },
+         "condition": { "u_is_wearing": "badge_marshal" }
+       },
+       {
+         "text": "…",
+-        "topic": "TALK_LEAVE_NOW",
++        "topic": "TALK_LEAVE_NOW_MARSHAL_JACK",
+         "opinion": { "trust": -20, "value": -20 },
+         "condition": { "u_is_wearing": "badge_marshal" }
+       },
+@@ -198,7 +199,7 @@
+   {
+     "type": "talk_topic",
+     "id": "TALK_JACK_FARM",
+-    "dynamic_line": "Even out here we've had some attacks and seen … other things.  We have been working on our defenses, but it takes time.  We've been able to keep up with the crops and animals though so we won't have to risk our necks for supplies.",
++    "dynamic_line": "Even out here we've had some attacks and seen… other things.  We have been working on our defenses, but it takes time.  We've been able to keep up with the crops and animals though so we won't have to risk our necks for supplies.",
+     "responses": [
+       { "text": "What sort of defenses do you want?", "topic": "TALK_FARM_DEFENSE" },
+       { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_JACK_TOPICS" },
+@@ -250,14 +251,14 @@
+   },
+   {
+     "type": "talk_topic",
+-    "id": "TALK_LEAVE_NOW",
++    "id": "TALK_LEAVE_NOW_MARSHAL_JACK",
+     "dynamic_line": "You should get off my land, the government proved its incompetence with this catastrophe.",
+     "responses": [ { "text": "…", "topic": "TALK_DONE" } ]
+   },
+   {
+     "type": "talk_topic",
+     "id": "TALK_ISHERWOOD_JACK_TOPICS",
+-    "dynamic_line": "Go on ...",
++    "dynamic_line": "Go on…",
+     "responses": [
+       {
+         "text": "I'm here to deliver some resources.",
+--- a/data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json
++++ b/data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json
+@@ -28,7 +28,7 @@
+         "skill": "ALL",
+         "level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "constant": -2 }, { "one_in": 4 } ] } ] }
+       },
+-      { "skill": "barter", "bonus": { "rng": [ 6, 9 ] } },
++      { "skill": "speech", "bonus": { "rng": [ 6, 9 ] } },
+       { "skill": "melee", "bonus": { "rng": [ 3, 6 ] } },
+       { "skill": "survival", "bonus": { "rng": [ 3, 6 ] } },
+       { "skill": "gun", "bonus": { "rng": [ 3, 6 ] } },
+@@ -51,14 +51,14 @@
+     "responses": [
+       {
+         "text": "Yeah, I'm a Marshal, what are you going to do about it?",
+-        "topic": "TALK_LEAVE_NOW",
++        "topic": "TALK_LEAVE_NOW_MARSHAL",
+         "effect": "hostile",
+         "opinion": { "trust": -20, "value": -20 },
+         "condition": { "u_is_wearing": "badge_marshal" }
+       },
+       {
+         "text": "…",
+-        "topic": "TALK_LEAVE_NOW",
++        "topic": "TALK_LEAVE_NOW_MARSHAL",
+         "opinion": { "trust": -20, "value": -20 },
+         "condition": { "u_is_wearing": "badge_marshal" }
+       },
+@@ -124,7 +124,7 @@
+     "id": "TALK_MET_JACK_CLAIRE",
+     "dynamic_line": "Oh good, I'm sure Jack wanted to put you to work.  If you're interested, I could use a hand clearing out the woods.  My son, Chris has his hands full trying to keep the predators under control.",
+     "responses": [
+-      { "text": "I'd like to speak with Carlos too about some work.", "topic": "TALK_JESSE_CARLOS" },
++      { "text": "I'd like to speak with Carlos too about some work.", "topic": "TALK_JESSE_CARLOS1" },
+       {
+         "text": "Is Chris around?  I'd like to know what he's run into out in the woods.",
+         "topic": "TALK_JESSE_CHRIS"
+@@ -136,7 +136,7 @@
+   },
+   {
+     "type": "talk_topic",
+-    "id": "TALK_JESSE_CARLOS",
++    "id": "TALK_JESSE_CARLOS1",
+     "dynamic_line": "He's out back in the workshop.",
+     "responses": [
+       { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_JESSE_TOPICS" },
+@@ -154,7 +154,7 @@
+   },
+   {
+     "type": "talk_topic",
+-    "id": "TALK_JESSE_CARLOS",
++    "id": "TALK_JESSE_CARLOS2",
+     "dynamic_line": "Carlos will be in his workshop if he isn't out hunting.  He is trying to get a forge set up.",
+     "responses": [
+       { "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_JESSE_TOPICS" },
+@@ -163,19 +163,19 @@
+   },
+   {
+     "type": "talk_topic",
+-    "id": "TALK_LEAVE_NOW",
++    "id": "TALK_LEAVE_NOW_MARSHAL",
+     "dynamic_line": "You should get off my farm, I won't deal with a government stooge.",
+     "responses": [ { "text": "…", "topic": "TALK_DONE" } ]
+   },
+   {
+     "type": "talk_topic",
+     "id": "TALK_ISHERWOOD_JESSE_TOPICS",
+-    "dynamic_line": "Go on...",
++    "dynamic_line": "Go on…",
+     "responses": [
+       { "text": "Looks like you are doing well here.", "topic": "TALK_ISHERWOOD_JESSE_TALK1" },
+       { "text": "Do you have any animal care tips?", "topic": "TALK_ISHERWOOD_JESSE_TIPS" },
+       { "text": "Jack and Claire suggested I come talk to you.", "topic": "TALK_MET_JACK_CLAIRE" },
+-      { "text": "I'd like to speak with Carlos too about some work.", "topic": "TALK_JESSE_CARLOS" },
++      { "text": "I'd like to speak with Carlos too about some work.", "topic": "TALK_JESSE_CARLOS2" },
+       { "text": "Is Chris around?", "topic": "TALK_JESSE_CHRIS" },
+       { "text": "Can I do anything for you?", "topic": "TALK_MISSION_LIST" },
+       { "text": "I'd better get going.", "topic": "TALK_DONE" }
+@@ -206,33 +206,7 @@
+       "success_lie": "Show me the bodies.",
+       "failure": "It was a lost cause anyways…"
+     },
+-    "end": { "opinion": { "trust": 1, "value": 1 }, "effect": [ { "u_buy_item": "horse_tack", "count": 1 } ] }
+-  },
+-  {
+-    "id": "MISSION_ISHERWOOD_JESSE_2",
+-    "type": "mission_definition",
+-    "name": { "str": "Kill monster" },
+-    "goal": "MGOAL_KILL_MONSTER",
+-    "difficulty": 8,
+-    "value": 80000,
+-    "start": {
+-      "assign_mission_target": { "om_terrain": "forest_thick", "reveal_radius": 1, "random": true, "search_range": 20, "min_distance": 15 },
+-      "update_mapgen": { "place_monster": [ { "monster": "mon_flying_polyp", "pack_size": [ 3, 6 ], "x": 11, "y": 11, "target": true } ] }
+-    },
+-    "origins": [ "ORIGIN_SECONDARY" ],
+-    "has_generic_rewards": false,
+-    "dialogue": {
+-      "describe": "We could use some help killing some wolves.",
+-      "offer": "There's been some wolves that keep scaring our chickens and horses, I'd be grateful if you can kill them.",
+-      "accepted": "Wonderful, let me know when it is done.",
+-      "rejected": "Thanks anyway, we will try some traps.",
+-      "advice": "A gun will probably help.",
+-      "inquire": "Did you kill it?",
+-      "success": "I appreciate it, I've got this old saddle I want you to have.  I'll be happy to put a horse under it if you want to do some more heroics.",
+-      "success_lie": "Show me the bodies.",
+-      "failure": "It was a lost cause anyways…"
+-    },
+-    "end": { "opinion": { "trust": 1, "value": 1 }, "effect": [ { "u_buy_item": "horse_tack", "count": 1 } ] }
++    "end": { "opinion": { "trust": 1, "value": 1 }, "effect": [ { "u_buy_item": "horse_tack", "count": 1 } ] }
+   },
+   {
+     "id": "MISSION_ISHERWOOD_JESSE_2",
+--- a/data/json/npcs/isherwood_farm/NPC_Lisa_Isherwood.json
++++ b/data/json/npcs/isherwood_farm/NPC_Lisa_Isherwood.json
+@@ -45,7 +45,7 @@
+     "responses": [
+       {
+         "text": "…",
+-        "topic": "TALK_LEAVE_NOW",
++        "topic": "TALK_LEAVE_NOW_MARSHAL",
+         "opinion": { "trust": -20, "value": -20 },
+         "condition": { "u_is_wearing": "badge_marshal" }
+       },
+@@ -123,17 +123,11 @@
+   {
+     "type": "talk_topic",
+     "id": "TALK_ISHERWOOD_LISA_TOPICS",
+-    "dynamic_line": "Go on...",
++    "dynamic_line": "Go on…",
+     "responses": [
+       { "text": "Hi, I'm looking for Jesse.", "topic": "TALK_LISA_JESSE" },
+       { "text": "Hi, I'm looking for Chris.", "topic": "TALK_LISA_CHRIS" },
+       { "text": "I'd better get going.", "topic": "TALK_DONE" }
+     ]
+-  },
+-  {
+-    "type": "talk_topic",
+-    "id": "TALK_LEAVE_NOW",
+-    "dynamic_line": "You should get off my farm, I won't deal with a government stooge.",
+-    "responses": [ { "text": "…", "topic": "TALK_DONE" } ]
+   }
+ ]
+--- a/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json
++++ b/data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json
+@@ -47,7 +47,7 @@
+     "responses": [
+       {
+         "text": "…",
+-        "topic": "TALK_LEAVE_NOW",
++        "topic": "TALK_LEAVE_NOW_LUKE",
+         "opinion": { "trust": -20, "value": -20 },
+         "condition": { "u_is_wearing": "badge_marshal" }
+       },
+@@ -135,14 +135,14 @@
+   },
+   {
+     "type": "talk_topic",
+-    "id": "TALK_LEAVE_NOW",
++    "id": "TALK_LEAVE_NOW_LUKE",
+     "dynamic_line": "You won't find any help here.",
+     "responses": [ { "text": "…", "topic": "TALK_DONE" } ]
+   },
+   {
+     "type": "talk_topic",
+     "id": "TALK_ISHERWOOD_LUKE_TOPICS",
+-    "dynamic_line": "Go on...",
++    "dynamic_line": "Go on…",
+     "responses": [
+       {
+         "text": "Must be tough having the world fall apart when you had you future to look forward to.",