From 1751b9d765548fe6ef2e1e2f262043086a258dc6 Mon Sep 17 00:00:00 2001
From: Zukero <kpochat@gmail.com>
Date: Fri, 11 Aug 2017 10:41:44 +0200
Subject: [PATCH] Fixed and robustified the pathway_fallhaven quest.

---
 .../raw/conversationlist_fallhaven_south.json | 30 +++++++++++++++++++
 .../conversationlist_pathway_fallhaven.json   | 12 ++------
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/AndorsTrail/res/raw/conversationlist_fallhaven_south.json b/AndorsTrail/res/raw/conversationlist_fallhaven_south.json
index 6947f4e2c..11cc2e0c2 100644
--- a/AndorsTrail/res/raw/conversationlist_fallhaven_south.json
+++ b/AndorsTrail/res/raw/conversationlist_fallhaven_south.json
@@ -3,6 +3,7 @@
         "id":"fallhaven_lumberjack",
         "replies":[
             {
+                "text":"N",
                 "nextPhraseID":"fallhaven_lumberjack_15",
                 "requires":[
                     {
@@ -13,6 +14,24 @@
                 ]
             },
             {
+                "text":"N",
+                "nextPhraseID":"fallhaven_lumberjack_16",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"pathway_fallhaven",
+                        "value":40
+                    },
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"pathway_fallhaven",
+                        "value":50,
+                        "negate":true
+                    }
+                ]
+            },
+            {
+                "text":"N",
                 "nextPhraseID":"fallhaven_lumberjack_14",
                 "requires":[
                     {
@@ -23,6 +42,7 @@
                 ]
             },
             {
+                "text":"N",
                 "nextPhraseID":"fallhaven_lumberjack_1"
             }
         ]
@@ -280,5 +300,15 @@
                 "nextPhraseID":"X"
             }
         ]
+    },
+    {
+        "id":"fallhaven_lumberjack_16",
+        "message":"Thank you for bringing me back my axe!",
+        "replies":[
+            {
+                "text":"So will you cut away those trees which block the old pathway?",
+                "nextPhraseID":"fallhaven_lumberjack_11"
+            }
+        ]
     }
 ]
\ No newline at end of file
diff --git a/AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json b/AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json
index af94b5baf..ef42fea4e 100644
--- a/AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json
+++ b/AndorsTrail/res/raw/conversationlist_pathway_fallhaven.json
@@ -33,14 +33,7 @@
         "replies":[
             {
                 "text":"Why is that so?",
-                "nextPhraseID":"guard_pathway_1",
-                "requires":[
-                    {
-                        "requireType":"questProgress",
-                        "requireID":"pathway_fallhaven",
-                        "value":10
-                    }
-                ]
+                "nextPhraseID":"guard_pathway_1"
             },
             {
                 "text":"Never mind. Shadow be with you.",
@@ -187,7 +180,8 @@
                     {
                         "requireType":"questLatestProgress",
                         "requireID":"pathway_fallhaven",
-                        "value":30
+                        "value":30,
+                        "negate":true
                     }
                 ]
             },