diff --git a/game/modules/tome/data/achievements/quests.lua b/game/modules/tome/data/achievements/quests.lua
index 71fd4c2d29a57dda212df210391300a33df3231e..1bfaf3a4852b42ab8f13d972faca9742cea50660 100644
--- a/game/modules/tome/data/achievements/quests.lua
+++ b/game/modules/tome/data/achievements/quests.lua
@@ -119,7 +119,7 @@ newAchievement{
}
newAchievement{
name = "Eye of the storm", id = "EYE_OF_THE_STORM",
- desc = [[Freed Bree from the onslaught of the mad Tempest, Urkis.]],
+ desc = [[Freed Derth from the onslaught of the mad Tempest, Urkis.]],
}
newAchievement{
name = "Antimagic!", id = "ANTIMAGIC",
diff --git a/game/modules/tome/data/birth/races/tutorial.lua b/game/modules/tome/data/birth/races/tutorial.lua
index 59f2bd222ad462c245e41f1df9309016f70e5cf9..a8e4e4a787c09734f6c5007d1ce44635439275ec 100644
--- a/game/modules/tome/data/birth/races/tutorial.lua
+++ b/game/modules/tome/data/birth/races/tutorial.lua
@@ -47,7 +47,7 @@ newBirthDescriptor
type = "subrace",
name = "Tutorial Human",
desc = {
- "Humans hailing from the northen town of Bree. A common kind of man, unremarkable in all respects.",
+ "Humans hailing from the northen town of Derth. A common kind of man, unremarkable in all respects.",
},
copy = {
default_wilderness = {1, 1, "wilderness-tutorial"},
diff --git a/game/modules/tome/data/chats/angolwen-leader.lua b/game/modules/tome/data/chats/angolwen-leader.lua
index 1296ee0552f81e6c9f0a6883ccc6124c72d77fa5..511994d820684a410264bf057c214872a9c7f8e6 100644
--- a/game/modules/tome/data/chats/angolwen-leader.lua
+++ b/game/modules/tome/data/chats/angolwen-leader.lua
@@ -19,15 +19,15 @@
newChat{ id="welcome",
text = [[#LIGHT_GREEN#*A tall elven woman stands before you, her fair skin radiates incredible power throught her white robe.*#WHITE#
-I am Anlinwen Noromiel, head of the Circle of the Wise. Welcome to our city, @playerdescriptor.subclass@. What may I do for you?]],
+I am Linaniil of the Kar'Krul. Welcome to our city, @playerdescriptor.subclass@. What may I do for you?]],
answers = {
- {"I require all the help I can get, not for my sake but for the town of Bree, in the north east of here.", jump="save-bree", cond=function(npc, player) local q = player:hasQuest("lightning-overload") return q and q:isCompleted("saved-bree") and not q:isCompleted("tempest-located") end},
+ {"I require all the help I can get, not for my sake but for the town of Derth, in the north east of here.", jump="save-derth", cond=function(npc, player) local q = player:hasQuest("lightning-overload") return q and q:isCompleted("saved-derth") and not q:isCompleted("tempest-located") end},
{"I am ready, send me to Urkis!", jump="teleport-urkis", cond=function(npc, player) local q = player:hasQuest("lightning-overload") return q and not q:isEnded("tempest-located") and q:isCompleted("tempest-located") end},
{"Nothing for now, sorry to have took your time. Farewell my lady."},
}
}
-newChat{ id="save-bree",
+newChat{ id="save-derth",
text = [[Yes we have noticed the devastation that happened there. I have sent some friends to dispose of the cloud but the real threat is not there.
We know who created this abomination: Urkis. He is a Tempest, a powerful archmage who can control the storms.
A few years ago he has gone rogue, cutting himself from Angolwen. He remained quiet so we were reluctant to go against him openly, but it seems we have no choice now.
@@ -35,12 +35,12 @@ The removal of the could will take much time, in the meanwhile we can, if you ar
I will not lie to you, we can send you there but this cuold be a death trap, and we have no way of knowing if there is a way for you to exit his lair as he lives on top of a tall peak in the misty mountains.]],
answers = {
{"I need to prepare myself, I will be back soon.", action=function(npc, player) player:setQuestStatus("lightning-overload", engine.Quest.COMPLETED, "tempest-located") end},
- {"I am ready, send me, I will not let the good people of Bree down.", action=function(npc, player) player:setQuestStatus("lightning-overload", engine.Quest.COMPLETED, "tempest-located") player:hasQuest("lightning-overload"):teleport_urkis() end},
+ {"I am ready, send me, I will not let the good people of Derth down.", action=function(npc, player) player:setQuestStatus("lightning-overload", engine.Quest.COMPLETED, "tempest-located") player:hasQuest("lightning-overload"):teleport_urkis() end},
}
}
newChat{ id="teleport-urkis",
- text = [[Good luck to you, you have the blessings of the Free People.]],
+ text = [[Good luck to you, you have the blessings of Angolwen.]],
answers = {
{"Thank you.", action=function(npc, player) player:hasQuest("lightning-overload"):teleport_urkis() end},
}
diff --git a/game/modules/tome/data/chats/bree-attack-over.lua b/game/modules/tome/data/chats/bree-attack-over.lua
index 36e9b242af7c6cf728b367b46015ab53f6ba1df9..49182578ebf318ee24eaa782b389c5736d7c82f6 100644
--- a/game/modules/tome/data/chats/bree-attack-over.lua
+++ b/game/modules/tome/data/chats/bree-attack-over.lua
@@ -37,7 +37,7 @@ newChat{ id="quest",
text = [[Thank you! You have saved many people today!
I have heard of rumours of a reclusive town of wise and powerful men somewhere in the blue mountains, maybe they could help? If they even exist...]],
answers = {
- {"I will not let you down.", action=function(npc, player) player:hasQuest("lightning-overload"):done_bree() end},
+ {"I will not let you down.", action=function(npc, player) player:hasQuest("lightning-overload"):done_derth() end},
}
}
diff --git a/game/modules/tome/data/quests/lightning-overload.lua b/game/modules/tome/data/quests/lightning-overload.lua
index 2e62cfbe6b03d58a151974d49c812ab17bc373a8..aaba0d3cdacce1872c0cc8cfa6320c70b51f1bc8 100644
--- a/game/modules/tome/data/quests/lightning-overload.lua
+++ b/game/modules/tome/data/quests/lightning-overload.lua
@@ -20,9 +20,9 @@
name = "Storming the city"
desc = function(self, who)
local desc = {}
- desc[#desc+1] = "As you came to Bree you saw a huge dark cloud over the small town."
+ desc[#desc+1] = "As you came to Derth you saw a huge dark cloud over the small town."
desc[#desc+1] = "When you entered you were greeted by an army of air elementals slaughtering the population."
- if self:isCompleted("saved-bree") then
+ if self:isCompleted("saved-derth") then
desc[#desc+1] = " * You have dispatched the elementals but the cloud lingers still. You must find a powerful ally to remove it. There are rumours of a secret town in the blue mountains, to the south west."
end
if self:isCompleted("tempest-located") then
@@ -52,7 +52,7 @@ on_grant = function(self, who)
-- Populate with nice air elementals
self.max_count = 0
for i = 1, 12 do
- local m = game.zone:makeEntity(game.level, "actor", {special_rarity="bree_rarity"}, nil, true)
+ local m = game.zone:makeEntity(game.level, "actor", {special_rarity="derth_rarity"}, nil, true)
if m then
local x, y = rng.range(10, game.level.map.w - 11), rng.range(10, game.level.map.h - 11)
local tries = 0
@@ -71,7 +71,7 @@ on_grant = function(self, who)
end
self.kill_count = 0
- require("engine.ui.Dialog"):simpleLongPopup("Danger...", "As you arrive in Bree you notice a huge dark cloud hovering over the town.\nYou hear screams coming from the central place.", 400)
+ require("engine.ui.Dialog"):simpleLongPopup("Danger...", "As you arrive in Derth you notice a huge dark cloud hovering over the town.\nYou hear screams coming from the central place.", 400)
end
on_status_change = function(self, who, status, sub)
@@ -87,13 +87,13 @@ kill_one = function(self)
if self.kill_count >= self.max_count then
local Chat = require "engine.Chat"
- local chat = Chat.new("bree-attack-over", {name="Scared hobbit"}, game.player)
+ local chat = Chat.new("derth-attack-over", {name="Scared hobbit"}, game.player)
chat:invoke()
end
end
-done_bree = function(self)
- game.player:setQuestStatus(self.id, engine.Quest.COMPLETED, "saved-bree")
+done_derth = function(self)
+ game.player:setQuestStatus(self.id, engine.Quest.COMPLETED, "saved-derth")
end
teleport_urkis = function(self)
@@ -102,13 +102,13 @@ teleport_urkis = function(self)
The storm is raging of your head.]], 400)
end
-reenter_bree = function(self)
- if (self:isCompleted() or self:isEnded()) and not self:isCompleted("restored-bree") then
+reenter_derth = function(self)
+ if (self:isCompleted() or self:isEnded()) and not self:isCompleted("restored-derth") then
game.level.map:setShown(1, 1, 1, 1)
game.level.map:setObscure(1*0.6, 1*0.6, 1*0.6, 1)
game.level.data.background = nil
- game.player:setQuestStatus(self.id, engine.Quest.COMPLETED, "restored-bree")
- require("engine.ui.Dialog"):simpleLongPopup("Clear sky", "It seems the mages have kept their word.\nBree is free of the storm could.", 400)
+ game.player:setQuestStatus(self.id, engine.Quest.COMPLETED, "restored-derth")
+ require("engine.ui.Dialog"):simpleLongPopup("Clear sky", "It seems the mages have kept their word.\nDerth is free of the storm could.", 400)
end
end
diff --git a/game/modules/tome/data/quests/starter-zones.lua b/game/modules/tome/data/quests/starter-zones.lua
index b1c182080d2a05a64a10b69c995cba55da048653..35736408072989f9d42cf5b42cd6f7688a8dcfcb 100644
--- a/game/modules/tome/data/quests/starter-zones.lua
+++ b/game/modules/tome/data/quests/starter-zones.lua
@@ -22,10 +22,10 @@ name = "Into the darkness"
desc = function(self, who)
local desc = {}
desc[#desc+1] = "It is time to explore some new places dark, forgotten and dangerous ones."
- desc[#desc+1] = "The Old Forest is just south-west of the town of Bree."
- desc[#desc+1] = "The Maze is west of Bree."
- desc[#desc+1] = "The Sandworm Lair is to the far west of Bree, near the sea."
- desc[#desc+1] = "Carn Dûm is to the north of Amon Sûl."
+ desc[#desc+1] = "The Old Forest is just south-east of the town of Derth."
+ desc[#desc+1] = "The Maze is west of Derth."
+ desc[#desc+1] = "The Sandworm Lair is to the far west of Derth, near the sea."
+ desc[#desc+1] = "The Daikara is to the eastern borders of the Thaloren forest."
if self:isCompleted("old-forest") then
desc[#desc+1] = "#LIGHT_GREEN#* You have explored the Old Forest and vanquished the Old Man Willow.#WHITE#"
else
@@ -42,16 +42,16 @@ desc = function(self, who)
desc[#desc+1] = "#SLATE#* You must explore the Sandworm Lair and find out what lurks there and what treasures are to be gained!#WHITE#"
end
if self:isCompleted("carn-dum") then
- desc[#desc+1] = "#LIGHT_GREEN#* You have explored Carn Dûm and vanquished the Dragon.#WHITE#"
+ desc[#desc+1] = "#LIGHT_GREEN#* You have explored the Daikara and vanquished the Dragon.#WHITE#"
else
- desc[#desc+1] = "#SLATE#* You must explore Carn Dûm and find out what lurks there and what treasures are to be gained!#WHITE#"
+ desc[#desc+1] = "#SLATE#* You must explore the Daikara and find out what lurks there and what treasures are to be gained!#WHITE#"
end
return table.concat(desc, "\n")
end
on_status_change = function(self, who, status, sub)
if sub then
- if self:isCompleted("old-forest") and self:isCompleted("maze") and self:isCompleted("sandworm-lair") and self:isCompleted("carn-dum") then
+ if self:isCompleted("old-forest") and self:isCompleted("maze") and self:isCompleted("sandworm-lair") and self:isCompleted("daikara") then
who:setQuestStatus(self.id, engine.Quest.DONE)
who:grantQuest("tol-falas")
end
diff --git a/game/modules/tome/data/quests/tol-falas.lua b/game/modules/tome/data/quests/tol-falas.lua
index f4fc5f779edfddb2a2ab6b03d675f09d5ed3c3de..4b83f5ac73c2c29579cbeea64891f207b4caac61 100644
--- a/game/modules/tome/data/quests/tol-falas.lua
+++ b/game/modules/tome/data/quests/tol-falas.lua
@@ -21,7 +21,7 @@
name = "The Island of Dread"
desc = function(self, who)
local desc = {}
- desc[#desc+1] = "You have heard that in the bay of Belfalas, far to the south of Bree, lies the ruined tower of Tol Falas."
+ desc[#desc+1] = "You have heard that in the bay of Belfalas, near the Charred Scar, to the south, lies the ruined tower of Tol Falas."
desc[#desc+1] = "There are disturbing rumors of greater undeads and nobody who reached it ever returned."
desc[#desc+1] = "Perhaps you should explore it and find the truth, and the treasures, for yourself!"
return table.concat(desc, "\n")
diff --git a/game/modules/tome/data/zones/daikara/npcs.lua b/game/modules/tome/data/zones/daikara/npcs.lua
index dcbc871e5013292cb66682fa47591825a599239f..db25ae7945e0b418802112ff41ab009946503cd8 100644
--- a/game/modules/tome/data/zones/daikara/npcs.lua
+++ b/game/modules/tome/data/zones/daikara/npcs.lua
@@ -67,9 +67,9 @@ newEntity{ define_as = "RANTHA_THE_WORM",
ai = "dumb_talented_simple", ai_state = { talent_in=1, ai_move="move_astar", },
on_die = function(self, who)
- game.state:activateBackupGuardian("MASSOK", 7, 43, "I have heard there is a dargon hunter in Carn Dûm that is unhappy about the wyrm being already dead.")
+ game.state:activateBackupGuardian("MASSOK", 7, 43, "I have heard there is a dargon hunter in the Daikara that is unhappy about the wyrm being already dead.")
game.player:resolveSource():grantQuest("starter-zones")
- game.player:resolveSource():setQuestStatus("starter-zones", engine.Quest.COMPLETED, "carn-dum")
+ game.player:resolveSource():setQuestStatus("starter-zones", engine.Quest.COMPLETED, "daikara")
end,
}
diff --git a/game/modules/tome/data/zones/town-derth/npcs.lua b/game/modules/tome/data/zones/town-derth/npcs.lua
index 210964dfc8cec8fb3234f512a8a520e61b0d12a1..e290c955df1b2ab831954eb5a1ec54c5cf5a3157 100644
--- a/game/modules/tome/data/zones/town-derth/npcs.lua
+++ b/game/modules/tome/data/zones/town-derth/npcs.lua
@@ -17,15 +17,15 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
-load("/data/general/npcs/gwelgoroth.lua", function(e) if e.rarity then e.bree_rarity, e.rarity = e.rarity, nil end end)
+load("/data/general/npcs/gwelgoroth.lua", function(e) if e.rarity then e.derth_rarity, e.rarity = e.rarity, nil end end)
local Talents = require("engine.interface.ActorTalents")
newEntity{
- define_as = "BASE_NPC_BREE_TOWN",
+ define_as = "BASE_NPC_DERTH_TOWN",
type = "humanoid", subtype = "human",
display = "p", color=colors.WHITE,
- faction = "reunited-kingdom",
+ faction = "allied-kingdoms",
combat = { dam=resolvers.rngavg(1,2), atk=2, apr=0, dammod={str=0.4} },
@@ -44,8 +44,8 @@ newEntity{
stats = { str=12, dex=8, mag=6, con=10 },
}
-newEntity{ base = "BASE_NPC_BREE_TOWN",
- name = "bree guard", color=colors.LIGHT_UMBER,
+newEntity{ base = "BASE_NPC_DERTH_TOWN",
+ name = "derth guard", color=colors.LIGHT_UMBER,
desc = [[A stern looking guard, he will not let you disturb the town.]],
level_range = {1, nil}, exp_worth = 1,
rarity = 3,
@@ -58,10 +58,10 @@ newEntity{ base = "BASE_NPC_BREE_TOWN",
resolvers.talents{ [Talents.T_RUSH]=1, [Talents.T_PERFECT_STRIKE]=1, },
}
-newEntity{ base = "BASE_NPC_BREE_TOWN",
- name = "hobbit slinger", color=colors.UMBER,
- subtype = "hobbit",
- desc = [[A hobbit, with a sling. Beware.]],
+newEntity{ base = "BASE_NPC_DERTH_TOWN",
+ name = "halfling slinger", color=colors.UMBER,
+ subtype = "halfling",
+ desc = [[A halfling, with a sling. Beware.]],
level_range = {1, nil}, exp_worth = 1,
rarity = 3,
max_life = resolvers.rngavg(50,60),
@@ -71,7 +71,7 @@ newEntity{ base = "BASE_NPC_BREE_TOWN",
resolvers.equip{ {type="weapon", subtype="sling", autoreq=true}, {type="ammo", subtype="shot", autoreq=true} },
}
-newEntity{ base = "BASE_NPC_BREE_TOWN",
+newEntity{ base = "BASE_NPC_DERTH_TOWN",
name = "human farmer", color=colors.WHITE,
desc = [[A weather worn human farmer.]],
level_range = {1, nil}, exp_worth = 1,
@@ -80,10 +80,10 @@ newEntity{ base = "BASE_NPC_BREE_TOWN",
combat_armor = 2, combat_def = 0,
}
-newEntity{ base = "BASE_NPC_BREE_TOWN",
- name = "hobbit gardener", color=colors.WHITE,
- subtype = "hobbit",
- desc = [[A hobbit, he seems to be looking for plants.]],
+newEntity{ base = "BASE_NPC_DERTH_TOWN",
+ name = "halfling gardener", color=colors.WHITE,
+ subtype = "halfling",
+ desc = [[A halfling, he seems to be looking for plants.]],
level_range = {1, nil}, exp_worth = 1,
rarity = 1,
max_life = resolvers.rngavg(30,40),
diff --git a/game/modules/tome/data/zones/town-derth/zone.lua b/game/modules/tome/data/zones/town-derth/zone.lua
index 27ae0cd0cb866375a9d75e616c594489b68e1030..e3ba3312f1d3a7b4bb5032da91e35fdb9d75c2f3 100644
--- a/game/modules/tome/data/zones/town-derth/zone.lua
+++ b/game/modules/tome/data/zones/town-derth/zone.lua
@@ -46,7 +46,7 @@ return {
if game.player.level >= 12 and game.player.level <= 20 and not game.player:hasQuest("lightning-overload") then
game.player:grantQuest("lightning-overload")
elseif game.player:hasQuest("lightning-overload") then
- game.player:hasQuest("lightning-overload"):reenter_bree()
+ game.player:hasQuest("lightning-overload"):reenter_derth()
end
end
}