From 9452b656604dd9b509adc3c55572ed6139dfe766 Mon Sep 17 00:00:00 2001
From: Rijackson <richard.jackson@vspec-solutions.com>
Date: Fri, 29 Jun 2018 07:49:45 -0400
Subject: [PATCH] Fix for the problem with pathway_fallhaven where the axe was
 still in inventory after returning it. Also a fix for the Talion dialogue
 problem identified by zizkin (i.e. eight items should be nine items).

---
 .../res/raw/conversationlist_pathway_fallhaven.json       | 4 ++--
 AndorsTrail/res/raw/conversationlist_talion_2.json        | 2 +-
 AndorsTrail/res/raw/questlist_pathway_fallhaven.json      | 8 ++++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json b/AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json
index 1bd8a9126..8c969659f 100644
--- a/AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json
+++ b/AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json
@@ -143,7 +143,7 @@
                     {
                         "requireType":"questProgress",
                         "requireID":"pathway_fallhaven",
-                        "value":40,
+                        "value":35,
                         "negate":true
                     }
                 ]
@@ -157,7 +157,7 @@
             {
                 "rewardType":"questProgress",
                 "rewardID":"pathway_fallhaven",
-                "value":40
+                "value":35
             }
         ]
     },
diff --git a/AndorsTrail/res/raw/conversationlist_talion_2.json b/AndorsTrail/res/raw/conversationlist_talion_2.json
index 347aa8eb9..31ce3b374 100644
--- a/AndorsTrail/res/raw/conversationlist_talion_2.json
+++ b/AndorsTrail/res/raw/conversationlist_talion_2.json
@@ -174,7 +174,7 @@
     },
     {
         "id":"talion_infect_12",
-        "message":"Or .. well .. actually, eight items in total, but four different types. Eh .. well, you get the idea.",
+        "message":"Or .. well .. actually, nine items in total, but four different types. Eh .. well, you get the idea.",
         "replies":[
             {
                 "text":"N",
diff --git a/AndorsTrail/res/raw/questlist_pathway_fallhaven.json b/AndorsTrail/res/raw/questlist_pathway_fallhaven.json
index 5139fa02f..f5bb4a193 100644
--- a/AndorsTrail/res/raw/questlist_pathway_fallhaven.json
+++ b/AndorsTrail/res/raw/questlist_pathway_fallhaven.json
@@ -17,13 +17,17 @@
                 "logText":"I talked to Jakrar the woodcutter. He will only cut the trees away if I do him a favor. I should search for his favorite axe east of the Crossroads Guardhouse located to the north of Fallhaven. I should look out for an evil wolf pack."
             },
             {
-                "progress":40,
+                "progress":35,
                 "logText":"I have found a wolf pack and slain their leader. I found Jakrar's axe beneath its remains. I should take it back to him.",
                 "rewardExperience":300
             },
+            {
+                "progress":40,
+                "logText":"I showed Jakrar the axe I found and he recognized it immediately."
+            },
             {
                 "progress":50,
-                "logText":"Jakrar was very happy to see his good old axe again. He is grateful, and started to cut away the woods immediately."
+                "logText":"Jakrar was very happy to see his good old axe again. He is grateful, and started to cut away the fallen trees immediately."
             },
             {
                 "progress":60,