From 0db5bf24ac485992c7429e16f849a958a9fd2bf2 Mon Sep 17 00:00:00 2001
From: Nut <nut.andor@o2online.de>
Date: Sun, 28 Oct 2018 09:00:18 +0100
Subject: [PATCH] Gyra's quest ending

- you can end the quest now at Berbane or at Odirath. Quest stages will be in correct order
---
 .../conversationlist_stoutford_combined.json  | 120 ++++++++++++++++--
 .../res/raw/questlist_stoutford_combined.json |  15 +++
 2 files changed, 122 insertions(+), 13 deletions(-)

diff --git a/AndorsTrail/res/raw/conversationlist_stoutford_combined.json b/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
index 6de95ff87..0bb37772d 100644
--- a/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
+++ b/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
@@ -3175,12 +3175,28 @@
     },
     {
         "id":"odirath_3",
-        "message":"Gyra is back and has told me everything. Many thanks again for your help.",
         "replies":[
             {
-                "text":"I was happy to do it.",
+                "nextPhraseID":"odirath_3_2",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"stn_quest_gyra",
+                        "value":99
+					}
+                ]
+            },
+            {
                 "nextPhraseID":"odirath_3_1"
             }
+        ]
+    },
+    {
+        "id":"odirath_3_1",
+        "replies":[
+            {
+                "nextPhraseID":"odirath_3_3"
+            }
         ],
         "rewards":[
             {
@@ -3191,7 +3207,32 @@
         ]
     },
     {
-        "id":"odirath_3_1",
+        "id":"odirath_3_2",
+        "replies":[
+            {
+                "nextPhraseID":"odirath_3_3"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"stn_quest_gyra",
+                "value":170
+            }
+        ]
+    },
+    {
+        "id":"odirath_3_3",
+        "message":"Gyra is back and has told me everything. Many thanks again for your help.",
+        "replies":[
+            {
+                "text":"I was happy to do it.",
+                "nextPhraseID":"odirath_3_5"
+            }
+        ]
+    },
+    {
+        "id":"odirath_3_5",
         "message":"Please give the helmet to its owner Lord Bourbon - eh, Lord Berbane I mean. He will be in the tavern.",
         "replies":[
             {
@@ -3215,8 +3256,8 @@
                 "requires":[
                     {
                         "requireType":"questProgress",
-                        "requireID":"stn_quest_gyra",
-                        "value":92
+                        "requireID":"stn_nondisplay",
+                        "value":149
                     }
                 ]
             },
@@ -3955,7 +3996,7 @@
     },
     {
         "id":"yolgen_3",
-        "message":"While Erwyn and Emeric fought to capture of the central area, Lord Geomyr waited for the right moment and crushed his enemies with his great army. He has ruled the Kingdom ever since with an iron hand.",
+        "message":"While Erwyn and Emeric fought to capture the central area, Lord Geomyr waited for the right moment and crushed his enemies with his great army. He has ruled the Kingdom ever since with an iron hand.",
         "replies":[
             {
                 "text":"Why do you say iron hand?",
@@ -5836,18 +5877,27 @@
     },
     {
         "id":"berbane_140",
-        "message":"[Low voice] Well-behaved.\n[Loud voice] And now: Mead for everyone! Let's be merry! Forget all sorrows!",
+        "replies":[
+            {
+                "nextPhraseID":"berbane_144",
+                "requires":[
+                    {
+                        "requireType":"questProgress",
+                        "requireID":"stn_quest_gyra",
+                        "value":70                    
+					}
+                ]
+            },
+            {
+                "nextPhraseID":"berbane_142"
+            }
+        ],
         "rewards":[
             {
                 "rewardType":"giveItem",
                 "rewardID":"mead",
                 "value":1
             },
-            {
-                "rewardType":"questProgress",
-                "rewardID":"stn_quest_gyra",
-                "value":99
-            },
             {
                 "rewardType":"questProgress",
                 "rewardID":"stn_nondisplay",
@@ -5855,6 +5905,40 @@
             }
         ]
     },
+    {
+        "id":"berbane_142",
+        "replies":[
+            {
+                "nextPhraseID":"berbane_146"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"stn_quest_gyra",
+                "value":99
+            }
+        ]
+    },
+    {
+        "id":"berbane_144",
+        "replies":[
+            {
+                "nextPhraseID":"berbane_146"
+            }
+        ],
+        "rewards":[
+            {
+                "rewardType":"questProgress",
+                "rewardID":"stn_quest_gyra",
+                "value":199
+            }
+        ]
+    },
+    {
+        "id":"berbane_146",
+        "message":"[Low voice] Well-behaved.\n[Loud voice] And now: Mead for everyone! Let's be merry! Forget all sorrows!"
+    },
     {
         "id":"berbane_200",
         "message":"Lord Berbane is singing merrily about his heroic deeds.",
@@ -6649,12 +6733,17 @@
             {
                 "rewardType":"removeQuestProgress",
                 "rewardID":"stn_nondisplay",
-                "value":19
+                "value":29
             },
             {
                 "rewardType":"removeSpawnArea",
                 "rewardID":"stn_gyra1",
                 "mapName":"wild19"
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"fatigue_minor",
+                "value":-99
             }
         ]
     },
@@ -6675,6 +6764,11 @@
                 "rewardType":"removeQuestProgress",
                 "rewardID":"stn_nondisplay",
                 "value":29
+            },
+            {
+                "rewardType":"actorCondition",
+                "rewardID":"fatigue_minor",
+                "value":-99
             }
         ]
     },
diff --git a/AndorsTrail/res/raw/questlist_stoutford_combined.json b/AndorsTrail/res/raw/questlist_stoutford_combined.json
index 8fecb3a31..d5a594362 100644
--- a/AndorsTrail/res/raw/questlist_stoutford_combined.json
+++ b/AndorsTrail/res/raw/questlist_stoutford_combined.json
@@ -425,6 +425,10 @@
                 "progress":148,
                 "logText":"148=Erwyn introduced"
             },
+            {
+                "progress":149,
+                "logText":"149=Helm given to Berbane"
+            },
             {
                 "progress":150,
                 "logText":"150=Monster5 waits"
@@ -625,6 +629,17 @@
             {
                 "progress":99,
                 "logText":"Lord Berbane is singing merrily about his pretended heroic deeds. What a boaster.",
+                "rewardExperience":200
+            },
+            {
+                "progress":170,
+                "logText":"Odirath thanks you many thousand times.",
+                "rewardExperience":2000,
+                "finishesQuest":1
+            },
+            {
+                "progress":199,
+                "logText":"Lord Berbane is singing merrily about his pretended heroic deeds. What a boaster.",
                 "rewardExperience":200,
                 "finishesQuest":1
             }