diff --git a/game/engines/default/engine/version.lua b/game/engines/default/engine/version.lua
index b204e043ffd4bb3dc210025e45aed21470c83370..8d60ffab4d7a1b65c63285dba56a8b68f75513e9 100644
--- a/game/engines/default/engine/version.lua
+++ b/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])
diff --git a/game/engines/default/modules/boot/init.lua b/game/engines/default/modules/boot/init.lua
index 345e248efc8478877700bdc85e8a33e42850b486..fd2701282ff9377c950e13cf03a150965a36b91d 100644
--- a/game/engines/default/modules/boot/init.lua
+++ b/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!
]]
diff --git a/game/modules/angband/init.lua b/game/modules/angband/init.lua
index 02ce10fb1de68a73b4601a9738fbc6cbc134f2da..f08e4c1918f39a3d1e4ff93860f454c730b41c81 100644
--- a/game/modules/angband/init.lua
+++ b/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.
]]
diff --git a/game/modules/example/init.lua b/game/modules/example/init.lua
index e3b983e919c15de3f2d6f3760e3fa7aa98dc6dc6..b479fc3e7bc8d4bb62d10551b97be1c041d45c6c 100644
--- a/game/modules/example/init.lua
+++ b/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.
]]
diff --git a/game/modules/example_realtime/init.lua b/game/modules/example_realtime/init.lua
index 8c0884a4b68d98cc260e3cef3cd4c1601a0ce214..93cad2c25125fd20f0425c2366a56e30a68fadf4 100644
--- a/game/modules/example_realtime/init.lua
+++ b/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.
]]
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index 54eb67d60844536e236a775b56b3aa4dc34ac98a..d586b83eeb85e52bed7d11e254ccad7a76de67af 100644
--- a/game/modules/tome/class/Game.lua
+++ b/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()
diff --git a/game/modules/tome/data/birth/descriptors.lua b/game/modules/tome/data/birth/descriptors.lua
index 497843ef345b2a6e765434aa5e7defa07b08ab53..6adcc59c28413354524f6d16b3f43d9e44049ff9 100644
--- a/game/modules/tome/data/birth/descriptors.lua
+++ b/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 = {},
diff --git a/game/modules/tome/data/birth/races/dwarf.lua b/game/modules/tome/data/birth/races/dwarf.lua
index e02111b6012ab5c3aad8a6a86fc948c02df4ed37..af3725ac3bfaea32d48f605bcc11258d2ebce74a 100644
--- a/game/modules/tome/data/birth/races/dwarf.lua
+++ b/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",
diff --git a/game/modules/tome/data/birth/races/elf.lua b/game/modules/tome/data/birth/races/elf.lua
index c8c0766062c290e3a7b46348f3b1734e4b73681d..d9d7b232e85aed3da116db6e09a0e391837a129f 100644
--- a/game/modules/tome/data/birth/races/elf.lua
+++ b/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,
diff --git a/game/modules/tome/data/birth/races/hobbit.lua b/game/modules/tome/data/birth/races/hobbit.lua
index 788c71dd671395583286f6a60ff5016d6bf1cc2e..4aa64ec9cc4cb29fe4e6bdac8ab2ff8876d61f96 100644
--- a/game/modules/tome/data/birth/races/hobbit.lua
+++ b/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,
diff --git a/game/modules/tome/data/birth/races/human.lua b/game/modules/tome/data/birth/races/human.lua
index feedf47673f445b250ffbe5bd7789ec80f3cec2a..9f1db1c9fed46f2c6fdcd582a8db8e1d4d2e5486 100644
--- a/game/modules/tome/data/birth/races/human.lua
+++ b/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 = {},
-}
-]]
diff --git a/game/modules/tome/data/birth/races/troll.lua b/game/modules/tome/data/birth/races/troll.lua
index afe86eaad35aec3b8ce3614dd61ee8d341addda3..3516b350298ac2252a0c2da8f88118799f810770 100644
--- a/game/modules/tome/data/birth/races/troll.lua
+++ b/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",
diff --git a/game/modules/tome/data/birth/races/undead.lua b/game/modules/tome/data/birth/races/undead.lua
index 14298e021efd0c7970fcdd6e3ed02dac35a75ce5..afecb700e4cb78e69a4de4d352227d8774651e1d 100644
--- a/game/modules/tome/data/birth/races/undead.lua
+++ b/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,
diff --git a/game/modules/tome/data/birth/worlds.lua b/game/modules/tome/data/birth/worlds.lua
index 3455ac8297e4ab817ea16de215d19acc48fb20cf..1153cc343581f371d55c9990476a4fab6fb2e3b5 100644
--- a/game/modules/tome/data/birth/worlds.lua
+++ b/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?",
diff --git a/game/modules/tome/data/factions.lua b/game/modules/tome/data/factions.lua
index ab1d77f9f6df26e7795958dd23bae2a6174dc7c0..78a41c1155b57cba865ffbbea5c3585ba56a0743 100644
--- a/game/modules/tome/data/factions.lua
+++ b/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 = {}
diff --git a/game/modules/tome/data/general/encounters/arda-west.lua b/game/modules/tome/data/general/encounters/maj-eyal.lua
similarity index 100%
rename from game/modules/tome/data/general/encounters/arda-west.lua
rename to game/modules/tome/data/general/encounters/maj-eyal.lua
diff --git a/game/modules/tome/data/gfx/terrain/burnt-tree.png b/game/modules/tome/data/gfx/terrain/burnt-tree.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e8b5a73a620200831c967456c2f37615e89cdee
Binary files /dev/null and b/game/modules/tome/data/gfx/terrain/burnt-tree.png differ
diff --git a/game/modules/tome/data/gfx/terrain/cultivation.png b/game/modules/tome/data/gfx/terrain/cultivation.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1f5860abd8de2ad0df69c446a6f73b5d65e7337
Binary files /dev/null and b/game/modules/tome/data/gfx/terrain/cultivation.png differ
diff --git a/game/modules/tome/data/gfx/terrain/ice-shelf.png b/game/modules/tome/data/gfx/terrain/ice-shelf.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7d68179ed74759ab98ed17afc238e9adeb9abeb
Binary files /dev/null and b/game/modules/tome/data/gfx/terrain/ice-shelf.png differ
diff --git a/game/modules/tome/data/maps/wilderness/arda-west.lua b/game/modules/tome/data/maps/wilderness/arda-west.lua
index bfe0ad3601c7a374d43b997aaf561f7902b1980f..da33b873510291252e31d5d5aa31d7af255d9100 100644
--- a/game/modules/tome/data/maps/wilderness/arda-west.lua
+++ b/game/modules/tome/data/maps/wilderness/arda-west.lua
@@ -17,55 +17,55 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
--- The western parts of Middle-earth on Arda
+-- Maj'Eyal, the main continent
+
+quickEntity('~', {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('-', {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('*', {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('^', {show_tooltip=true, name='mountains', display='^', color=colors.LIGHT_UMBER, back_color=colors.UMBER, image="terrain/mountain.png", block_move=true})
+quickEntity('m', {show_tooltip=true, name='Daikara', display='^', color=colors.LIGHT_UMBER, back_color=colors.UMBER, image="terrain/rocky_mountain.png", block_move=true})
+quickEntity('#', {show_tooltip=true, name='Iron Throne', display='^', color=colors.SLATE, back_color=colors.UMBER, image="terrain/mountain.png", block_move=true})
+
+quickEntity('T', {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', {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('_', {show_tooltip=true, name='burnt forest', display='#', color=colors.UMBER, back_color=colors.DARK_GREY, image="terrain/burnt-tree.png", block_move=true})
+quickEntity('v', {show_tooltip=true, name='old forest', force_clone=true, display='#', color=colors.GREEN, back_color=colors.DARK_GREEN, image="terrain/grass_dark1.png", resolvers.generic(function(e) e.add_displays = e:makeTrees("terrain/tree_alpha") end), block_move=true})
-quickEntity('a', {show_tooltip=true, name='Ephel Duath', display='^', color=colors.LIGHT_DARK, back_color=colors.UMBER, image="terrain/mountain.png", block_move=true})
-quickEntity('d', {show_tooltip=true, name='Haradwaith', display='.', color={r=203,g=189,b=72}, back_color={r=163,g=149,b=42}, image="terrain/sand.png", block_move=true})
-quickEntity('b', {show_tooltip=true, name='blue mountains', display='^', color=colors.LIGHT_BLUE, back_color=colors.BLUE, tint=colors.LIGHT_BLUE, image="terrain/mountain.png", block_move=true})
-quickEntity('m', {show_tooltip=true, name='misty mountains', display='^', color=colors.LIGHT_UMBER, back_color=colors.UMBER, image="terrain/mountain.png", block_move=true})
-quickEntity('f', {show_tooltip=true, name='grey mountains', display='^', color=colors.SLATE, back_color=colors.UMBER, image="terrain/mountain.png", block_move=true})
-quickEntity('u', {show_tooltip=true, name='deep forest', display='#', color=colors.GREEN, back_color=colors.DARK_GREEN, image="terrain/grass.png", add_displays = {mod.class.Grid.new{image="terrain/tree_alpha1.png"}}, block_move=true})
-quickEntity('t', {show_tooltip=true, name='forest', display='#', color=colors.LIGHT_GREEN, back_color=colors.DARK_GREEN, image="terrain/grass.png", add_displays = {mod.class.Grid.new{image="terrain/tree_alpha3.png"}}, block_move=true})
-quickEntity('l', {show_tooltip=true, name='Lorien', display='#', color=colors.GOLD, back_color=colors.DARK_GREEN, image="terrain/grass.png", add_displays = {mod.class.Grid.new{image="terrain/tree_alpha2.png"}}, block_move=true})
-quickEntity('v', {show_tooltip=true, name='old forest', display='#', color=colors.GREEN, back_color=colors.DARK_GREEN, image="terrain/grass_dark1.png", add_displays = {mod.class.Grid.new{image="terrain/tree_alpha1.png"}}, block_move=true})
-quickEntity('i', {show_tooltip=true, name='iron mountains', display='^', color=colors.SLATE, back_color=colors.UMBER, image="terrain/mountain.png", block_move=true})
-quickEntity('=', {show_tooltip=true, name='the great sea', 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('.', {show_tooltip=true, name='plains', display='.', color=colors.LIGHT_GREEN, back_color=colors.DARK_GREEN, image="terrain/grass.png", can_encounter=true, equilibrium_level=-10})
-quickEntity('g', {show_tooltip=true, name='Forodwaith, the cold lands', display='.', color=colors.LIGHT_BLUE, back_color=colors.BLUE, can_encounter=true, equilibrium_level=-10})
-quickEntity('q', {show_tooltip=true, name='Icebay of Forochel', display=';', color=colors.LIGHT_BLUE, back_color=colors.BLUE, can_encounter=true, equilibrium_level=-10})
-quickEntity('w', {show_tooltip=true, name='ash', display='.', color=colors.WHITE, back_color=colors.LIGHT_DARK, image="terrain/ash1.png", can_encounter=true})
-quickEntity('&', {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('|', {show_tooltip=true, name='desert', display='.', color={r=203,g=189,b=72}, back_color={r=163,g=149,b=42}, image="terrain/sand.png", can_encounter="desert", equilibrium_level=-10})
+
+quickEntity('"', {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('=', {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('{', {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('!', {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', {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})
-quickEntity(' ', {show_tooltip=true, name='sea of Rhun', display='~', color=colors.BLUE, back_color=colors.BLUE, image="terrain/river.png", block_move=true, shader = "water", textures = { function() return _3DNoise, true end }, })
-quickEntity('_', {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('~', {show_tooltip=true, name='Anduin river', display='~', color={r=0, g=30, 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('-', {show_tooltip=true, name='plains', display='.', color=colors.LIGHT_GREEN, back_color=colors.DARK_GREEN, image="terrain/grass.png", can_encounter=true, equilibrium_level=-10})
-quickEntity('|', {show_tooltip=true, name='plains', display='.', color=colors.LIGHT_GREEN, back_color=colors.DARK_GREEN, image="terrain/grass.png", can_encounter=true, equilibrium_level=-10})
-quickEntity('x', {show_tooltip=true, name='plains', display='.', color=colors.LIGHT_GREEN, back_color=colors.DARK_GREEN, image="terrain/grass.png", can_encounter=true, equilibrium_level=-10})
-quickEntity('s', {show_tooltip=true, name='dead marches', display='~', color=colors.DARK_GREEN, back_color=colors.DARK_GREEN, can_encounter=true})
-quickEntity('"', {show_tooltip=true, name='the valley of Nurn', display='.', color=colors.WHITE, back_color=colors.LIGHT_DARK, image="terrain/ash1.png", can_encounter=true})
-quickEntity('A', {show_tooltip=true, name="Caves below the tower of Amon Sûl", display='>', color={r=0, g=255, b=255}, notice = true, change_level=1, change_zone="tower-amon-sul"})
+quickEntity('&', {show_tooltip=true, name='cultivated fields', display=';', color=colors.GREEN, back_color=colors.DARK_GREEN, image="terrain/cultivation.png", can_encounter=true, equilibrium_level=-10})
+
+quickEntity('A', {show_tooltip=true, name="Ruins of Kor'Pul", display='>', color={r=0, g=255, b=255}, notice = true, change_level=1, change_zone="ruins-kor-pul"})
quickEntity('B', {show_tooltip=true, name="Passageway into the Trollshaws", display='>', color={r=0, g=255, b=0}, notice = true, change_level=1, change_zone="trollshaws"})
quickEntity('C', {show_tooltip=true, name="A gate into a maze", display='>', color={r=0, g=255, b=255}, notice = true, change_level=1, change_zone="maze"})
quickEntity('D', {show_tooltip=true, name="A path into the Old Forest", display='>', color={r=0, g=255, b=155}, notice = true, change_level=1, change_zone="old-forest"})
quickEntity('E', {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', {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', {show_tooltip=true, name="Passageway into Carn Dûm",display='>', color=colors.UMBER, notice = true, change_level=1, change_zone="carn-dum"})
-quickEntity('H', {show_tooltip=true, name='Mount Doom (Orodruin)', display='>', color=colors.RED, back_color=colors.LIGHT_DARK, image="terrain/volcano1.png", notice = true, change_level=1, change_zone="mount-doom"})
+quickEntity('G', {show_tooltip=true, name="Passageway into Daikara",display='>', color=colors.UMBER, notice = true, change_level=1, change_zone="daikara"})
+quickEntity('H', {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="mount-doom"})
-quickEntity('1', {show_tooltip=true, name="Bree (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-bree"})
-quickEntity('2', {show_tooltip=true, name="Minas Tirith (Town)", desc="Capital city of the Reunited-Kingdom and Gondor ruled by High King Eldarion", 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-minas-tirith"})
+quickEntity('1', {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', {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"})
-- Angolwen is only know from the start to mages
-if game.player.descriptor.class == "Mage" then
+if game.player:knowTalent(game.player.T_TELEPORT_ANGOLWEN) then
quickEntity('3', {show_tooltip=true, name="Angolwen, the hidden city of magic", desc="Secret place of magic, set apart from the world to protect it.", display='*', color=colors.WHITE, back_color=colors.UMBER, image="terrain/town1.png", notice = true, change_level=1, change_zone="town-angolwen"})
else
quickEntity('3', 'b')
end
-- Load encounters for this map
-prepareEntitiesList("encounters", "mod.class.Encounter", "/data/general/encounters/arda-west.lua")
+prepareEntitiesList("encounters", "mod.class.Encounter", "/data/general/encounters/maj-eyal.lua")
addData{ encounters = {
chance=function(who)
local harmless_chance = 1 + who:getLck(7)
@@ -77,67 +77,73 @@ addData{ encounters = {
}
return [[
-========q=qqqqqqqqqgggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg
-=========q=qq=qqqqggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg
-==========qq=q=qqqqgggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg
-==============qqq=qqggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg
-===============q=q=q=gwwwwgggwwwwwgggggggggwwwwwwwwwwggggwwwwwwwwwwwwwggggwwwwwwwwggggwwwwwwwwwgggg
-====================qwwwwwwwwwwwwwwwwggggggggwwwwwwwwwwwwwwwwwwwwwwwwwwggwwwwwwwwwwwwwwwwwwwwwwuuuu
-======================wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww.uuuuuuuu
-========================wwwwwwww...wwwwwwwwww..........wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww.uuuuuuuuuuu
-========================..www....wwwwwwww................wwwwffffwwwwwwww......wwwww.uuuuuuuuuuuuuu
-==========.......======.........hhhh..................fffffffwwwwwwww.........wwww.utuuuutuuuuuutuu
-========......bb..===.........hhhhhhhh..mmmmm...&..fffffffffffff.................tuuututuututtuuuut
-=======......bb..===............hhhh......Gmmmmmmff.._._...........................tttttttttttttttt
-======...._.bb._..._..h........................mm....._._uuu................ii........ttttttttttttt
-=======.._..bb.._.._..hhhh................&....&mm~~~~.uu_uuuu..........i.....iii........tttttthhhh
-======.._...bb..._._..hhh.......hhhhhh.....&&&&._mm..~.uuu_u_uu..........iiiiii..............ttthhh
-=====.._..ubbb...._._..h.=....hhh.hh..........__.mm__~.uuuu_h_uu..........._.....................hh
-===...._....bb....._..hh.=_....h............__...mm..~.uuuuuu_uu.=........_........................
-====.._...bbbb...._....hhhh__..........A..._.....mm..~.uuuuuu____........._........................
-=====.._..uubb..._........._......h......._Btt...mm..~.uuuuu&&&u._........._.......................
-====...__..ubbb._......hh.._.......hh...._.thhh._mm..~..uuu&&&&&u._........._......................
-=====..._.....__......hhh.-_......1hh......._h...mm..~..uuuuuuuuu._........_.......................
-======..==..=__....h....h..._.hh..ih....._..hhh._m...~..uuuuuuuuuu._........_......................
-=============.....hhh......._.vvD.h......_.._.._mmm...~..uuuuuuuuu.._........_....................t
-======........bb...h........._vvv.hh...._.._...mm.....~..uuuuuuuu...._......_....................tt
-=====E........bb............._.v...h...._._..mmmmm..._~..uuuuuuuu....._......_..................ttt
-=====.........bb............._........._.._..mmmm____.~~.uuuuuuuu......_.._._..................tttt
-======.......bbb...Cb......._.........._._...mmmm.....~~.uuuuu.u........._.._.................ttttt
-=======.....ub3b..bbbb....._..........._....mmmmm....~~...uuuu.............._...............ttttttt
-==========..ubbbu........._..........._.....mmmm.....~~...uuuu..............._...._.......ttttttttt
-==========..uuubbubb....._........____.....hmmmm....~~....uuuuuuu............._.__._ ...ttttttttttt
-==========...uubuu......_........______....mmmmm....~~..uuuuuuuuuu............._.... ...t ttttttt
-==========.....u.u....._........_.....______mm___...~~.uuuuuuuuuu................... ttttttt
-===========.=........._........_...........mmmm_lll~~..uu&uuuuuuu.................. ttttttt
-================....__........_..ttt......mmmm.llll~~..uuuuuuuuu................... ...tttt
-=================.==t........_....tt.....ttmmm.lll.~.....uuuuu..................hh. ......tt
-===================tt........._.........ttmmm.......~~.........................hhhh. .......t
-===================t==......._..........ttmmmttttt._..~~~~~~....................hhh. ... .......t
-===================t==......_...........t&mmmmtttt___.....~~~..................hhhhh. ... ........t
-=====================......_.ttt........t&mmmtttttt..__~~~~~...................hhhhhh.............t
-=====================.....=_.tt.........&&mmmttttt.....~...........................hh.............t
-======================...==..ttt........&&_&&&.._.......~~........................................t
-=======================.===..............h_h....._........~.......................................t
-===========================..............._........_.....~........................................t
-==========================.tt......._._.._........_....h=hh...sss.................................t
-==========================.tt._.._t_...__.........._..h===h.ssss.................................tt
-==========================..__.__._._._..&&&b....._....h=hh..ss.a.a.............................ttt
-============================....._..._.__.&&&......_....~~.....aaaaaa..a..aa..a..a..aa...a.....tttt
-===========================.............._&&&hh....._....~~....aavvaaaaaaaaaaaaaaaaaaaaaaaaaaaaattt
-===========================.......h.&.hh&&&&&&&......__.~~~~....aavvvvvvvavvvavaa_"""_""""""..aaatt
-===========================.....hh.&.&_&h&.&h&_&&&....._..~~~...aavvmm""vvvvvvva_"""""_""""""...aat
-===========================....h....__hh...hhh._h&&........~~...aavvmH"""""""aa_"""""""_"""".....aa
-===========================..hhh_.._.......hh._.hh&&&........~~.aa""""""""""aa""_""""""_"""""""....
-============================.ht_.__._........_&hhh.&&&&&........aa"aa"aaa""""""""_""""_""""""".....
-============================.th_..._....hh.._&&&hh.._&&&&.&...~.aaa""a"a""""""""=="""_""""""""""...
-============================.th._.hhhhhhhh...__...._h&h&&&&&.~..aa""""""""""""======_"""""""""""aaa
-===========================.hh._...h.h........._.._.h&hh._h2.~..aa"""_"_"""""=====""""""""""""aaaaa
-==========================..hh.._.....===.=====_._&h...._...h.~.aa"__"_"__======"""""aa""""aaaadddd
-==========================.h...._...=====F=====_&&h...._._...~~.aa_""""""""""""_""a"aaaaaaaaddddddd
-========================.hhh=...=_.==========&hhhh.._._..._.~~..aaa""aaa""a"""aa_adaadddddddddddddd
-======================....=====.==============h.h._=._.....~~...aaaaaaaaaaaaaaaaaaadddddddddddddddd
-==============================================.hhh==....~~~~....................ddddddddddddddddddd
-===============================================..====~~~~................dddddddddddddddddddddddddd
-===============================================.==h==_............ddddddddddddddddddddddddddddddddd
-=================================================hh===........ddddddddddddddddddddddddddddddddddddd]]
+==========""""""""""""""""""""""""""""""""""""""""""""""""m###########
+========""""""""""""""""""""""""""""""""""""""""""""""""mmm###########
+=======""""""""""""""""""""""""""""""ttttt"""""""mmmmmmmmmm""#########
+=======""""""""""""""""""""""""tttttttttttttmm"mmmmmmmmmmmm"""########
+======="""""""...."""""""""""tttttttttttttttmmmmmmTTTT!mmmm""""#######
+======="""""......"""""...""tttttttttttttttttmmmmTTTTT!!Gm""""""######
+========"".........""".....tttttttttTTTTTtttttmmTTTTT!!!!!!.."""######
+=======........!!!........BTtttttttTT!!!TTTTTTTTTTTTTT!!!!!..."""#####
+===~~~.........!!!....A....TTTtttTTTT!!!TTTTTTTTTTTTT!!!!!!......#####
+~~~~~||.......!!!!&&........TTTTTTTTTT!TTTTTTTTTTTTT!!!!!!.......#####
+~~~~|||.......!!!&&&&............TTTTTTTTTTTTTTTTT....!!!........#####
+~~~|||........!!!&&&&..1..........TTTTTTTTTTTT...................#####
+~~||||...TT...!!!&&&..............................................-###
+~~||||..TTTTT.!!!&&&..............................................-###
+~~||||.TTT^^T..!!.................................................-###
+~~||||TTT^^^T.............vv.....................................--###
+~~|||.TT^^^^C..............vv....................................-.###
+~~|||.TT^^^^.............Dvvvv...................................-..##
+~~E||.TT^^3^............vvvvvvvvv................................-...#
+~~|||..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.................--.....!!!
+~~~~~~~~~~-.....--~~~~................TTTTT.........~......--....!!!!~
+~~~~~~~~~~........~~~.................____T........~~~....2-....!!!!~~
+~~~~~~~~~.........~~~..............~.T_{{__........~~~..----....!!!~~~
+~~~~~~~~..........~~~~.....~~~..~~~~~T_{{{_........~~~~~~.-....!!!~~~~
+~~~~~~~~..........~~~~~~~~~~~~~~~~~~~~__{{{.......~~~~~~~.-....!!~~~~~
+~~~~~.~~..........~~~~~~~~~~~~~~~~~~~~~___{{.....~~~~~~~~---..!!~~~~~~
+~~~~~.............~~~~~~~~~~~~~~~~~~~~~~T_{{{{~~F~~~~~~~~-.-..!!~~~~~~
+~~~~~.............~~~~~~~~~~..~~~~~~~~~~~~..{{~~~~~~~~~~~~.-...~~~~~~~
+~~~~~.............~~~~~~~~~....~~~~~~~~~~~~~~~~~~~~~~~~~~~~~..~~~~~~~~
+~~~~~~............~~~~~~~~.T^^..~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~.........~~~~~~~~..^^^^.~~~~~~~~~~~~~~~~~~~{{{~~~~~~~~~~~~~~~~
+~~~~~~~~~~.......~~~~~~~~.^^^^^.~~~~~~~~~~~~~~~~~~{{{~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~.^^^^^.~~~~~~~~~~~~~~~~~~~{{{H~~~{{~~~~~~~~~~
+~~~~~~~~~~~~....~~~~~~~~~.T^^^T.~~~~~~~~~~~~~~~~~~~{{{{{{{{{~~~~~~~~~~
+~~~~~~~~~.........~~~~~~~~.TTT..~~~~~~~~~~~~~~~~~~~~{{{{{{{~~~~~~~~~~~
+~~~~~~~~~..........~~~~~~~~T..~~~~~~~~~~~~~~~~~~~~~~~~~{{~~~~~~~.~~~~~
+~~~~~~~~~~.........~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{..~~~~~
+~~~~~~~~~~~~.......~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{{{{~~~~~
+~~~~~~~~~~~~........~~~~~~........~~~~~~~~.......~~~~~~~~~~~~.{{{~~~~~
+~~~~~~~~~~~~.........~~~~.........~~~~...........~~~~~~~~~~~~....~~~~~
+~~~~~~~~~~~~.........~~~.........................~~~~~~~~~~~.....~~~~~
+~~~~~~~~~~~~.....................................~~~~~~~~~~~.....~~~~~
+~~~~~~~~~~~~......................................~~~~~~~~~.......~~~~
+~~~~~~~~~~~.......................................~~~~~~~~~.......~~~~
+~~~~~~~~~~~........................................~~~.............~~~
+~~~~~~~............................................................~~~
+~~~~~~..............................................................~~
+~~~~~.................................................................
+~~~~~.................................................................
+~~~~~.................................................................
+~~~~~.................................................................
+~~~~~~................................................................
+~~~~~~~...............................................................
+~~~~~~~~..............................................................
+~~~~~~~~~.............................................................
+~~~~~~~~~.............................................................
+~~~~~~~~..............................................................
+~~~~~~~...............................................................]]
\ No newline at end of file
diff --git a/game/modules/tome/data/quests/start-dunadan.lua b/game/modules/tome/data/quests/start-allied.lua
similarity index 100%
rename from game/modules/tome/data/quests/start-dunadan.lua
rename to game/modules/tome/data/quests/start-allied.lua
diff --git a/game/modules/tome/data/talents/misc/misc.lua b/game/modules/tome/data/talents/misc/misc.lua
index 5389348843f92530d776e07d367733b06b864a1b..3444ced6fe528cf3d25d59077289149df26aef67 100644
--- a/game/modules/tome/data/talents/misc/misc.lua
+++ b/game/modules/tome/data/talents/misc/misc.lua
@@ -152,9 +152,9 @@ newTalent{
The spell will take time to activate, you must be out of sight of any creature when you cast it and when the teleportation takes effect.]]
}
--- Dunadan's power, a "weak" regeneration
+-- Highers's power, a "weak" regeneration
newTalent{
- short_name = "DUNADAN_HEAL",
+ short_name = "HIGHER_HEAL",
name = "King's Gift",
type = {"base/race", 1},
no_energy = true,
@@ -169,10 +169,10 @@ newTalent{
end,
}
--- Nandor's power, a temporary speedup
+-- Shaloren's power, a temporary speedup
newTalent{
- short_name = "NANDOR_SPEED",
- name = "Grace of the Eldar",
+ short_name = "SHALOREN_SPEED",
+ name = "Grace of the Eternals",
type = {"base/race", 1},
no_energy = true,
cooldown = 50,
@@ -181,7 +181,7 @@ newTalent{
return true
end,
info = function(self)
- return ([[Call upon the grace of the Eldar to increase your general speed by %d%% for 8 turns.
+ return ([[Call upon the grace of the Eternals to increase your general speed by %d%% for 8 turns.
The speed bonus will increase with the Dexterity stat]]):format((0.20 + self:getDex() / 80) * 100)
end,
}
@@ -207,9 +207,9 @@ newTalent{
end,
}
--- Hobbit's power, temporary crit bonus
+-- Halflings's power, temporary crit bonus
newTalent{
- short_name = "HOBBIT_LUCK",
+ short_name = "HALFLING_LUCK",
name = "Luck of the Little Folk",
type = {"base/race", 1},
no_energy = true,
@@ -227,9 +227,9 @@ newTalent{
end,
}
--- Noldor's power: temporary damage increase and damage reduction
+-- Thaloren's power: temporary damage increase and damage reduction
newTalent{
- short_name = "NOLDOR_WRATH",
+ short_name = "THALOREN_WRATH",
name = "Wrath of the Eldar",
type = {"base/race", 1},
no_energy = true,
diff --git a/game/modules/tome/data/texts/intro-bree-man.lua b/game/modules/tome/data/texts/intro-cornac.lua
similarity index 92%
rename from game/modules/tome/data/texts/intro-bree-man.lua
rename to game/modules/tome/data/texts/intro-cornac.lua
index e25a51ed5901ba2df7f8c185b9331a441940baf4..ae8b1d633f2f68ccc8016697679a3a8c7c499ae5 100644
--- a/game/modules/tome/data/texts/intro-bree-man.lua
+++ b/game/modules/tome/data/texts/intro-cornac.lua
@@ -18,7 +18,7 @@
-- darkgod@te4.org
return [[Welcome #LIGHT_GREEN#@name@#WHITE#.
-You are a native of the town of Bree, a multicultural town that both men and hobbits call home.
+You are a native of the northern region of the Allied Kingdom, a peaceful land that both humans and halflings call home.
Humans are the most common race of the land, and you are one of them. In an attempt to prove your worth, you have decided to venture into the old and wild places of the world, looking for ancient treasures and glory.
You have come to a land called Rhudaur, just east of Bree, in search of the Trollshaws. It is an old forest infested with trolls and all kinds of wild animals.
diff --git a/game/modules/tome/data/texts/intro-hobbit.lua b/game/modules/tome/data/texts/intro-halfling.lua
similarity index 100%
rename from game/modules/tome/data/texts/intro-hobbit.lua
rename to game/modules/tome/data/texts/intro-halfling.lua
diff --git a/game/modules/tome/data/texts/intro-dunadan.lua b/game/modules/tome/data/texts/intro-higher.lua
similarity index 100%
rename from game/modules/tome/data/texts/intro-dunadan.lua
rename to game/modules/tome/data/texts/intro-higher.lua
diff --git a/game/modules/tome/data/texts/intro-elf.lua b/game/modules/tome/data/texts/intro-shalore.lua
similarity index 100%
rename from game/modules/tome/data/texts/intro-elf.lua
rename to game/modules/tome/data/texts/intro-shalore.lua
diff --git a/game/modules/tome/data/texts/intro-thalore.lua b/game/modules/tome/data/texts/intro-thalore.lua
new file mode 100644
index 0000000000000000000000000000000000000000..82838020547ecaebb14a3f7994e6099a5e4baf2e
--- /dev/null
+++ b/game/modules/tome/data/texts/intro-thalore.lua
@@ -0,0 +1,31 @@
+-- ToME - Tales of Middle-Earth
+-- Copyright (C) 2009, 2010 Nicolas Casalini
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- Nicolas Casalini "DarkGod"
+-- darkgod@te4.org
+
+return [[Welcome #LIGHT_GREEN#@name@#WHITE#.
+You are an elf, one of the first born. Many of your kind, having grown weary of Middle Earth, have left for the immortal lands.
+Yet some elves do not wish to leave this land they fought so hard for. In Mirkwood Forest, now called Eryn Lasgalen, the kingdom of Thranduil still thrives.
+You lived a peaceful life deep in the forest for many years, but lately you have grown restless and have decided to step into the world.
+
+You have decided to venture into the old and wild places looking for ancient treasures and glory.
+
+You have come to a land called Rhudaur on the western side of the Misty Mountains, far away from your home, in search of the Trollshaws. It is an old forest infested with trolls and all kinds of wild animals.
+To the east lies another dangerous place: the ruined tower of Amon Sûl. You heard the caves below were infested by vermin and undead.
+
+After days of travel, you have found the forest and entered it, what will you find there?...
+]]
diff --git a/game/modules/tome/data/zones/carn-dum/grids.lua b/game/modules/tome/data/zones/daikara/grids.lua
similarity index 100%
rename from game/modules/tome/data/zones/carn-dum/grids.lua
rename to game/modules/tome/data/zones/daikara/grids.lua
diff --git a/game/modules/tome/data/zones/carn-dum/npcs.lua b/game/modules/tome/data/zones/daikara/npcs.lua
similarity index 100%
rename from game/modules/tome/data/zones/carn-dum/npcs.lua
rename to game/modules/tome/data/zones/daikara/npcs.lua
diff --git a/game/modules/tome/data/zones/carn-dum/objects.lua b/game/modules/tome/data/zones/daikara/objects.lua
similarity index 100%
rename from game/modules/tome/data/zones/carn-dum/objects.lua
rename to game/modules/tome/data/zones/daikara/objects.lua
diff --git a/game/modules/tome/data/zones/carn-dum/traps.lua b/game/modules/tome/data/zones/daikara/traps.lua
similarity index 100%
rename from game/modules/tome/data/zones/carn-dum/traps.lua
rename to game/modules/tome/data/zones/daikara/traps.lua
diff --git a/game/modules/tome/data/zones/carn-dum/zone.lua b/game/modules/tome/data/zones/daikara/zone.lua
similarity index 100%
rename from game/modules/tome/data/zones/carn-dum/zone.lua
rename to game/modules/tome/data/zones/daikara/zone.lua
diff --git a/game/modules/tome/data/zones/tower-amon-sul/grids.lua b/game/modules/tome/data/zones/ruins-kor-pul/grids.lua
similarity index 100%
rename from game/modules/tome/data/zones/tower-amon-sul/grids.lua
rename to game/modules/tome/data/zones/ruins-kor-pul/grids.lua
diff --git a/game/modules/tome/data/zones/tower-amon-sul/npcs.lua b/game/modules/tome/data/zones/ruins-kor-pul/npcs.lua
similarity index 100%
rename from game/modules/tome/data/zones/tower-amon-sul/npcs.lua
rename to game/modules/tome/data/zones/ruins-kor-pul/npcs.lua
diff --git a/game/modules/tome/data/zones/tower-amon-sul/objects.lua b/game/modules/tome/data/zones/ruins-kor-pul/objects.lua
similarity index 100%
rename from game/modules/tome/data/zones/tower-amon-sul/objects.lua
rename to game/modules/tome/data/zones/ruins-kor-pul/objects.lua
diff --git a/game/modules/tome/data/zones/tower-amon-sul/traps.lua b/game/modules/tome/data/zones/ruins-kor-pul/traps.lua
similarity index 100%
rename from game/modules/tome/data/zones/tower-amon-sul/traps.lua
rename to game/modules/tome/data/zones/ruins-kor-pul/traps.lua
diff --git a/game/modules/tome/data/zones/tower-amon-sul/zone.lua b/game/modules/tome/data/zones/ruins-kor-pul/zone.lua
similarity index 100%
rename from game/modules/tome/data/zones/tower-amon-sul/zone.lua
rename to game/modules/tome/data/zones/ruins-kor-pul/zone.lua
diff --git a/game/modules/tome/init.lua b/game/modules/tome/init.lua
index 51f6da2b965bfe88fd12b38efb756c16359f1ac2..d65bc69e3fc20129a510acb183c4e7ca22ce4702 100644
--- a/game/modules/tome/init.lua
+++ b/game/modules/tome/init.lua
@@ -18,34 +18,30 @@
-- darkgod@te4.org
name = "T.o.M.E"
-long_name = "Tales of Middle Earth: The Fourth Age"
+long_name = "Tales of Maj'Eyal: Age of Ascendancy"
short_name = "tome"
author = { "DarkGod", "darkgod@te4.org" }
homepage = "http://tome.te4.org/"
-version = {3,9,13}
-engine = {0,9,13,"te4"}
+version = {3,9,14}
+engine = {0,9,14,"te4"}
description = [[
-Morgoth is banned to the Void. Sauron has been vanquished, the #ff0000#One Ring#ffffff# destroyed.
-The nations of Men, Dwarves, Elves and Hobbits are freed from the tyranny of the Rings.
+Welcome to Maj'Eyal.
-For over one hundred twenty years, peace prevailed in the West under the
-rule of the High King of the Reunited Kingdom, #14fffc#Aragorn II Elessar#ffffff# and his wife #14fffc#Arwen Evenstar#ffffff#.
-The High King died of old age two years ago, and his son, #14fffc#Eldarion#ffffff#, is now king.
+This is the Age of Ascendancy, after over ten thousand years of strife, pain and chaos the known world is at last at relative peace.
+The #FF0000#Spellblaze#WHITE# last effects are now tamed, the land slowly heals itself and the civilisations rebuild themselves after the Age of Pyre.
-#14fffc#Elrond and Galadriel#ffffff#, the great leaders of the Elves, left Middle-earth for Valinor.
-But many elves still dwell in Middle-earth, for some of them love this land for which they fought so hard.
+It has been one hundred and twenty two years since the Allied Kingdoms have been established under the rule of #14fffc#Toknor#ffffff# and his wife #14fffc#Mirvenia#ffffff#.
+Together they ruled the kingdoms with fairness and brought prosperity to both halflings and humans.
+The King died of old age fourteen years ago, and his son, #14fffc#Tolak#ffffff#, is now king.
-In the the Lonely Mountain, the dwarves prosper along with their human allies of Dale
-under the guidance of #14fffc#Thorin III Stonehelm#ffffff#, the King under the Mountain.
+The elven kingdoms are quiet. The Shaloran elves in their home of Elvala are trying to make the world forget about their role in the Spellblaze and are living happy lifes under the leadership of #14fffc#Aranion Gayaeil#ffffff#.
+The Thaloran elves keep to their ancient tradition of living in the woods, ruled as always by #14fffc#Nessilla Tantaelen#ffffff# the wise.
-In the Shire, life is... as usual, simple and full of joy and pipeweed! If such thing as ruling exists for Hobbits, then it is #14fffc#Thain Faramir I and Mayor Tolman Gardner#ffffff# that should handle it.
+The dwarves of the Iron Throne have started a careful trade relationship with the Allied Kingdoms for nearly one hundred year, yet not much is known about them, not even their leader.
-This is a golden age, or at least it should be....
+While the people of Maj'Eyal know that the mages helped put an end to the terrors of the Spellblaze, they also did not forget that it was magic that started those events. As such mages are still shuned from society, if not downright hunted down.
+Still, this is a golden age, civilizations are leaking the wounds of thousands of years of conflict, even the humans and the halflings have made lasting peace.
-Trouble is brewing in the east. Rumours in Lake-town near the Lonely Mountain have it
-that some power is growing in the far east, and Orcs sightings have started to multiply.
-
-However, you do not think this concerns you---for you have set out to discover wonders, explore old places, and venture into the unknown for wealth and glory.
-But beware, the eastern troubles could be yours all too soon....
+You are an adventurer, set out to discover wonders, explore old places, and venture into the unknown for wealth and glory.
]]
starter = "mod.load"
diff --git a/ideas/factions.ods b/ideas/factions.ods
index f4a20db3b59ecb1ee07c3f00871437bc874e6b0d..f242c9a9a5f5dd464d4d948b2b1de1074dbac14a 100644
Binary files a/ideas/factions.ods and b/ideas/factions.ods differ
diff --git a/ideas/setting.ods b/ideas/setting.ods
index e116fa67064cedb53d504d173c0646518329da6b..204660a6f2048b7ce89686a49945cbacfda19715 100644
Binary files a/ideas/setting.ods and b/ideas/setting.ods differ