Updated to 2023-02-22-2301.

Revert another ammo patch and update old reverts accordingly.
Update isherwood patches for mainline changes.
Add patch lowering the Eddie Isherwood clay mission from 1000 to 100.
Add patch to make canned corn a valid veggy_all requirement.
Add patch fixing multiple mutant items not being flagged as BAD_TASTE.
Add patch fixing black powder scrap shot not being flagged as BLACKPOWDER.
Add patch to add missing stairs up in the FMC.

1 files changed, 0 insertions, 35 deletions

diff --git a/npc-01_isherwood-update.patch b/npc-01_isherwood-update.patch
index 6e34964..8a73b55 100644
--- a/npc-01_isherwood-update.patch
+++ b/npc-01_isherwood-update.patch
@@ -330,41 +330,6 @@
        { "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 @@