Updated to 2022-02-15-0614.

Add patches to allow the fmc broker and tacoma nurse to buy more items.
Disable tests as they are broken with gcc 11.2

4 files changed, 256 insertions, 703 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3921cb7..51b7b82 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,8 +13,8 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202202041939
-_pkgver=2022-02-04-1939
+pkgver=202202150614
+_pkgver=2022-02-15-0614
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -34,6 +34,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "revert-02_revert-book-revamp.patch"
         "revert-03_generic-nv.patch"
         "revert-04_telescopic-lenses.patch"
+        #"revert-05_JSONize-ranged-bash-reinforced-glass-letting-bullets.patch"
 
         "ammo-01_inconsistent-ammo-names.patch"
         "ammo-02_fix-20x66mm-loudness.patch"
@@ -48,6 +49,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "bionics-01_npc-can-use-more-bionics.patch"
 
         "faction-01_more-factions.patch"
+        #"faction-02_more-monster-factions.patch"
 
         "foods-01_fix-food-materials.patch"
         "foods-02_fix-food-naming.patch"
@@ -59,6 +61,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "meds-01_antibiotics-unhealthy.patch"
 
         "monsters-01_medical-zombies-called-zombies.patch"
+        #"monsters-02_power-leech-update.patch"
 
         "mutations-01_nerf-lightstep.patch"
         "mutations-02_fix-evac3-background-visible.patch"
@@ -71,8 +74,10 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "npc-05_kindred-update.patch"
         "npc-06_lapin-update.patch"
         "npc-07_lighthouse-family_v2.patch"
+        "npc-08_nurse-takes-more-meds.patch"
+        "npc-09_broker-takes-more-foods.patch"
         #"npc-nn_refugee.patch"
-        #"npc-nn_robofac.patch"
+        #"npc-nn_robofac-v2.patch"
         "npc-10_dialogue-fixes.patch"
 
         "recipes-01_4570-dragon-can-be-dismantled.patch"
@@ -113,7 +118,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "cataclysm-dda-soundpack_jcsoundpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-soundpack_jcsoundpack.git/snapshot/cataclysm-dda-soundpack_jcsoundpack-master.tar.xz"
         "cataclysm-dda-musicpack_coag-musicpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-musicpack_coag-musicpack.git/snapshot/cataclysm-dda-musicpack_coag-musicpack-master.tar.xz"
         )
-b2sums=('e63a887564927e1bef9e7f01656c46576f8ed76d7003d47e7c3b1b02619f1c7ef53cf8e45c5f6630133f59cbf111155ec7ab5ef8c834ea57db080db1c68f08e1'
+b2sums=('e5f7ad41b43bce265f4fbd29b74af8d6a875c11dca94b500bf81c81198621eeedbf65afc403320e69d6c32f5d641c367b0e7f04ec05b4c87a74ebb6963376d31'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -148,6 +153,8 @@ b2sums=('e63a887564927e1bef9e7f01656c46576f8ed76d7003d47e7c3b1b02619f1c7ef53cf8e
         'd3d582336519191f73c8cf3c7bbb0a8df8ecbb333d864a32ad4b263daaeb193f771aa4b9cbf00ab929b4296da6db31fd575bdb2b337148147a76e25459f703ad'
         '17ded8bdfccef7555cc01727984c768ecc601878319bc8cc959cff51b5091335dd43f45cf69ec12dfd478644ccceab48c7a49c3469bbe3eee9ec9b380cfac7fb'
         'd2c149bb48e3152100b02d138471ec107e172f282a05ee4bae321ef0828c758d0cf1f7a6e9bbb02bca14148d59d61f92abcbc5ddb9a7a0b7cba8db9cef22c391'
+        '026fb478045b82e3b329a53c023c8c3ee29e792ca2e77c285a67b3655853cd6a960a8e27a65c9ad6988d8000333f6b8f8bf77ea6656b879519fc74a475d8aef7'
+        '9f34e372124b23bbc0598f42a1331f5a37f6ca4bfa3117d8b83fc804446a0d55f7fe3f462ff924bfa563100127338713bf27241a4244b1a37d9cca9b5da79bca'
         'adcf0b46ad57390488b3932910fba5a5be8152f91b45864bf078a2b8d92dc89e9944c320dafb7a0d4786e1fce48bedea714d671feefe565ffbbb74baca21d98e'
         '3373939e76f1ddb788b45424533c2e7687bbacae840fb3e6b1d49034e18315297af66dddf1b13d4f42033608123929b78819f38cca6cbc6c5ecca09bc67ab69f'
         'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e'
@@ -175,7 +182,7 @@ b2sums=('e63a887564927e1bef9e7f01656c46576f8ed76d7003d47e7c3b1b02619f1c7ef53cf8e
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
         '1de3fed057adb6c0d41c97bbb5af2b753147ea8f8ac7023759684054aead266100dc8c8e0cc261c7a5cf922e4194e8cabaf626fb5f7974c6036edc64f25cc8f9'
-        'fb41ab2c313bf7e76179490b15aadd6c530a246d993ec974d961394efcef08a3306df5a34aa992f1f9a895d8fc2fe3eabe23747bbce44f265d2710bdb48242f5'
+        '89241aa3a25d9f8b8e18ebde0687c23445ee24121a4ddc146be8106696ebf2af6a2f9d20bacf5718e5bdef6ed1cbb3cab2c8aeb00edac228413b74733e435926'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         '26a1e5a583a30687da3534a3846f5e316954bdc5a5fc36ed0a7eeda6f642644a74ae459f90d6ab80879813d500b4dfa6c68d38508e4cef3a0feba1c057e3b09a'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -195,7 +202,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2022-02-04-1939|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2022-02-15-0614|' Makefile
 
 
   # # # Hotfixes
@@ -215,6 +222,9 @@ prepare() {
   # Revert the Infection Immune Trait and Revert Infection Resistant to as before. Also keep Truthteller.
   patch -Np1 -i "$srcdir"/revert-01_removed-traits.patch
 
+  # Revert bullet penetration patch til the bug with viewing over tables is fixed
+  #patch -NRp1 -i "$srcdir"/revert-05_JSONize-ranged-bash-reinforced-glass-letting-bullets.patch
+
 
   # # # Various fixes for bugs I came across
   # # Ammo fixes
@@ -264,6 +274,9 @@ prepare() {
   # Backport the factions.json updates from DDA
   patch -Np1 -i "$srcdir"/faction-01_more-factions.patch
 
+  # Backport the monster_factions.json updates from DDA
+  #patch -Np1 -i "$srcdir"/faction-02_more-monster-factions.patch
+
 
   # # food fixes
   echo "Applying food fixes"
@@ -304,6 +317,9 @@ prepare() {
   # It just felt weird seeing "nurse" in the enemy list.
   patch -Np1 -i "$srcdir"/monsters-01_medical-zombies-called-zombies.patch
 
+  # Port the updates to power leeches from DDA
+  #patch -Np1 -i "$srcdir"/monsters-02_power-leech-update.patch
+
 
   # # mutation fixes
   echo "Applying mutation fixes"
@@ -342,13 +358,21 @@ prepare() {
   # Hack in some effects to use as timers and probe NPC mechanic skill.
   patch -Np1 -i "$srcdir"/npc-07_lighthouse-family_v2.patch
 
+  # Update the Tacoma Nurse to buy almost every non-dangerous, non-electrical, and non-expensive medicine.
+  # Also remove acceptance for various tools that are not correctly taken, such as first aid kits.
+  patch -Np1 -i "$srcdir"/npc-08_nurse-takes-more-meds.patch
+
+  # Update the FMC broker to buy most preserved foods.
+  # Also update the dialogue to specify that he buys more types.
+  patch -Np1 -i "$srcdir"/npc-09_broker-takes-more-foods.patch
+
   # Port the updates to Free Merchant Center from DDA
   # Relies on new json functions :/
   #patch -Np1 -i "$srcdir"/npc-nn_refugee.patch
 
   # Port the updates to Hub 01 from DDA
   # Relies on new json functions :/
-  #patch -Np1 -i "$srcdir"/npc-nn_robofac.patch
+  #patch -Np1 -i "$srcdir"/zz_npc-nn_robofac-v2.patch
 
   # Assorted typos in NPC dialogue.
   # Fix Jack Isherwood mission listing 10 jars, when it is actually 20.
@@ -477,15 +501,16 @@ build() {
 
   # tests "ifdef TILES" so "TILES=0" will enable tiles!
   # DYNAMIC_LINKING appears to be a windows flag?
-  make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LTO=1 LOCALIZE=1 LANGUAGES=all
-  make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LTO=1 LOCALIZE=1 LANGUAGES=all TILES=1 SOUND=1
+  # TESTS disabled due to gcc 11.2 bug
+  make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LTO=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0
+  make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LTO=1 LOCALIZE=1 LANGUAGES=all TILES=1 SOUND=1 RUNTESTS=0
   ./lang/compile_mo.sh
 }
 
 package_cataclysm-bn() {
   cd "${_pkgname}-${_pkgver}"
 
-  make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 USE_HOME_DIR=1 LTO=1 LOCALIZE=1 LANGUAGES=all install
+  make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 USE_HOME_DIR=1 LTO=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 install
 
   # Docs
   install -d "$pkgdir/usr/share/doc/cataclysm-bn"
@@ -516,7 +541,7 @@ package_cataclysm-bn-tiles() {
   depends=('cataclysm-bn' 'sdl2_image' 'sdl2_ttf' 'freetype2' 'sdl2_mixer')
   cd "${_pkgname}-${_pkgver}"
 
-  make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 LTO=1 LOCALIZE=1 LANGUAGES=all TILES=1 SOUND=1 install
+  make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 LTO=1 LOCALIZE=1 LANGUAGES=all TILES=1 SOUND=1 RUNTESTS=0 install
 
 
   # Icon
diff --git a/npc-07_lighthouse-family.patch b/npc-07_lighthouse-family.patch
deleted file mode 100644
index 72bebbe..0000000
--- a/npc-07_lighthouse-family.patch
+++ /dev/null
@@ -1,692 +0,0 @@
---- a/data/json/npcs/Lighthouse_Family/NPC_lighthouse_girl.json
-+++ b/data/json/npcs/Lighthouse_Family/NPC_lighthouse_girl.json
-@@ -0,0 +1,121 @@
-+[
-+  {
-+    "type": "npc",
-+    "id": "NPC_lighthouse_girl",
-+    "name_unique": "Angelina Frolova",
-+    "gender": "female",
-+    "class": "NC_NONE",
-+    "attitude": 1,
-+    "mission": 8,
-+    "chat": "TALK_lighthouse_girl_start",
-+    "faction": "fisherman_family"
-+  },
-+  {
-+    "type": "talk_topic",
-+    "id": "TALK_lighthouse_girl_start",
-+    "dynamic_line": "I'm scared.  Where is my papa?",
-+    "speaker_effect": { "sentinel": "met", "effect": [ "follow_only", { "add_mission": "MISSION_lighthouse_girl_0" } ] },
-+    "responses": [
-+      {
-+        "text": "I want you to use this item.",
-+        "topic": "TALK_lighthouse_girl_start",
-+        "condition": "npc_following",
-+        "effect": "npc_gets_item_to_use"
-+      },
-+      {
-+        "text": "We're here.",
-+        "topic": "TALK_lighthouse_girl_safe",
-+        "condition": { "npc_at_om_location": "lighthouse_ground" },
-+        "effect": [
-+          "mission_success",
-+          "clear_mission",
-+          "stop_following",
-+          { "npc_first_topic": "TALK_lighthouse_girl_safe" },
-+          { "u_add_var": "lighthouse_girl", "type": "flag", "context": "safe", "value": "yes" }
-+        ]
-+      },
-+      { "text": "Let's go.", "topic": "TALK_DONE" }
-+    ]
-+  },
-+  {
-+    "type": "talk_topic",
-+    "id": "TALK_lighthouse_girl_safe",
-+    "dynamic_line": {
-+      "u_has_mission": "MISSION_lighthouse_man_3",
-+      "yes": {
-+        "u_has_var": "lighthouse_woman_dead",
-+        "type": "flag",
-+        "context": "death",
-+        "value": "yes",
-+        "yes": "Thank you for saving me.  It's a shame my mother didn't make it… you did everything you could, and I don't blame you for it…",
-+        "no": "Thank you!"
-+      },
-+      "no": {
-+        "u_has_var": "lighthouse_woman_dead",
-+        "type": "flag",
-+        "context": "death",
-+        "value": "yes",
-+        "yes": "Poor, poor mama…",
-+        "no": "Hello."
-+      }
-+    },
-+    "responses": [
-+      {
-+        "text": "Hi.",
-+        "condition": { "u_has_var": "lighthouse_family_safe", "type": "flag", "context": "help", "value": "yes" },
-+        "topic": "TALK_lighthouse_girl_1",
-+        "effect": { "npc_first_topic": "TALK_lighthouse_girl_1" },
-+        "switch": true
-+      },
-+      {
-+        "truefalsetext": {
-+          "true": "I'm sorry…",
-+          "false": "…",
-+          "condition": { "u_has_var": "lighthouse_woman_dead", "type": "flag", "context": "death", "value": "yes" }
-+        },
-+        "topic": "TALK_DONE",
-+        "switch": true
-+      }
-+    ]
-+  },
-+  {
-+    "type": "talk_topic",
-+    "id": [ "TALK_lighthouse_girl_1", "TALK_lighthouse_girl_Background" ],
-+    "dynamic_line": "How are you today?",
-+    "responses": [
-+      { "text": "About that job…", "condition": "has_assigned_mission", "topic": "TALK_MISSION_INQUIRE" },
-+      { "text": "<BGSS_intro_question>", "topic": "TALK_lighthouse_girl_Background" },
-+      { "text": "Do you need any help?", "topic": "TALK_MISSION_LIST" },
-+      { "text": "Goodbye.", "topic": "TALK_DONE" }
-+    ]
-+  },
-+  {
-+    "type": "talk_topic",
-+    "id": "TALK_lighthouse_girl_Background",
-+    "dynamic_line": "I don't have much to tell, sorry.  I'm busy with helping my mom, tiding this place to make it our new home.  You should talk to my dad, he doesn't look busy right now.  Or always…"
-+  },
-+  {
-+    "id": "MISSION_lighthouse_girl_0",
-+    "type": "mission_definition",
-+    "has_generic_rewards": false,
-+    "name": { "str": "Protect fisherman's daughter" },
-+    "description": "She looks like a nice girl.  Maybe you should not let her die?",
-+    "goal": "MGOAL_CONDITION",
-+    "goal_condition": { "npc_has_var": "-", "type": "-", "context": "-", "value": "-" },
-+    "difficulty": 0,
-+    "value": 0,
-+    "origins": [ "ORIGIN_SECONDARY" ],
-+    "dialogue": {
-+      "describe": "-",
-+      "offer": "-",
-+      "accepted": "-",
-+      "rejected": "-",
-+      "advice": "-",
-+      "inquire": "-",
-+      "success": "-",
-+      "success_lie": "-",
-+      "failure": "-"
-+    },
-+    "fail": { "effect": [ { "u_add_var": "lighthouse_girl_dead", "type": "flag", "context": "death", "value": "yes" } ] }
-+  }
-+]
---- a/data/json/npcs/Lighthouse_Family/NPC_lighthouse_man.json
-+++ b/data/json/npcs/Lighthouse_Family/NPC_lighthouse_man.json
-@@ -0,0 +1,418 @@
-+[
-+  {
-+    "type": "npc",
-+    "id": "NPC_lighthouse_man",
-+    "gender": "male",
-+    "class": "NC_NONE",
-+    "name_unique": "Mikhail Frolov",
-+    "name_suffix": "Fisherman",
-+    "attitude": 0,
-+    "mission": 8,
-+    "chat": "TALK_lighthouse_man_1",
-+    "faction": "fisherman_family",
-+    "mission_offered": "MISSION_lighthouse_man_1"
-+  },
-+  {
-+    "type": "npc_class",
-+    "id": "NC_lighthouse_man",
-+    "common": false,
-+    "name": { "str": "Fisherman" },
-+    "job_description": "I'm just wandering.",
-+    "shopkeeper_item_group": "NPC_lighthouse_man_shop",
-+    "traits": [ { "group": "NPC_starting_traits" }, { "group": "Appearance_Caucasian" } ],
-+    "skills": [
-+      { "skill": "ALL", "level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 4, 2 ] }, { "rng": [ -4, -1 ] } ] } ] } }
-+    ]
-+  },
-+  {
-+    "type": "item_group",
-+    "id": "NPC_lighthouse_man_shop",
-+    "subtype": "collection",
-+    "items": [
-+      { "item": "fish_bait", "count": [ 15, 35 ] },
-+      { "item": "fish", "count": [ 5, 20 ] },
-+      { "item": "fish_smoked", "count": [ 1, 4 ] },
-+      { "item": "fish_cooked", "count": [ 4, 14 ] },
-+      { "item": "salted_fish", "count": [ 2, 6 ] },
-+      { "item": "fish_fried", "count": [ 2, 6 ] },
-+      { "item": "soup_fish", "count": [ 35, 50 ], "container-item": "bottle_plastic" },
-+      { "item": "fishspear", "prob": 20, "count": [ 4, 8 ] },
-+      [ "doublespeargun", 20 ],
-+      [ "fish_trap", 55 ],
-+      [ "fishing_hook_bone", 100 ],
-+      [ "fishing_rod_basic", 100 ]
-+    ]
-+  },
-+  {
-+    "type": "talk_topic",
-+    "id": [ "TALK_lighthouse_man_1", "TALK_lighthouse_man_Background", "TALK_lighthouse_man_hay" ],
-+    "dynamic_line": "<greet>",
-+    "responses": [
-+      { "text": "About that job…", "condition": "has_assigned_mission", "topic": "TALK_MISSION_INQUIRE" },
-+      { "text": "<BGSS_intro_question>", "topic": "TALK_lighthouse_man_Background" },
-+      {
-+        "text": "How are you doing?",
-+        "topic": "TALK_lighthouse_man_hay",
-+        "condition": { "npc_has_var": "helped_lighthouse_man", "type": "flag", "context": "help", "value": "yes" }
-+      },
-+      { "text": "Do you need any help?", "topic": "TALK_MISSION_LIST" },
-+      {
-+        "text": "Care to trade?",
-+        "topic": "TALK_lighthouse_man_1",
-+        "condition": { "npc_has_var": "helped_lighthouse_man", "type": "flag", "context": "help", "value": "yes" },
-+        "effect": "start_trade"
-+      },
-+      { "text": "Goodbye.", "topic": "TALK_DONE" }
-+    ]
-+  },
-+  {
-+    "type": "talk_topic",
-+    "id": "TALK_lighthouse_man_Background",
-+    "dynamic_line": "I'm just a simple man from a simple family.  Before <the_cataclysm> I had a fishing boat, and I went to sea on it, to catch fish and other marine life.  This is how my grandfather lived, my father lived, and I began to live like that.  I had a large family, 7 children, but not many survived, only my wife and daughter remained…"
-+  },
-+  {
-+    "type": "talk_topic",
-+    "id": "TALK_lighthouse_man_hay",
-+    "dynamic_line": "You know, <very> good.  It is cozy here, there is a lot of space, and most importantly, it's safe.  We even started considering this place as our new home.  By the way, while I was fishing, a bottle with a piece of paper came to the shore of our island.  Here, take a look.\", he gave you a piece of paper, something was written on it: '0030045-0030045-35321700', with something similar to lightning scribbled nearby.  \"I wonder what it could mean…"
-+  },
-+  {
-+    "type": "talk_topic",
-+    "id": "TALK_lighthouse_man_lighthouse",
-+    "dynamic_line": "Are we there yet, <name_g>?",
-+    "responses": [
-+      { "text": "I want you to use this item.", "topic": "TALK_lighthouse_man_lighthouse", "effect": "npc_gets_item_to_use" },
-+      {
-+        "text": "We're here.",
-+        "topic": "TALK_MISSION_INQUIRE",
-+        "condition": "mission_complete",
-+        "effect": [ "stop_following", { "npc_first_topic": "TALK_lighthouse_man_1" } ]
-+      },
-+      { "text": "Almost.", "topic": "TALK_DONE" }
-+    ]
-+  },
-+  {
-+    "type": "talk_topic",
-+    "id": "TALK_lighthouse_man_cleaning",
-+    "dynamic_line": "Is it safe, my <name_g>?",
-+    "responses": [
-+      {
-+        "text": "Yes.  Ground floor is clear.",
-+        "topic": "TALK_lighthouse_man_cleaned",
-+        "condition": {
-+          "and": [
-+            { "npc_has_var": "lighthouse_man", "type": "count", "context": "cleaning", "value": "0" },
-+            "at_safe_space",
-+            { "npc_at_om_location": "lighthouse_ground" }
-+          ]
-+        },
-+        "effect": { "npc_adjust_var": "lighthouse_man", "type": "count", "context": "cleaning", "adjustment": 1 }
-+      },
-+      {
-+        "text": "Yes.  First floor is clear.",
-+        "topic": "TALK_lighthouse_man_cleaned",
-+        "condition": {
-+          "and": [
-+            { "npc_has_var": "lighthouse_man", "type": "count", "context": "cleaning", "value": "1" },
-+            "at_safe_space",
-+            { "npc_at_om_location": "lighthouse_z1" }
-+          ]
-+        },
-+        "effect": { "npc_adjust_var": "lighthouse_man", "type": "count", "context": "cleaning", "adjustment": 1 }
-+      },
-+      {
-+        "text": "Yes.  Second floor is clear.",
-+        "topic": "TALK_lighthouse_man_cleaned",
-+        "condition": {
-+          "and": [
-+            { "npc_has_var": "lighthouse_man", "type": "count", "context": "cleaning", "value": "2" },
-+            "at_safe_space",
-+            { "npc_at_om_location": "lighthouse_z2" }
-+          ]
-+        },
-+        "effect": { "npc_adjust_var": "lighthouse_man", "type": "count", "context": "cleaning", "adjustment": 1 }
-+      },
-+      {
-+        "text": "Yes.  Third floor is clear.",
-+        "topic": "TALK_lighthouse_man_cleaned",
-+        "condition": {
-+          "and": [
-+            { "npc_has_var": "lighthouse_man", "type": "count", "context": "cleaning", "value": "3" },
-+            "at_safe_space",
-+            { "npc_at_om_location": "lighthouse_z3" }
-+          ]
-+        },
-+        "effect": { "npc_adjust_var": "lighthouse_man", "type": "count", "context": "cleaning", "adjustment": 1 }
-+      },
-+      {
-+        "text": "Yes.  Fourth floor is clear.",
-+        "topic": "TALK_lighthouse_man_cleaned",
-+        "condition": {
-+          "and": [
-+            { "npc_has_var": "lighthouse_man", "type": "count", "context": "cleaning", "value": "4" },
-+            "at_safe_space",
-+            { "npc_at_om_location": "lighthouse_z4" }
-+          ]
-+        },
-+        "effect": { "npc_adjust_var": "lighthouse_man", "type": "count", "context": "cleaning", "adjustment": 1 }
-+      },
-+      {
-+        "text": "Yes.  Top floor is clear.",
-+        "condition": {
-+          "and": [
-+            { "npc_has_var": "lighthouse_man", "type": "count", "context": "cleaning", "value": "5" },
-+            "at_safe_space",
-+            { "npc_at_om_location": "lighthouse_z5" }
-+          ]
-+        },
-+        "effect": { "npc_adjust_var": "lighthouse_man", "type": "count", "context": "cleaning", "adjustment": 1 },
-+        "topic": "TALK_lighthouse_man_cleaned_done"
-+      },
-+      {
-+        "text": "Looks like that's over.",
-+        "condition": {
-+          "and": [
-+            { "npc_has_var": "lighthouse_man", "type": "count", "context": "cleaning", "value": "6" },
-+            "at_safe_space",
-+            { "npc_at_om_location": "lighthouse_ground" }
-+          ]
-+        },
-+        "effect": { "npc_adjust_var": "lighthouse_man", "type": "count", "context": "cleaning", "adjustment": 1 },
-+        "topic": "TALK_MISSION_INQUIRE"
-+      },
-+      { "text": "Not yet.", "topic": "TALK_DONE" }
-+    ]
-+  },
-+  {
-+    "type": "talk_topic",
-+    "id": "TALK_lighthouse_man_cleaned",
-+    "dynamic_line": "<its_safe>  Let's clean the next floor.",
-+    "responses": [ { "text": "…", "topic": "TALK_DONE" } ]
-+  },
-+  {
-+    "type": "talk_topic",
-+    "id": "TALK_lighthouse_man_cleaned_done",
-+    "dynamic_line": "<its_safe>  Let's return to the first floor.",
-+    "responses": [ { "text": "…", "topic": "TALK_DONE" } ]
-+  },
-+  {
-+    "type": "talk_topic",
-+    "id": "TALK_lighthouse_man_family",
-+    "dynamic_line": "Did you find them, <name_g>?",
-+    "responses": [
-+      {
-+        "text": "We did it.  All safe.",
-+        "topic": "TALK_MISSION_SUCCESS",
-+        "condition": {
-+          "and": [
-+            { "u_has_mission": "MISSION_lighthouse_man_3" },
-+            { "not": "mission_complete" },
-+            { "u_has_var": "lighthouse_woman", "type": "flag", "context": "safe", "value": "yes" },
-+            { "u_has_var": "lighthouse_girl", "type": "flag", "context": "safe", "value": "yes" }
-+          ]
-+        },
-+        "effect": [ "mission_success", { "npc_first_topic": "TALK_lighthouse_man_1" } ]
-+      },
-+      {
-+        "text": "I'm sorry, I failed you… I couldn't bring them alive…",
-+        "topic": "TALK_lighthouse_man_fail",
-+        "condition": {
-+          "and": [
-+            "mission_complete",
-+            { "not": { "u_has_var": "lighthouse_woman", "type": "flag", "context": "safe", "value": "yes" } },
-+            { "u_has_var": "lighthouse_girl_dead", "type": "flag", "context": "death", "value": "yes" }
-+          ]
-+        }
-+      },
-+      {
-+        "text": "I'm sorry, I failed you… I couldn't bring your wife alive…",
-+        "topic": "TALK_lighthouse_man_fail",
-+        "condition": { "and": [ "mission_complete", { "u_has_var": "lighthouse_girl", "type": "flag", "context": "safe", "value": "yes" } ] }
-+      },
-+      {
-+        "text": "I'm sorry, I failed you… I couldn't bring your daughter alive…",
-+        "topic": "TALK_lighthouse_man_fail",
-+        "condition": {
-+          "and": [
-+            { "not": "mission_complete" },
-+            { "u_has_var": "lighthouse_woman", "type": "flag", "context": "safe", "value": "yes" },
-+            { "u_has_var": "lighthouse_girl_dead", "type": "flag", "context": "death", "value": "yes" }
-+          ]
-+        }
-+      },
-+      { "text": "Nothing, really.", "topic": "TALK_DONE" }
-+    ]
-+  },
-+  {
-+    "type": "talk_topic",
-+    "id": "TALK_lighthouse_man_fail",
-+    "dynamic_line": "<name_g>… I entrusted you with the most valuable thing that I have left, and you…",
-+    "responses": [
-+      { "text": "I'm sorry…", "topic": "TALK_DONE", "effect": [ "mission_failure", "clear_mission", "end_conversation" ] }
-+    ]
-+  },
-+  {
-+    "id": "MISSION_lighthouse_man_1",
-+    "type": "mission_definition",
-+    "has_generic_rewards": false,
-+    "name": { "str": "Lighthouse" },
-+    "description": "Lead Mikhail to lighthouse.",
-+    "goal": "MGOAL_GO_TO",
-+    "difficulty": 0,
-+    "value": 5000,
-+    "start": {
-+      "assign_mission_target": { "om_terrain": "lighthouse_ground", "om_special": "Lighthouse Island", "reveal_radius": 10, "search_range": 360 },
-+      "update_mapgen": [
-+        {
-+          "om_terrain": "lighthouse_ground",
-+          "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 1, 22 ], "y": [ 1, 22 ], "density": 0.3 } ]
-+        },
-+        {
-+          "om_terrain": "lighthouse_z1",
-+          "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 11, 16 ], "y": [ 8, 16 ], "density": 0.3 } ]
-+        },
-+        {
-+          "om_terrain": "lighthouse_z2",
-+          "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 11, 16 ], "y": [ 8, 16 ], "density": 0.3 } ]
-+        },
-+        {
-+          "om_terrain": "lighthouse_z3",
-+          "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 11, 16 ], "y": [ 8, 16 ], "density": 0.3 } ]
-+        },
-+        {
-+          "om_terrain": "lighthouse_z4",
-+          "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 11, 16 ], "y": [ 8, 16 ], "density": 0.3 } ]
-+        },
-+        {
-+          "om_terrain": "lighthouse_z5",
-+          "place_monsters": [ { "monster": "GROUP_ZOMBIE", "x": [ 11, 16 ], "y": [ 8, 16 ], "density": 0.3 } ]
-+        }
-+      ],
-+      "effect": [ "follow_only", { "npc_first_topic": "TALK_lighthouse_man_lighthouse" } ]
-+    },
-+    "end": { "opinion": { "trust": 3, "value": 3 } },
-+    "origins": [ "ORIGIN_SECONDARY" ],
-+    "followup": "MISSION_lighthouse_man_2",
-+    "dialogue": {
-+      "describe": "-",
-+      "offer": "We've been wandering around the state with my family for a long time since <the_cataclysm>, and I realized that the safest hideout is the island.  I left my family in a shelter, and went to explore the area, looking for some island nearby, in a lake or in the ocean.  And you know, I found a sea map marked with navigational beacons near here.  If you want, you can help me get to one of these and take a good look at it.",
-+      "accepted": "Good.  I'll be right behind you.",
-+      "rejected": "Well, it's your choice.",
-+      "advice": "First we need to find a transport to get there.",
-+      "inquire": "We finally reached it.",
-+      "success": "Looks nice, <name_g>.  Now I need to clean it from <zombies> somehow…",
-+      "success_lie": "-",
-+      "failure": "-"
-+    }
-+  },
-+  {
-+    "id": "MISSION_lighthouse_man_2",
-+    "type": "mission_definition",
-+    "has_generic_rewards": false,
-+    "name": { "str": "House cleaning" },
-+    "description": "Clean lighthouse from <zombies> with Mikhail.",
-+    "goal": "MGOAL_CONDITION",
-+    "goal_condition": { "npc_has_var": "lighthouse_man", "type": "count", "context": "cleaning", "value": "7" },
-+    "difficulty": 0,
-+    "value": 5000,
-+    "start": {
-+      "effect": [
-+        "follow_only",
-+        { "npc_first_topic": "TALK_lighthouse_man_cleaning" },
-+        { "npc_add_var": "lighthouse_man", "type": "count", "context": "cleaning", "value": "0" }
-+      ]
-+    },
-+    "end": {
-+      "opinion": { "trust": 3, "value": 3 },
-+      "update_mapgen": {
-+        "om_terrain": "lighthouse_ground",
-+        "faction_owner": [ { "id": "fisherman_family", "x": [ 0, 23 ], "y": [ 0, 23 ] } ],
-+        "place_zones": [ { "type": "NPC_INVESTIGATE_ONLY", "faction": "fisherman_family", "x": [ 0, 23 ], "y": [ 0, 23 ] } ]
-+      },
-+      "effect": [
-+        "stop_following",
-+        { "npc_first_topic": "TALK_lighthouse_man_1" },
-+        { "npc_lose_var": "lighthouse_man", "type": "count", "context": "cleaning" }
-+      ]
-+    },
-+    "origins": [ "ORIGIN_SECONDARY" ],
-+    "followup": "MISSION_lighthouse_man_3",
-+    "dialogue": {
-+      "describe": "-",
-+      "offer": "So, we found the lighthouse.  Now, I need to clean it.  Want to help me with it?",
-+      "accepted": "Great.  Let's do it together.  I'll be right behind you.  We will clean floor by floor.  If you decide that the floor is clean, tell me about it, and we will move on to the next, and so on to the very top.",
-+      "rejected": "Well, it's your choice.",
-+      "advice": "Be <very> careful.  These <name_b>s are most dangerous in tight spaces.",
-+      "inquire": "<its_safe>",
-+      "success": "Great, <very> great.  All that remains is to wash all the floors…",
-+      "success_lie": "-",
-+      "failure": "-"
-+    }
-+  },
-+  {
-+    "id": "MISSION_lighthouse_man_3",
-+    "type": "mission_definition",
-+    "name": { "str": "Fisherman's family" },
-+    "description": "Mikhail asked you to bring back his family.",
-+    "goal": "MGOAL_ASSASSINATE",
-+    "difficulty": 0,
-+    "value": 25000,
-+    "start": {
-+      "effect": { "npc_first_topic": "TALK_lighthouse_man_family" },
-+      "assign_mission_target": { "om_terrain": "house_04_basement", "reveal_radius": 2 },
-+      "update_mapgen": {
-+        "place_npcs": [
-+          { "class": "NPC_lighthouse_woman", "x": 4, "y": 8, "target": true },
-+          { "class": "NPC_lighthouse_girl", "x": 3, "y": 8 }
-+        ]
-+      }
-+    },
-+    "end": {
-+      "opinion": { "trust": 6, "value": 6 },
-+      "effect": { "u_add_var": "lighthouse_family_safe", "type": "flag", "context": "help", "value": "yes" }
-+    },
-+    "origins": [ "ORIGIN_SECONDARY" ],
-+    "followup": "MISSION_lighthouse_man_4",
-+    "dialogue": {
-+      "describe": "-",
-+      "offer": "We found the lighthouse and cleared it of <zombies>.  Now, I need to bring my family here.  May I ask you for a favor?  Since you bring me here, can you go back, find my family and bring them here?",
-+      "accepted": "You are my savior!  I'll take a look around here for a while, prepare everything here for their arrival.",
-+      "rejected": "Well, it's your choice.",
-+      "advice": "Please be very careful.  I don't want to lose them…",
-+      "inquire": "-",
-+      "success": "I don't even know how to thank you, <name_g>.  I am in eternal debt to you.",
-+      "success_lie": "-",
-+      "failure": "-"
-+    }
-+  },
-+  {
-+    "id": "MISSION_lighthouse_man_4",
-+    "type": "mission_definition",
-+    "name": { "str": "Fisherman's boat" },
-+    "description": "Help Mikhail make a boat.  Bring 250 nails.",
-+    "goal": "MGOAL_FIND_ITEM",
-+    "item": "nail",
-+    "count": 250,
-+    "difficulty": 0,
-+    "value": 10000,
-+    "end": {
-+      "opinion": { "trust": 3, "value": 3 },
-+      "update_mapgen": {
-+        "om_terrain": "lighthouse_ground",
-+        "place_vehicles": [ { "vehicle": "canoe", "x": 3, "y": 3, "rotation": 0, "status": 0, "chance": 100 } ]
-+      },
-+      "effect": [ { "npc_add_var": "helped_lighthouse_man", "type": "flag", "context": "help", "value": "yes" } ]
-+    },
-+    "origins": [ "ORIGIN_SECONDARY" ],
-+    "dialogue": {
-+      "describe": "-",
-+      "offer": "The building has been cleared of <zombies>, my family is here, everything is going very well.  It remains only to provide ourselves with food, transport and we can not worry about the future.  You helped me and my family so much, can you help us with something else?  I need a boat for fishing, or just to explore the area.  Can you help me make a boat?",
-+      "accepted": "Thank you, <name_g>.  I need only 250 nails.  I'll find the planks, the rest of the tools too, but the main problem is the nails.  Too much for one boat, but I want to have resources in reserve, just in case.",
-+      "rejected": "Well, it's your choice.",
-+      "advice": "Please, if you can, don't disassemble furniture here.  It can still be useful.",
-+      "inquire": "Did you find it?",
-+      "success": "<very> good, <name_g>, thank you!  Now we are not afraid of hunger, rain, or other bad weather, he-he.  By the way, I have a small supply of fish, tackle, baits and rods.  If you are interested, I can share some with you.",
-+      "success_lie": "-",
-+      "failure": "-"
-+    }
-+  }
-+]
---- a/data/json/npcs/Lighthouse_Family/NPC_lighthouse_woman.json
-+++ b/data/json/npcs/Lighthouse_Family/NPC_lighthouse_woman.json
-@@ -0,0 +1,121 @@
-+[
-+  {
-+    "type": "npc",
-+    "id": "NPC_lighthouse_woman",
-+    "name_unique": "Heather Frolova",
-+    "gender": "female",
-+    "class": "NC_NONE",
-+    "attitude": 1,
-+    "mission": 8,
-+    "chat": "TALK_lighthouse_woman_start",
-+    "faction": "fisherman_family"
-+  },
-+  {
-+    "type": "talk_topic",
-+    "id": "TALK_lighthouse_woman_start",
-+    "dynamic_line": "I'm scared.  Where is my husband?",
-+    "speaker_effect": { "sentinel": "met", "effect": [ "follow_only", { "add_mission": "MISSION_lighthouse_woman_0" } ] },
-+    "responses": [
-+      {
-+        "text": "I want you to use this item.",
-+        "topic": "TALK_lighthouse_woman_start",
-+        "condition": "npc_following",
-+        "effect": "npc_gets_item_to_use"
-+      },
-+      {
-+        "text": "We're here.",
-+        "topic": "TALK_lighthouse_woman_safe",
-+        "condition": { "npc_at_om_location": "lighthouse_ground" },
-+        "effect": [
-+          "mission_success",
-+          "clear_mission",
-+          "stop_following",
-+          { "npc_first_topic": "TALK_lighthouse_woman_safe" },
-+          { "u_add_var": "lighthouse_woman", "type": "flag", "context": "safe", "value": "yes" }
-+        ]
-+      },
-+      { "text": "Let's go.", "topic": "TALK_DONE" }
-+    ]
-+  },
-+  {
-+    "type": "talk_topic",
-+    "id": "TALK_lighthouse_woman_safe",
-+    "dynamic_line": {
-+      "u_has_mission": "MISSION_lighthouse_man_3",
-+      "yes": {
-+        "u_has_var": "lighthouse_girl_dead",
-+        "type": "flag",
-+        "context": "death",
-+        "value": "yes",
-+        "yes": "Thank you for saving me.  It's a shame my Angelina didn't make it… you did everything you could, and I don't blame you for it…",
-+        "no": "Thank you!"
-+      },
-+      "no": {
-+        "u_has_var": "lighthouse_girl_dead",
-+        "type": "flag",
-+        "context": "death",
-+        "value": "yes",
-+        "yes": "Poor, poor Angelina…",
-+        "no": "Hello."
-+      }
-+    },
-+    "responses": [
-+      {
-+        "text": "Hi.",
-+        "condition": { "u_has_var": "lighthouse_family_safe", "type": "flag", "context": "help", "value": "yes" },
-+        "topic": "TALK_lighthouse_woman_1",
-+        "effect": { "npc_first_topic": "TALK_lighthouse_woman_1" },
-+        "switch": true
-+      },
-+      {
-+        "truefalsetext": {
-+          "true": "I'm sorry…",
-+          "false": "…",
-+          "condition": { "u_has_var": "lighthouse_girl_dead", "type": "flag", "context": "death", "value": "yes" }
-+        },
-+        "topic": "TALK_DONE",
-+        "switch": true
-+      }
-+    ]
-+  },
-+  {
-+    "type": "talk_topic",
-+    "id": [ "TALK_lighthouse_woman_1", "TALK_lighthouse_woman_Background" ],
-+    "dynamic_line": "How are you today?",
-+    "responses": [
-+      { "text": "About that job…", "condition": "has_assigned_mission", "topic": "TALK_MISSION_INQUIRE" },
-+      { "text": "<BGSS_intro_question>", "topic": "TALK_lighthouse_woman_Background" },
-+      { "text": "Do you need any help?", "topic": "TALK_MISSION_LIST" },
-+      { "text": "Goodbye.", "topic": "TALK_DONE" }
-+    ]
-+  },
-+  {
-+    "type": "talk_topic",
-+    "id": "TALK_lighthouse_woman_Background",
-+    "dynamic_line": "I don't have much to tell, sorry.  I'm busy with tiding this place, making it our new home.  You should talk to my husband, he doesn't look busy right now.  Or always…"
-+  },
-+  {
-+    "id": "MISSION_lighthouse_woman_0",
-+    "type": "mission_definition",
-+    "has_generic_rewards": false,
-+    "name": { "str": "Protect fisherman's wife" },
-+    "description": "She looks like a nice woman.  Maybe you should not let her die?",
-+    "goal": "MGOAL_CONDITION",
-+    "goal_condition": { "npc_has_var": "-", "type": "-", "context": "-", "value": "-" },
-+    "difficulty": 0,
-+    "value": 0,
-+    "origins": [ "ORIGIN_SECONDARY" ],
-+    "dialogue": {
-+      "describe": "-",
-+      "offer": "-",
-+      "accepted": "-",
-+      "rejected": "-",
-+      "advice": "-",
-+      "inquire": "-",
-+      "success": "-",
-+      "success_lie": "-",
-+      "failure": "-"
-+    },
-+    "fail": { "effect": [ { "u_add_var": "lighthouse_wife_dead", "type": "flag", "context": "death", "value": "yes" } ] }
-+  }
-+]
---- a/data/json/mapgen/dock.json
-+++ b/data/json/mapgen/dock.json
-@@ -74,7 +74,8 @@
-         "      dddddddddddd      ",
-         "      dddddddddddd      "
-       ],
--      "palettes": [ "dock_small" ]
-+      "palettes": [ "dock_small" ],
-+      "place_nested": [ { "chunks": [ [ "NPC_lighthouse_man_spawn", 25 ], [ "null", 75 ] ], "x": 12, "y": 21 } ]
-     }
-   },
-   {
---- a/data/json/mapgen/nested/npc_nested_spawns.json
-+++ b/data/json/mapgen/nested/npc_nested_spawns.json
-@@ -0,0 +1,8 @@
-+[
-+  {
-+    "type": "mapgen",
-+    "method": "json",
-+    "nested_mapgen_id": "NPC_lighthouse_man_spawn",
-+    "object": { "mapgensize": [ 1, 1 ], "place_npcs": [ { "class": "NPC_lighthouse_man", "x": 0, "y": 0 } ] }
-+  }
-+]
diff --git a/npc-08_nurse-takes-more-meds.patch b/npc-08_nurse-takes-more-meds.patch
new file mode 100644
index 0000000..25685d1
--- /dev/null
+++ b/npc-08_nurse-takes-more-meds.patch
@@ -0,0 +1,74 @@
+--- a/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json
++++ b/data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json
+@@ -35,27 +35,69 @@
+     "dynamic_line": "I'm willing to pay a premium for medical supplies that you might be able to scavenge up.  I also have a few miscellaneous jobs from time to time.",
+     "repeat_responses": {
+       "for_item": [
+-        "1st_aid",
++        "adderall",
++        "adrenaline_injector",
++        "anesthetic_kit",
+         "antibiotics",
++        "antifungal",
++        "antiparasitic",
+         "aspirin",
+         "bandages",
++        "bandages_makeshift",
++        "bandages_makeshift_bleached",
++        "bandages_makeshift_boiled",
+         "bfipowder",
++        "bonemeal_tablet",
++        "calcium_tablet",
++        "cattail_jelly",
+         "chem_hydrogen_peroxide",
+         "codeine",
++        "contacts",
++        "cotton_ball",
+         "dayquil",
++        "disincottonball",
+         "disinfectant",
++        "disinfectant_makeshift",
++        "disinrag",
++        "diazepam",
++        "smoxygen_tank",
++        "eyedrops",
++        "flavored_bonemeal_tablet",
+         "flu_shot",
++        "gummy_vitamins",
++        "inhaler",
++        "inj_vitb",
++        "inj_iron",
++        "iodine",
++        "makeshift_stethoscope",
++        "medical_gauze",
++        "medical_tape",
+         "morphine",
++        "mugwort_oil",
+         "nyquil",
+         "oxycodone",
++        "oxygen_tank",
++        "pepto",
++        "pills_sleep",
+         "poppy_pain",
++        "poppy_sleep",
+         "poppysyrup",
++        "prozac",
++        "prussian_blue",
+         "quikclot",
++        "saline",
++        "syringe",
++        "stethoscope",
++        "tea_bark",
++        "thermometer",
++        "thorazine",
+         "thyme_oil",
+         "tramadol",
+         "vaccine_shot",
++        "vitamins",
+         "weak_antibiotic",
+-        "cattail_jelly"
++        "wrapped_rad_badge",
++        "xanax"
+       ],
+       "response": { "text": "Delivering <topic_item>.", "topic": "TALK_DELIVER_ASK" }
+     },
diff --git a/npc-09_broker-takes-more-foods.patch b/npc-09_broker-takes-more-foods.patch
new file mode 100644
index 0000000..1bdc829
--- /dev/null
+++ b/npc-09_broker-takes-more-foods.patch
@@ -0,0 +1,146 @@
+--- 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
+@@ -75,20 +75,117 @@
+     "dynamic_line": "Excellent.  What've you brought us?",
+     "repeat_responses": {
+       "for_item": [
+-        "jerky",
+-        "meat_smoked",
+-        "fish_smoked",
+-        "dry_veggy",
+-        "dry_fruit",
++        "acorn_roasted",
++        "almond_roasted",
++        "apple_canned",
++        "apple_sugar",
++        "bacon",
++        "beer",
++        "belgian_ale",
++        "can_beans",
++        "can_chicken",
++        "can_chowder",
++        "can_clams",
++        "can_corn",
++        "can_herring",
++        "can_peaches",
++        "can_pineapple",
++        "can_salmon",
++        "can_sardine",
++        "can_spam",
++        "can_tuna",
++        "can_tomato",
++        "cheese_hard",
++        "chestnut_roasted",
++        "con_milk",
+         "cooking_oil",
+         "cooking_oil2",
+         "cornmeal",
++        "dried_salad",
++        "dry_beans",
++        "dry_fish",
++        "dry_fruit",
++        "dry_meat",
++        "dry_mushroom",
++        "dry_lentils",
++        "dry_rice",
++        "dry_tofu",
++        "dry_veggy",
++        "edamame_roasted",
++        "european_pilsner",
++        "fish_canned",
++        "fish_pickled",
++        "fish_smoked",
+         "flour",
++        "fruit_leather",
+         "fruit_wine",
+-        "beer",
+-        "sugar",
++        "granola",
++        "hardtack",
++        "hazelnut_roasted",
++        "hb_beer",
++        "hickory_nut_roasted",
++        "india_pale_ale",
++        "jar_eggs_pickled",
++        "jar_pickles_pickled",
++        "jar_sauerkraut_pickled",
++        "jerky",
++        "kompot",
++        "mead",
++        "meat_canned",
++        "meat_pickled",
++        "meat_salted",
++        "meat_smoked",
++        "milk_evap",
++        "milk_powder",
++        "milk_UHT",
++        "mre_asianbeef_box",
++        "mre_bbqbeef_box",
++        "mre_beef_box",
++        "mre_beefstew_box",
++        "mre_beeftaco_box",
++        "mre_cheesetort_box",
++        "mre_chicken_box",
++        "mre_chickenburritobowl_box",
++        "mre_chickennoodle_box",
++        "mre_chickenpesto_box",
++        "mre_chilimac_box",
++        "mre_chilibeans_box",
++        "mre_hashbrownbacon_box",
++        "mre_hotdog_box",
++        "mre_lemontuna_box",
++        "mre_macaronimarinara_box",
++        "mre_maplesausage_box",
++        "mre_meatball_box",
++        "mre_mexicanchickenstew_box",
++        "mre_mushroomfettuccine_box",
++        "mre_pepperjackbeef_box",
++        "mre_ravioli_box",
++        "mre_southwestbeef_box",
++        "mre_spaghetti_box",
++        "mre_veggy_box",
++        "oatmeal",
++        "pale_ale",
++        "pecan_roasted",
++        "pemmican",
++        "pistachio_roasted",
++        "pork_beans",
++        "powder_eggs",
++        "ravioli",
++        "drink_rumcola",
+         "salt",
+-        "vinegar"
++        "sausage",
++        "soup_chicken",
++        "soup_dumplings",
++        "soup_tomato",
++        "soy_nuts",
++        "stout",
++        "sugar",
++        "veggy_canned",
++        "veggy_pickled",
++        "veggy_salted",
++        "vinegar",
++        "wine_barley",
++        "yeast"
+       ],
+       "response": { "text": "Delivering <topic_item>.", "topic": "TALK_DELIVER_ASK" }
+     },
+@@ -128,7 +225,7 @@
+   {
+     "type": "talk_topic",
+     "id": "TALK_FREE_MERCHANT_STOCKS_WHY",
+-    "dynamic_line": "All three are easy to locally produce in significant quantities and are non-perishable.  We have a local farmer or two and a few hunter types that have been making attempts to provide us with the nutritious supplies.  We do always need more suppliers though.  This stuff is rather cheap in bulk, so I can pay a premium for any you have on you.  Canned food and other edibles are handled by the merchant in the front in trade.",
++    "dynamic_line": "All three are easy to locally produce in significant quantities and are non-perishable.  We have a local farmer or two and a few hunter types that have been making attempts to provide us with the nutritious supplies.  We do always need more suppliers though.  This stuff is rather cheap in bulk, so I can pay a premium for any you have on you.",
+     "responses": [
+       { "text": "Are you looking to buy anything else?", "topic": "TALK_FREE_MERCHANT_STOCKS_ALL" },
+       { "text": "Very well… let's talk about something else.", "topic": "TALK_FREE_MERCHANT_STOCKS" }
+@@ -142,7 +239,7 @@
+   {
+     "type": "talk_topic",
+     "id": "TALK_FREE_MERCHANT_STOCKS_ALL",
+-    "dynamic_line": "I'm actually accepting a number of different foodstuffs: beer, sugar, flour, smoked meat, smoked fish, dried fruit and vegetables, cooking oil, preservatives like salt and vinegar; and as mentioned before, jerky, cornmeal, and fruit wine."
++    "dynamic_line": "I'm actually accepting a number of different foodstuffs: Basic cooking supplies like flour, sugar, yeast, cooking oils, powdered eggs, powdered milk; Any sort of preserved meat, fish, cheese, fruit, nut, or vegetable; preservation supplies like salt and vinegar; low alcohol content liquors like fruit wine and beer; and of course, any sort of pre-cataclysm factory-sealed foods you can get your hands on, such as canned ravioli, evaporated milk, or military MREs."
+   },
+   {
+     "type": "talk_topic",