From 69b87cb58271a4298891dc439d318fc4e7d34bb9 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Thu, 28 Oct 2010 09:21:55 +0000
Subject: [PATCH] plop
git-svn-id: http://svn.net-core.org/repos/t-engine4@1659 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/data/chats/istari-end.lua | 10 ++++-----
game/modules/tome/data/chats/istari-fight.lua | 16 +++++++-------
.../data/maps/wilderness/arda-fareast.lua | 2 +-
.../tome/data/maps/zones/charred-scar.lua | 4 ++--
.../tome/data/maps/zones/high-peak-last.lua | 4 ++--
game/modules/tome/data/quests/high-peak.lua | 16 +++++++-------
game/modules/tome/data/texts/win.lua | 14 ++++++------
.../tome/data/zones/charred-scar/npcs.lua | 20 ++++++++---------
.../tome/data/zones/high-peak/grids.lua | 2 +-
.../tome/data/zones/high-peak/npcs.lua | 22 +++++++++----------
.../tome/data/zones/high-peak/objects.lua | 2 +-
.../tome/data/zones/high-peak/zone.lua | 2 +-
12 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/game/modules/tome/data/chats/istari-end.lua b/game/modules/tome/data/chats/istari-end.lua
index b4e6eac4be..be6e8b4d95 100644
--- a/game/modules/tome/data/chats/istari-end.lua
+++ b/game/modules/tome/data/chats/istari-end.lua
@@ -31,10 +31,10 @@ end
---------- If the void portal has been openned
if void_portal_open(nil, game.player) then
newChat{ id="welcome",
- text = [[#LIGHT_GREEN#*The two istari stand dead before you.*#WHITE#
+ text = [[#LIGHT_GREEN#*The two sorcerers stand dead before you.*#WHITE#
#LIGHT_GREEN#*Their bodies vanish in small cloud of mist, quickly fading away.*#WHITE#
-But the portal to the Void is already open. It must be closed before Morgoth can come through or all will have been in vain!
-After searching the remains of the Istari you find a note explaining that the portal can only be closed with a sentient being's sacrifice.]],
+But the portal to the Void is already open. It must be closed before the Creator can come through or all will have been in vain!
+After searching the remains of the Sorcerers you find a note explaining that the portal can only be closed with a sentient being's sacrifice.]],
answers = {
{"Aeryn, I am sorry but one of us needs to be sacrificed for the world to go on. #LIGHT_GREEN#[sacrifice Aeryn for the sake of the world]", jump="aeryn-sacrifice", cond=aeryn_alive},
{"I will close it #LIGHT_GREEN#[sacrifice yourself for the sake of the world]", action=function(npc, player)
@@ -59,10 +59,10 @@ Please, make sure the world is safe.]],
----------- If the void portal is still closed
else
newChat{ id="welcome",
- text = [[#LIGHT_GREEN#*The two istari stand dead before you.*#WHITE#
+ text = [[#LIGHT_GREEN#*The two sorcerer stand dead before you.*#WHITE#
#LIGHT_GREEN#*Their bodies vanish in some immaterial mist.*#WHITE#
You have won the game!
-Both Middle-earth and the Far East are safe from the return of Morgoth.]],
+Both Maj'Eyal and the Far East are safe from the dark schemes of the Sorcerers and their God.]],
answers = {
{"Aeryn, are you well?", jump="aeryn-ok", cond=aeryn_alive},
{"[leave]", action=function(npc, player) player:hasQuest("high-peak"):win("full") end},
diff --git a/game/modules/tome/data/chats/istari-fight.lua b/game/modules/tome/data/chats/istari-fight.lua
index 78de8e7111..fe4ce1b6b2 100644
--- a/game/modules/tome/data/chats/istari-fight.lua
+++ b/game/modules/tome/data/chats/istari-fight.lua
@@ -39,9 +39,9 @@ local function aeryn_comes(npc, player)
game.player:setQuestStatus("high-peak", engine.Quest.COMPLETED, "aeryn-helps")
game.logPlayer(player, "High Sun Paladin Aeryn appears next to you!")
- -- The istari focus her first
+ -- The sorcerer focus her first
for uid, e in pairs(game.level.entities) do
- if e.define_as and (e.define_as == "ALATAR" or e.define_as == "PALLANDO") then
+ if e.define_as and (e.define_as == "ELANDAR" or e.define_as == "ARGONIEL") then
e:setTarget(aeryn)
end
end
@@ -49,7 +49,7 @@ local function aeryn_comes(npc, player)
end
newChat{ id="welcome",
- text = [[#LIGHT_GREEN#*The two istari stands before you, shining like the sun.*#WHITE#
+ text = [[#LIGHT_GREEN#*The two sorcerers stands before you, shining like the sun.*#WHITE#
Ah! Our guest is finally here. I take it you found the peak entertaining?]],
answers = {
{"Spare me the small talk. I am here to stop you!", jump="explain"},
@@ -59,7 +59,7 @@ Ah! Our guest is finally here. I take it you found the peak entertaining?]],
newChat{ id="explain",
text = [[Oh, but all we want is to help people. We have come to the self-evident conclusion that common people are just unfit to govern themselves, always bickering, arguing...
-Since the fall of Sauron there is no threat to unite them!]],
+Since the last invasion of the orcs there has been no threat to unite them!]],
answers = {
{"So you have decided to become the threat yourselves?", jump="explain2"},
}
@@ -74,9 +74,9 @@ newChat{ id="explain2",
if void_portal_open(nil, game.player) then
newChat{ id="explain3",
- text = [[Isn't it obvious? The greatest of them, the black foe of the world. Melkor the great, whom you may know as Morgoth!
+ text = [[The Creator. The God who made this world, He who watched silently as the races fought and burnt the land.
+He who felt great sorrow for this world. He who shall now shatter the barriers of this world to remake it, only better!
The staff has allowed us to drain enough energy from this world to open the portal to the Void and summon him through!
-We will bring forth the Last Battle, Dagor Dagorath, as was prophesied to happen when the world was made.
It is already too late. He is coming through as we speak -- it is only a matter of hours!]],
answers = {
{"I *WILL* stop you! The world will not end today!", jump="aeryn", action=aeryn_comes, cond=aeryn_alive},
@@ -85,9 +85,9 @@ It is already too late. He is coming through as we speak -- it is only a matter
}
else
newChat{ id="explain3",
- text = [[Isn't it obvious? The greatest of them, the black foe of the world. Melkor the great, whom you may know as Morgoth!
+ text = [[The Creator. The God who made this world, He who watched silently as the races fought and burnt the land.
+He who felt great sorrow for this world. He who shall now shatter the barriers of this world to remake it, only better!
The staff will allow us to drain enough energy from this world to open the portal to the Void and summon him through!
-We will bring forth the Last Battle, Dagor Dagorath, as was prophesied to happen when the world was made.
You cannot stop us now!]],
answers = {
{"I *WILL* stop you! The world will not end today!", jump="aeryn", action=aeryn_comes, cond=aeryn_alive},
diff --git a/game/modules/tome/data/maps/wilderness/arda-fareast.lua b/game/modules/tome/data/maps/wilderness/arda-fareast.lua
index 3ac0efe0f3..8e9eec77f0 100644
--- a/game/modules/tome/data/maps/wilderness/arda-fareast.lua
+++ b/game/modules/tome/data/maps/wilderness/arda-fareast.lua
@@ -36,7 +36,7 @@ quickEntity('B', {always_remember = true, show_tooltip=true, name="High Peak", d
quickEntity('1', {always_remember = true, show_tooltip=true, name="Gates of Morning", desc="A massive hole in the Sun Wall", display='*', color=colors.GOLD, back_color=colors.CRIMSON, image="terrain/gate-morning.png", tint=colors.GOLD, notice = true, change_level=1, change_zone="town-gates-of-morning"})
--- The shield protecting the istari hideout
+-- The shield protecting the sorcerer hideout
local p = getMap():particleEmitter(43, 25, 3, "istari_shield_map")
-- Load encounters for this map
diff --git a/game/modules/tome/data/maps/zones/charred-scar.lua b/game/modules/tome/data/maps/zones/charred-scar.lua
index 04aaf416fc..80e0e7e065 100644
--- a/game/modules/tome/data/maps/zones/charred-scar.lua
+++ b/game/modules/tome/data/maps/zones/charred-scar.lua
@@ -25,8 +25,8 @@ defineTile('p', "FLOOR", nil, "SUN_PALADIN_DEFENDER")
defineTile('@', "FLOOR", nil, "SUN_PALADIN_DEFENDER_RODMOUR")
defineTile('o', "FLOOR", nil, "URUK-HAI_ATTACK")
-defineTile('1', "LAVA_FLOOR", nil, "ALATAR")
-defineTile('2', "LAVA_FLOOR", nil, "PALLANDO")
+defineTile('1', "LAVA_FLOOR", nil, "ELANDAR")
+defineTile('2', "LAVA_FLOOR", nil, "ARDONIEL")
subGenerator{
x = 0, y = 23, w = 12, h = 401,
diff --git a/game/modules/tome/data/maps/zones/high-peak-last.lua b/game/modules/tome/data/maps/zones/high-peak-last.lua
index 04318ba1f5..afda779d3c 100644
--- a/game/modules/tome/data/maps/zones/high-peak-last.lua
+++ b/game/modules/tome/data/maps/zones/high-peak-last.lua
@@ -33,8 +33,8 @@ defineTile('E', "PORTAL_ELEMENTS", nil, nil, nil, {lite=true, no_teleport=true})
defineTile('U', "PORTAL_UNDEAD", nil, nil, nil, {lite=true, no_teleport=true})
-- Bosses
-defineTile('A', "FLOOR", nil, "ALATAR", nil, {lite=true, no_teleport=true})
-defineTile('P', "FLOOR", nil, "PALLANDO", nil, {lite=true, no_teleport=true})
+defineTile('A', "FLOOR", nil, "ELANDAR", nil, {lite=true, no_teleport=true})
+defineTile('P', "FLOOR", nil, "ARDONIEL", nil, {lite=true, no_teleport=true})
subGenerator{
x = 0, y = 23, w = 50, h = 52,
diff --git a/game/modules/tome/data/quests/high-peak.lua b/game/modules/tome/data/quests/high-peak.lua
index 2d53a6702f..86425f8e83 100644
--- a/game/modules/tome/data/quests/high-peak.lua
+++ b/game/modules/tome/data/quests/high-peak.lua
@@ -23,11 +23,11 @@ desc = function(self, who)
if not self:isCompleted() then
desc[#desc+1] = "You have vanquished the masters of the Orc Pride, now you must venture inside the most dangerous place of this world, the High Peak."
- desc[#desc+1] = "Seek the Blue Wizards and stop them before they bend the world to their will."
+ desc[#desc+1] = "Seek the Sorcerers and stop them before they bend the world to their will."
desc[#desc+1] = "To enter you will need the four orbs of command to remove the shield over the peak."
desc[#desc+1] = "The entrance to the peak passes through a place called 'the slime tunnels', probably located inside or near Grushnak Pride."
else
- desc[#desc+1] = "You have reached the summit of the High Peak, entered the sanctum of the Istari and destroyed them, freeing the world from the threat of evil."
+ desc[#desc+1] = "You have reached the summit of the High Peak, entered the sanctum of the Sorcerers and destroyed them, freeing the world from the threat of evil."
desc[#desc+1] = "You have won the game!"
end
@@ -58,7 +58,7 @@ on_status_change = function(self, who, status, sub)
self:end_end_combat()
local Chat = require"engine.Chat"
- local chat = Chat.new("istari-end", {name="Endgame"}, game.player)
+ local chat = Chat.new("sorcerer-end", {name="Endgame"}, game.player)
chat:invoke()
end
end
@@ -92,11 +92,11 @@ function end_end_combat(self)
if self:isCompleted("closed-portal-dragon") then nb_portal = nb_portal + 1 end
if self:isCompleted("closed-portal-elemental") then nb_portal = nb_portal + 1 end
if self:isCompleted("closed-portal-undead") then nb_portal = nb_portal + 1 end
- if nb_portal == 0 then world:gainAchievement("ISTARI_NO_PORTAL", game.player)
- elseif nb_portal == 1 then world:gainAchievement("ISTARI_ONE_PORTAL", game.player)
- elseif nb_portal == 2 then world:gainAchievement("ISTARI_TWO_PORTAL", game.player)
- elseif nb_portal == 3 then world:gainAchievement("ISTARI_THREE_PORTAL", game.player)
- elseif nb_portal == 4 then world:gainAchievement("ISTARI_FOUR_PORTAL", game.player)
+ if nb_portal == 0 then world:gainAchievement("SORCERER_NO_PORTAL", game.player)
+ elseif nb_portal == 1 then world:gainAchievement("SORCERER_ONE_PORTAL", game.player)
+ elseif nb_portal == 2 then world:gainAchievement("SORCERER_TWO_PORTAL", game.player)
+ elseif nb_portal == 3 then world:gainAchievement("SORCERER_THREE_PORTAL", game.player)
+ elseif nb_portal == 4 then world:gainAchievement("SORCERER_FOUR_PORTAL", game.player)
end
end
diff --git a/game/modules/tome/data/texts/win.lua b/game/modules/tome/data/texts/win.lua
index f3c4bd48f0..3e3af75402 100644
--- a/game/modules/tome/data/texts/win.lua
+++ b/game/modules/tome/data/texts/win.lua
@@ -19,16 +19,16 @@
local desc = {}
-desc[#desc+1] = "#GOLD#Well done! You have won the Tales of Middle-earth: the Fourth Age#WHITE#"
+desc[#desc+1] = "#GOLD#Well done! You have won the Tales of Maj'Eyal: the Fourth Age#WHITE#"
desc[#desc+1] = ""
-desc[#desc+1] = "The Istari are dead, the Orc Prides lie in ruins, thanks to your efforts."
+desc[#desc+1] = "The Sorcerers are dead, the Orc Prides lie in ruins, thanks to your efforts."
desc[#desc+1] = ""
if game.player.winner == "full" then
- desc[#desc+1] = "You have prevented the portal to the Void from opening and thus stopped Morgoth from bringing about the end of the world."
+ desc[#desc+1] = "You have prevented the portal to the Void from opening and thus stopped the Creator from bringing about the end of the world."
elseif game.player.winner == "aeryn-sacrifice" then
- desc[#desc+1] = "In a selfless act, High Sun Paladin Aeryn sacrificed herself to close the portal to the Void and thus stopped Morgoth from bringing about the end of the world."
+ desc[#desc+1] = "In a selfless act, High Sun Paladin Aeryn sacrificed herself to close the portal to the Void and thus stopped the Creator from bringing about the end of the world."
elseif game.player.winner == "self-sacrifice" then
- desc[#desc+1] = "In a selfless act, you sacrificed yourself to close the portal to the Void and thus stopped Morgoth from bringing about the end of the world."
+ desc[#desc+1] = "In a selfless act, you sacrificed yourself to close the portal to the Void and thus stopped the Creator from bringing about the end of the world."
end
if game.player:isQuestStatus("high-peak", engine.Quest.COMPLETED, "gates-of-morning-destroyed") then
@@ -36,11 +36,11 @@ if game.player:isQuestStatus("high-peak", engine.Quest.COMPLETED, "gates-of-morn
desc[#desc+1] = "The Gates of Morning have been destroyed and the Sunwall has fallen, the last remnants of the free people in the Far East will surely disminish and soon only orcs will inhabit this land."
else
desc[#desc+1] = ""
- desc[#desc+1] = "The orc presence in the Far East has greatly been disminished by the loss of their leaders and the destruction of the Istari. The free people of the Sunwall will be able to prosper and thrive on this land."
+ desc[#desc+1] = "The orc presence in the Far East has greatly been disminished by the loss of their leaders and the destruction of the Sorcerers. The free people of the Sunwall will be able to prosper and thrive on this land."
end
desc[#desc+1] = ""
-desc[#desc+1] = "The West will once more know peace, most of its inhabitant will never know they even were on the verge of destruction, but then this is what being a true hero means, to do the right thing even though nobody will know about it."
+desc[#desc+1] = "Maj'Eyal will once more know peace, most of its inhabitant will never know they even were on the verge of destruction, but then this is what being a true hero means, to do the right thing even though nobody will know about it."
if game.player.winner ~= "self-sacrifice" then
desc[#desc+1] = ""
diff --git a/game/modules/tome/data/zones/charred-scar/npcs.lua b/game/modules/tome/data/zones/charred-scar/npcs.lua
index 032ff4f35f..bcdea96e92 100644
--- a/game/modules/tome/data/zones/charred-scar/npcs.lua
+++ b/game/modules/tome/data/zones/charred-scar/npcs.lua
@@ -156,13 +156,13 @@ newEntity{ base = "BASE_NPC_ORC_ATTACKER", define_as = "URUK-HAI_ATTACK",
newEntity{
- define_as = "ALATAR",
- type = "humanoid", subtype = "istari",
- name = "Alatar the Blue",
+ define_as = "ELANDAR",
+ type = "humanoid", subtype = "sorcerer",
+ name = "Elandar",
display = "@", color=colors.AQUAMARINE,
- faction = "blue-wizards",
+ faction = "sorcererss",
- desc = [[Lost to the memory of the West, the Blue Wizards have setup in the Far East, slowly growing corrupt. Now they must be stopped.]],
+ desc = [[The renegates mages from Angolwen, the Sorcerers have setup in the Far East, slowly growing corrupt. Now they must be stopped.]],
level_range = {70, 70}, exp_worth = 15,
max_life = 1000, life_rating = 36, fixed_rating = true,
max_mana = 10000,
@@ -212,13 +212,13 @@ newEntity{
}
newEntity{
- define_as = "PALLANDO",
- type = "humanoid", subtype = "istari",
- name = "Pallando the Blue",
+ define_as = "ARGONIEL",
+ type = "humanoid", subtype = "sorcerer",
+ name = "Argoniel",
display = "@", color=colors.LIGHT_BLUE,
- faction = "blue-wizards",
+ faction = "sorcerers",
- desc = [[Lost to the memory of the West, the Blue Wizards have setup in the Far East, slowly growing corrupt. Now they must be stopped.]],
+ desc = [[The renegates mages from Angolwen, the Sorcerers have setup in the Far East, slowly growing corrupt. Now they must be stopped.]],
level_range = {70, 70}, exp_worth = 15,
max_life = 1000, life_rating = 36, fixed_rating = true,
max_mana = 10000,
diff --git a/game/modules/tome/data/zones/high-peak/grids.lua b/game/modules/tome/data/zones/high-peak/grids.lua
index b66e31e66e..da7749200e 100644
--- a/game/modules/tome/data/zones/high-peak/grids.lua
+++ b/game/modules/tome/data/zones/high-peak/grids.lua
@@ -154,7 +154,7 @@ newEntity{
message = "#VIOLET#You enter the swirling portal and appear in a large room with other portals and the two wizards.",
on_use = function()
local Chat = require "engine.Chat"
- local chat = Chat.new("istari-fight", {name="Alatar, the Blue"}, game.player)
+ local chat = Chat.new("sorcerer-fight", {name="Elandar"}, game.player)
chat:invoke()
game.player:hasQuest("high-peak"):start_end_combat()
end,
diff --git a/game/modules/tome/data/zones/high-peak/npcs.lua b/game/modules/tome/data/zones/high-peak/npcs.lua
index 23bb631aef..b918a0b401 100644
--- a/game/modules/tome/data/zones/high-peak/npcs.lua
+++ b/game/modules/tome/data/zones/high-peak/npcs.lua
@@ -51,13 +51,13 @@ local Talents = require("engine.interface.ActorTalents")
-- Alatar & Palando, the final bosses
newEntity{
- define_as = "ALATAR",
- type = "humanoid", subtype = "istari",
- name = "Alatar the Blue",
+ define_as = "ELANDAR",
+ type = "humanoid", subtype = "sorcerer",
+ name = "Elandar",
display = "@", color=colors.AQUAMARINE,
- faction = "blue-wizards",
+ faction = "sorcerers",
- desc = [[Lost to the memory of the West, the Blue Wizards have set up in the Far East, slowly growing corrupt. Now they must be stopped.]],
+ desc = [[The renegates mages from Angolwen, the Sorcerers have setup in the Far East, slowly growing corrupt. Now they must be stopped.]],
level_range = {75, 75}, exp_worth = 15,
max_life = 1000, life_rating = 36, fixed_rating = true,
max_mana = 10000,
@@ -119,13 +119,13 @@ newEntity{
}
newEntity{
- define_as = "PALLANDO",
- type = "humanoid", subtype = "istari",
- name = "Pallando the Blue",
+ define_as = "ARGONIEL",
+ type = "humanoid", subtype = "sorcerer",
+ name = "Argoniel",
display = "@", color=colors.ROYAL_BLUE,
- faction = "blue-wizards",
+ faction = "sorcerers",
- desc = [[Lost to the memory of the West, the Blue Wizards have set up in the Far East, slowly growing corrupt. Now they must be stopped.]],
+ desc = [[The renegates mages from Angolwen, the Sorcerers have setup in the Far East, slowly growing corrupt. Now they must be stopped.]],
level_range = {75, 75}, exp_worth = 15,
max_life = 1000, life_rating = 36, fixed_rating = true,
max_mana = 10000,
@@ -253,7 +253,7 @@ newEntity{ define_as = "FALLEN_SUN_PALADIN_AERYN",
resolvers.sustains_at_birth(),
}
--- Aeryn coming back to help the player in the fight with the Istari
+-- Aeryn coming back to help the player in the fight with the Sorcerers
newEntity{ define_as = "HIGH_SUN_PALADIN_AERYN",
type = "humanoid", subtype = "human",
display = "p",
diff --git a/game/modules/tome/data/zones/high-peak/objects.lua b/game/modules/tome/data/zones/high-peak/objects.lua
index bce0f76e42..e0f109bf7c 100644
--- a/game/modules/tome/data/zones/high-peak/objects.lua
+++ b/game/modules/tome/data/zones/high-peak/objects.lua
@@ -30,7 +30,7 @@ newEntity{ define_as = "STAFF_ABSORPTION_AWAKENED", base="BASE_STAFF", no_unique
encumber = 7,
desc = [[Carved with runes of power, this staff seems to have been made long ago. Yet it bears no signs of tarnishment.
Light around it seems to dim and you can feel its tremendous power simply by touching it.
-The Istari seem to have awakened its power.]],
+The Sorcerers seem to have awakened its power.]],
require = { stat = { mag=60 }, },
combat = {
diff --git a/game/modules/tome/data/zones/high-peak/zone.lua b/game/modules/tome/data/zones/high-peak/zone.lua
index 9ff90cdc6e..e5a0248788 100644
--- a/game/modules/tome/data/zones/high-peak/zone.lua
+++ b/game/modules/tome/data/zones/high-peak/zone.lua
@@ -62,7 +62,7 @@ return {
game.player:grantQuest("high-peak")
for uid, e in pairs(level.entities) do e.faction="blue-wizards" end
- -- if we failed at charred scar (or did not do it at all) the gate of morning is destroyed and Aeryn turned to the service of the istari
+ -- if we failed at charred scar (or did not do it at all) the gate of morning is destroyed and Aeryn turned to the service of the sorcerers
if level.level == 15 then
local mtdm = game.player:hasQuest("charred-scar")
if not mtdm or mtdm:isCompleted("not-stopped") then
--
GitLab