plop

git-svn-id: http://svn.net-core.org/repos/t-engine4@1680 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/data/chats/last-hope-elder.lua

@@ -65,7 +65,7 @@ But do not let me trouble you; you brought important news and you are lucky to b
 }
 
 newChat{ id="orc_hunt",
-	text = [[We have heard rumours from the dwarves that there may still be an orc presence deep in the mines of Moria.
+	text = [[We have heard rumours from the dwarves that there may still be an orc presence deep in the old kingdom of Reknor, in the Iron Throne.
 I know you have been through a lot, but we need somebody to investigate and determine if there is a connection with the staff.]],
 	answers = {
 		{"I will check the mines.", action=function(npc, player)

game/modules/tome/data/chats/tannen.lua

@@ -19,7 +19,7 @@
 
 local function check_materials_gave_orb(npc, player)
 	local q = player:hasQuest("east-portal")
-	if not q or not q:isCompleted("gotomoria") or not q:isCompleted("gave-orb") then return false end
+	if not q or not q:isCompleted("gotoreknor") or not q:isCompleted("gave-orb") then return false end
 
 	local gem_o, gem_item, gem_inven_id = player:findInAllInventories("Resonating Diamond")
 	local athame_o, athame_item, athame_inven_id = player:findInAllInventories("Blood-Runed Athame")
@@ -28,7 +28,7 @@ end
 
 local function check_materials_withheld_orb(npc, player)
 	local q = player:hasQuest("east-portal")
-	if not q or not q:isCompleted("gotomoria") or not q:isCompleted("withheld-orb") then return false end
+	if not q or not q:isCompleted("gotoreknor") or not q:isCompleted("withheld-orb") then return false end
 
 	local gem_o, gem_item, gem_inven_id = player:findInAllInventories("Resonating Diamond")
 	local athame_o, athame_item, athame_inven_id = player:findInAllInventories("Blood-Runed Athame")
@@ -46,7 +46,7 @@ else
 newChat{ id="welcome",
 	text = [[How may I be of service, good @playerdescriptor.race@?]],
 	answers = {
-		{"[Relate to him the story of the staff and the Orb of Many Ways and the portals.]", jump="east_portal1", cond=function(npc, player) local q = player:hasQuest("east-portal"); return q and q:isCompleted("talked-elder") and not q:isCompleted("gotomoria") end},
+		{"[Relate to him the story of the staff and the Orb of Many Ways and the portals.]", jump="east_portal1", cond=function(npc, player) local q = player:hasQuest("east-portal"); return q and q:isCompleted("talked-elder") and not q:isCompleted("gotoreknor") end},
 		{"I have the diamond and the athame. [Hand over the Athame and Diamond]", jump="has_material_gave_orb", cond=check_materials_gave_orb},
 		{"I have the diamond and the athame. [Hand over the Athame and Diamond]", jump="has_material_withheld_orb", cond=check_materials_withheld_orb},
 		{"Thieving, murderous wretch. Prepare to die!", jump="fake_orb_end", cond=function(npc, player) local q = player:hasQuest("east-portal"); return q and q:isCompleted("tricked-demon") end},
@@ -81,7 +81,7 @@ newChat{ id="east_portal3",
 }
 
 newChat{ id="east_portal4",
-	text = [[If the orcs created a portal in the depths of Moria, they must have had access to such items. And if these items cannot pass through the portal they created, then it stands to reason that they must still be in Maj'Eyal. I would search Moria, starting near the portal itself. Perhaps they did not move the Athame and Diamond far after its creation.]],
+	text = [[If the orcs created a portal in the depths of Reknor, they must have had access to such items. And if these items cannot pass through the portal they created, then it stands to reason that they must still be in Maj'Eyal. I would search Reknor, starting near the portal itself. Perhaps they did not move the Athame and Diamond far after its creation.]],
 	answers = {
 		{"I'll get searching. Thank you.", jump="east_portal5"},
 	}
@@ -98,14 +98,14 @@ newChat{ id="east_portal5",
 newChat{ id="gave_orb",
 	text = [[Thank you. I will treat it with the utmost care.]],
 	answers = {
-		{"Farewell. I'll return with the Athame and Diamond.", action=function(npc, player) player:hasQuest("east-portal"):setStatus(engine.Quest.COMPLETED, "gotomoria") end},
+		{"Farewell. I'll return with the Athame and Diamond.", action=function(npc, player) player:hasQuest("east-portal"):setStatus(engine.Quest.COMPLETED, "gotoreknor") end},
 	}
 }
 
 newChat{ id="withheld_orb",
 	text = [[Very well. There is no hurry. But I will need to spend a number of days studying it before we can create your portal.]],
 	answers = {
-		{"I understand. I'll return with the Athame and Diamond.", action=function(npc, player) player:hasQuest("east-portal"):setStatus(engine.Quest.COMPLETED, "gotomoria") end},
+		{"I understand. I'll return with the Athame and Diamond.", action=function(npc, player) player:hasQuest("east-portal"):setStatus(engine.Quest.COMPLETED, "gotoreknor") end},
 	}
 }
 

game/modules/tome/data/quests/east-portal.lua

@@ -27,10 +27,10 @@ desc = function(self, who)
 	end
 
 	if self:isCompleted("gave-orb") then
-		desc[#desc+1] = "You gave the Orb of Many Ways to Tannen for study while you look for the athame and diamond in the Moria."
+		desc[#desc+1] = "You gave the Orb of Many Ways to Tannen for study while you look for the athame and diamond in Reknor."
 	end
 	if self:isCompleted("withheld-orb") then
-		desc[#desc+1] = "You kept the Orb of Many Ways despite Tannen's request to study it. You must now look for the athame and diamond in the Moria."
+		desc[#desc+1] = "You kept the Orb of Many Ways despite Tannen's request to study it. You must now look for the athame and diamond in Reknor."
 	end
 	if self:isCompleted("open-orthanc") then
 		desc[#desc+1] = "You brought back the diamond and athame to Tannen who asked you to check the tower of Orthanc, looking for a text of portals, although he is not sure it is even there. He told you to come back in a few days."

game/modules/tome/data/quests/orc-hunt.lua

@@ -21,20 +21,20 @@
 name = "Let's hunt some Orc"
 desc = function(self, who)
 	local desc = {}
-	desc[#desc+1] = "The elder in Last Hope sent you to the mines of Moria, deep under the misty mountains, to investigate the orc presence."
+	desc[#desc+1] = "The elder in Last Hope sent you to the old dwarven kingdom of Reknor, deep under the misty mountains, to investigate the orc presence."
 	desc[#desc+1] = "Find out if they are in any way linked to the lost staff."
 	desc[#desc+1] = "But be careful, even the dwarves did not venture in the old halls for many years."
 	return table.concat(desc, "\n")
 end
 
 on_grant = function(self, who)
-	-- Reveal moria entrance
+	-- Reveal reknor entrance
 	local g = mod.class.Grid.new{
 		show_tooltip=true,
-		name="A gate into the mines of Moria",
+		name="A gate into the old kingdom of Reknor",
 		display='>', color=colors.UMBER,
 		notice = true,
-		change_level=1, change_zone="moria"
+		change_level=1, change_zone="reknor"
 	}
 	g:resolve() g:resolve(nil, true)
 	game.zone:addEntity(game.memory_levels["wilderness-1"], g, "terrain", 44, 28)

game/modules/tome/data/quests/spydric-infestation.lua

@@ -30,7 +30,7 @@ desc = function(self, who)
 end
 
 on_grant = function(self, who)
-	-- Reveal moria entrance
+	-- Reveal entrance
 	local g = mod.class.Grid.new{
 		show_tooltip=true,
 		name="A way into the carvers of Ardhungol",

game/modules/tome/data/texts/message-last-hope.lua

@@ -25,7 +25,7 @@ return [[@playername@, this message is of utmost importance.
 The staff you left at Last Hope is gone, a raid of orcs ambushed the guards that were transporting it to a secret vault.
 Our troups managed to capture one of the orcs and made him talk.
 He did not knew much, but he did speak about "masters" in the far east.
-He spoke about Golbug, this seems to be a warmaster in the Moria, leading the raid to send the "package" through a portal.
+He spoke about Golbug, this seems to be a warmaster in Reknor, leading the raid to send the "package" through a portal.
 
 This calls for urgency, should you find this Golbug or the portal please investigate.
 
@@ -40,7 +40,7 @@ It turns out to be a powerful object indeed, able to absorb the power of places,
 This must not fall in the wrong hands, which certainly include orc hands.
 While you where gone one of our patrols met a group of orcs led by Ukruk, we could not stop them but we managed to capture one of them.
 He did not knew much, but he did speak about "masters" in the far east.
-He spoke about meeting with Golbug, this seems to be a warmaster in the Moria, to send the "package" through a portal.
+He spoke about meeting with Golbug, this seems to be a warmaster in Reknor, to send the "package" through a portal.
 
 This calls for urgency, should you find this Golbug or the portal please investigate.
 

game/modules/tome/data/zones/reknor/npcs.lua

@@ -24,7 +24,7 @@ load("/data/general/npcs/all.lua", rarity(4, 35))
 
 local Talents = require("engine.interface.ActorTalents")
 
--- The boss of Moria, no "rarity" field means it will not be randomly generated
+-- The boss of Reknor, no "rarity" field means it will not be randomly generated
 newEntity{ define_as = "GOLBUG",
 	type = "humanoid", subtype = "orc", unique = true,
 	faction = "orc-pride",
@@ -92,7 +92,7 @@ newEntity{ define_as = "GOLBUG",
 	end,
 
 	on_die = function(self, who)
-		game.state:activateBackupGuardian("LITHFENGEL", 4, 35, "They say that after it has been confirmed orcs still inhabited the Moria, they found a mighty demon there.", function(gen)
+		game.state:activateBackupGuardian("LITHFENGEL", 4, 35, "They say that after it has been confirmed orcs still inhabited Reknor, they found a mighty demon there.", function(gen)
 			if gen then require("engine.ui.Dialog"):simpleLongPopup("Danger...", "When last you saw it, this cavern was littered with the corpses of orcs that you had slain. Now many, many more corpses carpet the floor, all charred and reeking of sulfur. An orange glow dimly illuminates the far reaches of the cavern to the east.", 400) end
 		end)
 

game/modules/tome/data/zones/reknor/zone.lua

@@ -18,7 +18,7 @@
 -- darkgod@te4.org
 
 return {
-	name = "Mines of Moria",
+	name = "Lost Dwarven Kingdom of Reknor",
 	level_range = {18, 23},
 	level_scheme = "player",
 	max_level = 4,
@@ -65,7 +65,7 @@ return {
 			generator = {
 				map = {
 					class = "engine.generator.map.Static",
-					map = "zones/moria-last",
+					map = "zones/reknor-last",
 				},
 				actor = { nb_npc = {3, 3}, },
 				object = { nb_object = {8, 10}, },