begin switching to Maj'Eyal

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

game/engines/default/engine/version.lua

@@ -18,7 +18,7 @@
 -- darkgod@te4.org
 
 -- Engine Version
-engine.version = {0,9,13,"te4",5}
+engine.version = {0,9,14,"te4",5}
 engine.require_c_core = engine.version[5]
 engine.version_id = ("%s-%d_%d.%d.%d"):format(engine.version[4], engine.require_c_core, engine.version[1], engine.version[2], engine.version[3])
 

game/engines/default/modules/boot/init.lua

@@ -23,8 +23,8 @@ short_name = "boot"
 author = { "DarkGod", "darkgod@te4.org" }
 homepage = "http://te4.org/"
 is_boot = true
-version = {0,9,13}
-engine = {0,9,13,"te4"}
+version = {0,9,14}
+engine = {0,9,14,"te4"}
 description = [[
 Bootmenu!
 ]]

game/modules/angband/init.lua

@@ -23,7 +23,7 @@ short_name = "angband"
 author = { "DarkGod", "darkgod@te4.org" }
 homepage = "http://te4.org/modules:angband"
 version = {1,0,0}
-engine = {0,9,13,"te4"}
+engine = {0,9,14,"te4"}
 description = [[
 This is a port of Angband to T-Engine4.
 ]]

game/modules/example/init.lua

@@ -23,7 +23,7 @@ short_name = "example"
 author = { "DarkGod", "darkgod@te4.org" }
 homepage = "http://te4.org/modules:example"
 version = {1,0,0}
-engine = {0,9,13,"te4"}
+engine = {0,9,14,"te4"}
 description = [[
 This is *NOT* a game, just an example/template to make your own using the T-Engine4.
 ]]

game/modules/example_realtime/init.lua

@@ -23,7 +23,7 @@ short_name = "example_realtime"
 author = { "DarkGod", "darkgod@te4.org" }
 homepage = "http://te4.org/modules:example"
 version = {1,0,0}
-engine = {0,9,13,"te4"}
+engine = {0,9,14,"te4"}
 description = [[
 This is *NOT* a game, just an example/template to make your own using the T-Engine4.
 ]]

game/modules/tome/class/Game.lua

@@ -86,7 +86,7 @@ function _M:run()
 	self.player_display = PlayerDisplay.new(0, 220, 200, self.h * 0.8 - 220, {30,30,0})
 	self.hotkeys_display = HotkeysDisplay.new(nil, self.w * 0.5, self.h * 0.8, self.w * 0.5, self.h * 0.2, "/data/gfx/ui/talents-list.png")
 	self.npcs_display = ActorsSeenDisplay.new(nil, self.w * 0.5, self.h * 0.8, self.w * 0.5, self.h * 0.2, "/data/gfx/ui/talents-list.png")
-	self.calendar = Calendar.new("/data/calendar_rivendell.lua", "Today is the %s %s of the %s year of the Fourth Age of Middle-earth.\nThe time is %02d:%02d.", 122)
+	self.calendar = Calendar.new("/data/calendar_rivendell.lua", "Today is the %s %s of the %s year of the Age of Ascendancy of Maj'Eyal.\nThe time is %02d:%02d.", 122)
 	self.tooltip = Tooltip.new(nil, nil, {255,255,255}, {30,30,30})
 	self.flyers = FlyingText.new()
 	self:setFlyingText(self.flyers)
@@ -98,7 +98,7 @@ function _M:run()
 	self.logSeen = function(e, style, ...) if e and self.level.map.seens(e.x, e.y) then self.log(style, ...) end end
 	self.logPlayer = function(e, style, ...) if e == self.player then self.log(style, ...) end end
 
-	self.log(self.flash.GOOD, "Welcome to #00FF00#Tales of Middle Earth!")
+	self.log(self.flash.GOOD, "Welcome to #00FF00#Tales of Maj'Eyal!")
 
 	-- Setup inputs
 	self:setupCommands()

game/modules/tome/data/birth/descriptors.lua

@@ -51,6 +51,8 @@ newBirthDescriptor{
 		{
 			-- Nobdoy can be a sun paladin but humans & elves
 			['Sun Paladin'] = "disallow",
+			-- Nobdoy can be a sun paladin but elves
+			['Anorithil'] = "disallow",
 		},
 	},
 	talents = {},

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

@@ -24,8 +24,8 @@ newBirthDescriptor{
 	type = "race",
 	name = "Dwarf",
 	desc = {
-		"The children of Aule, a strong but small race.",
-		"Miners and fighters of legend.",
+		"Dwarves are a secretive people, hailing from their underground homes of the Iron Throne",
+		"They are a sturdy race and are known for their masterwork, yet they are not well loved, having left other races to fend for themselves in past conflicts.",
 		"Female dwarves remain a mystery and as such may not be played."
 	},
 	descriptor_choices =
@@ -42,14 +42,14 @@ newBirthDescriptor{
 		},
 	},
 	copy = {
-		faction = "lonely-mountain",
+		faction = "iron-throne",
 		type = "humanoid", subtype="dwarf",
-		default_wilderness = {43, 18},
+		default_wilderness = {26, 7},
 		starting_zone = "trollshaws",
-		starting_quest = "start-dunadan",
+		starting_quest = "start-allied",
 		starting_intro = "dwarf",
 	},
-	random_escort_possibilities = { {"trollshaws", 2, 5}, {"tower-amon-sul", 1, 4}, {"carn-dum", 1, 7}, {"old-forest", 1, 7}, {"tol-falas", 1, 8}, {"moria", 1, 1}, {"eruan", 1, 3}, },
+	random_escort_possibilities = { {"trollshaws", 2, 5}, {"ruins-kor-pul", 1, 4}, {"daikara", 1, 7}, {"old-forest", 1, 7}, {"tol-falas", 1, 8}, {"iron-throne", 1, 1}, {"eruan", 1, 3}, },
 }
 
 ---------------------------------------------------------
@@ -60,8 +60,9 @@ newBirthDescriptor
 	type = "subrace",
 	name = "Dwarf",
 	desc = {
-		"The children of Aule, a strong but small race.",
-		"Miners and fighters of legend.",
+		"Dwarves are a secretive people, hailing from their underground homes of the Iron Throne",
+		"They are a sturdy race and are known for their masterwork, yet they are not well loved, having left other races to fend for themselves in past conflicts.",
+		"Female dwarves remain a mystery and as such may not be played.",
 		"They possess the #GOLD#Resilience of the Dwarves#WHITE# which allows them to increase their armour, physical and spell saves for a few turns.",
 		"#GOLD#Stats modifiers:",
 		"#LIGHT_BLUE# * +4 Strength, -2 Dexterity, +3 Constitution",

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

@@ -24,35 +24,31 @@ newBirthDescriptor{
 	type = "race",
 	name = "Elf",
 	desc = {
-		"Quendi are Elves, the first children of Eru.",
-		"The first Elves awoke by Cuiviénen, the Water of Awakening in the far east of Middle-earth, long Ages before the Rising of the Sun or Moon.",
-		"Unlike Men, the Elves are not subject to death by old age.",
+		"The Second race to have awaken, thousands of years after the Sher'Tul.",
+		"Elves are split into three subrace, of which only two remain in the current age.",
+		"They are tolerated by most races but not usualy well liked, due to their role in the Spellblaze.",
+		"Unlike other races elves are not subject to death by old age.",
 	},
 	descriptor_choices =
 	{
 		subrace =
 		{
-			Nandor = "allow",
-			Noldor = "allow",
+			Shalore = "allow",
+			Thalore = "allow",
 			__ALL__ = "disallow",
 		},
 		subclass =
 		{
-			['Sun Paladin'] = "allow",
+			['Anorithil'] = "allow",
 		},
 	},
-	talents = {
---		[ActorTalents.T_IMPROVED_MANA_I]=1,
-	},
 	copy = {
-		faction = "eryn-lasgalen",
 		type = "humanoid", subtype="elf",
-		default_wilderness = {43, 18},
+		default_wilderness = {26, 7},
 		starting_zone = "trollshaws",
-		starting_quest = "start-dunadan",
-		starting_intro = "elf",
+		starting_quest = "start-allied",
 	},
-	random_escort_possibilities = { {"trollshaws", 2, 5}, {"tower-amon-sul", 1, 4}, {"carn-dum", 1, 7}, {"old-forest", 1, 7}, {"tol-falas", 1, 8}, {"moria", 1, 1}, {"eruan", 1, 3}, },
+	random_escort_possibilities = { {"trollshaws", 2, 5}, {"ruins-kor-pul", 1, 4}, {"daikara", 1, 7}, {"old-forest", 1, 7}, {"tol-falas", 1, 8}, {"iron-throne", 1, 1}, {"eruan", 1, 3}, },
 }
 
 ---------------------------------------------------------
@@ -61,11 +57,11 @@ newBirthDescriptor{
 newBirthDescriptor
 {
 	type = "subrace",
-	name = "Nandor",
+	name = "Shalore",
 	desc = {
-		"Elves who turned aside from the Great Journey in the early days and settled in th east of the Misty Mountains.",
-		"Both the Wood-Elves of Mirkwood and the Elves of Lórien are Nandor.",
-		"They posses the #GOLD#Grace of the Eldar#WHITE# talent which allows them a boost of speed every once in a while.",
+		"Shaloren elves have close ties with the magic of the world, they produced in the past many great mages.",
+		"Yet they remain quiet and try to prevent the teaching of magic to their people, for fear of an otehr Spellblaze.",
+		"They posses the #GOLD#Grace of the Eternals#WHITE# talent which allows them a boost of speed every once in a while.",
 		"#GOLD#Stats modifiers:",
 		"#LIGHT_BLUE# * -2 Strength, +1 Dexterity, +0 Constitution",
 		"#LIGHT_BLUE# * +2 Magic, +3 Willpower, +1 Cunning",
@@ -74,8 +70,10 @@ newBirthDescriptor
 	},
 	stats = { str=-2, mag=2, wil=3, cun=1, dex=1, con=0 },
 	experience = 1.3,
-	talents = { [ActorTalents.T_NANDOR_SPEED]=1 },
+	talents = { [ActorTalents.T_SHALOREN_SPEED]=1 },
 	copy = {
+		faction = "shalore",
+		starting_intro = "shalore",
 		life_rating = 9,
 	},
 	experience = 1.35,
@@ -84,11 +82,12 @@ newBirthDescriptor
 newBirthDescriptor
 {
 	type = "subrace",
-	name = "Noldor",
+	name = "Thalore",
 	desc = {
-		"The Noldor were the High Elves most enamoured of knowledge and the making of things. After the theft of the Silmarils, many Noldor forsook the blessed land and returned to Middle Earth, but for their sins en-route they were placed under the Doom of the Valar. After the Doom was lifted, most of the Noldor sailed west, but a few still remain in Middle Earth.",
-		"They are implacable foes of the servants of Morgoth, wherever they may be found.",
-		"They possess the #GOLD#Wrath of the Eldar#WHITE# talent, which allows them a boost to the damage both inflicted and resisted once in a while.",
+		"Thaloren elves have spend most of the ages hidden within their forests, seldom leaving them.",
+		"The ages of the world passed by and yet they remained unchanged.",
+		"Their natural affinity for nature and their reclusion have made them great protectors of the natural order, often opposing their Shaloren brothers.",
+		"They possess the #GOLD#Wrath of the Eternals#WHITE# talent, which allows them a boost to the damage both inflicted and resisted once in a while.",
 		"#GOLD#Stats modifiers:",
 		"#LIGHT_BLUE# * +2 Strength, +3 Dexterity, +1 Constitution",
 		"#LIGHT_BLUE# * -2 Magic, +1 Willpower, +0 Cunning",
@@ -97,8 +96,10 @@ newBirthDescriptor
 	},
 	stats = { str=2, mag=-2, wil=1, cun=0, dex=3, con=1 },
 	experience = 1.3,
-	talents = { [ActorTalents.T_NOLDOR_WRATH]=1 },
+	talents = { [ActorTalents.T_THALOREN_WRATH]=1 },
 	copy = {
+		faction = "thalore",
+		starting_intro = "thalore",
 		life_rating = 11,
 	},
 	experience = 1.35,

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

@@ -18,22 +18,23 @@
 -- darkgod@te4.org
 
 ---------------------------------------------------------
---                       Hobbits                       --
+--                      Halflings                      --
 ---------------------------------------------------------
 newBirthDescriptor{
 	type = "race",
-	name = "Hobbit",
+	name = "Halfling",
 	desc = {
-		"Hobbits, or 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, but a few have an adventurous heart.",
-		"Hobbits are agile, lucky, and resilient but lacking in strength.",
+		"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.",
+		"Halfling armies have brought many kingdoms to their knees and they kept a balance of power with the human kingdoms during the Age of Allure.",
+		"Halflings are agile, lucky, and resilient but lacking in strength.",
 	},
 	descriptor_choices =
 	{
 		subrace =
 		{
 			__ALL__ = "disallow",
-			Hobbit = "allow",
+			Halfling = "allow",
 		},
 		class =
 		{
@@ -42,26 +43,26 @@ newBirthDescriptor{
 	},
 	copy = {
 		faction = "shire",
-		type = "humanoid", subtype="hobbit",
-		default_wilderness = {43, 18},
+		type = "humanoid", subtype="halfling",
+		default_wilderness = {26, 7},
 		starting_zone = "trollshaws",
-		starting_quest = "start-dunadan",
-		starting_intro = "hobbit",
+		starting_quest = "start-allied",
+		starting_intro = "halfling",
 	},
-	random_escort_possibilities = { {"trollshaws", 2, 5}, {"tower-amon-sul", 1, 4}, {"carn-dum", 1, 7}, {"old-forest", 1, 7}, {"tol-falas", 1, 8}, {"moria", 1, 1}, {"eruan", 1, 3}, },
+	random_escort_possibilities = { {"trollshaws", 2, 5}, {"ruins-kor-pul", 1, 4}, {"daikara", 1, 7}, {"old-forest", 1, 7}, {"tol-falas", 1, 8}, {"iron-throne", 1, 1}, {"eruan", 1, 3}, },
 }
 
 ---------------------------------------------------------
---                       Hobbits                       --
+--                      Halflings                      --
 ---------------------------------------------------------
 newBirthDescriptor
 {
 	type = "subrace",
 	name = "Hobbit",
 	desc = {
-		"Hobbits, or 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, but a few have an adventurous heart.",
-		"Hobbits are agile, lucky, and resilient but lacking in strength.",
+		"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.",
+		"Halfling armies have brought many kingdoms to their knees and they kept a balance of power with the human kingdoms during the Age of Allure.",
 		"They possess the #GOLD#Luck of the Little Folk#WHITE# which allows them to increase their critical strike chance for a few turns.",
 		"#GOLD#Stats modifiers:",
 		"#LIGHT_BLUE# * -3 Strength, +3 Dexterity, +1 Constitution",
@@ -73,7 +74,7 @@ newBirthDescriptor
 	stats = { str=-3, dex=3, con=1, cun=3, lck=5, },
 	experience = 1.20,
 	talents = {
-		[ActorTalents.T_HOBBIT_LUCK]=1,
+		[ActorTalents.T_HALFLING_LUCK]=1,
 	},
 	copy = {
 		life_rating = 12,

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

@@ -24,29 +24,28 @@ newBirthDescriptor{
 	type = "race",
 	name = "Human",
 	desc = {
-		"The Edain, humans, are one of the youngest of the races of Arda.",
+		"The humans ",
 	},
 	descriptor_choices =
 	{
 		subrace =
 		{
-			["Bree-man"] = "allow",
-			["Dúnadan"] = "allow",
-			Rohirrim = "allow",
-			Beorning = "allow",
+			["Cornac"] = "allow",
+			["Higher"] = "allow",
 			__ALL__ = "disallow",
 		},
 		subclass =
 		{
 			['Sun Paladin'] = "allow",
+			['Anorithil'] = "allow",
 		},
 	},
 	talents = {},
 	copy = {
-		faction = "reunited-kingdom",
+		faction = "allied-kingdoms",
 		type = "humanoid", subtype="human",
 	},
-	random_escort_possibilities = { {"trollshaws", 2, 5}, {"tower-amon-sul", 1, 4}, {"carn-dum", 1, 7}, {"old-forest", 1, 7}, {"tol-falas", 1, 8}, {"moria", 1, 1}, {"eruan", 1, 3}, },
+	random_escort_possibilities = { {"trollshaws", 2, 5}, {"ruins-kor-pul", 1, 4}, {"daikara", 1, 7}, {"old-forest", 1, 7}, {"tol-falas", 1, 8}, {"iron-throne", 1, 1}, {"eruan", 1, 3}, },
 }
 
 ---------------------------------------------------------
@@ -55,36 +54,37 @@ newBirthDescriptor{
 newBirthDescriptor
 {
 	type = "subrace",
-	name = "Dúnadan",
+	name = "Higher",
 	desc = {
-		"The greatest of the Edain, humans in all respects but stronger, smarter, and wiser.",
+		"Highers are a special branch of humans that have been imbued with latent magic since the Age of Allure.",
+		"They usualy do not breed with other humans, trying to keep their blood 'pure'.",
 		"They possess the #GOLD#Gift of Kings#WHITE# which allows them to regenerate their wounds once in a while.",
 		"#GOLD#Stats modifiers:",
 		"#LIGHT_BLUE# * +1 Strength, +1 Dexterity, +0 Constitution",
-		"#LIGHT_BLUE# * +0 Magic, +1 Willpower, +1 Cunning",
+		"#LIGHT_BLUE# * +1 Magic, +1 Willpower, +0 Cunning",
 		"#GOLD#Life per levels:#LIGHT_BLUE# 11",
 		"#GOLD#Experience penality:#LIGHT_BLUE# 15%",
 	},
-	stats = { str=1, cun=1, dex=1, wil=1 },
+	stats = { str=1, mag=1, dex=1, wil=1 },
 	experience = 1.15,
 	talents = {
-		[ActorTalents.T_DUNADAN_HEAL]=1,
+		[ActorTalents.T_HIGHER_HEAL]=1,
 	},
 	copy = {
 		lite_rating = 11,
-		default_wilderness = {43, 18},
+		default_wilderness = {26, 7},
 		starting_zone = "trollshaws",
-		starting_quest = "start-dunadan",
-		starting_intro = "dunadan",
+		starting_quest = "start-allied",
+		starting_intro = "higher",
 	},
 }
 
 newBirthDescriptor
 {
 	type = "subrace",
-	name = "Bree-man",
+	name = "Cornac",
 	desc = {
-		"Humans hailing from the northen town of Bree. A common kind of man, unremarkable in all respects.",
+		"Cornacians are average humans from the northern parts of the Allied Kingdoms.",
 		"Humans are an inherently very adaptable race and as such they gain a #GOLD#talent category point#WHITE# at birth(others only gain one at level 10, 20 and 30).",
 		"#GOLD#Stats modifiers:",
 		"#LIGHT_BLUE# * +0 Strength, +0 Dexterity, +0 Constitution",
@@ -95,44 +95,9 @@ newBirthDescriptor
 	experience = 1.0,
 	copy = {
 		unused_talents_types = 1,
-		default_wilderness = {43, 18},
+		default_wilderness = {26, 7},
 		starting_zone = "trollshaws",
-		starting_quest = "start-dunadan",
-		starting_intro = "bree-man",
+		starting_quest = "start-allied",
+		starting_intro = "cornac",
 	},
 }
-
-
---[[
-newBirthDescriptor
-{
-	type = "subrace"
-	name = "Rohirrim"
-	desc = {
-		"Humans from the land of Rohan, who ride the great Mearas.",
-	}
-	stats = { [A_STR]=1, [A_INT]=1, [A_WIS]=0, [A_DEX]=3, [A_CON]=1, [A_CHR]=2, }
-	experience = 70
-	levels =
-	{
-		[ 1] = { SPEED=3 }
-	}
-	skills =
-	{
-		["Weaponmastery"]   = { mods.add(0)   , mods.add(200)  }
-		["Riding"]          = { mods.add(5000), mods.add(600)  }
-	}
-}
-newBirthDescriptor
-{
-	type = "subrace",
-	name = "Beorning",
-	desc = {
-		"A race of shapeshifter men.",
-		"They have the unique power of being able to polymorph into bear form.",
-	},
-	stats = { str=2, con=2, dex=-1, cun=-3, },
-	experience = 1.8,
-	talents = {},
-}
-]]

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

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

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

@@ -49,13 +49,13 @@ newBirthDescriptor{
 		},
 		-- Force undead faction to undead
 		resolvers.genericlast(function(e) e.faction = "undead" end),
-		default_wilderness = {34, 49},
+		default_wilderness = {37, 33},
 		starting_zone = "paths-of-the-dead",
 		starting_level = 8, starting_level_force_down = true,
 		starting_quest = "start-undead",
 		undead = 1,
 	},
-	random_escort_possibilities = { {"trollshaws", 2, 5}, {"tower-amon-sul", 1, 4}, {"carn-dum", 1, 7}, {"old-forest", 1, 7}, {"tol-falas", 1, 8}, {"moria", 1, 1}, {"eruan", 1, 3}, },
+	random_escort_possibilities = { {"trollshaws", 2, 5}, {"ruins-kor-pul", 1, 4}, {"daikara", 1, 7}, {"old-forest", 1, 7}, {"tol-falas", 1, 8}, {"iron-throne", 1, 1}, {"eruan", 1, 3}, },
 }
 
 newBirthDescriptor
@@ -141,7 +141,6 @@ newBirthDescriptor
 	},
 	copy = {
 		type = "undead", subtype="skeleton",
-		default_wilderness = {43, 18},
 		starting_intro = "skeleton",
 		life_rating=12,
 		poison_immune = 1,

game/modules/tome/data/birth/worlds.lua

@@ -58,17 +58,10 @@ newBirthDescriptor{
 newBirthDescriptor{
 	type = "world",
 	name = "Arda",
-	display_name = "Free People: The Fourth Age",
+	display_name = "",
 	desc =
 	{
---[[
-		"Arda, the World.",
-		"It was shaped into being ages ago by the Music of the Ainur.",
-		"It is home of elves, men, dwarves and hobbits, but also evil orcs, trolls and dragons.",
-		"Since the downfall of Sauron, the lands have known relative peace.",
-		"Until recently it was the only world known to exist.",
-]]
-		"The Free People of Middle-earth: Humans, Hobbits, 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?",

game/modules/tome/data/factions.lua

@@ -19,17 +19,17 @@
 
 -- CSV export
 local src = [[
-,Enemies,Undead,Reunited Kingdom,Shire,Lonely Mountain,Eryn Lasgalen,Angolwen,Tol Falas,,Silmaril Guardians|H,Water lair|H,Assassin lair|H,,Sunwall|H,Orc Pride,,Sandworm Burrowers,,Blue Wizards
+,Enemies,Undead,Allied Kingdoms,Shalore,Thalore,Iron Throne,Angolwen,Tol Falas,,Guardians of the Tide|H,Water lair|H,Assassin lair|H,,Sunwall|H,Orc Pride,,Sandworm Burrowers,,Sorcerers
 Enemies,,,,,,,,,,,,,,,,,,,
 Undead,-1,,,,,,,,,,,,,,,,,,
-Reunited Kingdom,-1,-1,,,,,,,,,,,,,,,,,
-Shire,-1,-1,1,,,,,,,,,,,,,,,,
-Lonely Mountain,-1,-1,0.5,1,,,,,,,,,,,,,,,
-Eryn Lasgalen,-1,-1,0.5,1,0.3,,,,,,,,,,,,,,
+Allied Kingdoms,-1,-1,,,,,,,,,,,,,,,,,
+Shalorë,-1,-1,0.5,,,,,,,,,,,,,,,,
+Thalorë,-1,-1,0.7,0.2,,,,,,,,,,,,,,,
+Iron Throne,-1,-1,0.2,0.2,0.2,,,,,,,,,,,,,,
 Angolwen,-1,-1,,,,,,,,,,,,,,,,,
 Tol Falas,,-1,-1,-1,-1,-1,-1,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,
-Silmaril Guardians|H,,,,,,,,,,,,,,,,,,,
+Guardians of the Tide|H,,,,,,,,,,,,,,,,,,,
 Water lair|H,-1,,,,,,,,,-1,,,,,,,,,
 Assassin lair|H,,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,
@@ -38,7 +38,7 @@ Orc Pride,,-1,-1,-1,-1,-1,-1,-1,,,,,,-1,,,,,
 ,,,,,,,,,,,,,,,,,,,
 Sandworm Burrowers,,,,,,,,,,,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,
-Blue Wizards,,-1,-1,-1,-1,-1,-1,-1,,,,,,-1,1,,,,
+Sorcerers,,-1,-1,-1,-1,-1,-1,-1,,,,,,-1,1,,,,
 ]]
 
 local facts = {}