diff --git a/game/engine/DamageType.lua b/game/engine/DamageType.lua
index a78fa90c58ea6462b4ac7b74936951dd15274944..cbd9dbe73a544d2db143db45fc3f0059ae6af80a 100644
--- a/game/engine/DamageType.lua
+++ b/game/engine/DamageType.lua
@@ -25,7 +25,7 @@ module(..., package.seeall, class.make)
_M.dam_def = {}
-- Default damage projector
-function _M.defaultProject(x, y, type, dam)
+function _M.defaultProject(src, x, y, type, dam)
print("implement a projector!")
end
diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua
index 52e8e6c64f5f38b8d49c420c3a26fb2cfd34915d..cf1f29b9ccc2b5fc1322c2e9e7509df1482a9f9d 100644
--- a/game/modules/tome/class/Actor.lua
+++ b/game/modules/tome/class/Actor.lua
@@ -70,6 +70,7 @@ function _M:init(t, no_default)
self.combat_spellspeed = 0
self.combat_spellcrit = 0
self.combat_spellpower = 0
+ self.combat_mindpower = 0
self.combat_physresist = 0
self.combat_spellresist = 0
@@ -819,6 +820,10 @@ function _M:preUseTalent(ab, silent)
game.logSeen(self, "%s is too afraid to use %s.", self.name:capitalize(), ab.name)
return false
end
+ if ab.no_silence and self:attr("silence") then
+ game.logSeen(self, "%s silenced and can not use %s.", self.name:capitalize(), ab.name)
+ return false
+ end
if not self:enoughEnergy() then print("fail energy") return false end
@@ -1162,6 +1167,7 @@ function _M:canBe(what)
if what == "cut" and rng.percent(100 * (self:attr("cut_immune") or 0)) then return false end
if what == "confusion" and rng.percent(100 * (self:attr("confusion_immune") or 0)) then return false end
if what == "blind" and rng.percent(100 * (self:attr("blind_immune") or 0)) then return false end
+ if what == "silence" and rng.percent(100 * (self:attr("silence_immune") or 0)) then return false end
if what == "stun" and rng.percent(100 * (self:attr("stun_immune") or 0)) then return false end
if what == "fear" and rng.percent(100 * (self:attr("fear_immune") or 0)) then return false end
if what == "knockback" and rng.percent(100 * (self:attr("knockback_immune") or 0)) then return false end
@@ -1195,6 +1201,9 @@ function _M:updateEffectDuration(dur, what)
elseif what == "blind" then
local p = self:combatMentalResist(), rankmod * (util.bound(self:combatMentalResist() * 3, 40, 115) / 100)
dur = dur - math.ceil(dur * (p) / 100)
+ elseif what == "silence" then
+ local p = self:combatMentalResist(), rankmod * (util.bound(self:combatMentalResist() * 3, 40, 115) / 100)
+ dur = dur - math.ceil(dur * (p) / 100)
elseif what == "slow" then
local p = self:combatPhysicalResist(), rankmod * (util.bound(self:combatPhysicalResist() * 3, 40, 115) / 100)
dur = dur - math.ceil(dur * (p) / 100)
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index 1f172e9bdba93389bc1a54f8d4d8574eb0328a71..d337f057a698eeb46a7db9c739bebbd5ba7a9200 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -469,7 +469,7 @@ function _M:setupCommands()
self.player.esp.all = 1
self.player.esp.range = 50
self.player.inc_damage.all = 100000
- self:changeLevel(9, "tol-falas")
+ self:changeLevel(2, "caverns-osse")
-- self:changeLevel(1, "wilderness-arda-fareast")
-- game.memory_levels["wilderness-arda-fareast-1"] = game.level
-- self.player:grantQuest("orc-pride")
diff --git a/game/modules/tome/class/Object.lua b/game/modules/tome/class/Object.lua
index 6841d28efb2c2805e727fab96e200749db29d008..7afb7fbfe34c20784f14ce777d2e91710f7466da 100644
--- a/game/modules/tome/class/Object.lua
+++ b/game/modules/tome/class/Object.lua
@@ -64,6 +64,10 @@ function _M:use(who, typ)
game.logPlayer(who, "You can not see!")
return
end
+ if self.use_no_silence and who:attr("silence") then
+ game.logPlayer(who, "You are silenced!")
+ return
+ end
local types = {}
if self:canUseObject() then types[#types+1] = "use" end
@@ -272,9 +276,9 @@ function _M:getTextualDesc()
desc[#desc+1] = ("Reduces talent cooldowns: %s."):format(table.concat(tcds, ','))
end
- if w.combat_physresist then desc[#desc+1] = ("Increases physical resistance: %s."):format(w.combat_physresist) end
- if w.combat_spellresist then desc[#desc+1] = ("Increases spell resistance: %s."):format(w.combat_spellresist) end
- if w.combat_mentalresist then desc[#desc+1] = ("Increases mental resistance: %s."):format(w.combat_mentalresist) end
+ if w.combat_physresist then desc[#desc+1] = ("Increases physical save: %s."):format(w.combat_physresist) end
+ if w.combat_spellresist then desc[#desc+1] = ("Increases spell save: %s."):format(w.combat_spellresist) end
+ if w.combat_mentalresist then desc[#desc+1] = ("Increases mental save: %s."):format(w.combat_mentalresist) end
if w.blind_immune then desc[#desc+1] = ("Increases blindness immunity: %d%%."):format(w.blind_immune * 100) end
if w.poison_immune then desc[#desc+1] = ("Increases poison immunity: %d%%."):format(w.poison_immune * 100) end
diff --git a/game/modules/tome/class/interface/Combat.lua b/game/modules/tome/class/interface/Combat.lua
index 6bbb80a6ccf852869f1514259d4f50ac317d11dc..999d7c6603dd5a30db9afdbb30d2d2710d2c2979 100644
--- a/game/modules/tome/class/interface/Combat.lua
+++ b/game/modules/tome/class/interface/Combat.lua
@@ -513,6 +513,21 @@ function _M:spellFriendlyFire()
return not rng.percent(self:getTalentLevelRaw(self.T_SPELL_SHAPING) * 20 + (self:getLck() - 50) * 0.2)
end
+--- Gets mindpower
+function _M:combatMindpower(mod)
+ mod = mod or 1
+ local add = 0
+ return (self.combat_mindpower + add + self:getWil() * 0.7 + self:getCun() * 0.4) * mod
+end
+
+--- Gets damage based on talent
+function _M:combatTalentMindDamage(t, base, max)
+ -- Compute at "max"
+ local mod = max / ((base + 100) * ((math.sqrt(5) - 1) * 0.8 + 1))
+ -- Compute real
+ return (base + (self:combatMindpower())) * ((math.sqrt(self:getTalentLevel(t)) - 1) * 0.8 + 1) * mod
+end
+
--- Computes physical resistance
function _M:combatPhysicalResist()
return self.combat_physresist + (self:getCon() + self:getStr() + (self:getLck() - 50) * 0.5) * 0.25
diff --git a/game/modules/tome/data/autolevel_schemes.lua b/game/modules/tome/data/autolevel_schemes.lua
index 44823c1f078858ddaa837be7cb75710dd9f320bb..29c49552c3b335b66c717af659ffc46d105636a7 100644
--- a/game/modules/tome/data/autolevel_schemes.lua
+++ b/game/modules/tome/data/autolevel_schemes.lua
@@ -73,3 +73,7 @@ end}
Autolevel:registerScheme{ name = "drake", levelup = function(self)
self:learnStats{ self.STAT_STR, self.STAT_WIL, self.STAT_DEX }
end}
+
+Autolevel:registerScheme{ name = "wildcaster", levelup = function(self)
+ self:learnStats{ self.STAT_WIL, self.STAT_WIL, self.STAT_CUN }
+end}
diff --git a/game/modules/tome/data/damage_types.lua b/game/modules/tome/data/damage_types.lua
index 362b3c03a265172ff0d604c9bcdc06038205cb5b..f5f18d9a6f088b79098b932ab0a4764138735c0f 100644
--- a/game/modules/tome/data/damage_types.lua
+++ b/game/modules/tome/data/damage_types.lua
@@ -184,6 +184,37 @@ newDamageType{
name = "darkness", type = "DARKNESS", text_color = "#DARK_GREY#",
}
+-- Mind damage
+newDamageType{
+ name = "mind", type = "MIND", text_color = "#YELLOW#",
+ projector = function(src, x, y, type, dam)
+ local target = game.level.map(x, y, Map.ACTOR)
+ if target then
+ if target:checkHit(src:combatMindpower() * 0.7, target:combatMentalResist(), 0, 95, 15) then
+ return DamageType.defaultProjector(src, x, y, type, dam)
+ else
+ game.logSeen(target, "%s resists the mind attack!", target.name:capitalize())
+ return 0
+ end
+ end
+ end,
+}
+
+-- Silence
+newDamageType{
+ name = "SILENCE", type = "SILENCE",
+ projector = function(src, x, y, type, dam)
+ local target = game.level.map(x, y, Map.ACTOR)
+ if target then
+ if target:checkHit(src:combatMindpower() * 0.7, target:combatMentalResist(), 0, 95, 15) then
+ target:setEffect(target.EFF_SILENCED, math.ceil(dam), {})
+ else
+ game.logSeen(target, "%s resists!", target.name:capitalize())
+ end
+ end
+ end,
+}
+
-- Blinds
newDamageType{
name = "blindness", type = "BLIND",
@@ -247,6 +278,22 @@ newDamageType{
end,
}
+-- Cold + Stun
+newDamageType{
+ name = "coldstun", type = "COLDSTUN",
+ projector = function(src, x, y, type, dam)
+ DamageType:get(DamageType.COLD).projector(src, x, y, DamageType.COLD, dam)
+ local target = game.level.map(x, y, Map.ACTOR)
+ if target then
+ if target:checkHit(src:combatSpellpower(), target:combatPhysicalResist(), 0, 95, 15) and target:canBe("stun") then
+ target:setEffect(target.EFF_STUNNED, 4, {})
+ else
+ game.logSeen(target, "%s resists the stun!", target.name:capitalize())
+ end
+ end
+ end,
+}
+
-- Fire DOT + Stun
newDamageType{
name = "flameshock", type = "FLAMESHOCK",
@@ -361,7 +408,25 @@ newDamageType{
end,
}
--- Physical damage + repulsion; checks for spell power against physical resistance
+-- Physical damage + repulsion; checks for mind power against physical resistance
+newDamageType{
+ name = "mindknockback", type = "MINDKNOCKBACK",
+ projector = function(src, x, y, type, dam, tmp)
+ local target = game.level.map(x, y, Map.ACTOR)
+ if target and not tmp[target] then
+ tmp[target] = true
+ DamageType:get(DamageType.PHYSICAL).projector(src, x, y, DamageType.PHYSICAL, dam)
+ if target:checkHit(src:combatMindpower() * 0.8, target:combatPhysicalResist(), 0, 95, 15) and target:canBe("knockback") then
+ target:knockback(src.x, src.y, 3)
+ game.logSeen(target, "%s is knocked back!", target.name:capitalize())
+ else
+ game.logSeen(target, "%s resists the punch!", target.name:capitalize())
+ end
+ end
+ end,
+}
+
+-- Physical damage + repulsion; checks for attack power against physical resistance
newDamageType{
name = "physknockback", type = "PHYSKNOCKBACK",
projector = function(src, x, y, type, dam, tmp)
diff --git a/game/modules/tome/data/general/npcs/naga.lua b/game/modules/tome/data/general/npcs/naga.lua
index fac84c27bfb703c8c6adefe7ba09d19a579d2968..07e11bc32a1056776e74163c10664440b5eb91e9 100644
--- a/game/modules/tome/data/general/npcs/naga.lua
+++ b/game/modules/tome/data/general/npcs/naga.lua
@@ -39,78 +39,75 @@ newEntity{
open_door = true,
autolevel = "warrior",
- ai = "dumb_talented_simple", ai_state = { talent_in=3, },
+ ai = "dumb_talented_simple", ai_state = { talent_in=1, },
energy = { mod=1.2 },
stats = { str=15, dex=15, mag=15, con=10 },
}
newEntity{ base = "BASE_NPC_NAGA",
name = "naga myrmidon", color=colors.DARK_UMBER,
- desc = [[A naga warrior, wielding a menacing trident. Myrmidons are the most devoted warriors, following the orders of Maglor whatever they may be.]],
+ desc = [[A naga warrior, wielding a menacing trident.
+Myrmidons are the most devoted warriors, following the orders of Maglor whatever they may be.]],
level_range = {30, nil}, exp_worth = 1,
rarity = 1,
- max_life = resolvers.rngavg(120,150), life_rating = 14,
+ max_life = resolvers.rngavg(120,150), life_rating = 16,
resolvers.equip{
{type="weapon", subtype="trident", autoreq=true},
},
combat_armor = 20, combat_def = 10,
resolvers.talents{
+ [Talents.T_SPIT_POISON]=5,
[Talents.T_SUNDER_ARMOUR]=4,
[Talents.T_STUNNING_BLOW]=3,
+ [Talents.T_RUSH]=8,
+ [Talents.T_WEAPON_COMBAT]=6,
+ [Talents.T_AXE_MASTERY]=6,
},
}
newEntity{ base = "BASE_NPC_NAGA",
- name = "naga vemon spitter", color=colors.DARK_UMBER,
- desc = [[A naga warrior, wielding a menacing trident. Myrmidons are the most devoted warriors, following the orders of Maglor whatever they may be.]],
- level_range = {30, nil}, exp_worth = 1,
- rarity = 1,
- max_life = resolvers.rngavg(120,150), life_rating = 14,
- resolvers.equip{
- {type="weapon", subtype="trident", autoreq=true},
- },
- combat_armor = 20, combat_def = 10,
- resolvers.talents{ [Talents.T_SUNDER_ARMOUR]=4, },
-}
-
-newEntity{ base = "BASE_NPC_NAGA",
- name = "naga tide hunter", color=colors.DARK_UMBER,
- desc = [[A naga warrior, wielding a menacing trident. Myrmidons are the most devoted warriors, following the orders of Maglor whatever they may be.]],
- level_range = {30, nil}, exp_worth = 1,
- rarity = 1,
+ name = "naga tide huntress", color=colors.RED,
+ desc = [[A naga hunter, wielding a long bow.
+Tide huntress wield both magic and hunting skills, making them terrible foes.]],
+ level_range = {34, nil}, exp_worth = 1,
+ rarity = 4,
+ rank = 3,
female = true,
- max_life = resolvers.rngavg(120,150), life_rating = 14,
+ max_life = resolvers.rngavg(110,130), life_rating = 14,
resolvers.equip{
- {type="weapon", subtype="trident", autoreq=true},
+ {type="weapon", subtype="longbow", autoreq=true},
+ {type="ammo", subtype="arrow", autoreq=true},
},
- combat_armor = 20, combat_def = 10,
- resolvers.talents{ [Talents.T_SUNDER_ARMOUR]=4, },
-}
-
-newEntity{ base = "BASE_NPC_NAGA",
- name = "naga psyren", color=colors.DARK_UMBER,
- desc = [[A naga warrior, wielding a menacing trident. Myrmidons are the most devoted warriors, following the orders of Maglor whatever they may be.]],
- level_range = {30, nil}, exp_worth = 1,
- rarity = 1,
- female = true,
- max_life = resolvers.rngavg(120,150), life_rating = 14,
- resolvers.equip{
- {type="weapon", subtype="trident", autoreq=true},
+ combat_armor = 10, combat_def = 10,
+ autolevel = "warriormage",
+ resolvers.talents{
+ [Talents.T_SPIT_POISON]=5,
+ [Talents.T_WATER_JET]=6,
+ [Talents.T_WATER_BOLT]=7,
+ [Talents.T_SHOOT]=1,
+ [Talents.T_WEAPON_COMBAT]=6,
+ [Talents.T_BOW_MASTERY]=6,
},
- combat_armor = 20, combat_def = 10,
- resolvers.talents{ [Talents.T_SUNDER_ARMOUR]=4, },
}
newEntity{ base = "BASE_NPC_NAGA",
- name = "naga shield-maiden", color=colors.DARK_UMBER,
- desc = [[A female naga, tasked to protect the sanctuary at all costs.]],
- level_range = {30, nil}, exp_worth = 1,
- rarity = 1,
+ name = "naga psyren", color=colors.YELLOW,
+ desc = [[A naga psyren, she looks at you with great intensity.
+Psyrens are dangerous naga that can directly assault your mind.]],
+ level_range = {36, nil}, exp_worth = 1,
+ rarity = 4,
+ rank = 3,
female = true,
- max_life = resolvers.rngavg(120,150), life_rating = 14,
+ max_life = resolvers.rngavg(100,110), life_rating = 11,
resolvers.equip{
{type="weapon", subtype="trident", autoreq=true},
},
- combat_armor = 20, combat_def = 10,
- resolvers.talents{ [Talents.T_SUNDER_ARMOUR]=4, },
+ combat_armor = 5, combat_def = 10,
+ autolevel = "wildcaster",
+ resolvers.talents{
+ [Talents.T_MIND_DISRUPTION]=4,
+ [Talents.T_MIND_SEAR]=5,
+ [Talents.T_SILENCE]=4,
+ [Talents.T_TELEKINETIC_BLAST]=4,
+ },
}
diff --git a/game/modules/tome/data/general/objects/scrolls.lua b/game/modules/tome/data/general/objects/scrolls.lua
index d3397e11b9be25c9ae3f786bbaa36267cbbadae0..46fe0aecfa2082b94b623df5401e1f8acd5ae07c 100644
--- a/game/modules/tome/data/general/objects/scrolls.lua
+++ b/game/modules/tome/data/general/objects/scrolls.lua
@@ -26,6 +26,7 @@ newEntity{
stacking = true,
use_sound = "actions/read",
use_no_blind = true,
+ use_no_silence = true,
fire_destroy = {{10,1}, {20,2}, {40,5}, {60,10}, {120,20}},
desc = [[Magical scrolls can have wildly different effects! Most of them function better with a high Magic score]],
egos = "/data/general/objects/egos/scrolls.lua", egos_chance = resolvers.mbonus(10, 5),
diff --git a/game/modules/tome/data/gfx/particles/mind.lua b/game/modules/tome/data/gfx/particles/mind.lua
new file mode 100644
index 0000000000000000000000000000000000000000..fbaa08a24b4baf52230ccbe90202093668bae7be
--- /dev/null
+++ b/game/modules/tome/data/gfx/particles/mind.lua
@@ -0,0 +1,48 @@
+-- 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 { generator = function()
+ local ad = rng.range(0, 360)
+ local a = math.rad(ad)
+ local dir = math.rad(ad + 90)
+ local r = rng.range(15, 20)
+
+ return {
+ trail = 1,
+ life = 6,
+ size = 4, sizev = -0.1, sizea = 0,
+
+ x = r * math.cos(a), xv = 0, xa = 0,
+ y = r * math.sin(a), yv = 0, ya = 0,
+ dir = dir, dirv = 1, dira = 0,
+ vel = 1, velv = 0, vela = 0,
+
+ r = rng.float(0.4, 0.5), rv = 0, ra = 0,
+ g = rng.float(0.4, 0.5), gv = 0, ga = 0,
+ b = rng.float(0.4, 0.5), bv = 0, ba = 0,
+ a = rng.float(0.7, 1), av = 0, aa = 0,
+ }
+end, },
+function(self)
+ self.nb = (self.nb or 0) + 1
+ if self.nb < 6 then
+ self.ps:emit(30)
+ end
+end,
+30*6*6
diff --git a/game/modules/tome/data/talents.lua b/game/modules/tome/data/talents.lua
index 04cc292f36598840108df4461dee8ffd44a18444..15a287e23e84b67e59715c82822748e19a3618fe 100644
--- a/game/modules/tome/data/talents.lua
+++ b/game/modules/tome/data/talents.lua
@@ -21,6 +21,7 @@ local oldNewTalent = newTalent
newTalent = function(t)
assert(engine.interface.ActorTalents.talents_types_def[t.type[1]], "No talent category "..tostring(t.type[1]).." for talent "..t.name)
if engine.interface.ActorTalents.talents_types_def[t.type[1]].generic then t.generic = true end
+ if engine.interface.ActorTalents.talents_types_def[t.type[1]].no_silence then t.no_silence = true end
return oldNewTalent(t)
end
diff --git a/game/modules/tome/data/talents/corruptions/corruptions.lua b/game/modules/tome/data/talents/corruptions/corruptions.lua
index 9b73a02e5aa50aa207099da70ca928df4acdd445..705f3b6e01ce78d9fd349b68e758b73cb19aca4a 100644
--- a/game/modules/tome/data/talents/corruptions/corruptions.lua
+++ b/game/modules/tome/data/talents/corruptions/corruptions.lua
@@ -18,12 +18,12 @@
-- darkgod@te4.org
-- Corruptions
-newTalentType{ type="corruption/ritual", name = "blighted rituals", description = "Learn how to control the dark powers." }
-newTalentType{ type="corruption/blight-magic", name = "blight magic", description = "Control the corruptions to form dark spells." }
-newTalentType{ type="corruption/blighted-combat", name = "blighted combat", description = "Control the corruptions to enhance melee combat." }
-newTalentType{ type="corruption/diseases", name = "diseases", description = "The subtle art of diseases and rotting." }
-newTalentType{ type="corruption/blood-magic", name = "blood magic", description = "Allows control of the blood, both yours or of your foes." }
-newTalentType{ type="corruption/necromancy", name = "necromancy", description = "The dark art of raising undeads." }
+newTalentType{ no_silence=true, type="corruption/ritual", name = "blighted rituals", description = "Learn how to control the dark powers." }
+newTalentType{ no_silence=true, type="corruption/blight-magic", name = "blight magic", description = "Control the corruptions to form dark spells." }
+newTalentType{ no_silence=true, type="corruption/blighted-combat", name = "blighted combat", description = "Control the corruptions to enhance melee combat." }
+newTalentType{ no_silence=true, type="corruption/diseases", name = "diseases", description = "The subtle art of diseases and rotting." }
+newTalentType{ no_silence=true, type="corruption/blood-magic", name = "blood magic", description = "Allows control of the blood, both yours or of your foes." }
+newTalentType{ no_silence=true, type="corruption/necromancy", name = "necromancy", description = "The dark art of raising undeads." }
-- Generic requires for corruptions based on talent level
corrs_req1 = {
diff --git a/game/modules/tome/data/talents/divine/chants.lua b/game/modules/tome/data/talents/divine/chants.lua
index ade7f1451a4cb33d943017376b1a84d6bfaa4147..d1a4901b834103fc13b7b071ab9a7d3ba444f0ae 100644
--- a/game/modules/tome/data/talents/divine/chants.lua
+++ b/game/modules/tome/data/talents/divine/chants.lua
@@ -62,7 +62,7 @@ newTalent{
return true
end,
info = function(self, t)
- return ([[Chant the glory of the sun, granting you %d physical and spell resistance.
+ return ([[Chant the glory of the sun, granting you %d physical and spell save.
In addition it surrounds you with a shield of light, damaging anything that attacks you for %0.2f light damage.
You may only have one Chant active at once.
The resistance and damage will increase with the Magic stat]]):format(self:combatTalentSpellDamage(t, 5, 70), self:combatTalentSpellDamage(t, 5, 25))
diff --git a/game/modules/tome/data/talents/divine/divine.lua b/game/modules/tome/data/talents/divine/divine.lua
index 54ad9ed12aa907acc08500d0571f6489b949aeb4..eaa78c82891a60c0c3a5adafa51ce719af0a7219 100644
--- a/game/modules/tome/data/talents/divine/divine.lua
+++ b/game/modules/tome/data/talents/divine/divine.lua
@@ -18,16 +18,16 @@
-- darkgod@te4.org
-- Corruptions
-newTalentType{ type="divine/chants", name = "chants", generic = true, description = "Chant the glory of the sun." }
-newTalentType{ type="divine/light", name = "light", description = "Invoke the power of light to heal and mend." }
-newTalentType{ type="divine/combat", name = "combat", description = "Your devotion allows you to combat your foes with indomitable determination." }
-newTalentType{ type="divine/sun", name = "sun", description = "Summon the power of the Sun to burn your foes." }
-newTalentType{ type="divine/glyphs", name = "glyphs", description = "Bind the holy powers into glyphs to trap your foes." }
-newTalentType{ type="divine/twilight", name = "twilight", description = "Stand between the darkness and the light, harnessing both." }
-newTalentType{ type="divine/star-fury", name = "star fury", description = "Call fury of the stars and moon to destroy your foes." }
-newTalentType{ type="divine/hymns", name = "hymns", generic = true, description = "Chant the glory of the moon." }
+newTalentType{ no_silence=true, type="divine/chants", name = "chants", generic = true, description = "Chant the glory of the sun." }
+newTalentType{ no_silence=true, type="divine/light", name = "light", description = "Invoke the power of light to heal and mend." }
+newTalentType{ no_silence=true, type="divine/combat", name = "combat", description = "Your devotion allows you to combat your foes with indomitable determination." }
+newTalentType{ no_silence=true, type="divine/sun", name = "sun", description = "Summon the power of the Sun to burn your foes." }
+newTalentType{ no_silence=true, type="divine/glyphs", name = "glyphs", description = "Bind the holy powers into glyphs to trap your foes." }
+newTalentType{ no_silence=true, type="divine/twilight", name = "twilight", description = "Stand between the darkness and the light, harnessing both." }
+newTalentType{ no_silence=true, type="divine/star-fury", name = "star fury", description = "Call fury of the stars and moon to destroy your foes." }
+newTalentType{ no_silence=true, type="divine/hymns", name = "hymns", generic = true, description = "Chant the glory of the moon." }
-newTalentType{ type="divine/other", name = "other", description = "Various divine talents." }
+newTalentType{ no_silence=true, type="divine/other", name = "other", description = "Various divine talents." }
-- Generic requires for corruptions based on talent level
divi_req1 = {
diff --git a/game/modules/tome/data/talents/misc/misc.lua b/game/modules/tome/data/talents/misc/misc.lua
index bddc52a84250a6d339f7225d7e47a5021c24bec3..b3488e4b2aaf4ad4fd128d53fadcdc0543d48821 100644
--- a/game/modules/tome/data/talents/misc/misc.lua
+++ b/game/modules/tome/data/talents/misc/misc.lua
@@ -20,7 +20,7 @@
-- race & classes
newTalentType{ type="base/class", name = "class", hide = true, description = "The basic talents defining a class." }
newTalentType{ type="base/race", name = "race", hide = true, description = "The various racial bonuses a character can have." }
-newTalentType{ type="rituals/rituals", name = "rituals", hide = true, description = "Rituals are not class abilities, you must find them or learn them from other people." }
+newTalentType{ no_silence=true, type="rituals/rituals", name = "rituals", hide = true, description = "Rituals are not class abilities, you must find them or learn them from other people." }
-- Load other misc things
load("/data/talents/misc/npcs.lua")
diff --git a/game/modules/tome/data/talents/misc/npcs.lua b/game/modules/tome/data/talents/misc/npcs.lua
index f70aabaabf4dc31ef7c54d85000a052558906663..84f44964b01d46ac8a96cd4252f57646fe716af5 100644
--- a/game/modules/tome/data/talents/misc/npcs.lua
+++ b/game/modules/tome/data/talents/misc/npcs.lua
@@ -19,7 +19,7 @@
-- race & classes
newTalentType{ type="technique/other", name = "other", hide = true, description = "Talents of the various entities of the world." }
-newTalentType{ type="spell/other", name = "other", hide = true, description = "Talents of the various entities of the world." }
+newTalentType{ no_silence=true, type="spell/other", name = "other", hide = true, description = "Talents of the various entities of the world." }
newTalentType{ type="wild-gift/other", name = "other", hide = true, description = "Talents of the various entities of the world." }
newTalentType{ type="other/other", name = "other", hide = true, description = "Talents of the various entities of the world." }
newTalentType{ type="undead/other", name = "other", hide = true, description = "Talents of the various entities of the world." }
@@ -430,6 +430,31 @@ newTalent{
end,
}
+newTalent{
+ name = "Water Jet",
+ type = {"spell/other", },
+ points = 5,
+ mana = 10,
+ cooldown = 8,
+ tactical = {
+ ATTACK = 10,
+ },
+ range = 20,
+ reflectable = true,
+ action = function(self, t)
+ local tg = {type="hit", range=self:getTalentRange(t), talent=t}
+ local x, y = self:getTarget(tg)
+ if not x or not y then return nil end
+ self:project(tg, x, y, DamageType.COLDSTUN, self:spellCrit(12 + self:combatSpellpower(0.20) * self:getTalentLevel(t)), {type="freeze"})
+ game:playSoundNear(self, "talents/ice")
+ return true
+ end,
+ info = function(self, t)
+ return ([[Condenses ambient water on a target, damaging it for %0.2f and stunning it for 4 turns.
+ The damage will increase with the Magic stat]]):format(12 + self:combatSpellpower(0.20) * self:getTalentLevel(t))
+ end,
+}
+
newTalent{
name = "Grab",
type = {"technique/other", 1},
@@ -728,3 +753,65 @@ newTalent{
return ([[Hits the target with a mighty blow to the legs doing %d%% weapon damage, if the attack hits, the target is unable to move for %d turns.]]):format(100 * self:combatTalentWeaponDamage(t, 1, 1.4), 2+self:getTalentLevel(t))
end,
}
+
+newTalent{
+ name = "Mind Sear",
+ type = {"wild-gift/other", 1},
+ points = 5,
+ cooldown = 2,
+ equilibrium = 5,
+ range = 15,
+ action = function(self, t)
+ local tg = {type="beam", range=self:getTalentRange(t), talent=t}
+ local x, y = self:getTarget(tg)
+ if not x or not y then return nil end
+ self:project(tg, x, y, DamageType.MIND, self:spellCrit(self:combatTalentMindDamage(t, 10, 370)), {type="mind"})
+ game:playSoundNear(self, "talents/spell_generic")
+ return true
+ end,
+ info = function(self)
+ return ([[Sends a telepathic attack, trying to destroy the brains of any target in the beam, doing %0.2f mind damage.
+ The damage will increase with Willpower and Cunning stats.]]):format(self:combatTalentMindDamage(t, 10, 370))
+ end,
+}
+
+newTalent{
+ name = "Silence",
+ type = {"wild-gift/other", 1},
+ points = 5,
+ cooldown = 10,
+ equilibrium = 5,
+ range = 15,
+ action = function(self, t)
+ local tg = {type="hit", range=self:getTalentRange(t), talent=t}
+ local x, y = self:getTarget(tg)
+ if not x or not y then return nil end
+ self:project(tg, x, y, DamageType.SILENCE, math.floor(4 + self:getTalentLevel(t)), {type="mind"})
+ game:playSoundNear(self, "talents/spell_generic")
+ return true
+ end,
+ info = function(self)
+ return ([[Sends a telepathic attack, silencing the target for %d turns.]]):format(math.floor(4 + self:getTalentLevel(t)))
+ end,
+}
+
+newTalent{
+ name = "Telekinetic Blast",
+ type = {"wild-gift/other", 1},
+ points = 5,
+ cooldown = 2,
+ equilibrium = 5,
+ range = 15,
+ action = function(self, t)
+ local tg = {type="beam", range=self:getTalentRange(t), talent=t}
+ local x, y = self:getTarget(tg)
+ if not x or not y then return nil end
+ self:project(tg, x, y, DamageType.MINDKNOCKBACK, self:spellCrit(self:combatTalentMindDamage(t, 10, 170)), {type="mind"})
+ game:playSoundNear(self, "talents/spell_generic")
+ return true
+ end,
+ info = function(self)
+ return ([[Sends a telekinetic attack, knocking back the target and doing %0.2f physical damage.
+ The damage will increase with Willpower and Cunning stats.]]):format(self:combatTalentMindDamage(t, 10, 170))
+ end,
+}
diff --git a/game/modules/tome/data/talents/spells/spells.lua b/game/modules/tome/data/talents/spells/spells.lua
index 215ce697b945d0b77e5934b5b2565c7cd41018b9..182c60ba3f0240f6c2cf118ba28e0a37ed4df275 100644
--- a/game/modules/tome/data/talents/spells/spells.lua
+++ b/game/modules/tome/data/talents/spells/spells.lua
@@ -18,36 +18,36 @@
-- darkgod@te4.org
-- Archmage spells
-newTalentType{ type="spell/arcane", name = "arcane", description = "Arcane manipulates the raw magic energies to shape them into both offensive and defensive spells." }
+newTalentType{ no_silence=true, type="spell/arcane", name = "arcane", description = "Arcane manipulates the raw magic energies to shape them into both offensive and defensive spells." }
-- Elemental spells
-newTalentType{ type="spell/fire", name = "fire", description = "Harness the power of fire to burn your foes to ashes." }
-newTalentType{ type="spell/wildfire", name = "wildfire", description = "Harness the power of wildfire to burn your foes to ashes." }
-newTalentType{ type="spell/earth", name = "earth", description = "Harness the power of the earth to protect and destroy." }
-newTalentType{ type="spell/water", name = "water", description = "Harness the power of water to drown your foes." }
-newTalentType{ type="spell/ice", name = "ice", description = "Harness the power of ice to freeze and shatter your foes." }
-newTalentType{ type="spell/air", name = "air", description = "Harness the power of the air to fry your foes." }
-newTalentType{ type="spell/storm", name = "storm", description = "Harness the power of the storm to incinerate your foes." }
+newTalentType{ no_silence=true, type="spell/fire", name = "fire", description = "Harness the power of fire to burn your foes to ashes." }
+newTalentType{ no_silence=true, type="spell/wildfire", name = "wildfire", description = "Harness the power of wildfire to burn your foes to ashes." }
+newTalentType{ no_silence=true, type="spell/earth", name = "earth", description = "Harness the power of the earth to protect and destroy." }
+newTalentType{ no_silence=true, type="spell/water", name = "water", description = "Harness the power of water to drown your foes." }
+newTalentType{ no_silence=true, type="spell/ice", name = "ice", description = "Harness the power of ice to freeze and shatter your foes." }
+newTalentType{ no_silence=true, type="spell/air", name = "air", description = "Harness the power of the air to fry your foes." }
+newTalentType{ no_silence=true, type="spell/storm", name = "storm", description = "Harness the power of the storm to incinerate your foes." }
-- Various other magic schools
-newTalentType{ type="spell/conveyance", name = "conveyance", generic = true, description = "Conveyance is the school of travel. It allows you to travel faster and to track others." }
-newTalentType{ type="spell/nature", name = "nature", generic = true, description = "Summons the power of nature to rejuvenate yourself and the world." }
-newTalentType{ type="spell/meta", name = "meta", description = "Meta spells alter the working of magic itself." }
-newTalentType{ type="spell/divination", name = "divination", generic = true, description = "Divination allows the caster to sense its surroundings, find hidden things." }
-newTalentType{ type="spell/temporal", name = "temporal", description = "The school of time manipulation." }
-newTalentType{ type="spell/phantasm", name = "phantasm", description = "Control the power of tricks and illusions." }
-newTalentType{ type="spell/enhancement", name = "enhancement", description = "Magical enhancement of your body." }
+newTalentType{ no_silence=true, type="spell/conveyance", name = "conveyance", generic = true, description = "Conveyance is the school of travel. It allows you to travel faster and to track others." }
+newTalentType{ no_silence=true, type="spell/nature", name = "nature", generic = true, description = "Summons the power of nature to rejuvenate yourself and the world." }
+newTalentType{ no_silence=true, type="spell/meta", name = "meta", description = "Meta spells alter the working of magic itself." }
+newTalentType{ no_silence=true, type="spell/divination", name = "divination", generic = true, description = "Divination allows the caster to sense its surroundings, find hidden things." }
+newTalentType{ no_silence=true, type="spell/temporal", name = "temporal", description = "The school of time manipulation." }
+newTalentType{ no_silence=true, type="spell/phantasm", name = "phantasm", description = "Control the power of tricks and illusions." }
+newTalentType{ no_silence=true, type="spell/enhancement", name = "enhancement", description = "Magical enhancement of your body." }
-- Alchemist spells
-newTalentType{ type="spell/explosives", name = "explosive admixtures", description = "Manipulate gems to turn them into explosive magical bombs." }
-newTalentType{ type="spell/infusion", name = "infusion", description = "Infusion your gem bombs with the powers of the elements." }
-newTalentType{ type="spell/golemancy-base", name = "golemancy", hide = true, description = "Learn to craft and upgrade your golem." }
-newTalentType{ type="spell/golemancy", name = "golemancy", description = "Learn to craft and upgrade your golem." }
-newTalentType{ type="spell/advanced-golemancy", name = "advanced-golemancy", description = "Advanced golem operations." }
-newTalentType{ type="spell/fire-alchemy", name = "fire alchemy", description = "Alchemical control over fire.é" }
-newTalentType{ type="spell/stone-alchemy-base", name = "stone alchemy", hide = true, description = "Manipulate gems, imbue their powers into other objects." }
-newTalentType{ type="spell/stone-alchemy", name = "stone alchemy", generic = true, description = "Alchemical control over stone and gems." }
-newTalentType{ type="spell/staff-combat", name = "staff combat", generic = true, description = "Harness the power of magical staves." }
+newTalentType{ no_silence=true, type="spell/explosives", name = "explosive admixtures", description = "Manipulate gems to turn them into explosive magical bombs." }
+newTalentType{ no_silence=true, type="spell/infusion", name = "infusion", description = "Infusion your gem bombs with the powers of the elements." }
+newTalentType{ no_silence=true, type="spell/golemancy-base", name = "golemancy", hide = true, description = "Learn to craft and upgrade your golem." }
+newTalentType{ no_silence=true, type="spell/golemancy", name = "golemancy", description = "Learn to craft and upgrade your golem." }
+newTalentType{ no_silence=true, type="spell/advanced-golemancy", name = "advanced-golemancy", description = "Advanced golem operations." }
+newTalentType{ no_silence=true, type="spell/fire-alchemy", name = "fire alchemy", description = "Alchemical control over fire.é" }
+newTalentType{ no_silence=true, type="spell/stone-alchemy-base", name = "stone alchemy", hide = true, description = "Manipulate gems, imbue their powers into other objects." }
+newTalentType{ no_silence=true, type="spell/stone-alchemy", name = "stone alchemy", generic = true, description = "Alchemical control over stone and gems." }
+newTalentType{ no_silence=true, type="spell/staff-combat", name = "staff combat", generic = true, description = "Harness the power of magical staves." }
-- Generic requires for spells based on talent level
spells_req1 = {
diff --git a/game/modules/tome/data/talents/techniques/combat-techniques.lua b/game/modules/tome/data/talents/techniques/combat-techniques.lua
index 1a0404bb5d555b45783f55c73647c3c6d07c997a..4b0d711a94555aa4ee0df6bebdc31b0649cd3a01 100644
--- a/game/modules/tome/data/talents/techniques/combat-techniques.lua
+++ b/game/modules/tome/data/talents/techniques/combat-techniques.lua
@@ -174,7 +174,7 @@ newTalent{
self.combat_spellresist = self.combat_spellresist - 4
end,
info = function(self, t)
- return ([[Rigorous training allows you to be more resistant to some spell effects. (+%d spell resistance).]]):format(self:getTalentLevelRaw(t) * 4)
+ return ([[Rigorous training allows you to be more resistant to some spell effects. (+%d spell save).]]):format(self:getTalentLevelRaw(t) * 4)
end,
}
diff --git a/game/modules/tome/data/talents/techniques/weaponshield.lua b/game/modules/tome/data/talents/techniques/weaponshield.lua
index 9d31eab62664e89e56b1e9d8f7151842508b1bac..2d2dbd037ed7215c0e07490bb9f30026a8c400a5 100644
--- a/game/modules/tome/data/talents/techniques/weaponshield.lua
+++ b/game/modules/tome/data/talents/techniques/weaponshield.lua
@@ -254,7 +254,7 @@ newTalent{
self.combat_spellresist = self.combat_spellresist + 2
end,
info = function(self, t)
- return ([[Improves your damage with shield attacks and increases your spell and physical resistance.]]):format()
+ return ([[Improves your damage with shield attacks and increases your spell and physical save.]]):format()
end,
}
diff --git a/game/modules/tome/data/timed_effects.lua b/game/modules/tome/data/timed_effects.lua
index c1492739d55d10bcc855fd796d6c737364e3cc58..5f0c3cae92d535aadf44d61a34af72208949094f 100644
--- a/game/modules/tome/data/timed_effects.lua
+++ b/game/modules/tome/data/timed_effects.lua
@@ -248,6 +248,23 @@ newEffect{
end,
}
+newEffect{
+ name = "SILENCED",
+ desc = "Silenced",
+ type = "mental",
+ status = "detrimental",
+ parameters = {},
+ on_gain = function(self, err) return "#Target# is silenced!", "+Silenced" end,
+ on_lose = function(self, err) return "#Target# is not silenced anymore.", "-Silenced" end,
+ activate = function(self, eff)
+ eff.tmpid = self:addTemporaryValue("silence", 1)
+ eff.dur = self:updateEffectDuration(eff.dur, "silence")
+ end,
+ deactivate = function(self, eff)
+ self:removeTemporaryValue("silence", eff.tmpid)
+ end,
+}
+
newEffect{
name = "CONSTRICTED",
desc = "Constricted",
diff --git a/game/modules/tome/dialogs/CharacterSheet.lua b/game/modules/tome/dialogs/CharacterSheet.lua
index 638111e999bec086c1378c4d5f0e3401b65642b8..1201abd73cfdc41d4035df73332fb8ceb720e11c 100644
--- a/game/modules/tome/dialogs/CharacterSheet.lua
+++ b/game/modules/tome/dialogs/CharacterSheet.lua
@@ -132,9 +132,9 @@ function _M:drawDialog(s)
s:drawColorStringBlended(self.font, ("Ranged Defense: #00ff00#%3d"):format(game.player:combatDefenseRanged()), w, h, 255, 255, 255) h = h + self.font_h
h = h + self.font_h
- s:drawColorStringBlended(self.font, ("Physical Resist: #00ff00#%3d"):format(game.player:combatPhysicalResist()), w, h, 255, 255, 255) h = h + self.font_h
- s:drawColorStringBlended(self.font, ("Spell Resist: #00ff00#%3d"):format(game.player:combatSpellResist()), w, h, 255, 255, 255) h = h + self.font_h
- s:drawColorStringBlended(self.font, ("Mental Resist: #00ff00#%3d"):format(game.player:combatMentalResist()), w, h, 255, 255, 255) h = h + self.font_h
+ s:drawColorStringBlended(self.font, ("Physical Save: #00ff00#%3d"):format(game.player:combatPhysicalResist()), w, h, 255, 255, 255) h = h + self.font_h
+ s:drawColorStringBlended(self.font, ("Spell Save: #00ff00#%3d"):format(game.player:combatSpellResist()), w, h, 255, 255, 255) h = h + self.font_h
+ s:drawColorStringBlended(self.font, ("Mental Save: #00ff00#%3d"):format(game.player:combatMentalResist()), w, h, 255, 255, 255) h = h + self.font_h
h = h + self.font_h
if self.actor.resists.all then s:drawColorStringBlended(self.font, ("All Resists: #00ff00#%3d%%"):format(self.actor.resists.all), w, h, 255, 255, 255) h = h + self.font_h end
@@ -282,9 +282,9 @@ function _M:dump()
end
nl()
- nl(makelabel("Physical Resist",game.player:combatPhysicalResist() ..""))
- nl(makelabel("Spell Resist",game.player:combatSpellResist() ..""))
- nl(makelabel("Mental Resist",game.player:combatMentalResist() ..""))
+ nl(makelabel("Physical Save",game.player:combatPhysicalResist() ..""))
+ nl(makelabel("Spell Save",game.player:combatSpellResist() ..""))
+ nl(makelabel("Mental Save",game.player:combatMentalResist() ..""))
nl()
if self.actor.resists.all then nl(("All Resists: %3d%%"):format(self.actor.resists.all)) end
@@ -393,7 +393,7 @@ function _M:dump()
local char = string.char(string.byte('a') + index)
nl(("%s) %s"):format(char, o:getName{force_id=true}))
nl((" %s"):format(table.concat(o:getTextualDesc(), "\n ")))
- if o.droppedBy then
+ if o.droppedBy then
nl((" Dropped by %s"):format(o.droppedBy))
end
index = index + 1
@@ -418,7 +418,7 @@ function _M:dump()
local char = string.char(string.byte('a') + item - 1)
nl(("%s) %s"):format(char, o:getName{force_id=true}))
nl((" %s"):format(table.concat(o:getTextualDesc(), "\n ")))
- if o.droppedBy then
+ if o.droppedBy then
nl((" Dropped by %s"):format(o.droppedBy))
end
end
diff --git a/ideas/gifts.ods b/ideas/gifts.ods
index 1a2414d09a62b31a1b8055ae648c849da819e05b..a07f4ea1e80313f065e24874fba5460e90699079 100644
Binary files a/ideas/gifts.ods and b/ideas/gifts.ods differ