From c9ea6c286d62c5a8e6c24b67dc0fce2a73a6f1c3 Mon Sep 17 00:00:00 2001 From: Nut Date: Mon, 29 Oct 2018 23:28:04 +0100 Subject: [PATCH] add nut changes with Erwyn+Gyra --- .../conversationlist_stoutford_combined.json | 208 +++++++++++++++--- .../res/raw/questlist_stoutford_combined.json | 13 +- 2 files changed, 177 insertions(+), 44 deletions(-) diff --git a/AndorsTrail/res/raw/conversationlist_stoutford_combined.json b/AndorsTrail/res/raw/conversationlist_stoutford_combined.json index 5efb6ae83..250a33f5c 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?", @@ -4279,6 +4320,11 @@ "requireID":"stoutford_castle", "value":10, "negate":true + }, + { + "requireType":"questProgress", + "requireID":"nondisplay_2", + "value":180 } ] }, @@ -4295,7 +4341,7 @@ { "requireType":"questProgress", "requireID":"flagstone", - "value":70, + "value":60, "negate":true }, { @@ -4303,8 +4349,17 @@ "requireID":"flagstone", "value":100, "negate":true + }, + { + "requireType":"questProgress", + "requireID":"nondisplay_2", + "value":190 } ] + }, + { + "text":"OK, bye.", + "nextPhraseID":"X" } ] }, @@ -4319,7 +4374,7 @@ { "requireType":"questProgress", "requireID":"flagstone", - "value":70, + "value":60, "negate":true } ] @@ -4331,7 +4386,7 @@ { "requireType":"questProgress", "requireID":"flagstone", - "value":70 + "value":60 } ] } @@ -4393,7 +4448,7 @@ { "requireType":"questProgress", "requireID":"flagstone", - "value":70, + "value":60, "negate":true } ] @@ -4429,6 +4484,11 @@ } ], "rewards":[ + { + "rewardType":"deactivateSpawnArea", + "rewardID":"narael", + "mapName":"flagstone4" + }, { "rewardType":"questProgress", "rewardID":"flagstone", @@ -4501,7 +4561,11 @@ "replies":[ { "text":"Thank you.", - "nextPhraseID":"yolgen_castle_1" + "nextPhraseID":"X" + }, + { + "text":"There was something else I wanted to ask you about.", + "nextPhraseID":"yolgen_surroundings_0" } ], "rewards":[ @@ -4761,7 +4825,7 @@ "id":"check_erwyn", "replies":[ { - "nextPhraseID":"check_erwyn_1", + "nextPhraseID":"check_erwyn_1a", "requires":[ { "requireType":"killedMonster", @@ -4861,7 +4925,7 @@ "replies":[ { "text":"N", - "nextPhraseID":"check_erwyn_1a" + "nextPhraseID":"X" } ], "rewards":[ @@ -4869,6 +4933,16 @@ "rewardType":"removeQuestProgress", "rewardID":"stn_nondisplay", "value":48 + }, + { + "rewardType":"questProgress", + "rewardID":"stoutford_castle", + "value":16 + }, + { + "rewardType":"removeSpawnArea", + "rewardID":"erwyn", + "mapName":"stoutford_castle0" } ] }, @@ -4884,13 +4958,9 @@ "value":1 } ] - } - ], - "rewards":[ + }, { - "rewardType":"removeSpawnArea", - "rewardID":"erwyn", - "mapName":"stoutford_castle0" + "nextPhraseID":"check_erwyn_1" } ] }, @@ -5124,7 +5194,7 @@ "requires":[ { "requireType":"killedMonster", - "requireID":"erwyn", + "requireID":"erwyn2", "value":1 } ] @@ -5142,13 +5212,6 @@ "text":"An unfriendly guy, yes.", "nextPhraseID":"yolgen_castle_2" } - ], - "rewards":[ - { - "rewardType":"questProgress", - "rewardID":"stoutford_castle", - "value":40 - } ] }, { @@ -5624,6 +5687,11 @@ "requireType":"questProgress", "requireID":"stn_nondisplay", "value":47 + }, + { + "requireType":"questProgress", + "requireID":"stn_quest_gyra", + "value":20 } ] } @@ -5683,6 +5751,11 @@ "rewardType":"questProgress", "rewardID":"stn_quest_gyra", "value":90 + }, + { + "rewardType":"questProgress", + "rewardID":"nondisplay", + "value":149 } ] }, @@ -5699,6 +5772,11 @@ "requireType":"questProgress", "requireID":"stn_nondisplay", "value":47 + }, + { + "requireType":"questProgress", + "requireID":"stn_quest_gyra", + "value":20 } ] }, @@ -5789,6 +5867,11 @@ "rewardType":"questProgress", "rewardID":"stn_quest_gyra", "value":92 + }, + { + "rewardType":"questProgress", + "rewardID":"nondisplay", + "value":149 } ] }, @@ -5804,18 +5887,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", @@ -5823,6 +5915,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.", @@ -6617,12 +6743,17 @@ { "rewardType":"removeQuestProgress", "rewardID":"stn_nondisplay", - "value":19 + "value":29 }, { "rewardType":"removeSpawnArea", "rewardID":"stn_gyra1", "mapName":"wild19" + }, + { + "rewardType":"actorCondition", + "rewardID":"fatigue_minor", + "value":-99 } ] }, @@ -6643,6 +6774,11 @@ "rewardType":"removeQuestProgress", "rewardID":"stn_nondisplay", "value":29 + }, + { + "rewardType":"actorCondition", + "rewardID":"fatigue_minor", + "value":-99 } ] }, @@ -9560,7 +9696,7 @@ }, { "requireType":"killedMonster", - "requireID":"erwyn", + "requireID":"erwyn2", "value":1 } ] @@ -11566,4 +11702,4 @@ "id":"blornvale_thorns72_92", "message":"No more talk. Go now!" } -] \ No newline at end of file +] diff --git a/AndorsTrail/res/raw/questlist_stoutford_combined.json b/AndorsTrail/res/raw/questlist_stoutford_combined.json index 36d6c34b6..3947142a9 100644 --- a/AndorsTrail/res/raw/questlist_stoutford_combined.json +++ b/AndorsTrail/res/raw/questlist_stoutford_combined.json @@ -614,27 +614,24 @@ { "progress":70, "logText":"Odirath thanks you many thousand times.", - "rewardExperience":2000 + "rewardExperience":2300 }, { "progress":90, - "logText":"Lord Berbane slowly took his helmet. Nevertheless, he remained sitting at the table. He probably needs a few more hours without drinks before he can get back to work. If ever.", - "rewardExperience":200 + "logText":"Lord Berbane slowly took his helmet. Nevertheless, he remained sitting at the table. He probably needs a few more hours without drinks before he can get back to work. If ever." }, { "progress":92, - "logText":"Lord Berbane took his helmet. But somehow that does not really satisfy you.", - "rewardExperience":200 + "logText":"Lord Berbane took his helmet. But somehow that does not really satisfy you." }, { "progress":99, - "logText":"Lord Berbane is singing merrily about his pretended heroic deeds. What a boaster.", - "rewardExperience":200 + "logText":"Lord Berbane is singing merrily about his pretended heroic deeds. What a boaster." }, { "progress":170, "logText":"Odirath thanks you many thousand times.", - "rewardExperience":2000, + "rewardExperience":2500, "finishesQuest":1 }, {