Both Maj'Eyal and the Far East are on the same worldmap

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

game/modules/tome/class/Game.lua

@@ -446,7 +446,7 @@ function _M:changeLevel(lev, zone, keep_old_lev, force_down)
 	self.level.map:redisplay()
 
 	-- Autosave
-	if left_zone and left_zone.short_name ~= self.zone.short_name then self:saveGame() end
+	if left_zone and left_zone.short_name ~= "wilderness" and left_zone.short_name ~= self.zone.short_name then self:saveGame() end
 end
 
 function _M:getPlayer()
@@ -601,8 +601,8 @@ function _M:setupCommands()
 				self.player.inc_damage.all = 100000
 --				self:changeLevel(5, "gorbat-pride")
 --				self:changeLevel(1, "town-gates-of-morning")
-				self:changeLevel(1, "wilderness-fareast")
-				self.memory_levels["wilderness-fareast-1"] = self.level
+				self:changeLevel(1, "wilderness")
+				self.memory_levels["wilderness-1"] = self.level
 				self.player:grantQuest("spydric-infestation")
 				self.player:setQuestStatus("spydric-infestation", engine.Quest.COMPLETED)
 				self.player:grantQuest("orc-pride")

game/modules/tome/data/birth/races/orc.lua

@@ -52,8 +52,8 @@ newBirthDescriptor{
 	copy = {
 		faction = "orc-pride",
 		type = "humanoid", subtype="orc",
-		default_wilderness = {10, 39, "wilderness-fareast"},
-		starting_zone = "wilderness-arda-fareast",
+		default_wilderness = {10, 39, "wilderness"},
+		starting_zone = "wilderness",
 		starting_quest = "start-dunadan",
 		starting_intro = "orc",
 		life_rating=12,

game/modules/tome/data/birth/races/troll.lua

@@ -46,7 +46,7 @@ newBirthDescriptor{
 	copy = {
 		faction = "orc-pride",
 		type = "humanoid", subtype="troll",
-		default_wilderness = {26, 7, "wilderness-fareast"},
+		default_wilderness = {26, 7, "wilderness"},
 		starting_zone = "trollshaws",
 		starting_quest = "start-dunadan",
 		starting_intro = "dwarf",

game/modules/tome/data/chats/angolwen-leader.lua

@@ -32,7 +32,7 @@ newChat{ id="save-derth",
 We know who created this abomination: Urkis. He is a Tempest, a powerful archmage who can control the storms.
 A few years ago he has gone rogue, cutting himself from Angolwen. He remained quiet so we were reluctant to go against him openly, but it seems we have no choice now.
 The removal of the could will take much time, in the meanwhile we can, if you are willing, send you to Urkis lair to try stop him.
-I will not lie to you, we can send you there but this cuold be a death trap, and we have no way of knowing if there is a way for you to exit his lair as he lives on top of a tall peak in the misty mountains.]],
+I will not lie to you, we can send you there but this cuold be a death trap, and we have no way of knowing if there is a way for you to exit his lair as he lives on top of a tall peak in the Daikara mountains.]],
 	answers = {
 		{"I need to prepare myself, I will be back soon.", action=function(npc, player) player:setQuestStatus("lightning-overload", engine.Quest.COMPLETED, "tempest-located") end},
 		{"I am ready, send me, I will not let the good people of Derth down.", action=function(npc, player) player:setQuestStatus("lightning-overload", engine.Quest.COMPLETED, "tempest-located") player:hasQuest("lightning-overload"):teleport_urkis() end},

game/modules/tome/data/chats/derth-attack-over.lua

@@ -21,7 +21,7 @@ newChat{ id="welcome",
 	text = [[#LIGHT_GREEN#*A halfling comes forth from his hiding place.*#WHITE#
 You killed them all? Are we safe now? Oh please tell me this was a bad dream!]],
 	answers = {
-		{"Be at easy, I have dispatched those monstrosities. Do you know where they came from or what they wanted?", jump="quest"},
+		{"Be at ease, I have dispatched those monstrosities. Do you know where they came from or what they wanted?", jump="quest"},
 	}
 }
 

game/modules/tome/data/chats/gates-of-morning-welcome.lua

@@ -65,7 +65,7 @@ You may now enter the Gates of Morning.]],
 		{"Thank you, my lady.", action=function(npc, player)
 			world:gainAchievement("SPYDRIC_INFESTATION", game.player)
 			player:setQuestStatus("spydric-infestation", engine.Quest.DONE)
-			npc:move(47, 27, true)
+			npc:move(162, 28, true)
 			npc.can_talk = "gates-of-morning-main"
 			game:setAllowedBuild("divine")
 			game:setAllowedBuild("divine_sun_paladin", true)

game/modules/tome/data/general/grids/basic.lua

@@ -33,7 +33,7 @@ newEntity{
 	always_remember = true,
 	notice = true,
 	change_level = 1,
-	change_zone = "wilderness-fareast",
+	change_zone = "wilderness",
 }
 
 newEntity{

game/modules/tome/data/maps/towns/angolwen.lua

@@ -28,7 +28,7 @@ quickEntity('4', {show_tooltip=true, name="Alchemist", display='4', color=colors
 quickEntity('5', {show_tooltip=true, name="Scribe", display='5', color=colors.WHITE, resolvers.store("SCROLL"), image="terrain/wood_store_book.png"})
 quickEntity('6', {show_tooltip=true, name="Staves & Wands", display='6', color=colors.RED, resolvers.store("ANGOLWEN_STAFF_WAND"), resolvers.chatfeature("magic-store"), image="terrain/wood_store_closed.png"})
 
-quickEntity('L', {show_tooltip=true, name="Circle of the Wise", display='*', color=colors.LIGHT_RED, resolvers.chatfeature("angolwen-leader"), image="terrain/wood_store_closed.png"})
+defineTile('@', "GRASS", nil, "SUPREME_ARCHMAGE_LINANIIL")
 
 startx = 46
 starty = 43
@@ -56,7 +56,7 @@ return [[
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^T     o     T^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ooo      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-^^^^^^^^^^^^^^^^^^^^^^^^^^^L                ooToo               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^@                ooToo               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^      ooo      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^T     o     T^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

game/modules/tome/data/maps/towns/gates-of-morning.lua

@@ -19,7 +19,7 @@
 
 defineTile(' ', "FLOOR", nil, nil, nil, {no_teleport=true})
 quickEntity('M', {always_remember = true, show_tooltip=true, name='Sun Wall', display='^', color=colors.GOLD, back_color=colors.CRIMSON, image="terrain/mountain.png", tint=colors.GOLD, block_move=true}, {no_teleport=true})
-quickEntity('<', {show_tooltip=true, name='into the wild', display='<', color=colors.WHITE, change_level=1, change_zone="wilderness-fareast"}, {no_teleport=true})
+quickEntity('<', {show_tooltip=true, name='into the wild', display='<', color=colors.WHITE, change_level=1, change_zone="wilderness"}, {no_teleport=true})
 quickEntity('S', {name='brick roof top', display='#', color=colors.RED, block_move=true, block_sight=true, image="terrain/wood_wall1.png"}, {no_teleport=true})
 quickEntity('s', {name='brick roof', display='#', color=colors.RED, block_move=true, block_sight=true, image="terrain/wood_wall1.png"}, {no_teleport=true})
 quickEntity('t', {name='brick roof chimney', display='#', color=colors.LIGHT_RED, block_move=true, block_sight=true, image="terrain/wood_wall1.png"}, {no_teleport=true})

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

@@ -79,7 +79,7 @@ This one seems to go near the Gates of Morning in the Far East.]],
 
 		orb_portal = {
 			change_level = 1,
-			change_zone = "wilderness-fareast",
+			change_zone = "wilderness",
 			change_wilderness = {
 				x = 65, y = 35,
 			},
@@ -127,15 +127,15 @@ open_orthanc = function(self, player)
 	-- Reveal entrances
 	local g = mod.class.Grid.new{
 		show_tooltip=true,
-		name="Entrance into the tower of Orthanc",
+		name="Entrance into Telmur, tower of Telos",
 		display='>', color=colors.RED,
 		notice = true,
-		change_level=1, change_zone="orthanc"
+		change_level=1, change_zone="telmur"
 	}
 	g:resolve() g:resolve(nil, true)
-	game.zone:addEntity(game.memory_levels["wilderness-1"], g, "terrain", 43, 40)
+	game.zone:addEntity(game.memory_levels["wilderness-1"], g, "terrain", 55, 23)
 
-	game.logPlayer(game.player, "Tannen points the location of Orthanc on your map.")
+	game.logPlayer(game.player, "Tannen points the location of Telmur on your map.")
 	player:setQuestStatus(self.id, engine.Quest.COMPLETED, "open-orthanc")
 	self.wait_turn = game.turn + game.calendar.DAY * 3
 end

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

@@ -106,7 +106,7 @@ function failed_charred_scar(self, level)
 	game.logPlayer(game.player, "#LIGHT_RED#As you enter the level you hear a familiar voice.")
 	game.logPlayer(game.player, "#LIGHT_RED#Fallen Sun Paladin Aeryn: '%s YOU BROUGHT ONLY DESTRUCTION TO THE SUNWALL! YOU WILL PAY!'", game.player.name:upper())
 
-	local wild = game.memory_levels["wilderness-fareast-1"].map(66, 35, engine.Map.TERRAIN)
+	local wild = game.memory_levels["wilderness-1"].map(163, 31, engine.Map.TERRAIN)
 	wild.name = "Ruins of the Gates of Morning"
 	wild.desc = "The sunwall was destroyed while you were trapped in the High Peak."
 	wild.change_level = nil

game/modules/tome/data/quests/master-jeweler.lua

@@ -63,7 +63,7 @@ start_search = function(self, who)
 		change_level=1, change_zone="valley-moon-caverns"
 	}
 	g:resolve() g:resolve(nil, true)
-	game.zone:addEntity(game.memory_levels["wilderness-fareast-1"], g, "terrain", 48, 53)
+	game.zone:addEntity(game.memory_levels["wilderness-1"], g, "terrain", 150, 55)
 
 	who:setQuestStatus(self.id, engine.Quest.COMPLETED, "search-valley")
 	game.logPlayer(game.player, "Limmir points the entrance to a cave on your map, this is supposed to be the way to the valley.")

game/modules/tome/data/quests/orb-command.lua

@@ -38,7 +38,7 @@ on_status_change = function(self, who, status, sub)
 end
 
 open_high_peak = function(self, who)
-	local wild = game.memory_levels["wilderness-fareast-1"]
+	local wild = game.memory_levels["wilderness-1"]
 	wild.map:removeParticleEmitter(wild.data.istari_shield)
 
 	local g = game.zone:makeEntityByName(game.level, "terrain", "PEAK_STAIR")

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

@@ -37,6 +37,6 @@ on_grant = function(self, who)
 		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.zone:addEntity(game.memory_levels["wilderness-1"], g, "terrain", 68, 17)
 	game.logPlayer(game.player, "The elder points the mines on your map, to the north on the western side of the misty mountains.")
 end

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

@@ -42,7 +42,7 @@ desc = function(self, who)
 	if self:isCompleted("grushnak") then
 		desc[#desc+1] = "#LIGHT_GREEN#* You have destroyed Grushnak.#WHITE#"
 	else
-		desc[#desc+1] = "#SLATE#* Grushnak Pride, on the eastern slope of the High Peak.#WHITE#"
+		desc[#desc+1] = "#SLATE#* Grushnak Pride, near a small mountain range in the north west.#WHITE#"
 	end
 	if self:isCompleted("gorbat") then
 		desc[#desc+1] = "#LIGHT_GREEN#* You have destroyed Gorbat.#WHITE#"
@@ -68,7 +68,7 @@ on_grant = function(self, who)
 		change_level=1, change_zone="rak-shor-pride"
 	}
 	g:resolve() g:resolve(nil, true)
-	game.zone:addEntity(game.memory_levels["wilderness-fareast-1"], g, "terrain", 38, 49)
+	game.zone:addEntity(game.memory_levels["wilderness-1"], g, "terrain", 142, 50)
 
 	-- Reveal entrances
 	local g = mod.class.Grid.new{
@@ -79,7 +79,7 @@ on_grant = function(self, who)
 		change_level=1, change_zone="vor-pride"
 	}
 	g:resolve() g:resolve(nil, true)
-	game.zone:addEntity(game.memory_levels["wilderness-fareast-1"], g, "terrain", 63, 14)
+	game.zone:addEntity(game.memory_levels["wilderness-1"], g, "terrain", 168, 8)
 
 	-- Reveal entrances
 	local g = mod.class.Grid.new{
@@ -90,7 +90,7 @@ on_grant = function(self, who)
 		change_level=1, change_zone="gorbat-pride"
 	}
 	g:resolve() g:resolve(nil, true)
-	game.zone:addEntity(game.memory_levels["wilderness-fareast-1"], g, "terrain", 43, 53)
+	game.zone:addEntity(game.memory_levels["wilderness-1"], g, "terrain", 147, 54)
 
 	-- Reveal entrances
 	local g = mod.class.Grid.new{
@@ -101,7 +101,7 @@ on_grant = function(self, who)
 		change_level=1, change_zone="grushnak-pride"
 	}
 	g:resolve() g:resolve(nil, true)
-	game.zone:addEntity(game.memory_levels["wilderness-fareast-1"], g, "terrain", 50, 21)
+	game.zone:addEntity(game.memory_levels["wilderness-1"], g, "terrain", 135, 10)
 
 	game.logPlayer(game.player, "Aeryn points the known locations on your map.")
 end

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

@@ -39,6 +39,6 @@ on_grant = function(self, who)
 		change_level=1, change_zone="eruan"
 	}
 	g:resolve() g:resolve(nil, true)
-	game.zone:addEntity(game.memory_levels["wilderness-fareast-1"], g, "terrain", 56, 51)
+	game.zone:addEntity(game.memory_levels["wilderness-1"], g, "terrain", 155, 48)
 	game.logPlayer(game.player, "Aeryn explained where the orcs were spotted.")
 end

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

@@ -39,6 +39,6 @@ on_grant = function(self, who)
 		change_level=1, change_zone="ardhungol"
 	}
 	g:resolve() g:resolve(nil, true)
-	game.zone:addEntity(game.memory_levels["wilderness-fareast-1"], g, "terrain", 66, 32)
+	game.zone:addEntity(game.memory_levels["wilderness-1"], g, "terrain", 162, 28)
 	game.logPlayer(game.player, "High Sun Paladin Aeryn marks the location of Ardhungol on your map.")
 end

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

@@ -51,7 +51,7 @@ on_grant = function(self, who)
 		change_level=1, change_zone="vor-armoury"
 	}
 	g:resolve() g:resolve(nil, true)
-	game.zone:addEntity(game.memory_levels["wilderness-fareast-1"], g, "terrain", 62, 14)
+	game.zone:addEntity(game.memory_levels["wilderness-1"], g, "terrain", 167, 8)
 
 	game.logPlayer(game.player, "Zemekkys points the location of Vor Armoury on your map.")
 end
@@ -66,7 +66,7 @@ wyrm_lair = function(self, who)
 		change_level=1, change_zone="briagh-lair"
 	}
 	g:resolve() g:resolve(nil, true)
-	game.zone:addEntity(game.memory_levels["wilderness-fareast-1"], g, "terrain", 67, 49)
+	game.zone:addEntity(game.memory_levels["wilderness-1"], g, "terrain", 166, 51)
 
 	game.logPlayer(game.player, "Zemekkys points the location of Briagh lair on your map.")
 end