plop

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

game/modules/tome/data/achievements/quests.lua

@@ -76,23 +76,23 @@ newAchievement{
 	desc = [[Won ToME by closing the Void portal using yourself as a sacrifice.]],
 }
 newAchievement{
-	name = "Tactical master", id = "ISTARI_NO_PORTAL",
+	name = "Tactical master", id = "SORCERER_NO_PORTAL",
 	desc = [[Fought the two Sorcerers without closing any invocation portals.]],
 }
 newAchievement{
-	name = "Portal destroyer", id = "ISTARI_ONE_PORTAL",
+	name = "Portal destroyer", id = "SORCERER_ONE_PORTAL",
 	desc = [[Fought the two Sorcerers and closed one invocation portal.]],
 }
 newAchievement{
-	name = "Portal reaver", id = "ISTARI_TWO_PORTAL",
+	name = "Portal reaver", id = "SORCERER_TWO_PORTAL",
 	desc = [[Fought the two Sorcerers and closed two invocation portals.]],
 }
 newAchievement{
-	name = "Portal ender", id = "ISTARI_THREE_PORTAL",
+	name = "Portal ender", id = "SORCERER_THREE_PORTAL",
 	desc = [[Fought the two Sorcerers and closed three invocation portals.]],
 }
 newAchievement{
-	name = "Portal master", id = "ISTARI_FOUR_PORTAL",
+	name = "Portal master", id = "SORCERER_FOUR_PORTAL",
 	desc = [[Fought the two Sorcerers and closed four invocation portals.]],
 }
 

game/modules/tome/data/maps/zones/charred-scar.lua

@@ -26,7 +26,7 @@ defineTile('@', "FLOOR", nil, "SUN_PALADIN_DEFENDER_RODMOUR")
 defineTile('o', "FLOOR", nil, "URUK-HAI_ATTACK")
 
 defineTile('1', "LAVA_FLOOR", nil, "ELANDAR")
-defineTile('2', "LAVA_FLOOR", nil, "ARDONIEL")
+defineTile('2', "LAVA_FLOOR", nil, "ARGONIEL")
 
 subGenerator{
 	x = 0, y = 23, w = 12, h = 401,

game/modules/tome/data/maps/zones/high-peak-last.lua

@@ -34,7 +34,7 @@ defineTile('U', "PORTAL_UNDEAD", nil, nil, nil, {lite=true, no_teleport=true})
 
 -- Bosses
 defineTile('A', "FLOOR", nil, "ELANDAR", nil, {lite=true, no_teleport=true})
-defineTile('P', "FLOOR", nil, "ARDONIEL", nil, {lite=true, no_teleport=true})
+defineTile('P', "FLOOR", nil, "ARGONIEL", nil, {lite=true, no_teleport=true})
 
 subGenerator{
 	x = 0, y = 23, w = 50, h = 52,

game/modules/tome/data/quests/charred-scar.lua

@@ -21,18 +21,18 @@
 name = "The Doom of the World!"
 desc = function(self, who)
 	local desc = {}
-	desc[#desc+1] = "You were sent to the Charred Scar at the haert of which lies a huge volcano. In the Age of Pyre it destroyed the old Sher'Tul ruins that stood there, absorbing much of their latent magic."
+	desc[#desc+1] = "You were sent to the Charred Scar at the heart of which lies a huge volcano. In the Age of Pyre it destroyed the old Sher'Tul ruins that stood there, absorbing much of their latent magic."
 	desc[#desc+1] = "This place is still full of that power and the orcs intend to absorb this power using the Staff of Absorption!"
 	desc[#desc+1] = "Whatever their plan may be, they must be stopped at all cost."
 	desc[#desc+1] = "The volcano is attacked by orcs, a few Sun Paladins made it there with you, they will hold the line at the cost of their lives to buy you some time."
 	desc[#desc+1] = "Honor their sacrifice, do not let the orcs finish their work!"
 	if self:isCompleted("not-stopped") then
 		desc[#desc+1] = ""
-		desc[#desc+1] = "You arrived too late, the place has been drained of its power and the blue wizards have left."
+		desc[#desc+1] = "You arrived too late, the place has been drained of its power and the sorcerers have left."
 		desc[#desc+1] = "Use the portal to go back to the Far East, you *MUST* stop them, no matter the cost."
 	elseif self:isCompleted("stopped") then
 		desc[#desc+1] = ""
-		desc[#desc+1] = "You arrived in time and interrupted the ritual, the blue wizards have departed."
+		desc[#desc+1] = "You arrived in time and interrupted the ritual, the sorcerers have departed."
 		desc[#desc+1] = "Use the portal to go back to the Far East, you *MUST* stop them, no matter the cost."
 	end
 	return table.concat(desc, "\n")
@@ -44,8 +44,8 @@ start_fyrk = function(self)
 
 	local alatar, pallando
 	for uid, e in pairs(game.level.entities) do
-		if e.define_as == "ALATAR" then alatar = e
-		elseif e.define_as == "PALLANDO" then pallando = e end
+		if e.define_as == "ELANDAR" then alatar = e
+		elseif e.define_as == "ADRONIEL" then pallando = e end
 	end
 
 	if alatar then game.level:removeEntity(alatar) alatar.dead = true end

game/modules/tome/data/quests/high-peak.lua

@@ -34,9 +34,9 @@ desc = function(self, who)
 	if self:isCompleted("killed-aeryn") then desc[#desc+1] = "#LIGHT_GREEN#* You encountered Sun Paladin Aeryn who blamed you for the loss of the Sunwall and killed her.#LAST#" end
 	if self:isCompleted("spared-aeryn") then desc[#desc+1] = "#LIGHT_GREEN#* You encountered Sun Paladin Aeryn who blamed you for the loss of the Sunwall and spared her.#LAST#" end
 
-	if game.winner and game.winner == "full" then desc[#desc+1] = "#LIGHT_GREEN#* You defeated the blue wizards before the Void portal could open.#LAST#" end
-	if game.winner and game.winner == "aeryn-sacrifice" then desc[#desc+1] = "#LIGHT_GREEN#* You defeated the blue wizards and Aeryn sacrified herself to close the Void portal.#LAST#" end
-	if game.winner and game.winner == "self-sacrifice" then desc[#desc+1] = "#LIGHT_GREEN#* You defeated the blue wizards and sacrified yourself to close the Void portal.#LAST#" end
+	if game.winner and game.winner == "full" then desc[#desc+1] = "#LIGHT_GREEN#* You defeated the Sorcerers before the Void portal could open.#LAST#" end
+	if game.winner and game.winner == "aeryn-sacrifice" then desc[#desc+1] = "#LIGHT_GREEN#* You defeated the Sorcerers and Aeryn sacrified herself to close the Void portal.#LAST#" end
+	if game.winner and game.winner == "self-sacrifice" then desc[#desc+1] = "#LIGHT_GREEN#* You defeated the Sorcerers and sacrified yourself to close the Void portal.#LAST#" end
 
 	return table.concat(desc, "\n")
 end
@@ -46,7 +46,7 @@ end
 
 on_status_change = function(self, who, status, sub)
 	if sub then
-		if self:isCompleted("alatar-dead") and self:isCompleted("pallando-dead") then
+		if self:isCompleted("elandar-dead") and self:isCompleted("argoniel-dead") then
 			who:setQuestStatus(self.id, engine.Quest.DONE)
 
 			-- Remove all remaining hostiles

game/modules/tome/data/zones/high-peak/npcs.lua

@@ -114,7 +114,7 @@ newEntity{
 	ai = "dumb_talented_simple", ai_state = { talent_in=1, ai_move="move_astar" },
 
 	on_die = function(self, who)
-		game.player:resolveSource():setQuestStatus("high-peak", engine.Quest.COMPLETED, "alatar-dead")
+		game.player:resolveSource():setQuestStatus("high-peak", engine.Quest.COMPLETED, "elandar-dead")
 	end,
 }
 
@@ -186,7 +186,7 @@ newEntity{
 	ai = "dumb_talented_simple", ai_state = { talent_in=3, ai_move="move_astar" },
 
 	on_die = function(self, who)
-		game.player:resolveSource():setQuestStatus("high-peak", engine.Quest.COMPLETED, "pallando-dead")
+		game.player:resolveSource():setQuestStatus("high-peak", engine.Quest.COMPLETED, "argoniel-dead")
 	end,
 }
 
@@ -194,7 +194,7 @@ newEntity{
 newEntity{ define_as = "FALLEN_SUN_PALADIN_AERYN",
 	type = "humanoid", subtype = "human",
 	display = "p",
-	faction = "blue-wizards",
+	faction = "sorcerers",
 	name = "Fallen Sun Paladin Aeryn", color=colors.VIOLET, unique = true,
 	desc = [[A beautiful woman, clad in a shining plate armour. Power radiates from her.]],
 	level_range = {56, 56}, exp_worth = 2,

game/modules/tome/data/zones/high-peak/zone.lua

@@ -60,7 +60,7 @@ return {
 	},
 	post_process = function(level)
 		game.player:grantQuest("high-peak")
-		for uid, e in pairs(level.entities) do e.faction="blue-wizards" end
+		for uid, e in pairs(level.entities) do e.faction="sorcerers" 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 sorcerers
 		if level.level == 15 then