diff --git a/game/engine/Entity.lua b/game/engine/Entity.lua
index 10c36c574c9894c486ed12c3526d7c629afcd3ed..357103247f50b04395a15206926810ef301223aa 100644
--- a/game/engine/Entity.lua
+++ b/game/engine/Entity.lua
@@ -326,7 +326,7 @@ end
-- @param res the table to load into, defaults to a new one
-- @param mod an optional function to which will be passed each entity as they are created. Can be used to adjust some values on the fly
-- @usage MyEntityClass:loadList("/data/my_entities_def.lua")
-function _M:loadList(file, no_default, res, mod)
+function _M:loadList(file, no_default, res, mod, loaded)
if type(file) == "table" then
res = res or {}
for i, f in ipairs(file) do
@@ -353,10 +353,15 @@ function _M:loadList(file, no_default, res, mod)
end
if err then error(err) end
+ loaded = loaded or {}
+ loaded[f] = true
+
setfenv(f, setmetatable({
class = self,
+ loaded = loaded,
resolvers = resolvers,
DamageType = require "engine.DamageType",
+ entity_mod = mod,
newEntity = function(t)
-- Do we inherit things ?
if t.base then
@@ -389,10 +394,10 @@ function _M:loadList(file, no_default, res, mod)
if t.define_as then res[t.define_as] = e end
end,
load = function(f, new_mod)
- self:loadList(f, no_default, res, new_mod or mod)
+ self:loadList(f, no_default, res, new_mod or mod, loaded)
end,
loadList = function(f, new_mod)
- return self:loadList(f, no_default, nil, new_mod or mod)
+ return self:loadList(f, no_default, nil, new_mod or mod, loaded)
end,
}, {__index=_G}))
f()
diff --git a/game/engine/interface/ObjectActivable.lua b/game/engine/interface/ObjectActivable.lua
index db4d3c6badc3951ba252d3af7df67ea1f066df15..729e4de18bebe1d9ae0878df1e6977fce13f8107 100644
--- a/game/engine/interface/ObjectActivable.lua
+++ b/game/engine/interface/ObjectActivable.lua
@@ -78,6 +78,7 @@ function _M:useObject(who)
return ret
elseif self.use_talent then
if not self.use_talent.power or self.power >= self.use_talent.power then
+ self.power = self.power - self.use_talent.power
return self:useTalent(self.use_talent.id, who, self.use_talent.level)
else
if self.power_regen and self.power_regen ~= 0 then
diff --git a/game/modules/tome/data/chats/magic-store.lua b/game/modules/tome/data/chats/magic-store.lua
new file mode 100644
index 0000000000000000000000000000000000000000..08a955db4c91975ae465dfbac2f532e02d4faa41
--- /dev/null
+++ b/game/modules/tome/data/chats/magic-store.lua
@@ -0,0 +1,46 @@
+-- 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
+
+local function recharge(npc, player)
+ player:showEquipInven("Select the item to recharge", function(o) return o.recharge_cost and o.power and o.max_power and o.power < o.max_power end, function(o, inven, item)
+ local cost = math.ceil(o.recharge_cost * (o.max_power / o.use_talent.power))
+ if cost > player.money then require("engine.Dialog"):simplePopup("Not enough money", "This costs "..cost.." gold.") return true end
+ require("engine.Dialog"):yesnoPopup("Recharge?", "This will cost you "..cost.." gold.", function(ok) if ok then
+ o.power = o.max_power
+ player.money = player.money - cost
+ player.changed = true
+ end end)
+ return true
+ end)
+
+end
+
+newChat{ id="welcome",
+ text = [[Welcome @playername@ to my shop.]],
+ answers = {
+ {"Let me see your wares.", action=function(npc, player)
+ npc.store:loadup(game.level, game.zone)
+ npc.store:interact(player)
+ end},
+ {"I want to recharge some of my equipment.", action=recharge},
+ {"Sorry I have to go!"},
+ }
+}
+
+return "welcome"
diff --git a/game/modules/tome/data/general/npcs/all.lua b/game/modules/tome/data/general/npcs/all.lua
new file mode 100644
index 0000000000000000000000000000000000000000..c5335ee96a05cfe1c4a962a4994f1d58d1a40341
--- /dev/null
+++ b/game/modules/tome/data/general/npcs/all.lua
@@ -0,0 +1,60 @@
+-- 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
+
+local loadIfNot = function(f)
+ if loaded[f] then return end
+ load(f, entity_mod)
+end
+
+-- Load all NPCs anyway but with higher rarity
+loadIfNot("/data/general/npcs/ant.lua")
+--loadIfNot("/data/general/npcs/aquatic_critter.lua")
+--loadIfNot("/data/general/npcs/aquatic_demon.lua")
+loadIfNot("/data/general/npcs/bear.lua")
+--loadIfNot("/data/general/npcs/bone-giant.lua")
+loadIfNot("/data/general/npcs/canine.lua")
+loadIfNot("/data/general/npcs/cold-drake.lua")
+--loadIfNot("/data/general/npcs/faeros.lua")
+loadIfNot("/data/general/npcs/fire-drake.lua")
+loadIfNot("/data/general/npcs/ghoul.lua")
+loadIfNot("/data/general/npcs/jelly.lua")
+loadIfNot("/data/general/npcs/minotaur.lua")
+loadIfNot("/data/general/npcs/molds.lua")
+--loadIfNot("/data/general/npcs/mummy.lua")
+loadIfNot("/data/general/npcs/ooze.lua")
+loadIfNot("/data/general/npcs/orc-grushnak.lua")
+loadIfNot("/data/general/npcs/orc.lua")
+loadIfNot("/data/general/npcs/orc-rak-shor.lua")
+loadIfNot("/data/general/npcs/orc-vor.lua")
+loadIfNot("/data/general/npcs/plant.lua")
+--loadIfNot("/data/general/npcs/ritch.lua")
+loadIfNot("/data/general/npcs/rodent.lua")
+loadIfNot("/data/general/npcs/sandworm.lua")
+loadIfNot("/data/general/npcs/skeleton.lua")
+loadIfNot("/data/general/npcs/snake.lua")
+loadIfNot("/data/general/npcs/snow-giant.lua")
+loadIfNot("/data/general/npcs/spider.lua")
+--loadIfNot("/data/general/npcs/sunwall-town.lua")
+loadIfNot("/data/general/npcs/swarm.lua")
+loadIfNot("/data/general/npcs/thieve.lua")
+loadIfNot("/data/general/npcs/troll.lua")
+loadIfNot("/data/general/npcs/vampire.lua")
+loadIfNot("/data/general/npcs/vermin.lua")
+loadIfNot("/data/general/npcs/wight.lua")
+loadIfNot("/data/general/npcs/xorn.lua")
diff --git a/game/modules/tome/data/maps/towns/angolwen.lua b/game/modules/tome/data/maps/towns/angolwen.lua
index 1963a23ffa64ad5614cc2a162df6f26089d813b9..fa9a17cccd60f9e2eadbb9f33f4ff52a4b2a6430 100644
--- a/game/modules/tome/data/maps/towns/angolwen.lua
+++ b/game/modules/tome/data/maps/towns/angolwen.lua
@@ -26,7 +26,7 @@ quickEntity(' ', {name='grass', display='.', color=colors.LIGHT_GREEN, image="te
quickEntity('2', {show_tooltip=true, name="Jewelry", display='2', color=colors.BLUE, resolvers.store("ANGOLWEN_JEWELRY"), image="terrain/wood_store_gem.png"})
quickEntity('4', {show_tooltip=true, name="Alchemist", display='4', color=colors.LIGHT_BLUE, resolvers.store("POTION"), image="terrain/wood_store_potion.png"})
quickEntity('5', {show_tooltip=true, name="Scribe", display='5', color=colors.WHITE, resolvers.store("SCROLL"), image="terrain/wood_store_book.png"})
-quickEntity('6', {show_tooltip=true, name="Staves & Wands", display='6', color=colors.RED, resolvers.store("ANGOLWEN_STAFF_WAND"), image="terrain/wood_store_closed.png"})
+quickEntity('6', {show_tooltip=true, name="Staves & Wands", display='6', color=colors.RED, resolvers.store("ANGOLWEN_STAFF_WAND"), resolvers.chatfeature("magic-store"), image="terrain/wood_store_closed.png"})
startx = 46
starty = 43
diff --git a/game/modules/tome/data/maps/towns/minas-tirith.lua b/game/modules/tome/data/maps/towns/minas-tirith.lua
index 3ed8eabc5f8af7de5ed7469e244e230f36dd73b4..033ff9be847a60481fd44920dc8f7438cd766249 100644
--- a/game/modules/tome/data/maps/towns/minas-tirith.lua
+++ b/game/modules/tome/data/maps/towns/minas-tirith.lua
@@ -37,7 +37,7 @@ quickEntity('1', {show_tooltip=true, name="Closed store", display='1', color=col
quickEntity('2', {show_tooltip=true, name="Armour Smith", display='2', color=colors.UMBER, resolvers.store("ARMOR"), image="terrain/wood_store_armor.png"})
quickEntity('3', {show_tooltip=true, name="Weapon Smith", display='3', color=colors.UMBER, resolvers.store("WEAPON"), resolvers.chatfeature("minas-tirith-weapon-store"), image="terrain/wood_store_weapon.png"})
quickEntity('4', {show_tooltip=true, name="Alchemist", display='4', color=colors.LIGHT_BLUE, resolvers.store("POTION"), image="terrain/wood_store_potion.png"})
-quickEntity('5', {show_tooltip=true, name="Scribe", display='5', color=colors.WHITE, resolvers.store("SCROLL"), image="terrain/wood_store_book.png"})
+quickEntity('5', {show_tooltip=true, name="Scribe", display='5', color=colors.WHITE, resolvers.store("SCROLL"), resolvers.chatfeature("magic-store"), image="terrain/wood_store_book.png"})
quickEntity('6', {show_tooltip=true, name="Closed store", display='6', color=colors.LIGHT_UMBER, block_move=true, block_sight=true, image="terrain/wood_store_closed.png"})
quickEntity('7', {show_tooltip=true, name="Closed store", display='7', color=colors.LIGHT_UMBER, block_move=true, block_sight=true, image="terrain/wood_store_closed.png"})
quickEntity('8', {show_tooltip=true, name="Closed store", display='8', color=colors.LIGHT_UMBER, block_move=true, block_sight=true, image="terrain/wood_store_closed.png"})
diff --git a/game/modules/tome/data/zones/ancient-elven-ruins/npcs.lua b/game/modules/tome/data/zones/ancient-elven-ruins/npcs.lua
index 064e8ea06d5b2f3c4cc89e988b4283932c0384cd..1f57dae6ecc71403ea93b012bc82f71d5a219f92 100644
--- a/game/modules/tome/data/zones/ancient-elven-ruins/npcs.lua
+++ b/game/modules/tome/data/zones/ancient-elven-ruins/npcs.lua
@@ -23,6 +23,8 @@ load("/data/general/npcs/molds.lua")
load("/data/general/npcs/mummy.lua")
load("/data/general/npcs/skeleton.lua")
+load("/data/general/npcs/all.lua", function(e) if e.rarity then e.rarity = e.rarity * 20 end end)
+
local Talents = require("engine.interface.ActorTalents")
-- The boss , no "rarity" field means it will not be randomly generated
diff --git a/game/modules/tome/data/zones/ardhungol/npcs.lua b/game/modules/tome/data/zones/ardhungol/npcs.lua
index bba5317bfc87e7500bb966a6a24a642587c4d0a1..7b2406fbfcf27855666122e4ef0ebef5a773513a 100644
--- a/game/modules/tome/data/zones/ardhungol/npcs.lua
+++ b/game/modules/tome/data/zones/ardhungol/npcs.lua
@@ -19,6 +19,8 @@
load("/data/general/npcs/spider.lua")
+load("/data/general/npcs/all.lua", function(e) if e.rarity then e.rarity = e.rarity * 10 end end)
+
local Talents = require("engine.interface.ActorTalents")
newEntity{ define_as = "UNGOLE", base = "BASE_NPC_SPIDER",
diff --git a/game/modules/tome/data/zones/carn-dum/npcs.lua b/game/modules/tome/data/zones/carn-dum/npcs.lua
index bcd0cbf00177d4cf9e76091eb97dfbef97e59ab4..197bdf31139cbd0005954b48593f1dff354f0c35 100644
--- a/game/modules/tome/data/zones/carn-dum/npcs.lua
+++ b/game/modules/tome/data/zones/carn-dum/npcs.lua
@@ -22,6 +22,8 @@ load("/data/general/npcs/canine.lua", function(e) if e.rarity then e.rarity = e.
load("/data/general/npcs/snow-giant.lua")
load("/data/general/npcs/cold-drake.lua")
+load("/data/general/npcs/all.lua", function(e) if e.rarity then e.rarity = e.rarity * 20 end end)
+
local Talents = require("engine.interface.ActorTalents")
-- The boss of trollshaws, no "rarity" field means it will not be randomly generated
diff --git a/game/modules/tome/data/zones/eruan/npcs.lua b/game/modules/tome/data/zones/eruan/npcs.lua
index d2026178b4e58d1e9bc716c3616aad9e55754918..c25f4fcb05acc97777192e25ed1e73c97491cd53 100644
--- a/game/modules/tome/data/zones/eruan/npcs.lua
+++ b/game/modules/tome/data/zones/eruan/npcs.lua
@@ -21,6 +21,8 @@ load("/data/general/npcs/sandworm.lua")
load("/data/general/npcs/ritch.lua")
load("/data/general/npcs/orc.lua")
+load("/data/general/npcs/all.lua", function(e) if e.rarity then e.rarity = e.rarity * 20 end end)
+
local Talents = require("engine.interface.ActorTalents")
newEntity{ define_as = "SUN_PALADIN_GUREN",
diff --git a/game/modules/tome/data/zones/grushnak-pride/npcs.lua b/game/modules/tome/data/zones/grushnak-pride/npcs.lua
index c4b055831d9869363e430cbd81ad43da48e08816..daf553e866e30172a5a41419d3b5389d8b8ac8d6 100644
--- a/game/modules/tome/data/zones/grushnak-pride/npcs.lua
+++ b/game/modules/tome/data/zones/grushnak-pride/npcs.lua
@@ -20,6 +20,8 @@
load("/data/general/npcs/orc.lua", function(e) if e.rarity then e.rarity = e.rarity * 3 end e.make_escort = nil end)
load("/data/general/npcs/orc-grushnak.lua")
+load("/data/general/npcs/all.lua", function(e) if e.rarity then e.rarity = e.rarity * 20 end end)
+
local Talents = require("engine.interface.ActorTalents")
newEntity{ base="BASE_NPC_ORC_GRUSHNAK", define_as = "GRUSHNAK",
@@ -42,7 +44,7 @@ newEntity{ base="BASE_NPC_ORC_GRUSHNAK", define_as = "GRUSHNAK",
ai = "dumb_talented_simple", ai_state = { talent_in=1, ai_move="move_astar", },
body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1, HEAD=1, FEET=1 },
-
+
resolvers.equip{
{type="weapon", subtype="waraxe", ego_change=100, autoreq=true},
{type="armor", subtype="shield", ego_change=100, autoreq=true},
diff --git a/game/modules/tome/data/zones/illusory-castle/npcs.lua b/game/modules/tome/data/zones/illusory-castle/npcs.lua
index 18d593d1dff8b775bd2a834b0d19c46826ec7f29..3196dffbe5c1eeb38df6e14a503a26462776677f 100644
--- a/game/modules/tome/data/zones/illusory-castle/npcs.lua
+++ b/game/modules/tome/data/zones/illusory-castle/npcs.lua
@@ -23,4 +23,6 @@ load("/data/general/npcs/molds.lua")
load("/data/general/npcs/skeleton.lua")
load("/data/general/npcs/snake.lua")
+load("/data/general/npcs/all.lua", function(e) if e.rarity then e.rarity = e.rarity * 20 end end)
+
local Talents = require("engine.interface.ActorTalents")
diff --git a/game/modules/tome/data/zones/infinite-dungeon/npcs.lua b/game/modules/tome/data/zones/infinite-dungeon/npcs.lua
index 9577edf4815091f7457b1932a224c8ba6776cc5d..3607b5b0a3a120530b397d0e22a1eae6c4c7426d 100644
--- a/game/modules/tome/data/zones/infinite-dungeon/npcs.lua
+++ b/game/modules/tome/data/zones/infinite-dungeon/npcs.lua
@@ -17,29 +17,4 @@
-- Nicolas Casalini "DarkGod"
-- darkgod@te4.org
-load("/data/general/npcs/ant.lua")
-load("/data/general/npcs/bear.lua")
-load("/data/general/npcs/canine.lua")
-load("/data/general/npcs/cold-drake.lua")
-load("/data/general/npcs/fire-drake.lua")
-load("/data/general/npcs/faeros.lua")
-load("/data/general/npcs/ghoul.lua")
-load("/data/general/npcs/jelly.lua")
-load("/data/general/npcs/minotaur.lua")
-load("/data/general/npcs/molds.lua")
-load("/data/general/npcs/ooze.lua")
-load("/data/general/npcs/orc.lua")
-load("/data/general/npcs/plant.lua")
-load("/data/general/npcs/rodent.lua")
-load("/data/general/npcs/sandworm.lua")
-load("/data/general/npcs/skeleton.lua")
-load("/data/general/npcs/snake.lua")
-load("/data/general/npcs/snow-giant.lua")
-load("/data/general/npcs/spider.lua")
-load("/data/general/npcs/swarm.lua")
-load("/data/general/npcs/thieve.lua")
-load("/data/general/npcs/troll.lua")
-load("/data/general/npcs/vampire.lua")
-load("/data/general/npcs/vermin.lua")
-load("/data/general/npcs/wight.lua")
-load("/data/general/npcs/xorn.lua")
+load("/data/general/npcs/all.lua")
diff --git a/game/modules/tome/data/zones/maze/npcs.lua b/game/modules/tome/data/zones/maze/npcs.lua
index a839ddae7ae85b310b97f14079ecb4dd3629f7ef..f0eba7f57238a81fba14e2b0804e965dd9d04a3f 100644
--- a/game/modules/tome/data/zones/maze/npcs.lua
+++ b/game/modules/tome/data/zones/maze/npcs.lua
@@ -27,6 +27,8 @@ load("/data/general/npcs/ant.lua")
load("/data/general/npcs/thieve.lua")
load("/data/general/npcs/minotaur.lua")
+load("/data/general/npcs/all.lua", function(e) if e.rarity then e.rarity = e.rarity * 20 end end)
+
local Talents = require("engine.interface.ActorTalents")
-- The boss of the maze, no "rarity" field means it will not be randomly generated
diff --git a/game/modules/tome/data/zones/moria/npcs.lua b/game/modules/tome/data/zones/moria/npcs.lua
index 93a1712b02b9314facfef78570757ec1a754cd5a..cc3f8054e734f01adfa8b65b7785e8a9744f2549 100644
--- a/game/modules/tome/data/zones/moria/npcs.lua
+++ b/game/modules/tome/data/zones/moria/npcs.lua
@@ -20,6 +20,8 @@
load("/data/general/npcs/orc.lua")
load("/data/general/npcs/troll.lua")
+load("/data/general/npcs/all.lua", function(e) if e.rarity then e.rarity = e.rarity * 20 end end)
+
local Talents = require("engine.interface.ActorTalents")
-- The boss of Moria, no "rarity" field means it will not be randomly generated
diff --git a/game/modules/tome/data/zones/old-forest/npcs.lua b/game/modules/tome/data/zones/old-forest/npcs.lua
index 9e4caa55d57ad8b621c8a9bb5824f8de0e4d4eb5..872738f431e6d63e68d0ccf25e4492333da87f67 100644
--- a/game/modules/tome/data/zones/old-forest/npcs.lua
+++ b/game/modules/tome/data/zones/old-forest/npcs.lua
@@ -25,6 +25,8 @@ load("/data/general/npcs/swarm.lua")
load("/data/general/npcs/plant.lua")
load("/data/general/npcs/ant.lua")
+load("/data/general/npcs/all.lua", function(e) if e.rarity then e.rarity = e.rarity * 20 end end)
+
local Talents = require("engine.interface.ActorTalents")
-- The boss of trollshaws, no "rarity" field means it will not be randomly generated
diff --git a/game/modules/tome/data/zones/rak-shor-pride/npcs.lua b/game/modules/tome/data/zones/rak-shor-pride/npcs.lua
index 05f6c747c0ed9bbe238497682d56833acfced8e2..e437f3068f1228d2586589825bc7168b003f9650 100644
--- a/game/modules/tome/data/zones/rak-shor-pride/npcs.lua
+++ b/game/modules/tome/data/zones/rak-shor-pride/npcs.lua
@@ -23,6 +23,8 @@ load("/data/general/npcs/skeleton.lua", function(e) if e.rarity then e.rarity =
load("/data/general/npcs/orc.lua", function(e) if e.rarity then e.rarity = e.rarity * 3 end e.make_escort = nil end)
load("/data/general/npcs/orc-rak-shor.lua")
+load("/data/general/npcs/all.lua", function(e) if e.rarity then e.rarity = e.rarity * 20 end end)
+
local Talents = require("engine.interface.ActorTalents")
newEntity{ base="BASE_NPC_ORC_RAK_SHOR", define_as = "RAK_SHOR",
diff --git a/game/modules/tome/data/zones/sandworm-lair/npcs.lua b/game/modules/tome/data/zones/sandworm-lair/npcs.lua
index f9e6071a51ffa54ad4d311447bdacec7cfe1d67f..54234356deb9cd89f92758913997ca60f84bf135 100644
--- a/game/modules/tome/data/zones/sandworm-lair/npcs.lua
+++ b/game/modules/tome/data/zones/sandworm-lair/npcs.lua
@@ -23,6 +23,8 @@ load("/data/general/npcs/ooze.lua", function(e) if e.rarity then e.rarity = e.ra
load("/data/general/npcs/jelly.lua", function(e) if e.rarity then e.rarity = e.rarity * 6 end end)
load("/data/general/npcs/sandworm.lua")
+load("/data/general/npcs/all.lua", function(e) if e.rarity then e.rarity = e.rarity * 20 end end)
+
local Talents = require("engine.interface.ActorTalents")
-- They make the tunnels, temporarily
diff --git a/game/modules/tome/data/zones/tol-falas/npcs.lua b/game/modules/tome/data/zones/tol-falas/npcs.lua
index e426ec3dfa2dfb51b5e3ce707b78dc96b9560e7f..2abcaab23e42b7e7d7b2833778e38dd8c0ba2793 100644
--- a/game/modules/tome/data/zones/tol-falas/npcs.lua
+++ b/game/modules/tome/data/zones/tol-falas/npcs.lua
@@ -22,6 +22,8 @@ load("/data/general/npcs/ghoul.lua")
load("/data/general/npcs/wight.lua")
load("/data/general/npcs/vampire.lua")
+load("/data/general/npcs/all.lua", function(e) if e.rarity then e.rarity = e.rarity * 20 end end)
+
local Talents = require("engine.interface.ActorTalents")
-- The boss of Tol Falas, no "rarity" field means it will not be randomly generated
diff --git a/game/modules/tome/data/zones/tower-amon-sul/npcs.lua b/game/modules/tome/data/zones/tower-amon-sul/npcs.lua
index e9641078ebf9a59fc6999251ba8ca056686045c3..02228758e81e7e88c5c18a39566f42a9904246ac 100644
--- a/game/modules/tome/data/zones/tower-amon-sul/npcs.lua
+++ b/game/modules/tome/data/zones/tower-amon-sul/npcs.lua
@@ -23,6 +23,8 @@ load("/data/general/npcs/molds.lua")
load("/data/general/npcs/skeleton.lua")
load("/data/general/npcs/snake.lua")
+load("/data/general/npcs/all.lua", function(e) if e.rarity then e.rarity = e.rarity * 20 end end)
+
local Talents = require("engine.interface.ActorTalents")
-- The boss of Amon Sul, no "rarity" field means it will not be randomly generated
diff --git a/game/modules/tome/data/zones/town-gates-of-morning/npcs.lua b/game/modules/tome/data/zones/town-gates-of-morning/npcs.lua
index d7622707ecf8aa663de8ec64c26ad457d594d9a1..f4dd2fe38cf2ed62890ef49eaf0f80b84700e622 100644
--- a/game/modules/tome/data/zones/town-gates-of-morning/npcs.lua
+++ b/game/modules/tome/data/zones/town-gates-of-morning/npcs.lua
@@ -18,7 +18,7 @@
-- darkgod@te4.org
load("/data/general/npcs/sunwall-town.lua")
-load("/data/general/npcs/.lua", function(e) e.faction = "sunwall" end)
+--load("/data/general/npcs/.lua", function(e) e.faction = "sunwall" end)
local Talents = require("engine.interface.ActorTalents")
diff --git a/game/modules/tome/data/zones/trollshaws/npcs.lua b/game/modules/tome/data/zones/trollshaws/npcs.lua
index 6cca1e4fbd5c335290d379f8b54e963b912f89f3..0151406893515ea126d03c3a1ceb2a9de60d3797 100644
--- a/game/modules/tome/data/zones/trollshaws/npcs.lua
+++ b/game/modules/tome/data/zones/trollshaws/npcs.lua
@@ -26,6 +26,8 @@ load("/data/general/npcs/plant.lua")
load("/data/general/npcs/swarm.lua")
load("/data/general/npcs/bear.lua")
+load("/data/general/npcs/all.lua", function(e) if e.rarity then e.rarity = e.rarity * 20 end end)
+
local Talents = require("engine.interface.ActorTalents")
-- The boss of trollshaws, no "rarity" field means it will not be randomly generated
diff --git a/game/modules/tome/data/zones/unremarkable-cave/npcs.lua b/game/modules/tome/data/zones/unremarkable-cave/npcs.lua
index 539aa83e8f95b353da28ff1fe7d010e6b5e57291..19c3b67cefcb9097f89381e04e1e749b1da4082a 100644
--- a/game/modules/tome/data/zones/unremarkable-cave/npcs.lua
+++ b/game/modules/tome/data/zones/unremarkable-cave/npcs.lua
@@ -23,6 +23,8 @@ load("/data/general/npcs/molds.lua")
load("/data/general/npcs/skeleton.lua")
load("/data/general/npcs/snake.lua")
+load("/data/general/npcs/all.lua", function(e) if e.rarity then e.rarity = e.rarity * 10 end end)
+
local Talents = require("engine.interface.ActorTalents")
newEntity{ define_as = "FILLAREL",
diff --git a/game/modules/tome/data/zones/vor-pride/npcs.lua b/game/modules/tome/data/zones/vor-pride/npcs.lua
index 0bf4c5b7fda5da72e4bf2dedb6a9d5ea4853ba71..5fa7bce313781d7072881f2fdcf1a2133d853b75 100644
--- a/game/modules/tome/data/zones/vor-pride/npcs.lua
+++ b/game/modules/tome/data/zones/vor-pride/npcs.lua
@@ -20,6 +20,8 @@
load("/data/general/npcs/orc.lua", function(e) if e.rarity then e.rarity = e.rarity * 3 end e.make_escort = nil end)
load("/data/general/npcs/orc-vor.lua")
+load("/data/general/npcs/all.lua", function(e) if e.rarity then e.rarity = e.rarity * 20 end end)
+
local Talents = require("engine.interface.ActorTalents")
newEntity{ base="BASE_NPC_ORC_VOR", define_as = "VOR",
diff --git a/game/modules/tome/resolvers.lua b/game/modules/tome/resolvers.lua
index 1b9225e0ba445072ac9e1db3f4fb2c1ad77d0d51..6621f01b68c3c6c414f5b23a30db44d4b404aeb2 100644
--- a/game/modules/tome/resolvers.lua
+++ b/game/modules/tome/resolvers.lua
@@ -202,8 +202,8 @@ function resolvers.calc.random_use_talent(tt, e)
local tid = rng.table(ts) or engine.interface.ActorTalents.T_SENSE
local t = engine.interface.ActorTalents.talents_def[tid]
local level = util.bound(math.ceil(rng.mbonus(5, resolvers.current_level, resolvers.mbonus_max_level) * ml / 5), 1, 5)
- e.cost = e.cost + t.type[2] * 3
- e.cost = e.cost + level * 2
+ e.cost = e.cost + t.type[2] * 3 * level
+ e.recharge_cost = t.type[2] * 3 * level
return { id=tid, level=level, power=tt[2] }
end