diff --git a/game/modules/tome/data/chats/gates-of-morning-main.lua b/game/modules/tome/data/chats/gates-of-morning-main.lua
index b095b660466a59dbe99be4c29f3e81cc7e9cb145..cb04a02eb04901e84a0ab0dcfb61f5111b42a49e 100644
--- a/game/modules/tome/data/chats/gates-of-morning-main.lua
+++ b/game/modules/tome/data/chats/gates-of-morning-main.lua
@@ -20,6 +20,7 @@
newChat{ id="welcome",
text = [[What may I do for you?]],
answers = {
+ {"Lady Aeryn, at last I am back home! [tell her your story]", jump="return", cond=function(npc, player) return player:hasQuest("start-sunwall") and not player:isQuestStatus("start-sunwall", engine.Quest.COMPLETED, "return") end, action=function(npc, player) player:setQuestStatus("start-sunwall", engine.Quest.COMPLETED, "return") end},
{"Tell me more about the Gates of Morning.", jump="explain-gates", cond=function(npc, player) return player.faction ~= "sunwall" end},
{"Before I came here, I happened upon members of the Sunwall in Maj'Eyal. Do you know of this?.", jump="sunwall_west", cond=function(npc, player) return game.state.found_sunwall_west and not npc.been_asked_sunwall_west end, action=function(npc, player) npc.been_asked_sunwall_west = true end},
{"I need help in my hunt for clues about the staff.", jump="clues", cond=function(npc, player) return game.state:isAdvanced() and not player:hasQuest("orc-pride") end},
@@ -29,6 +30,14 @@ newChat{ id="welcome",
}
}
+newChat{ id="return",
+ text = [[@playername@! We thought you had died in the portal explosion. I am glad we were wrong, you saved the sunwall.
+The news about the staff is troubling. Ah well, please at least take time to rest for a while.]],
+ answers = {
+ {"I shall, thank you, my lady.", jump="welcome"},
+ },
+}
+
newChat{ id="explain-gates",
text = [[There are two main groups in the population here, Humans and Elves.
Humans came here in the Age of Pyre. Our ancestors were part of a Mardrop expedition to find what had happened to the Naloren lands that sunk under the sea. Their ship was wrecked and the survivors landed on this continent.
diff --git a/game/modules/tome/data/chats/unremarkable-cave-fillarel.lua b/game/modules/tome/data/chats/unremarkable-cave-fillarel.lua
index 7f3120c95914563a8df640f337a2142233a09752..ca204a943e71af8bfee0dbcc02635874fde3d960 100644
--- a/game/modules/tome/data/chats/unremarkable-cave-fillarel.lua
+++ b/game/modules/tome/data/chats/unremarkable-cave-fillarel.lua
@@ -20,7 +20,8 @@
newChat{ id="welcome",
text = [[Thank you, @playername@. I hate to admit it, but you saved my life.]],
answers = {
- {"At your service. But may I ask what you were doing in this dark place?", jump="what"},
+ {"At your service. But may I ask what you were doing in this dark place?", jump="what", cond=function(npc, player) return not player:hasQuest("start-sunwall") end},
+ {"At your service. I have been gone for months, but I can feel it, at last this is my homeland!", jump="back", cond=function(npc, player) return player:hasQuest("start-sunwall") end},
}
}
@@ -40,4 +41,13 @@ Tell High Sun Paladin Aeryn that you met me. I'll send word to let you pass.]],
}
}
+newChat{ id="back",
+ text = [[Gone? Wait, this face.. you are @playername@! We thought you died in the naga portal explosion!
+Thanks to your courrage the Gates of Morning still stand.
+You should go there at once.]],
+ answers = {
+ {"Sadly I am the bringer of bad news, the orcs are planning something. Good luck, my lady."},
+ }
+}
+
return "welcome"
diff --git a/game/modules/tome/data/quests/start-sunwall.lua b/game/modules/tome/data/quests/start-sunwall.lua
index 7283b064037855b2fe0575c09aff8512c44f7901..95d3898efa668fd0938a1f27b7c990ee08a1f5f3 100644
--- a/game/modules/tome/data/quests/start-sunwall.lua
+++ b/game/modules/tome/data/quests/start-sunwall.lua
@@ -22,7 +22,13 @@ desc = function(self, who)
local desc = {}
desc[#desc+1] = "Nagas are invading the slazish fens. The Sunwall can not fight on two fronts, you need to stop the invaders before it is too late.\n Locate and destroy the invader's portal."
if self:isCompleted("slazish") then
- desc[#desc+1] = "#LIGHT_GREEN#* .#WHITE#"
+ desc[#desc+1] = "#LIGHT_GREEN#* You have destroyed the naga portal, the invasion is stopped.#WHITE#"
+
+ if self:isCompleted("return") then
+ desc[#desc+1] = "#LIGHT_GREEN#* You are back in Var'Eyal, the Far East as the people from the west call it.#WHITE#"
+ else
+ desc[#desc+1] = "#SLATE#* However you were teleported to a distant land, you must find a way back to the Gates of Morning.#WHITE#"
+ end
else
desc[#desc+1] = "#SLATE#* You must stop the nagas.#WHITE#"
end
@@ -31,7 +37,7 @@ end
on_status_change = function(self, who, status, sub)
if sub then
- if self:isCompleted("slazish") then
+ if self:isCompleted("return") then
who:setQuestStatus(self.id, engine.Quest.DONE)
who:grantQuest(who.celestial_race_start_quest)
end
diff --git a/game/modules/tome/data/zones/slazish-fen/grids.lua b/game/modules/tome/data/zones/slazish-fen/grids.lua
index eac5f141f12dd637720f4fd401efce21abc3a865..3a43195a9896c27606e97e2eaff4a073dc03eafe 100644
--- a/game/modules/tome/data/zones/slazish-fen/grids.lua
+++ b/game/modules/tome/data/zones/slazish-fen/grids.lua
@@ -68,6 +68,7 @@ newEntity{ base="BOGWATER",
if cnt > max then
game.log("#VIOLET#The portal starts to break down, run!")
self.broken = true
+ who:setQuestStatus("start-sunwall", engine.Quest.COMPLETED, "slazish")
game:onTickEnd(function()
local sx, sy = util.findFreeGrid(x, y, 10, true, {[engine.Map.ACTOR]=true})
local npc = game.zone:makeEntityByName(game.level, "actor", "ZOISLA")
diff --git a/game/modules/tome/data/zones/slazish-fen/objects.lua b/game/modules/tome/data/zones/slazish-fen/objects.lua
index 75a113fa8edae56076487815eeeb3f868f2f3511..c4b1048a267c06cb1ccc12c4a058bb812f0bb87b 100644
--- a/game/modules/tome/data/zones/slazish-fen/objects.lua
+++ b/game/modules/tome/data/zones/slazish-fen/objects.lua
@@ -17,7 +17,7 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
-load("/data/general/objects/objects-maj-eyal.lua")
+load("/data/general/objects/objects-far-east.lua")
for i = 1, 3 do
newEntity{ base = "BASE_LORE",