plop

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

game/modules/tome/data/chats/message-minas-tirith.lua

@@ -18,13 +18,13 @@
 -- darkgod@te4.org
 
 newChat{ id="welcome",
-	text = [[Well met, @playername@. I was sent with a message from King Eldarion of Minas Tirith.
+	text = [[Well met, @playername@. I was sent with a message from King Tolak of Last Hope.
 I followed the trail of bodies that you left - very impressive! We are lucky to have you on our side.
 But enough talk; take this message.  I must go now.
 #LIGHT_GREEN#He gives you a sealed scroll and vanishes into the shadows.#LAST#]],
 	answers = {
 		{"Thank you for your courage.", action=function(npc, player)
-			local o, item, inven_id = npc:findInAllInventories("Sealed Scroll of Minas Tirith")
+			local o, item, inven_id = npc:findInAllInventories("Sealed Scroll of Last Hope")
 			if o then
 				npc:removeObject(inven_id, item, true)
 				player:addObject(player.INVEN_INVEN, o)

game/modules/tome/data/chats/minas-tirith-elder.lua

@@ -18,10 +18,10 @@
 -- darkgod@te4.org
 
 newChat{ id="welcome",
-	text = [[Welcome @playername@ to Minas Tirith. Traveler, please be quick as my time is precious.]],
+	text = [[Welcome @playername@ to Last Hope. Traveler, please be quick as my time is precious.]],
 	answers = {
 		{"I have found a strange staff in my travels (#LIGHT_GREEN#*describe it in detail*#LAST#)  It looked very old and very powerful. I dared not use it.", jump="found_staff", cond=function(npc, player) return player:isQuestStatus("staff-absorption", engine.Quest.PENDING) end},
-		{"The hunt for the staff took me to a continent far to the east, accessible only by magic portal. I've recently returned by just such a portal, and I come bearing instructions on how to construct a similar portal here in Minas Tirith to make the return journey possible. I'm sure the elves there would welcome trade with the west.", jump="east_portal", cond=function(npc, player) local q = player:hasQuest("east-portal"); return q and not q:isCompleted("talked-elder") end},
+		{"The hunt for the staff took me to a continent far to the east, accessible only by magic portal. I've recently returned by just such a portal, and I come bearing instructions on how to construct a similar portal here in Last Hope to make the return journey possible. I'm sure the elves there would welcome trade with the west.", jump="east_portal", cond=function(npc, player) local q = player:hasQuest("east-portal"); return q and not q:isCompleted("talked-elder") end},
 		{"Nothing, excuse me. Bye!"},
 	}
 }
@@ -83,14 +83,14 @@ newChat{ id="east_portal",
 }
 
 newChat{ id="east_portal_winner",
-	text = [[Excellent! Well then, concerning this fascinating portal. I'm afraid that men have largely forgotten whatever they once knew about the great magics of old. I know of only one man in Gondor who might be able to help you, a wise man and recent arrival to Minas Tirith named Tannen. He claims to hail from Angolwen, a supposed haven for practitioners of magic and mysticism. He arrived just months ago with fabulous wealth and has already constructed his own tower on the north edge of the city. I know little of him, but if he is to be believed, then he is your best hope.]],
+	text = [[Excellent! Well then, concerning this fascinating portal. I'm afraid that men have largely forgotten whatever they once knew about the great magics of old. I know of only one man in these lands who might be able to help you, a wise man and recent arrival to Last Hope named Tannen. He claims to hail from Angolwen, a supposed haven for practitioners of magic and mysticism. He arrived just months ago with fabulous wealth and has already constructed his own tower on the north edge of the city. I know little of him, but if he is to be believed, then he is your best hope.]],
 	answers = {
 		{"Thank you.", action=function(npc, player) player:setQuestStatus("east-portal", engine.Quest.COMPLETED, "talked-elder") end},
 	}
 }
 
 newChat{ id="east_portal_hunt",
-	text = [[In that case, let us proceed as quickly as possible. Now, concerning this fascinating portal. I'm afraid that men have largely forgotten whatever they once knew about the great magics of old. I know of only one man in Gondor who might be able to help you, a wise man and recent arrival to Minas Tirith named Tannen. He claims to hail from Angolwen, a supposed haven for practitioners of magic and mysticism. He arrived just months ago with fabulous wealth and has already constructed his own tower on the north edge of the city. I know little of him, but if he is to be believed, then he is your best hope.]],
+	text = [[In that case, let us proceed as quickly as possible. Now, concerning this fascinating portal. I'm afraid that men have largely forgotten whatever they once knew about the great magics of old. I know of only one man in these lands who might be able to help you, a wise man and recent arrival to Last Hope named Tannen. He claims to hail from Angolwen, a supposed haven for practitioners of magic and mysticism. He arrived just months ago with fabulous wealth and has already constructed his own tower on the north edge of the city. I know little of him, but if he is to be believed, then he is your best hope.]],
 	answers = {
 		{"Thank you.", action=function(npc, player) player:setQuestStatus("east-portal", engine.Quest.COMPLETED, "talked-elder") end},
 	}

game/modules/tome/data/maps/towns/last-hope.lua

--- ToME - Tales of Maj'Eyal
+x-- ToME - Tales of Maj'Eyal
 -- Copyright (C) 2009, 2010 Nicolas Casalini
 --
 -- This program is free software: you can redistribute it and/or modify
@@ -36,7 +36,7 @@ quickEntity('M', {name='tunneled hills', show_tooltip=true, display='^', color=c
 
 quickEntity('1', {show_tooltip=true, name="Closed store", display='1', color=colors.LIGHT_UMBER, block_move=true, block_sight=true, image="terrain/wood_store_closed.png"})
 quickEntity('2', {show_tooltip=true, name="Armour Smith", display='2', color=colors.UMBER, resolvers.store("ARMOR"), image="terrain/wood_store_armor.png"})
-quickEntity('3', {show_tooltip=true, name="Weapon Smith", display='3', color=colors.UMBER, resolvers.store("WEAPON"), resolvers.chatfeature("minas-tirith-weapon-store"), image="terrain/wood_store_weapon.png"})
+quickEntity('3', {show_tooltip=true, name="Weapon Smith", display='3', color=colors.UMBER, resolvers.store("WEAPON"), resolvers.chatfeature("last-hope-weapon-store"), image="terrain/wood_store_weapon.png"})
 quickEntity('4', {show_tooltip=true, name="Alchemist", display='4', color=colors.LIGHT_BLUE, resolvers.store("POTION"), image="terrain/wood_store_potion.png"})
 quickEntity('5', {show_tooltip=true, name="Scribe", display='5', color=colors.WHITE, resolvers.store("SCROLL"), resolvers.chatfeature("magic-store"), image="terrain/wood_store_book.png"})
 quickEntity('6', {show_tooltip=true, name="Closed store", display='6', color=colors.LIGHT_UMBER, block_move=true, block_sight=true, image="terrain/wood_store_closed.png"})
@@ -48,9 +48,9 @@ quickEntity('a', {show_tooltip=true, name="Closed store", display='*', color=col
 quickEntity('b', {show_tooltip=true, name="Hall of the King", display='*', color=colors.LIGHT_UMBER, block_move=true, block_sight=true, image="terrain/wood_store_closed.png"})
 quickEntity('c', {show_tooltip=true, name="Closed store", display='*', color=colors.LIGHT_UMBER, block_move=true, block_sight=true, image="terrain/wood_store_closed.png"})
 quickEntity('d', {show_tooltip=true, name="Closed store", display='*', color=colors.LIGHT_UMBER, block_move=true, block_sight=true, image="terrain/wood_store_closed.png"})
-quickEntity('e', {show_tooltip=true, name="Rare goods", display='*', color=colors.AQUAMARINE, resolvers.store("LOST_MERCHANT"), resolvers.chatfeature("minas-tirith-lost-merchant"), image="terrain/wood_store_weapon.png"})
+quickEntity('e', {show_tooltip=true, name="Rare goods", display='*', color=colors.AQUAMARINE, resolvers.store("LOST_MERCHANT"), resolvers.chatfeature("last-hope-lost-merchant"), image="terrain/wood_store_weapon.png"})
 
-quickEntity('E', {show_tooltip=true, name="The Elder", display='*', color=colors.VIOLET, resolvers.chatfeature("minas-tirith-elder"), image="terrain/wood_store_closed.png"})
+quickEntity('E', {show_tooltip=true, name="The Elder", display='*', color=colors.VIOLET, resolvers.chatfeature("last-hope-elder"), image="terrain/wood_store_closed.png"})
 quickEntity('f', {show_tooltip=true, name="Tannen's Tower", display='*', color=colors.VIOLET, resolvers.chatfeature("tannen"), image="terrain/wood_store_closed.png"})
 
 startx = 95

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

@@ -166,9 +166,9 @@ tannen_exit = function(self, player)
 	game.zone:addEntity(game.level, g, "terrain", 12, 12)
 end
 
-back_to_minas_tirith = function(self)
-	-- TP minas tirith
-	game:changeLevel(1, "town-minas-tirith")
+back_to_last_hope = function(self)
+	-- TP last hope
+	game:changeLevel(1, "town-last-hope")
 	-- Move to the portal spot
 	game.player:move(12, 43, true)
 	-- Remove tannen
@@ -187,5 +187,5 @@ back_to_minas_tirith = function(self)
 	local Chat = require("engine.Chat")
 	local chat = Chat.new("east-portal-end", g, game.player)
 	chat:invoke()
-	game.logPlayer(who, "#VIOLET#You enter the swirling portal and in the blink of an eye you are back to Minas Tirith.")
+	game.logPlayer(who, "#VIOLET#You enter the swirling portal and in the blink of an eye you are back to Last Hope.")
 end

game/modules/tome/data/quests/lost-merchant.lua

@@ -46,7 +46,7 @@ leave_zone = function(self, who)
 		end
 	end
 	if merchant_alive then
-		game.logPlayer(who, "#LIGHT_BLUE#The merchant thanks you for saving his life. He gives you 8 gold and asks you to meet him again in Minas Tirith.")
+		game.logPlayer(who, "#LIGHT_BLUE#The merchant thanks you for saving his life. He gives you 8 gold and asks you to meet him again in Last Hope.")
 		who:incMoney(8)
 		who.changed = true
 		who:setQuestStatus(self.id, engine.Quest.COMPLETED, "saved")

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

@@ -21,7 +21,7 @@
 name = "Let's hunt some Orc"
 desc = function(self, who)
 	local desc = {}
-	desc[#desc+1] = "The elder in Minas Tirith 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 mines of Moria, 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")

game/modules/tome/data/quests/staff-absorption.lua

@@ -28,22 +28,22 @@ desc = function(self, who)
 	elseif self:isCompleted("ambush-finished") and not self:isCompleted("survived-ukruk") then
 		desc[#desc+1] = "On your way out of Tol Falas you were ambushed by a band of orcs and left for dead."
 		desc[#desc+1] = "They asked about the staff and stole it from you."
-		desc[#desc+1] = "#LIGHT_GREEN#Go at once to Minas Tirith to report those events!"
+		desc[#desc+1] = "#LIGHT_GREEN#Go at once to Last Hope to report those events!"
 	elseif self:isCompleted("ambush-finished") and self:isCompleted("survived-ukruk") then
-		desc[#desc+1] = "On your way out of Tol Falas you were ambushed by a band of orcs."
+		desc[#desc+1] = "On your way out of Last Hope you were ambushed by a band of orcs."
 		desc[#desc+1] = "They asked about the staff and stole it from you."
 		desc[#desc+1] = "You told them nothing and vanquished them."
-		desc[#desc+1] = "#LIGHT_GREEN#Go at once to Minas Tirith to report those events!"
+		desc[#desc+1] = "#LIGHT_GREEN#Go at once to Last Hope to report those events!"
 	else
 		desc[#desc+1] = "In its remains, you found a strange staff. It radiates power and danger and you dare not use it yourself."
-		desc[#desc+1] = "You should bring it to the elders of Minas Tirith in the south east."
+		desc[#desc+1] = "You should bring it to the elders of Last Hope in the south east."
 	end
 	return table.concat(desc, "\n")
 end
 
 on_grant = function(self, who)
 	game.logPlayer(who, "#00FFFF#You can feel the power of this staff just by carrying it. This is both ancient and dangerous.")
-	game.logPlayer(who, "#00FFFF#It should be shown to the wise elders in Minas Tirith!")
+	game.logPlayer(who, "#00FFFF#It should be shown to the wise elders in Last Hope!")
 end
 
 start_ambush = function(self, who)
@@ -69,7 +69,7 @@ start_ambush = function(self, who)
 		o:removed()
 
 		game.logPlayer(self, "#VIOLET#You wake up after a few hours, surprised to be alive, but the staff is gone!")
-		game.logPlayer(self, "#VIOLET#Go at once to Minas Tirith to report those events!")
+		game.logPlayer(self, "#VIOLET#Go at once to Last Hope to report those events!")
 
 		game.level.map(self.x, self.y, game.level.map.TERRAIN, game.zone.grid_list.UP_WILDERNESS)
 
@@ -85,7 +85,7 @@ killed_ukruk = function(self, who)
 	game.player.die = nil
 
 	game.logPlayer(self, "#VIOLET#You are surprised to still be alive.")
-	game.logPlayer(self, "#VIOLET#Go at once to Minas Tirith to report those events!")
+	game.logPlayer(self, "#VIOLET#Go at once to Last Hope to report those events!")
 
 	game.level.map(who.x, who.y, game.level.map.TERRAIN, game.zone.grid_list.UP_WILDERNESS)
 

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

@@ -74,13 +74,13 @@ end
 create_portal = function(self, npc, player)
 	-- Farportal
 	local g = mod.class.Grid.new{
-		name = "Farportal: Minas Tirith",
+		name = "Farportal: Last Hope",
 		display = '&', color_r=255, color_g=0, color_b=220, back_color=colors.VIOLET,
 		notice = true,
 		always_remember = true,
 		show_tooltip = true,
 		desc = [[A farportal is a way to travel incredible distances in the blink of an eye. They usually require an external item to use.
-This one seems to go near the town of Minas Tirith in the West.]],
+This one seems to go near the town of Last Hope in Maj'Eyal.]],
 
 		orb_portal = {
 			change_level = 1,
@@ -88,7 +88,7 @@ This one seems to go near the town of Minas Tirith in the West.]],
 			change_wilderness = {
 				x = 60, y = 54,
 			},
-			message = "#VIOLET#You enter the swirling portal and in the blink of an eye you set foot on the outskirts of Minas Tirith, with no trace of the portal...",
+			message = "#VIOLET#You enter the swirling portal and in the blink of an eye you set foot on the outskirts of Last Hope, with no trace of the portal...",
 			on_use = function(self, who)
 			end,
 		},

game/modules/tome/data/texts/message-minas-tirith.lua

@@ -22,14 +22,14 @@ local delivered_staff = game.player:resolveSource():isQuestStatus("staff-absorpt
 if delivered_staff then
 return [[@playername@, this message is of utmost importance.
 
-The staff you left at Minas Tirith is gone, a raid of orcs ambushed the guards that were transporting it to a secret vault.
+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.
 
 This calls for urgency, should you find this Golbug or the portal please investigate.
 
-               #GOLD#-- Eldarion, High King of the Reunited Kingdom]]
+               #GOLD#-- Tolak, King of the Allied Kingdoms]]
 
 else
 
@@ -44,5 +44,5 @@ He spoke about meeting with Golbug, this seems to be a warmaster in the Moria, t
 
 This calls for urgency, should you find this Golbug or the portal please investigate.
 
-               #GOLD#-- Eldarion, High King of the Reunited Kingdom]]
+               #GOLD#-- Tolak, King of the Allied Kingdoms]]
 end
\ No newline at end of file

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

@@ -106,13 +106,13 @@ newEntity{ define_as = "GOLBUG",
 	end,
 }
 
--- The messager sent by minas tirith
+-- The messager sent by last-hope
 newEntity{ define_as = "HARNO",
 	type = "humanoid", subtype = "human", unique = true,
 	faction = "reunited-kingdom",
-	name = "Harno, Herald of Minas Tirith",
+	name = "Harno, Herald of Last Hope",
 	display = "@", color=colors.LIGHT_BLUE,
-	desc = [[This is one of the heralds of Minas Tirith, he seems to be looking for you.]],
+	desc = [[This is one of the heralds of Last Hope, he seems to be looking for you.]],
 	energy = {mod=2},
 	level_range = {40, 40}, exp_worth = 0,
 	max_life = 150, life_rating = 12,
@@ -126,7 +126,7 @@ newEntity{ define_as = "HARNO",
 		{type="weapon", subtype="knife", autoreq=true},
 		{type="weapon", subtype="knife", autoreq=true},
 	},
-	resolvers.drops{chance=100, nb=1, {type="scroll", subtype="scroll", defined="NOTE_FROM_MINAS_TIRITH"} },
+	resolvers.drops{chance=100, nb=1, {type="scroll", subtype="scroll", defined="NOTE_FROM_LAST_HOPE"} },
 
 	stun_immune = 1,
 	see_invisible = 100,
@@ -134,7 +134,7 @@ newEntity{ define_as = "HARNO",
 	autolevel = "warrior",
 	ai = "dumb_talented_simple", ai_state = { ai_target="target_player", ai_move="move_astar", },
 
-	can_talk = "message-minas-tirith",
+	can_talk = "message-last-hope",
 	can_talk_only_once = true,
 
 	on_die = function(self, who)

game/modules/tome/data/zones/moria/objects.lua

@@ -19,12 +19,12 @@
 
 load("/data/general/objects/objects.lua")
 
-newEntity{ base = "BASE_SCROLL", define_as = "NOTE_FROM_MINAS_TIRITH",
-	name = "Sealed Scroll of Minas Tirith", identified=true, unique=true, no_unique_lore=true,
+newEntity{ base = "BASE_SCROLL", define_as = "NOTE_FROM_LAST_HOPE",
+	name = "Sealed Scroll of Last Hope", identified=true, unique=true, no_unique_lore=true,
 	fire_proof = true,
 
 	use_simple = { name="open the seal and read the message", use = function(self, who)
-		game:registerDialog(require("engine.dialogs.ShowText").new(self:getName{do_color=true}, "message-minas-tirith", {playername=who.name}, game.w * 0.6))
+		game:registerDialog(require("engine.dialogs.ShowText").new(self:getName{do_color=true}, "message-last-hope", {playername=who.name}, game.w * 0.6))
 	end}
 }
 

game/modules/tome/data/zones/tannen-tower/grids.lua

@@ -43,18 +43,18 @@ newEntity{
 
 newEntity{
 	define_as = "PORTAL_BACK",
-	name = "Portal to Minas Tirith",
+	name = "Portal to Last Hope",
 	display = '&', color_r=255, color_g=0, color_b=220, back_color=colors.VIOLET,
 	notice = true,
 	always_remember = true,
 	show_tooltip = true,
-	desc = [[This portal seems to be connected with Minas Tirith, you could probably use it to go back.]],
+	desc = [[This portal seems to be connected with Last Hope, you could probably use it to go back.]],
 
 	on_move = function(self, x, y, who)
 		if who == game.player then
-			require("engine.ui.Dialog"):yesnoPopup("Back and there again", "Enter the portal back to Minas Tirith?", function(ret)
+			require("engine.ui.Dialog"):yesnoPopup("Back and there again", "Enter the portal back to Last Hope?", function(ret)
 				if not ret then
-					game.player:hasQuest("east-portal"):back_to_minas_tirith()
+					game.player:hasQuest("east-portal"):back_to_last_hope()
 				end
 			end, "Stay", "Enter")
 		end