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/maps/wilderness/maj-eyal.lua

@@ -21,12 +21,17 @@
 
 quickEntity('~', {always_remember = true, show_tooltip=true, name='the sea of Maj', display='~', color=colors.DARK_BLUE, back_color=colors.BLUE, image="terrain/river.png", block_move=true, shader = "water", textures = { function() return _3DNoise, true end }, })
 quickEntity('-', {always_remember = true, show_tooltip=true, name='river', display='~', color={r=0, g=80, b=255}, back_color=colors.BLUE, image="terrain/river.png", can_encounter=true, equilibrium_level=-10, shader = "water", textures = { function() return _3DNoise, true end }, })
-quickEntity('*', {always_remember = true, show_tooltip=true, name='lake of Nur', display='~', color={r=0, g=80, b=255}, back_color=colors.BLUE, image="terrain/river.png", can_encounter=true, equilibrium_level=-10, shader = "water", textures = { function() return _3DNoise, true end }, })
+quickEntity('*', {always_remember = true, show_tooltip=true, name='lake of Nur', display='~', color={r=0, g=80, b=255}, back_color=colors.BLUE, image="terrain/river.png", block_move=true, equilibrium_level=-10, shader = "water", textures = { function() return _3DNoise, true end }, })
+quickEntity(')', {always_remember = true, show_tooltip=true, name='sea of Sash', display='~', color={r=0, g=80, b=255}, back_color=colors.BLUE, image="terrain/river.png", block_move=true, equilibrium_level=-10, shader = "water", textures = { function() return _3DNoise, true end }, })
+quickEntity('(', {always_remember = true, show_tooltip=true, name='lake', display='~', color={r=0, g=80, b=255}, back_color=colors.BLUE, image="terrain/river.png", block_move=true, equilibrium_level=-10, shader = "water", textures = { function() return _3DNoise, true end }, })
 
+quickEntity('q', {always_remember = true, show_tooltip=true, name='volcanic mountains', display='^', color=colors.LIGHT_UMBER, back_color=colors.UMBER, image="terrain/volcano2.png", block_move=true})
 quickEntity('^', {always_remember = true, show_tooltip=true, name='mountains', display='^', color=colors.LIGHT_UMBER, back_color=colors.UMBER, image="terrain/mountain.png", block_move=true})
 quickEntity('m', {always_remember = true, show_tooltip=true, name='Daikara', display='^', color=colors.LIGHT_UMBER, back_color=colors.UMBER, image="terrain/rocky_mountain.png", block_move=true})
 quickEntity('#', {always_remember = true, show_tooltip=true, name='Iron Throne', display='^', color=colors.SLATE, back_color=colors.UMBER, image="terrain/mountain.png", block_move=true})
+quickEntity('w', {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})
 
+quickEntity('p', {always_remember = true, show_tooltip=true, name='palm forest', display='#', color=colors.LIGHT_GREEN, back_color={r=163,g=149,b=42}, image="terrain/sand.png", add_displays = {mod.class.Grid.new{image="terrain/palmtree_alpha1.png"}}, block_move=true})
 quickEntity('T', {always_remember = true, show_tooltip=true, name='forest', force_clone=true, display='#', color=colors.GREEN, back_color=colors.DARK_GREEN, image="terrain/grass.png", resolvers.generic(function(e) e.add_displays = e:makeTrees("terrain/tree_alpha") end), block_move=true})
 quickEntity('t', {always_remember = true, show_tooltip=true, name='cold forest', display='#', color=colors.LIGHT_GREEN, back_color=colors.DARK_GREEN, image="terrain/rocky_snowy_tree.png", block_move=true})
 quickEntity('_', {always_remember = true, show_tooltip=true, name='burnt forest', display='#', color=colors.UMBER, back_color=colors.DARK_GREY, image="terrain/burnt-tree.png", block_move=true})
@@ -38,7 +43,7 @@ quickEntity('|', {always_remember = true, show_tooltip=true, name='desert', disp
 quickEntity('"', {always_remember = true, show_tooltip=true, name='polar cap', display='.', color=colors.LIGHT_BLUE, back_color=colors.WHITE, can_encounter=true, image="terrain/frozen_ground.png", equilibrium_level=-10})
 quickEntity('=', {always_remember = true, show_tooltip=true, name='frozen sea', display=';', color=colors.LIGHT_BLUE, back_color=colors.WHITE, can_encounter=true, image="terrain/ice_shelf.png", equilibrium_level=-10})
 
-quickEntity('{', {always_remember = true, show_tooltip=true, name='the Charred Scar', display='.', color=colors.WHITE, back_color=colors.LIGHT_DARK, image="terrain/lava_floor.png", shader = "lava", can_encounter=true})
+quickEntity('{', {always_remember = true, show_tooltip=true, name='Charred Scar', display='.', color=colors.WHITE, back_color=colors.LIGHT_DARK, image="terrain/lava_floor.png", shader = "lava", can_encounter=true})
 
 quickEntity('!', {always_remember = true, show_tooltip=true, name='hills', display='^', color=colors.GREEN, back_color=colors.DARK_GREEN, image="terrain/hills.png", can_encounter=true, equilibrium_level=-10})
 quickEntity('h', {always_remember = true, show_tooltip=true, name='low hills', display='^', color=colors.GREEN, back_color=colors.DARK_GREEN, image="terrain/hills.png", can_encounter=true, equilibrium_level=-10})
@@ -52,12 +57,15 @@ quickEntity('D', {always_remember = true, show_tooltip=true, name="A path into t
 quickEntity('E', {always_remember = true, show_tooltip=true, name="A mysterious hole in the beach", 	display='>', color={r=200, g=255, b=55}, notice = true, change_level=1, change_zone="sandworm-lair"})
 quickEntity('F', {always_remember = true, show_tooltip=true, name="The entry to the old tower of Tol Falas",display='>', color={r=0, g=255, b=255}, notice = true, change_level=1, change_zone="tol-falas"})
 quickEntity('G', {always_remember = true, show_tooltip=true, name="Passageway into Daikara",display='>', color=colors.UMBER, notice = true, change_level=1, change_zone="daikara"})
-quickEntity('H', {always_remember = true, show_tooltip=true, name='Charred Scar', display='>', color=colors.RED, back_color=colors.LIGHT_DARK, image="terrain/volcano1.png", notice = true, change_level=1, change_zone="charred-scar"})
+quickEntity('H', {always_remember = true, show_tooltip=true, name='Charred Scar Volcano', display='>', color=colors.RED, back_color=colors.LIGHT_DARK, image="terrain/volcano1.png", notice = true, change_level=1, change_zone="charred-scar"})
+quickEntity('I', {always_remember = true, show_tooltip=true, name="Sun Wall Outpost (Town)", display='*', color=colors.GOLD, notice = true, change_level=1, change_zone="town-sunwall-outpost"})
+quickEntity('J', {always_remember = true, show_tooltip=true, name="High Peak", display='>', color=colors.VIOLET, notice = true, change_level=1, change_zone="high-peak"})
 
 quickEntity('1', {always_remember = true, show_tooltip=true, name="Derth (Town)", desc="A quiet town at the crossroads of the north", display='*', color={r=255, g=255, b=255}, back_color=colors.DARK_GREEN, image="terrain/town1.png", notice = true, change_level=1, change_zone="town-derth"})
 quickEntity('2', {always_remember = true, show_tooltip=true, name="Last Hope (Town)", desc="Capital city of the Allied Kingdoms ruled by King Tolak", display='*', color={r=255, g=255, b=255}, back_color=colors.DARK_GREEN, image="terrain/town1.png", notice = true, change_level=1, change_zone="town-last-hope"})
 quickEntity('4', {always_remember = true, show_tooltip=true, name="Shatur (Town)", desc="Capital city of Thaloren lands, ruled by Nessilla Tantaelen", display='*', color={r=255, g=255, b=255}, back_color=colors.DARK_GREEN, image="terrain/town1.png", notice = true})
 quickEntity('5', {always_remember = true, show_tooltip=true, name="Elvala (Town)", desc="Capital city of Shaloren lands, ruled by Aranion Gayaeil", display='*', color={r=255, g=255, b=255}, back_color=colors.DARK_GREEN, image="terrain/town1.png", notice = true})
+quickEntity('6', {always_remember = true, show_tooltip=true, name="Gates of Morning", desc="A massive hole in the Sunwall", 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"})
 
 -- Angolwen is only know from the start to mages
 if game.player:knowTalent(game.player.T_TELEPORT_ANGOLWEN) then
@@ -86,117 +94,99 @@ addData{
 addSpot({35, 33}, "patrol", "allied-kingdoms")
 addSpot({23, 10}, "patrol", "allied-kingdoms")
 addSpot({15, 33}, "patrol", "allied-kingdoms")
+addSpot({16, 33}, "patrol", "allied-kingdoms")
 addSpot({40, 12}, "patrol", "allied-kingdoms")
 addSpot({40, 13}, "patrol", "allied-kingdoms")
 addSpot({63, 5}, "patrol", "allied-kingdoms")
 addSpot({58, 32}, "patrol", "allied-kingdoms")
-addSpot({22, 20}, "hostile", "random")
-addSpot({23, 20}, "hostile", "random")
-addSpot({24, 20}, "hostile", "random")
-addSpot({22, 21}, "hostile", "random")
-addSpot({23, 21}, "hostile", "random")
-addSpot({24, 21}, "hostile", "random")
-addSpot({22, 22}, "hostile", "random")
-addSpot({23, 22}, "hostile", "random")
-addSpot({24, 22}, "hostile", "random")
+addSpot({27, 24}, "hostile", "random")
+addSpot({28, 24}, "hostile", "random")
+addSpot({27, 25}, "hostile", "random")
+addSpot({28, 25}, "hostile", "random")
 addSpot({54, 7}, "hostile", "random")
 addSpot({55, 7}, "hostile", "random")
-addSpot({56, 7}, "hostile", "random")
 addSpot({54, 8}, "hostile", "random")
 addSpot({55, 8}, "hostile", "random")
-addSpot({56, 8}, "hostile", "random")
-addSpot({54, 9}, "hostile", "random")
-addSpot({55, 9}, "hostile", "random")
-addSpot({56, 9}, "hostile", "random")
-addSpot({43, 36}, "hostile", "random")
-addSpot({44, 36}, "hostile", "random")
-addSpot({45, 36}, "hostile", "random")
 addSpot({43, 37}, "hostile", "random")
 addSpot({44, 37}, "hostile", "random")
-addSpot({45, 37}, "hostile", "random")
 addSpot({43, 38}, "hostile", "random")
 addSpot({44, 38}, "hostile", "random")
-addSpot({45, 38}, "hostile", "random")
 addSpot({8, 25}, "hostile", "random")
 addSpot({9, 25}, "hostile", "random")
-addSpot({10, 25}, "hostile", "random")
 addSpot({8, 26}, "hostile", "random")
 addSpot({9, 26}, "hostile", "random")
-addSpot({10, 26}, "hostile", "random")
-addSpot({8, 27}, "hostile", "random")
-addSpot({9, 27}, "hostile", "random")
-addSpot({10, 27}, "hostile", "random")
 addSpot({35, 29})
+addSpot({54, 14})
 
 -- ASCII map section
 return [[
-==========""""""""""""""""""""""""""""""""""""""""""""""""m###########
-========""""""""""""""""""""""""""""""""""""""""""""""""mmm###########
-=======""""""""""""""""""""""""""""""ttttt"""""""mmmmmmmmmm""#########
-=======""""""""""""""""""""""""tttttttttttttmm"mmmmmmmmmmmm"""########
-======="""""""...."""""""""""tttttttttttttttmmmmmmTTTT!mmmm""""#######
-======="""""......"""""...""tttttttttttttttttmmmmTTTTT!!Gm""""""######
-========"".........""".....tttttttttTTTTTtttttmmTTTTT!!!!!!.."""######
-=======........!!!........BTtttttttTT!4!TTTTTTTTTTTTTT!!!!!..."""#####
-===~~~.........!!!....A....TTTtttTTTT!!!TTTTTTTTTTTTT!!!!!!......#####
-~~~~~||.......!!!!&&........TTTTTTTTTT!TTTTTTTTTTTTT!!!!!!.......#####
-~~~~|||.......!!!&&&&...T........TTTTTTTTTTTTTTTTT....!!!.....T..#####
-~~~|||........!!!&&&&..1TT........TTTTTTTTTTTT................T..#####
-~~||||...TT...!!!&&&...TTT...................................TT...-###
-~~||||..TTTTT.!!!&&&.........................................TTT..-###
-~~||||.TTT^^T..!!.........................................T.TTTT..-###
-~~||||TTT^^^T.............vv..............................TTTTTT.--###
-~~|||.TT^^^^C..............vv.............................TTTTTT.-.###
-~~|||.TT^^^^.............Dvvvv..............................TTT..-..##
-~~E||.TT^^3^............vvvvvvvvv............................TT..-...#
-~~|||..T^^^^............vvv**vvvvv...............................-...#
-~~|||..TT^^^.............vv**vvvvv...............................--...
-~~|||.TT.^^-..............vvvvv...................................-...
-~~|||.TT...--............vvvvvvv..................................-...
-~~|||.T.....--...........vv..vv...................................-...
-~~|||.......T--TT........v.................................&&.....-...
-~~~|.......TTT-TTT.......................................&&&&&&...-...
-~~~........TTT-TTT......................................&&&&&&&&.--...
-~~~~.......TT---TT......................................&&&&&&&&--....
-~~~~~..~...TT-T--.......................................&&&&&&&--.....
-~~~~~~~~....--TT-.........................TT...............&&&&-......
-~~~~~~~~~..--TTT-.......................TTTT................&--.......
-~~~~~~~~~~--....-...~~.................TTTT.................--.....!!!
-~~~~~~~~~~-TTT..--~~~~................TTTTT.........~......--....!!!!~
-~~~~~~~~~~TTTTT...~~~.................____T........~~~....2-....!!!!~~
-~~~~~~~~~..TTTTTTT~~~..............~.T_{{__........~~~..----....!!!~~~
-~~~~~~~~...&&TTTTT~~~~.....~~~..~~~~~T_{{{_........~~~~~~.-....!!!~~~~
-~~~~~~~~...&&-..TT~~~~~~~~~~~~~~~~~~~~__{{{.......~~~~~~~.-....!!~~~~~
-~~~~~T~~..&&--....~~~~~~~~~~~~~~~~~~~~~___{{.....~~~~~~~~---..!!~~~~~~
-~~~~~TTTT.&&-5....~~~~~~~~~~~~~~~~~~~~~~T_{{{{~~F~~~~~~~~-.-..!!~~~~~~
-~~~~~TTTT.&&-.....~~~~~~~~~~..~~~~~~~~~~~~..{{~~~~~~~~~~~~.-...~~~~~~~
-~~~~~TTT...----...~~~~~~~~~....~~~~~~~~~~~~~~~~~~~~~~~~~~~~~..~~~~~~~~
-~~~~~~TT...-..----~~~~~~~~.T^^..~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-~~~~~~~~...-.....~~~~~~~~..^^^^.~~~~~~~~~~~~~~~~~~~{{{~~~~~~~~~~~~~~~~
-~~~~~~~~~~--.....~~~~~~~~.^^^^^.~~~~~~~~~~~~~~~~~~{{{~~~~~~~~~~~~~~~~~
-~~~~~~~~~~~~~~~~~~~~~~~~~.^^^^^.~~~~~~~~~~~~~~~~~~~{{{H~~~{{~~~~~~~~~~
-~~~~~~~~~~~~....~~~~~~~~~.T^^^T.~~~~~~~~~~~~~~~~~~~{{{{{{{{{~~~~~~~~~~
-~~~~~~~~~.........~~~~~~~~.TTT..~~~~~~~~~~~~~~~~~~~~{{{{{{{~~~~~~~~~~~
-~~~~~~~~~..........~~~~~~~~T..~~~~~~~~~~~~~~~~~~~~~~~~~{{~~~~~~~.~~~~~
-~~~~~~~~~~.........~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{..~~~~~
-~~~~~~~~~~~~.......~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{{{{~~~~~
-~~~~~~~~~~~~........~~~~~~........~~~~~~~~.......~~~~~~~~~~~~.{{{~~~~~
-~~~~~~~~~~~~.........~~~~.........~~~~...........~~~~~~~~~~~~....~~~~~
-~~~~~~~~~~~~.........~~~.........................~~~~~~~~~~~.....~~~~~
-~~~~~~~~~~~~.....................................~~~~~~~~~~~.....~~~~~
-~~~~~~~~~~~~......................................~~~~~~~~~.......~~~~
-~~~~~~~~~~~.......................................~~~~~~~~~.......~~~~
-~~~~~~~~~~~........................................~~~.............~~~
-~~~~~~~............................................................~~~
-~~~~~~..............................................................~~
-~~~~~.................................................................
-~~~~~.................................................................
-~~~~~.................................................................
-~~~~~.................................................................
-~~~~~~................................................................
-~~~~~~~...............................................................
-~~~~~~~~..............................................................
-~~~~~~~~~.............................................................
-~~~~~~~~~.............................................................
-~~~~~~~~..............................................................
-~~~~~~~...............................................................]]
+==========ttt""""""""tttt"""""""""""""""""""""""""""""""""m##############~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+========""tttt""""""""ttt"""""""""""""""""""""""""""""""mmm###############~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+=======""tttt""""""""""""""""""""""""ttttt"""""""mmmmmmmmmm""#############~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~..~~~~~~~~~~~~....~~~~~~~
+=======""ttt"""""""""""""""""""tttttttttttttmm"mmmmmmmmmmmm"""############~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~..........~~~........~~~~~~
+======="""""""...."""""""""""tttttttttttttttmmmmmmTTTT!mmmm""""###########~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~.......................~~~~
+======="""""......"""""...""tttttttttttttttttmmmmTTTTT!!Gm""""""##########~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~......~~~~~~~...........................~
+========"".........""".....tttttttttTTTTTtttttmmTTTTT!!!!!!.."""##########~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~.........~~~~~~..............!!....------.~
+=======........!!!........BTtttttttTT!4!TTTTTTTTTTTTTT!!!!!..."""#########~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~.........~~~~~~............!!!!.----....--~
+===~~~.........!!!....A....TTTtttTTTT!!!TTTTTTTTTTTTT!!!!!!......#########~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~.............~~~~~.......^^^!!!.--.........~
+~~~~~||.......!!!!&&........TTTTTTTTTT!TTTTTTTTTTTTT!!!!!!.......########~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~.............~~......TT^^^^!!^--..........~
+~~~~|||.......!!!&&&&...T........TTTTTTTTTTTTTTTTT....!!!.....T..########~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~....^^............TTT^^^^^^^T...........~
+~~~|||........!!!&&&&..1TT........TTTTTTTTTTTT-!!.............T..########~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~....^^TT...........TTT^^^^^^TT...........~
+~~||||...TT...!!!&&&...TTT...................--!!............TT...-#####~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~...!!^TTTTTT........TTT^^^^^TTTT.........~~
+~~||||..TTTTT.!!!&&&.........................-!!!............TTT..-#####~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~...!!!^TTTTT........TTTT^^^^^TTTT.........~~
+~~||||.TTT^^T..!!............................-!!..........T.TTTT..-#####~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~.....!!!TTTTT.........TTT^^^^^^TTTT........~~~
+~~||||TTT^^^T.............vv................--!!..........TTTTTT.--#####~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~.....!!!...............TTT^^^^^^TTTT........~~~
+~~|||.TT^^^^C..............vv...!!!.........-!!...........TTTTTT.-.#####~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~.....!!!..............TT^^^^^^^^TTTT........~~~
+~~|||.TT^^^^.............Dvvvv.!!!!!.......)))).............TTT..-..####~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~......!!...............T^^^^^^^^^TTTTT......~~~~
+~~E||.TT^^3^............vvvvvvvvv!!!......)))))))............TT..-...###~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~.....................--^^^^^^^^^.TTTTT......~~~~
+~~|||..T^^^^............vvv**vvvvv!!......))))))))...............-...##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~................------..^^.(.^TTTT.TT.......~~~~
+~~|||..TT^^^.............vv**vvvvv!!......))))))))...............--....~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~..............---..........(..TTT..TT........~~~
+~~|||.TT.^^-..............vvvvv!!!!!......))))T)))................-.....~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~.............--............((.T.....T........~~~
+~~|||.TT...--............vvvvvvv!!!........))TTT))................---...~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~.........----TT...........(((..............~~~~
+~~|||.T.....--...........vv..vv!!!..........TTTTT-................-.---.~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~.......--TTTTT...........((((.............~~~~
+~~|||.......T--TT........v.....!!...........TTTTT--........&&.....-...---~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~......--!!TTT...........(((((..............~~~
+~~~|.......TTT-TTT............................T...--.....&&&&&&...-.&&...~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~.....-!!!.TT............((((..............~~~
+~~~........TTT-TTT.................................-....&&&&&&&&.--.&&...~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~....-!!................!!(...........ww..~~~
+~~~~.......TT---TT.................................-....&&&&&&&&--..&&..~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~------!.........~.....!!!-..........wwww~~~~
+~~~~~..~...TT-T--..................................-....&&&&&&&--...&&..~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~......-..........~~....!!!-..........wwww~~~~
+~~~~~~~~....--TT-.........................TT.......-.......&&&&-....&&.~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~......-..........~~~...!!-...........wwww.~~~
+~~~~~~~~~..--TTT-.......................TTTT.......--.......&--.....&&.~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~......--.........~~~...!!-............www..~~
+~~~~~~~~~~--....-...~~.................TTTT.........-.......--.....!!!~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~.......-.........~~~....!-............6ww..~~
+~~~~~~~~~~-TTT..--~~~~................TTTTT.........~......--....!!!!~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~.......-.........~~~....--............www..~~
+~~~~~~~~~~TTTTT...~~~................T____T........~~~....2-....!!!!~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~......-.........~~~...--............wwwww.~~
+~~~~~~~~~..TTTTTTT~~~..............~.T_{{__........~~~..----....!!!~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~....~-........~~~~----.............wwwww.~~
+~~~~~~~~...&&TTTTT~~~~.....~~~..~~~~~T_{{{_........~~~~~~.-....!!!~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~..~~.........~~~~..................www.~~~
+~~~~~~~~...&&-..TT~~~~~~~~~~~~~~~~~~~~__{{{.......~~~~~~~.-....!!~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~.........~~~.......................~~~
+~~~~~T~~..&&--!...~~~~~~~~~~~~~~~~~~~~~___{{.....~~~~~~~~---..!!~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~........~~~~.....^^^................~~
+~~~~~TTTT.&&-5!!..~~~~~~~~~~~~~~~~~~~~~~T_{{{{~~F~~~~~~~~-.-..!!~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~.......~~~~......^^^................~~
+~~~~~TTTT.&&-!!...~~~~~~~~~~..~~~~~~~~~~~~..{{~~~~~~~~~~~~.-...~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~......~~~~||....^^...............^...~
+~~~~~TTT...----...~~~~~~~~~....~~~~~~~~~~~~~~~~~~~~~~~~~~~~~..~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~....~~~~||..............||||....^^..~
+~~~~~~TT...-..----~~~~~~~~.T^^..~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~T!..~~~~~~~..~~~~|||..............|||||...^^.^~
+~~~~~~~~...-...!!~~~~~~~~..^^^^.~~~~~~~~~~~~~~~~~~~{{{~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~.T!!..~~~~~~..~~~||||.............||||||...^^^^~
+~~~~~~~~~~--.!!!!~~~~~~~~.^^^^^.~~~~~~~~~~~~~~~~~~{{{~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~TT!!!.~~~~~.~~~~|||p||...........|||p|||..^^^^^~
+~~~~~~~~~~~~~~~~~~~~~~~~~.^^^^^.~~~~~~~~~~~~~~~~~~~{{{H~~~{{~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~##T.!!.~~~~~~~~~~||||p||||||....|||||||||..^^^^^~
+~~~~~~~~~~~~....~~~~~~~~~.T^^^T.~~~~~~~~~~~~~~~~~~~{{{{{{{{{~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~#TT.!.~~~~~~~~~~||||p|p|||||||||||||||||....^^~~
+~~~~~~~~~.........~~~~~~~~.TTT..~~~~~~~~~~~~~~~~~~~~{{{{{{{~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~###.!.~~~~~~~~~~|||p||||||||||||||||||||....~~~~
+~~~~~~~~~..........~~~~~~~~T..~~~~~~~~~~~~~~~~~~~~~~~~~{{~~~~~~~|~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~##~~~~~~~~~~~~~||p||||||p|||||||||||||....~~~~
+~~~~~~~~~~.........~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{||~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~||pp||p|||||pp||||||p|||||....~~
+~~~~~~~~~~~~..||...~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{{{{~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~|||||||||||||||||||||||||||....~~
+~~~~~~~~~~~~||||||..~~~~~~||||||||~~~~~~~~|||||||~~~~~~~~~~~~|{{{~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~||||||||||||||qq||||p||||||||||||||~~
+~~~~~~~~~~~~|||||||||~~~~|||||||||~~~~|||||||||||~~~~~~~~~~~~||||~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~||||||||||||||qqqqq|||||||||||||||||~~
+~~~~~~~~~~~~|||||||||~~~|||||||||||||||||||||||||~~~~~~~~~~~|||||~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~||||||p|||||||qqq||||||||p(((||||||~~~
+~~~~~~~~~~~~|||||||||||||||||||||||||||||||||||||~~~~~~~~~~~|||||~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~||||||||||||qq|||||||||||((((||||~~~~
+~~~~~~~~~~~~||p|p|||||||||||qqqq||||||||||||||||||~~~~~~~~~|||||||~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~|||||||||||qqqqqq|||||||p((p||~~~~~~
+~~~~~~~~~~~||||||||||p||||qqqqqqqq||||||||||||||||~~~~~~~~~|||||||~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~|||p||||||qqqqqq|||||||||||~~~~~~~~
+~~~~~~~~~~~||||||||||pp||qqqqqqqqqq|||||||p||||||||~~~|||||||||||||~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~|||||||||||qqqqqq||||||||||~~~~~~~~
+~~~~~~~||||||||||p||||p||qqqqqqqqqqq|pp|||p||||||||||||||||||||||||~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~|||||~~~||||||q||||||||||||||~~~~~~
+~~~~~~|||||||p|||||||pp|qqqqqqqqqqqqq|p|||||||||pp||||||||||||||||||~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~||||||||||||p||p|||||~~~~~
+~~~~~||||||||p||||||||||qqqqqT...qqqqq||||||||||||||||||||||||||||||||~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~||p|||||p||||||||p|~~~~~
+~~~~~|||||||||||||||||||qqqqT.....qqqq|||||||||||||||||||||||||||||||||~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~|||||||||||||||||||~~~~
+~~~~~|||||p|||||||((||||qqqqT.((..Tqqqq|||||||||||||||||||||||||||||||||~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~|||||||||||||~|||||~~~~
+~~~~~||||||||||ppp(((|||qqqqT.(..TTqqqqqqqq|||||||p|||||||||||||||||||||||~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~||||~||||||||~~||||~~~~
+~~~~~~||||||||pppp(((|||qqqqTTT..TTqqqqqqqqq||||||||||||||||||||||||||||||~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~|||~~~~|||||~~~~~~~~~~~
+~~~~~~~|||||||p(p(((||||qqqqqqqTTqqqqqqqqqqqqq|||||||||||||||||||||||||~||~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~||||||p(((((|||||qqqqqqqqqqqqqqqqqqqqqqq|||||||||||||||||||||||~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~|||||pp(((||||p|||qqqqqqqqqqqqqqqqqqqqq|||||||||||||||||||||||~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~||||||||||||||||ppqqqqqqqqqqq|||qqqqqqqq||||||||||||||||||||||~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~||||||p||||pp||||p|||qppp||||pp||||qqqqqq|||||||||||||||||||||~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~|||||||||||||||||||||||||||||||||||||qqqq||||||||||||||||||||||~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~]]
\ No newline at end of file

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