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 23f32f6ee3649e8d2c0e8a251bd02d059d0da8ac..a20f3c97afc1a9f36cf126339c8f43d332544a9e 100644 --- a/game/modules/tome/data/chats/gates-of-morning-main.lua +++ b/game/modules/tome/data/chats/gates-of-morning-main.lua @@ -23,7 +23,7 @@ newChat{ id="welcome", {"Tell me more about the Gates of Morning.", jump="explain-gates"}, {"I need help in my hunt for clues about the staff.", jump="clues", cond=function(npc, player) return not player:hasQuest("orc-pride") end}, {"I have destroyed the leaders of all the Orc Prides.", jump="prides-dead", cond=function(npc, player) return player:isQuestStatus("orc-pride", engine.Quest.COMPLETED) end}, - {"I am back from Mount Doom, where the orcs took the staff.", jump="mount-doom", cond=function(npc, player) return player:hasQuest("mount-doom") and player:hasQuest("mount-doom"):isCompleted() end}, + {"I am back from the Charred Scar, where the orcs took the staff.", jump="charred-scar", cond=function(npc, player) return player:hasQuest("charred-scar") and player:hasQuest("charred-scar"):isCompleted() end}, {"Sorry, I have to go!"}, } } @@ -75,31 +75,31 @@ The known bastions of the Pride are: }, } -newChat{ id="mount-doom", +newChat{ id="charred-scar", text = [[I have heard about that; good men lost their lives for this. I hope it was worth it.]], answers = { - {"Yes, my lady, they delayed the orcs so that I could get to the heart of the volcano. *#LIGHT_GREEN#Tell her what happened#WHITE#*", jump="mount-doom-success", - cond=function(npc, player) return player:isQuestStatus("mount-doom", engine.Quest.COMPLETED, "stopped") end, + {"Yes, my lady, they delayed the orcs so that I could get to the heart of the volcano. *#LIGHT_GREEN#Tell her what happened#WHITE#*", jump="charred-scar-success", + cond=function(npc, player) return player:isQuestStatus("charred-scar", engine.Quest.COMPLETED, "stopped") end, }, - {"I am afraid I was too late, but I still have some valuable information. *#LIGHT_GREEN#Tell her what happened#WHITE#*", jump="mount-doom-fail", - cond=function(npc, player) return player:isQuestStatus("mount-doom", engine.Quest.COMPLETED, "not-stopped") end, + {"I am afraid I was too late, but I still have some valuable information. *#LIGHT_GREEN#Tell her what happened#WHITE#*", jump="charred-scar-fail", + cond=function(npc, player) return player:isQuestStatus("charred-scar", engine.Quest.COMPLETED, "not-stopped") end, }, }, } -newChat{ id="mount-doom-success", - text = [[Blue Wizards? I have never heard of them. There were rumours about a new master of the Pride, but it seems they have two. +newChat{ id="charred-scar-success", + text = [[Sorcerers? I have never heard of them. There were rumours about a new master of the Pride, but it seems they have two. Thank you for everything. You must continue your hunt now that you know what to look for.]], answers = { - {"I will avenge your men.", action=function(npc, player) player:setQuestStatus("mount-doom", engine.Quest.DONE) end} + {"I will avenge your men.", action=function(npc, player) player:setQuestStatus("charred-scar", engine.Quest.DONE) end} }, } -newChat{ id="mount-doom-fail", - text = [[Blue Wizards? I have never heard of them. There were rumours about a new master of the Pride, but it seems they have two. +newChat{ id="charred-scar-fail", + text = [[Sorcerers? I have never heard of them. There were rumours about a new master of the Pride, but it seems they have two. I am afraid with the power they gained today they will be even harder to stop, but we do not have a choice.]], answers = { - {"I will avenge your men.", action=function(npc, player) player:setQuestStatus("mount-doom", engine.Quest.DONE) end} + {"I will avenge your men.", action=function(npc, player) player:setQuestStatus("charred-scar", engine.Quest.DONE) end} }, } diff --git a/game/modules/tome/data/chats/istari-end.lua b/game/modules/tome/data/chats/istari-end.lua index 0c1a9e5713b57a4eb2920893b4997533bb1e0c96..a197d546968ec25e2f9cca19c25994ecbb05e624 100644 --- a/game/modules/tome/data/chats/istari-end.lua +++ b/game/modules/tome/data/chats/istari-end.lua @@ -19,7 +19,7 @@ local function void_portal_open(npc, player) -- Mount doom was succesfull - if player:hasQuest("mount-doom") and player:hasQuest("mount-doom"):isCompleted("stopped") then return false end + if player:hasQuest("charred-scar") and player:hasQuest("charred-scar"):isCompleted("stopped") then return false end return true end local function aeryn_alive(npc, player) diff --git a/game/modules/tome/data/chats/istari-fight.lua b/game/modules/tome/data/chats/istari-fight.lua index cb633356d52ffb54d25d46ef048a4741b1789711..a58b7e3e1a1605189f8cf11255231af7335b1f7b 100644 --- a/game/modules/tome/data/chats/istari-fight.lua +++ b/game/modules/tome/data/chats/istari-fight.lua @@ -19,12 +19,12 @@ local function void_portal_open(npc, player) -- Mount doom was succesfull - if player:hasQuest("mount-doom") and player:hasQuest("mount-doom"):isCompleted("stopped") then return false end + if player:hasQuest("charred-scar") and player:hasQuest("charred-scar"):isCompleted("stopped") then return false end return true end local function aeryn_alive(npc, player) -- Mount doom was succesfull - if player:hasQuest("mount-doom") and player:hasQuest("mount-doom"):isCompleted("stopped") then return true end + if player:hasQuest("charred-scar") and player:hasQuest("charred-scar"):isCompleted("stopped") then return true end -- Spared aeryn return player:isQuestStatus("high-peak", engine.Quest.COMPLETED, "spared-aeryn") diff --git a/game/modules/tome/data/maps/wilderness/maj-eyal.lua b/game/modules/tome/data/maps/wilderness/maj-eyal.lua index 084f472b2c3e7b193feb48a8c5089ab8133bedc9..d458e67562c4f466f29372a22405172090c4aad4 100644 --- a/game/modules/tome/data/maps/wilderness/maj-eyal.lua +++ b/game/modules/tome/data/maps/wilderness/maj-eyal.lua @@ -52,7 +52,7 @@ quickEntity('D', {always_remember = true, show_tooltip=true, name="A path into t quickEntity('E', {always_remember = true, show_tooltip=true, name="A mysterious hole in the beach", display='>', color={r=200, g=255, b=55}, notice = true, change_level=1, change_zone="sandworm-lair"}) quickEntity('F', {always_remember = true, show_tooltip=true, name="The entry to the old tower of Tol Falas",display='>', color={r=0, g=255, b=255}, notice = true, change_level=1, change_zone="tol-falas"}) quickEntity('G', {always_remember = true, show_tooltip=true, name="Passageway into Daikara",display='>', color=colors.UMBER, notice = true, change_level=1, change_zone="daikara"}) -quickEntity('H', {always_remember = true, show_tooltip=true, name='Charred Scar', display='>', color=colors.RED, back_color=colors.LIGHT_DARK, image="terrain/volcano1.png", notice = true, change_level=1, change_zone="mount-doom"}) +quickEntity('H', {always_remember = true, show_tooltip=true, name='Charred Scar', display='>', color=colors.RED, back_color=colors.LIGHT_DARK, image="terrain/volcano1.png", notice = true, change_level=1, change_zone="charred-scar"}) quickEntity('1', {always_remember = true, show_tooltip=true, name="Derth (Town)", desc="A quiet town at the crossroads of the north", display='*', color={r=255, g=255, b=255}, back_color=colors.DARK_GREEN, image="terrain/town1.png", notice = true, change_level=1, change_zone="town-derth"}) quickEntity('2', {always_remember = true, show_tooltip=true, name="Last Hope (Town)", desc="Capital city of the Allied Kingdoms ruled by King Tolak", display='*', color={r=255, g=255, b=255}, back_color=colors.DARK_GREEN, image="terrain/town1.png", notice = true, change_level=1, change_zone="town-last-hope"}) diff --git a/game/modules/tome/data/quests/mount-doom.lua b/game/modules/tome/data/quests/mount-doom.lua index 90b13714b2ea65c3dc16b6a0fc3468a2aa190a6b..a9225ce114651d8db3d82bdbb5553e03060d01e4 100644 --- a/game/modules/tome/data/quests/mount-doom.lua +++ b/game/modules/tome/data/quests/mount-doom.lua @@ -63,5 +63,5 @@ start_fyrk = function(self) game.logPlayer(game.player, "#VIOLET#The Blue Wizards flee through a portal, as you prepare to follow them a huge faeros appears to block the way.") world:gainAchievement("MOUNT_DOOM_SUCCESS", game.player) end - game.player:setQuestStatus("mount-doom", engine.Quest.COMPLETED) + game.player:setQuestStatus("charred-scar", engine.Quest.COMPLETED) end diff --git a/game/modules/tome/data/quests/pre-mount-doom.lua b/game/modules/tome/data/quests/pre-mount-doom.lua index 6110aed729cf8a29665ec4d014495f0ff4f755cf..4d8b07d50c693ca0160d2ac4dfe54ed0c22e23d5 100644 --- a/game/modules/tome/data/quests/pre-mount-doom.lua +++ b/game/modules/tome/data/quests/pre-mount-doom.lua @@ -27,7 +27,7 @@ end on_grant = function(self, who) local aeryn = {name="High Sun Paladin Aeryn"} - local chat = engine.Chat.new("pre-mount-doom", aeryn, who) + local chat = engine.Chat.new("pre-charred-scar", aeryn, who) chat:invoke() -- Reveal entrance diff --git a/game/modules/tome/data/zones/charred-scar/npcs.lua b/game/modules/tome/data/zones/charred-scar/npcs.lua index c356ebe7b4fb229db9ea26af755477f8d458cdab..4a20221d3f4ffe5ae00302236056135ac01f3548 100644 --- a/game/modules/tome/data/zones/charred-scar/npcs.lua +++ b/game/modules/tome/data/zones/charred-scar/npcs.lua @@ -206,8 +206,8 @@ newEntity{ on_acquire_target = function(self, who) self:doEmote("Damn you, you only postpone your death! Fyrk!", 60) - game.player:hasQuest("mount-doom"):setStatus(engine.Quest.COMPLETED, "stopped") - game.player:hasQuest("mount-doom"):start_fyrk() + game.player:hasQuest("charred-scar"):setStatus(engine.Quest.COMPLETED, "stopped") + game.player:hasQuest("charred-scar"):start_fyrk() end, } diff --git a/game/modules/tome/data/zones/eruan/grids.lua b/game/modules/tome/data/zones/eruan/grids.lua index 7dc0dcdf3fb32c8a9e9a2fa9ea49199401ed5c17..b22d977fa6c76054d2d2f84f5d6c9533b75e1bc4 100644 --- a/game/modules/tome/data/zones/eruan/grids.lua +++ b/game/modules/tome/data/zones/eruan/grids.lua @@ -36,7 +36,7 @@ This one seems to go to the west, to Mount Doom, in the land of Mordor. A fiery orb_portal = { change_level = 1, - change_zone = "mount-doom", + change_zone = "charred-scar", message = "#VIOLET#You enter the swirling portal while it fades away and in the blink of an eye you set foot on hellish land, the heart of a volcano...", on_preuse = function(self, who) -- Find all portals and deactivate them @@ -46,7 +46,7 @@ This one seems to go to the west, to Mount Doom, in the land of Mordor. A fiery end end end end, on_use = function(self, who) - who:setQuestStatus("pre-mount-doom", engine.Quest.DONE) + who:setQuestStatus("pre-charred-scar", engine.Quest.DONE) end, }, } diff --git a/game/modules/tome/data/zones/eruan/npcs.lua b/game/modules/tome/data/zones/eruan/npcs.lua index bf933b1b9d54acb30529fee823dc354e415cdfdf..739cd5180a9f55140c4ce8f63864ab6b5759fb9c 100644 --- a/game/modules/tome/data/zones/eruan/npcs.lua +++ b/game/modules/tome/data/zones/eruan/npcs.lua @@ -65,5 +65,5 @@ newEntity{ define_as = "SUN_PALADIN_GUREN", }, resolvers.sustains_at_birth(), - can_talk = "pre-mount-doom-eruan", + can_talk = "pre-charred-scar-eruan", } diff --git a/game/modules/tome/data/zones/gorbat-pride/npcs.lua b/game/modules/tome/data/zones/gorbat-pride/npcs.lua index 67cfe3d3de27b3f58d532d7b1cc82036c3573626..237b8b93ad66c5dd5b38fecf1e81d899a043043f 100644 --- a/game/modules/tome/data/zones/gorbat-pride/npcs.lua +++ b/game/modules/tome/data/zones/gorbat-pride/npcs.lua @@ -87,8 +87,8 @@ newEntity{ base="BASE_NPC_ORC_GORBAT", define_as = "GORBAT", on_die = function(self, who) game.player:resolveSource():setQuestStatus("orc-pride", engine.Quest.COMPLETED, "gorbat") - if not game.player:hasQuest("pre-mount-doom") then - game.player:grantQuest("pre-mount-doom") + if not game.player:hasQuest("pre-charred-scar") then + game.player:grantQuest("pre-charred-scar") end end, } diff --git a/game/modules/tome/data/zones/grushnak-pride/npcs.lua b/game/modules/tome/data/zones/grushnak-pride/npcs.lua index 75dd0b91705387ec6478730e1efd72423523f828..227850ac987339bab35e6be968a61ebf266fc36c 100644 --- a/game/modules/tome/data/zones/grushnak-pride/npcs.lua +++ b/game/modules/tome/data/zones/grushnak-pride/npcs.lua @@ -89,8 +89,8 @@ newEntity{ base="BASE_NPC_ORC_GRUSHNAK", define_as = "GRUSHNAK", on_die = function(self, who) game.player:resolveSource():setQuestStatus("orc-pride", engine.Quest.COMPLETED, "grushnak") - if not game.player:hasQuest("pre-mount-doom") then - game.player:grantQuest("pre-mount-doom") + if not game.player:hasQuest("pre-charred-scar") then + game.player:grantQuest("pre-charred-scar") end end, } diff --git a/game/modules/tome/data/zones/high-peak/zone.lua b/game/modules/tome/data/zones/high-peak/zone.lua index 1fb33558836a740221092ab1a1d3347bffb8d842..7c31d2e2c54cdd7c4ce39fa0993c2b5c8fba190c 100644 --- a/game/modules/tome/data/zones/high-peak/zone.lua +++ b/game/modules/tome/data/zones/high-peak/zone.lua @@ -64,7 +64,7 @@ return { -- if we failed at mount doom (or did not do it at all) the gate of morning is destroyed and Aeryn turned to the service of the istari if level.level == 15 then - local mtdm = game.player:hasQuest("mount-doom") + local mtdm = game.player:hasQuest("charred-scar") if not mtdm or mtdm:isCompleted("not-stopped") then game.player:hasQuest("high-peak"):failed_mount_doom(level) end diff --git a/game/modules/tome/data/zones/rak-shor-pride/npcs.lua b/game/modules/tome/data/zones/rak-shor-pride/npcs.lua index bed26fefb9c942ab1c2925e9a054e096201dedf6..a19e7eb52fab7c0c09c909bdd7988a1bc6f05dcb 100644 --- a/game/modules/tome/data/zones/rak-shor-pride/npcs.lua +++ b/game/modules/tome/data/zones/rak-shor-pride/npcs.lua @@ -81,8 +81,8 @@ newEntity{ base="BASE_NPC_ORC_RAK_SHOR", define_as = "RAK_SHOR", on_die = function(self, who) game.player:resolveSource():setQuestStatus("orc-pride", engine.Quest.COMPLETED, "rak-shor") - if not game.player:hasQuest("pre-mount-doom") then - game.player:grantQuest("pre-mount-doom") + if not game.player:hasQuest("pre-charred-scar") then + game.player:grantQuest("pre-charred-scar") end end, } diff --git a/game/modules/tome/data/zones/vor-pride/npcs.lua b/game/modules/tome/data/zones/vor-pride/npcs.lua index 2b941554432d3a3354ece3218740dd5d701ee07f..aa3a453611163daf32fde593e17c365db6cbdc86 100644 --- a/game/modules/tome/data/zones/vor-pride/npcs.lua +++ b/game/modules/tome/data/zones/vor-pride/npcs.lua @@ -78,8 +78,8 @@ newEntity{ base="BASE_NPC_ORC_VOR", define_as = "VOR", on_die = function(self, who) game.player:resolveSource():setQuestStatus("orc-pride", engine.Quest.COMPLETED, "vor") - if not game.player:hasQuest("pre-mount-doom") then - game.player:grantQuest("pre-mount-doom") + if not game.player:hasQuest("pre-charred-scar") then + game.player:grantQuest("pre-charred-scar") end end, }