diff --git a/AndorsTrail/res/raw/conversationlist_stoutford_combined.json b/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
index b253e3ba8..31229653a 100644
--- a/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
+++ b/AndorsTrail/res/raw/conversationlist_stoutford_combined.json
@@ -712,7 +712,8 @@
"message":"Oh, it is you again. Did you find my key?",
"replies":[
{
- "text":"No, not yet."
+ "text":"No, not yet.",
+ "nextPhraseID":"X"
}
]
},
@@ -1100,7 +1101,17 @@
"message":"With all these trolls around I don't feel safe to go through the cave and take care of the flowers in the glade.",
"replies":[
{
- "text":"The scorpions are bad enough, but the trolls are really dangerous.",
+ "text":"N",
+ "nextPhraseID":"caeda_root40_1a"
+ }
+ ]
+ },
+ {
+ "id":"caeda_root40_1a",
+ "message":"The scorpions are bad enough, but the trolls are really dangerous. I know that they hate the statue, but I am scared they can reach past it.",
+ "replies":[
+ {
+ "text":"N",
"nextPhraseID":"caeda_root40_2"
}
]
@@ -1110,7 +1121,7 @@
"message":"Would it be too much to ask if you could get rid of the trolls?",
"replies":[
{
- "text":"I could clear the caves a bit more. No problem.",
+ "text":"I can teach them to stay further away from the statue. No problem.",
"nextPhraseID":"X"
}
],
@@ -3029,6 +3040,75 @@
}
]
},
+ {
+ "id":"script_lakecave_cleared",
+ "replies":[
+ {
+ "text":"N",
+ "nextPhraseID":"script_lakecave_cleared_1",
+ "requires":[
+ {
+ "requireType":"questProgress",
+ "requireID":"secret_garden",
+ "value":50
+ },
+ {
+ "requireType":"questProgress",
+ "requireID":"secret_garden",
+ "value":55,
+ "negate":true
+ },
+ {
+ "requireType":"questProgress",
+ "requireID":"secret_garden",
+ "value":60,
+ "negate":true
+ },
+ {
+ "requireType":"killedMonster",
+ "requireID":"cave_troll_2",
+ "value":7
+ },
+ {
+ "requireType":"killedMonster",
+ "requireID":"cave_troll_3",
+ "value":15
+ },
+ {
+ "requireType":"killedMonster",
+ "requireID":"cave_troll_4",
+ "value":7
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "id":"script_lakecave_cleared_1",
+ "message":"Many of the trolls are dead now. The rest will no longer dare to approach the statue.",
+ "rewards":[
+ {
+ "rewardType":"questProgress",
+ "rewardID":"secret_garden",
+ "value":55
+ },
+ {
+ "rewardType":"removeSpawnArea",
+ "rewardID":"lakecave0_9",
+ "mapName":"lakecave0"
+ },
+ {
+ "rewardType":"removeSpawnArea",
+ "rewardID":"lakecave0_9_1",
+ "mapName":"lakecave0"
+ },
+ {
+ "rewardType":"removeSpawnArea",
+ "rewardID":"lakecave0_9_2",
+ "mapName":"lakecave0"
+ }
+ ]
+ },
{
"id":"script_close_glade_door_0",
"replies":[
@@ -8442,7 +8522,7 @@
},
{
"id":"stn_gyra_29_130",
- "message":"To find the helmet, we should really search all the rooms in the castle.",
+ "message":"To find the helmet, we should really search all the rooms within the castle and its walls.",
"rewards":[
{
"rewardType":"createTimer",
diff --git a/AndorsTrail/res/raw/questlist_stoutford_combined.json b/AndorsTrail/res/raw/questlist_stoutford_combined.json
index 07303aae0..e27f8080f 100644
--- a/AndorsTrail/res/raw/questlist_stoutford_combined.json
+++ b/AndorsTrail/res/raw/questlist_stoutford_combined.json
@@ -62,9 +62,13 @@
"progress":50,
"logText":"Caeda asked for my help to clear out the monsters in the caves so that she can go back there and attend to the flowers."
},
+ {
+ "progress":55,
+ "logText":"Many monsters are dead now. The rest wouldn't dare anymore to pass by the statue."
+ },
{
"progress":60,
- "logText":"I killed the monsters and told Caeda, so that she can attend to the glade.",
+ "logText":"I told Caeda, so that she can attend to the glade.",
"finishesQuest":1
}
]
diff --git a/AndorsTrail/res/xml/guynmart_wood_2.tmx b/AndorsTrail/res/xml/guynmart_wood_2.tmx
index d7f4f9a43..8831288ef 100644
--- a/AndorsTrail/res/xml/guynmart_wood_2.tmx
+++ b/AndorsTrail/res/xml/guynmart_wood_2.tmx
@@ -186,14 +186,14 @@
-
+
- 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
+ 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
-
+
- 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
+ eJylV01rFEEQneQWQaFnMct4y39Qf0H0pOTgGi8bQiDJ3T9lziY/QFRQRzCCC9ERNyHiJhrWg4GAl4BdSVfm9ZvqMa4PmumP2npVr6t7Zqs8O8O76SyriuwCC358P7SzdVev/fB2R0XziRgHvwOYf+r7m2S3N13/fuj7y74thcZ2+3kzBsEQbBdCX2yfdLJsw7fn3u5FEfvCGBXf8tif2H2YbfLhWG2XKd5RXms2F/z+Ir5PLksC+SQXS2PFkLivh3Ef5kfELTrNwvoBxDJ2zRi+u3os62iP/HvQ3ydOAerEeiDa8mV0wM8zo740n1PSW2rsntYCrWF+nAfGdpyfr78var4qj+tewHvUT2iv2A1znRZuRQnjw2A/9nM/w/xVP3ctzO+4ZixLcM4ZX4lfdZKzolyli7mPKJ+Prt5r4d6CePWcS83OJGJQ4D5su3O/FgaGHoKXRZyP6lAQr2qsZ+aQnuLjBObGiVqpwJ7n1Nd2Iodj0r0EO4mLz7OC6wXP2E7wMTDuTcEVGIu2GqtVn5on+tfzpfZYg2z7ytUx3DD2nfNATsGD0F8z7KT+TrhuIRarj3eDvhd0TePukc+HMF4N/T7ZvCYtIm5DpzLcr1rbi97fI996Xc/X0ha77XnieNc15xCVq/nudOO1NzPxeJ5isPhLI4aUJreJ7zKYN7jb+Ji7Z+R5Wdwl3ZFDaiqV6/9wKi/7TO03PifRl3kv/EOtWzHI/aF7z99ak/JiTSFXSmd5rvrf3pog75tGTf1Nc7QR/Cu3cK631JSA79fUU7jXqK1MNeeklaRfKp+2s4R9vQerEOvjqdqf3JVqN8rtPWWfFod+16Ri0XfDOryj9T2a+nYQvC3imCxdrPgt/DbqXv9nyHuK7378VrPuzS++DeFpacdr+g7Cb43Pztb6D6VTa9U=
@@ -201,9 +201,9 @@
eJztlEsKAjEMhos3UEGYhYdzq0fwHoreQG9Qt67cKugoegPdeAI7aCDGJE07Pjb+UBiaTr4kTePcXZuOc8uwDoVTBedA+yL+z6jt3LjN2ypf6w5v485RnoXPycLk/OfwNkbWu2NYCtyUeHLypbUFnhRPrmKxAc9613XZvnjlHcPeKaM//0rvvUmYMVNhznxSs8Cc/4BrlbUHB43vxgLfw4Ye4zvfEPjifOI9X5PH5cnZtL1U9Vs63wsxaDWx6Prg9lqvvjWexN52nxcWtYF939RzkXjnsC6Iu0vkcj6l+5bspTHfEtmlu5IYnuSaW2fwgXsKs6Q6p95vSeypNcVnLglc3AOQb+x9SLHkvCdP6sdxKmlvSfof68y8Ve5Oqd0y12hP5GpB+kxjVlrVYGqzX5qb3P9c7rFaxObGp7RgfN8AsDgNFw==
-
+
- eJy1lNsNwCAIRTtF91+hG/ariTH3BViTJlURDhf0ua/r+flDY+pnXWO2au37d2woXsKP/LB4ioHNGa/TPqlNlSGpU6U3XL4Jc5WnE+P7n8RVNXWxlS3r+Q7LiaF06jC4PkzOuHubxlf3YsJwYiiG5P3q+F/3dp2Yzen+Yzqr//3sSa7kbUDczEdljuK4NeaP7SttGUN695Q27v1wd1zV2NXE5ZJoxfyqfcbv8nP9XIm727n8Jjqn+VbzrvSV42AasblidgxJnp0Pse5ryE6d79wd1ctKX9ff6Uh0cZqtdkmsPS7imNQVsSDbF5RrW4k=
+ eJy1lNsNwCAIRTtF91+hG/ariTH3BViTJlYRDlfwua/r+flDY+pnXWO2au2bOzYUL+FHflg8xcD+Ga/TPrmbKkNyT5XacPkmzFWeToxvPomr7tTFVras5jssJ4bSqcPg6jA54/o2ja/6YsJwYiiG5P3q+F/3dp2Yzen6Yzqr+X72JFfyNiBu5YPVret7FntdY/7YfsKDck16T2nj3o+EzfWvek9ULkor51ftM36Xn6vnStzdzuU30TnNt5p3pa4cB9OI/Stmx5Dk2fkQ676G7NT5Tu+oWlb6uvpOR6KL02y1S2LtcRHH5F4RC7J9Af6KXRc=
diff --git a/AndorsTrail/res/xml/guynmart_wood_3.tmx b/AndorsTrail/res/xml/guynmart_wood_3.tmx
index 8d760d227..a45b92601 100644
--- a/AndorsTrail/res/xml/guynmart_wood_3.tmx
+++ b/AndorsTrail/res/xml/guynmart_wood_3.tmx
@@ -1,5 +1,5 @@
-
-
+
- eJxjYBgFo2AUjIJRQCnYLDkw9gqLDYy9yODyALnh8ADZe2mA7L0DTGN3ByidjYKhDUbTDv0AtrC+JzhwcTCdiXZm3wT655Ykgh4FQxcAALEgEJ4=
+ eJxjYBgFo2AUjIJRQCnYLDkw9gqLDYy9yOAyDd0Qy4Rb7vAA+f3SANl7B5jG7g5QOhsFtAUbgfG6iYZxO5p26AewhfU9wYGLg+l4ylBKwU2gf25JIuhRMHQBAJQ+EpI=
-
+
- eJxjYBgFo2AUjIJRQCnYLDkw9gqLDby9l+noBmR7Dw+QvZcGyN47wDR2l07pbDCkq1F7qQfQ085w9+9A2osc1jB77wnSN/8ig+lMtDP7JtA/tyQR9CgYugAAx64Sig==
+ eJxjYBgFo2AUjIJRQCnYLDkw9gqLDby9l2nohlgm3PYepqPfke29NED23gGmsbt0SmeDIV2NJHs3AuN1Ew3jFj3tDLR/h7O9yGENs/eeIH3zLzKYzkRYDbngJtA/tyQR9CgYugAAqswUfg==
@@ -218,12 +218,12 @@
- eJxjYBgFo2AUjIJRMFTBRrGBdgFtAch/yBiXGK3tR2ePJDBS/T0KKAcjLe3gKptoXV6hm0uITyt70eVGUtwPdQAARnQXUw==
+ eJxjYBgFo2AUjIJRMFTBRrGBdgFtAch/yBiXGK3tR2cPN4DPX7T093ANz6ECaJ2mh3OewQZwlU20Lq/QzSXEp5W96HIjKe6HOgAAi3kabw==
- eJxjYBgFo2AUjIJRMFTBRrGBdgFtAch/yBiXGL3sH+7hjQ2MVH+PAsrBSE47A11O0cN+fOaO5LgfigAAo/cabw==
+ eJxjYBgFo2AUjIJRMFTBRrGBdgFtAch/yBiXGL3sH67hjc9ftPT3cA3PoQJonaaHc54hBAa6nKKH/QNVbowC6gMA6Pwdiw==
diff --git a/AndorsTrail/res/xml/guynmart_wood_9.tmx b/AndorsTrail/res/xml/guynmart_wood_9.tmx
index 2f99be74b..e026b7a26 100644
--- a/AndorsTrail/res/xml/guynmart_wood_9.tmx
+++ b/AndorsTrail/res/xml/guynmart_wood_9.tmx
@@ -1,5 +1,5 @@
-
- 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
+ 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
-
+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
- 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
+ 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
diff --git a/AndorsTrail/res/xml/lakecave0.tmx b/AndorsTrail/res/xml/lakecave0.tmx
index d490f5e5e..09ba96c16 100644
--- a/AndorsTrail/res/xml/lakecave0.tmx
+++ b/AndorsTrail/res/xml/lakecave0.tmx
@@ -1,5 +1,5 @@
-