From 1df2275442986f6eef167f0f7488393906097269 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Thu, 28 Oct 2010 08:37:30 +0000
Subject: [PATCH] plop

git-svn-id: http://svn.net-core.org/repos/t-engine4@1649 51575b47-30f0-44d4-a5cc-537603b46e54
---
 game/modules/tome/data/achievements/quests.lua | 18 +++++++++---------
 game/modules/tome/data/birth/races/hobbit.lua  |  2 +-
 game/modules/tome/data/birth/races/undead.lua  |  2 +-
 game/modules/tome/data/birth/worlds.lua        |  8 +++-----
 .../data/maps/towns/{bree.lua => derth.lua}    |  0
 .../towns/{minas-tirith.lua => last-hope.lua}  |  0
 ...mon-sul-last.lua => ruins-kor-pul-last.lua} |  0
 7 files changed, 14 insertions(+), 16 deletions(-)
 rename game/modules/tome/data/maps/towns/{bree.lua => derth.lua} (100%)
 rename game/modules/tome/data/maps/towns/{minas-tirith.lua => last-hope.lua} (100%)
 rename game/modules/tome/data/maps/zones/{tower-amon-sul-last.lua => ruins-kor-pul-last.lua} (100%)

diff --git a/game/modules/tome/data/achievements/quests.lua b/game/modules/tome/data/achievements/quests.lua
index 565e7a47b5..b71d7fd209 100644
--- a/game/modules/tome/data/achievements/quests.lua
+++ b/game/modules/tome/data/achievements/quests.lua
@@ -35,7 +35,7 @@ newAchievement{
 }
 newAchievement{
 	name = "A dangerous secret",
-	desc = [[Found the mysterious staff and told Minas Tirith about it.]],
+	desc = [[Found the mysterious staff and told Last Hope about it.]],
 }
 newAchievement{
 	name = "The secret city",
@@ -51,7 +51,7 @@ newAchievement{
 }
 newAchievement{
 	name = "Race through fire", id = "MOUNT_DOOM_SUCCESS",
-	desc = [[Raced through the fires of Mount Doom to stop the Blue Wizards.]],
+	desc = [[Raced through the fires of the Charred Scar to stop the Sorcerers.]],
 }
 newAchievement{
 	name = "Arachnophobia", id = "SPYDRIC_INFESTATION",
@@ -77,23 +77,23 @@ newAchievement{
 }
 newAchievement{
 	name = "Tactical master", id = "ISTARI_NO_PORTAL",
-	desc = [[Fought the two Istari without closing any invocation portals.]],
+	desc = [[Fought the two Sorcerers without closing any invocation portals.]],
 }
 newAchievement{
 	name = "Portal destroyer", id = "ISTARI_ONE_PORTAL",
-	desc = [[Fought the two Istari and closed one invocation portal.]],
+	desc = [[Fought the two Sorcerers and closed one invocation portal.]],
 }
 newAchievement{
 	name = "Portal reaver", id = "ISTARI_TWO_PORTAL",
-	desc = [[Fought the two Istari and closed two invocation portals.]],
+	desc = [[Fought the two Sorcerers and closed two invocation portals.]],
 }
 newAchievement{
 	name = "Portal ender", id = "ISTARI_THREE_PORTAL",
-	desc = [[Fought the two Istari and closed three invocation portals.]],
+	desc = [[Fought the two Sorcerers and closed three invocation portals.]],
 }
 newAchievement{
 	name = "Portal master", id = "ISTARI_FOUR_PORTAL",
-	desc = [[Fought the two Istari and closed four invocation portals.]],
+	desc = [[Fought the two Sorcerers and closed four invocation portals.]],
 }
 
 -------------- Other quests
@@ -127,9 +127,9 @@ newAchievement{
 }
 newAchievement{
 	name = "There and back again", id = "WEST_PORTAL",
-	desc = [[Opened a portal to Middle-earth from the Far East.]],
+	desc = [[Opened a portal to Maj'Eyal from the Far East.]],
 }
 newAchievement{
 	name = "Back and there again", id = "EAST_PORTAL",
-	desc = [[Opened a portal to the Far East from Middle-earth.]],
+	desc = [[Opened a portal to the Far East from Maj'Eyal.]],
 }
diff --git a/game/modules/tome/data/birth/races/hobbit.lua b/game/modules/tome/data/birth/races/hobbit.lua
index 4aa64ec9cc..b101927ece 100644
--- a/game/modules/tome/data/birth/races/hobbit.lua
+++ b/game/modules/tome/data/birth/races/hobbit.lua
@@ -58,7 +58,7 @@ newBirthDescriptor{
 newBirthDescriptor
 {
 	type = "subrace",
-	name = "Hobbit",
+	name = "Halfling",
 	desc = {
 		"Halflings, are a race of very short stature, rarely exceeding four feet in height.",
 		"Most of them are happy to live a quiet life of farming and gardening, yet they are not to be taken lightly.",
diff --git a/game/modules/tome/data/birth/races/undead.lua b/game/modules/tome/data/birth/races/undead.lua
index afecb700e4..f0be484477 100644
--- a/game/modules/tome/data/birth/races/undead.lua
+++ b/game/modules/tome/data/birth/races/undead.lua
@@ -50,7 +50,7 @@ newBirthDescriptor{
 		-- Force undead faction to undead
 		resolvers.genericlast(function(e) e.faction = "undead" end),
 		default_wilderness = {37, 33},
-		starting_zone = "paths-of-the-dead",
+		starting_zone = "blighted-ruins",
 		starting_level = 8, starting_level_force_down = true,
 		starting_quest = "start-undead",
 		undead = 1,
diff --git a/game/modules/tome/data/birth/worlds.lua b/game/modules/tome/data/birth/worlds.lua
index 1153cc3435..07d8d50eb8 100644
--- a/game/modules/tome/data/birth/worlds.lua
+++ b/game/modules/tome/data/birth/worlds.lua
@@ -57,11 +57,11 @@ newBirthDescriptor{
 -- Player worlds/campaigns
 newBirthDescriptor{
 	type = "world",
-	name = "Arda",
+	name = "Maj'Eyal",
 	display_name = "",
 	desc =
 	{
-		"The people of Maj'Eyal: Humans, halflings, Elves and Dwarves.",
+		"The people of Maj'Eyal: Humans, Halflings, Elves and Dwarves.",
 		"The West has been at relative peace for over one hundred year and people are prospering again.",
 		"You are an adventurer, setting out to find lost treasure and glory.",
 		"But what lurks in the shadow of the world?",
@@ -74,9 +74,7 @@ newBirthDescriptor{
 			Human = "allow",
 			Elf = "allow",
 			Dwarf = "allow",
-			Hobbit = "allow",
-			Orc = function() return profile.mod.allow_build.orc and "allow" or "disallow" end,
-			Troll = function() return profile.mod.allow_build.troll and "allow" or "disallow" end,
+			Halfling = "allow",
 			Undead = function() return profile.mod.allow_build.undead and "allow" or "disallow" end,
 		},
 
diff --git a/game/modules/tome/data/maps/towns/bree.lua b/game/modules/tome/data/maps/towns/derth.lua
similarity index 100%
rename from game/modules/tome/data/maps/towns/bree.lua
rename to game/modules/tome/data/maps/towns/derth.lua
diff --git a/game/modules/tome/data/maps/towns/minas-tirith.lua b/game/modules/tome/data/maps/towns/last-hope.lua
similarity index 100%
rename from game/modules/tome/data/maps/towns/minas-tirith.lua
rename to game/modules/tome/data/maps/towns/last-hope.lua
diff --git a/game/modules/tome/data/maps/zones/tower-amon-sul-last.lua b/game/modules/tome/data/maps/zones/ruins-kor-pul-last.lua
similarity index 100%
rename from game/modules/tome/data/maps/zones/tower-amon-sul-last.lua
rename to game/modules/tome/data/maps/zones/ruins-kor-pul-last.lua
-- 
GitLab