plop

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

game/modules/tome/class/Game.lua

@@ -600,8 +600,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-arda-fareast")
-				self.memory_levels["wilderness-arda-fareast-1"] = self.level
+				self:changeLevel(1, "wilderness-fareast")
+				self.memory_levels["wilderness-fareast-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/descriptors.lua

@@ -38,7 +38,7 @@ newBirthDescriptor{
 		world =
 		{
 			Tutorial = "disallow",
-			Arda = "allow",
+			["Maj'Eyal"] = "allow",
 			Ents = "disallow",
 			Spydre = "disallow",
 			Orcs = "disallow",

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

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

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-arda-fareast"},
+		default_wilderness = {26, 7, "wilderness-fareast"},
 		starting_zone = "trollshaws",
 		starting_quest = "start-dunadan",
 		starting_intro = "dwarf",

game/modules/tome/data/general/encounters/maj-eyal.lua

@@ -218,7 +218,7 @@ newEntity{
 
 		local g = mod.class.NPC.new{
 			name="Merwionna, Elven camp leader",
-			type="humanoid", subtype="elf", faction="eryn-lasgalen",
+			type="humanoid", subtype="elf", faction="shaloren",
 			display='@', color=colors.LIGHT_BLUE,
 			can_talk = "ringil-exchange",
 		}

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

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

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-arda-fareast"}, {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('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/arda-fareast.lua

@@ -17,7 +17,7 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
--- The far east on Arda
+-- The Far East
 
 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('=', {always_remember = true, show_tooltip=true, name='the great sea', display='~', color=colors.DARK_BLUE, back_color=colors.BLUE, image="terrain/river.png", block_move=true, can_encounter="water", shader = "water", textures = { function() return _3DNoise, true end }, })

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-arda-fareast",
+			change_zone = "wilderness-fareast",
 			change_wilderness = {
 				x = 65, y = 35,
 			},

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-arda-fareast-1"].map(66, 35, engine.Map.TERRAIN)
+	local wild = game.memory_levels["wilderness-fareast-1"].map(66, 35, 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-arda-fareast-1"], g, "terrain", 48, 53)
+	game.zone:addEntity(game.memory_levels["wilderness-fareast-1"], g, "terrain", 48, 53)
 
 	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-arda-fareast-1"]
+	local wild = game.memory_levels["wilderness-fareast-1"]
 	wild.map:removeParticleEmitter(wild.data.istari_shield)
 
 	local g = game.zone:makeEntityByName(game.level, "terrain", "PEAK_STAIR")

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

@@ -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-arda-fareast-1"], g, "terrain", 38, 49)
+	game.zone:addEntity(game.memory_levels["wilderness-fareast-1"], g, "terrain", 38, 49)
 
 	-- 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-arda-fareast-1"], g, "terrain", 63, 14)
+	game.zone:addEntity(game.memory_levels["wilderness-fareast-1"], g, "terrain", 63, 14)
 
 	-- 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-arda-fareast-1"], g, "terrain", 43, 53)
+	game.zone:addEntity(game.memory_levels["wilderness-fareast-1"], g, "terrain", 43, 53)
 
 	-- 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-arda-fareast-1"], g, "terrain", 50, 21)
+	game.zone:addEntity(game.memory_levels["wilderness-fareast-1"], g, "terrain", 50, 21)
 
 	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-arda-fareast-1"], g, "terrain", 56, 51)
+	game.zone:addEntity(game.memory_levels["wilderness-fareast-1"], g, "terrain", 56, 51)
 	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-arda-fareast-1"], g, "terrain", 66, 32)
+	game.zone:addEntity(game.memory_levels["wilderness-fareast-1"], g, "terrain", 66, 32)
 	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-arda-fareast-1"], g, "terrain", 62, 14)
+	game.zone:addEntity(game.memory_levels["wilderness-fareast-1"], g, "terrain", 62, 14)
 
 	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-arda-fareast-1"], g, "terrain", 67, 49)
+	game.zone:addEntity(game.memory_levels["wilderness-fareast-1"], g, "terrain", 67, 49)
 
 	game.logPlayer(game.player, "Zemekkys points the location of Briagh lair on your map.")
 end

game/modules/tome/data/texts/intro-orc.lua

@@ -19,8 +19,7 @@
 
 return [[Welcome #LIGHT_GREEN#@name@#WHITE#.
 You are a member of the feared race of the Orcs.
-For ages your kind has served Morgoth and his lieutenant Sauron, but they have all been vanquished by the free people.
-Now as come the time for your revenge, a new power is rising in the far east of Arda, and you are one of its soldiers!
+BLAH BLAH BLAH
 
 You have been sent to a remote island on the south-west coast of the Far East to crush an outpost of the Sun Wall, the last remaining bastion of men, elves and dwarves on this continent.
 

game/modules/tome/data/texts/unlock-divine_anorithil.lua

@@ -19,7 +19,7 @@
 
 return "New Class: #LIGHT_GREEN#Anorithil (Divine)",
 [[
-In the uttermost east of Arda, on the continent known as the Far East, dwells the last remnants of the free people, fighting the Orc Pride and the many perils of the Far East.
+In the uttermost east, on the continent known only as the Far East, dwells the last remnants of elves and humans, fighting the Orc Pride and the many perils of the Far East.
 
 Anorithil are elven mages who are trained in special magic to manipulate the Sun and Moon powers.
 They have learned to harness the powers of both shadows and light in their battle against the Pride.

game/modules/tome/data/texts/unlock-divine_sun_paladin.lua

@@ -19,7 +19,7 @@
 
 return "New Class: #LIGHT_GREEN#Sun Paladin (Divine)",
 [[
-In the uttermost east of Arda, on the continent known as the Far East, dwells the last remnants of the free people, fighting the Orc Pride and the many perils of the Far East.
+In the uttermost east, on the continent known only as the Far East, dwells the last remnants of elves and humans, fighting the Orc Pride and the many perils of the Far East.
 
 Sun Paladins are humans warriors who are trained in special magic to manipulate the Sun powers.
 Paragons of all that is good they are nonetheless terrible in their battle against the Pride.

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

@@ -55,7 +55,7 @@ newEntity{
 
 	orb_portal = {
 		change_level = 1,
-		change_zone = "wilderness-arda-fareast",
+		change_zone = "wilderness-fareast",
 		change_wilderness = {
 			x = 9, y = 5,
 		},