necromancy

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

game/engine/interface/ActorTalents.lua

@@ -195,9 +195,10 @@ function _M:learnTalent(t_id, force)
 		end
 	end
 
+	self.talents[t_id] = (self.talents[t_id] or 0) + 1
+
 	if t.on_learn then t.on_learn(self, t) end
 
-	self.talents[t_id] = (self.talents[t_id] or 0) + 1
 	self.changed = true
 	return true
 end
@@ -216,10 +217,11 @@ function _M:unlearnTalent(t_id)
 		end
 	end
 
-	if t.on_unlearn then t.on_unlearn(self, t) end
-
 	self.talents[t_id] = self.talents[t_id] - 1
 	if self.talents[t_id] == 0 then self.talents[t_id] = nil end
+
+	if t.on_unlearn then t.on_unlearn(self, t) end
+
 	self.changed = true
 	return true
 end
@@ -337,6 +339,16 @@ function _M:getTalentLevel(id)
 	return (self.talents[id] or 0) * (self.talents_types_mastery[t.type[1]] or 1)
 end
 
+--- Talent type level, sum of all raw levels of talents inside
+function _M:getTalentTypeLevelRaw(tt)
+	local nb = 0
+	for tid, lev in pairs(self.talents) do
+		local t = self:getTalentFromId(tid)
+		if t.type[1] == tt then nb = nb + lev end
+	end
+	return nb
+end
+
 --- Return talent definition from id
 function _M:getTalentTypeMastery(tt)
 	return self.talents_types_mastery[tt] or 1

game/modules/tome/class/Actor.lua

@@ -296,6 +296,27 @@ function _M:attack(target)
 	self:bumpInto(target)
 end
 
+--- Actor learns a talent
+-- @param t_id the id of the talent to learn
+-- @return true if the talent was learnt, nil and an error message otherwise
+function _M:learnTalent(t_id, force)
+	if not engine.interface.ActorTalents.learnTalent(self, t_id, force) then return false end
+
+	-- If we learned a spell, get mana, if you learned a technique get stamina, if we learned a wild gift, get power
+	local t = _M.talents_def[t_id]
+	if t.type[1]:find("^spell/") and not self:knowTalent(self.T_MANA_POOL) then self:learnTalent(self.T_MANA_POOL) end
+	if t.type[1]:find("^technique/") and not self:knowTalent(self.T_STAMINA_POOL) then self:learnTalent(self.T_STAMINA_POOL) end
+	return true
+end
+
+--- Actor forgets a talent
+-- @param t_id the id of the talent to learn
+-- @return true if the talent was unlearnt, nil and an error message otherwise
+function _M:unlearnTalent(t_id)
+	if not engine.interface.ActorTalents.unlearnTalent(self, t_id, force) then return false end
+	return true
+end
+
 --- Called before a talent is used
 -- Check the actor can cast it
 -- @param ab the talent (not the id, the table)

game/modules/tome/class/PlayerDisplay.lua

@@ -37,6 +37,9 @@ function _M:display()
 	if game.player:knowTalent(game.player.T_MANA_POOL) then
 		self.surface:drawColorString(self.font, ("#7fffd4#Mana:    #00ff00#%d/%d"):format(game.player:getMana(), game.player.max_mana), 0, h, 255, 255, 255) h = h + self.font_h
 	end
+	if game.player:knowTalent(game.player.T_SOUL_POOL) then
+		self.surface:drawColorString(self.font, ("#777777#Soul: #00ff00#%d/%d"):format(game.player:getSoul(), game.player.max_soul), 0, h, 255, 255, 255) h = h + self.font_h
+	end
 	if game.player:knowTalent(game.player.T_STAMINA_POOL) then
 		self.surface:drawColorString(self.font, ("#ffcc80#Stamina: #00ff00#%d/%d"):format(game.player:getStamina(), game.player.max_stamina), 0, h, 255, 255, 255) h = h + self.font_h
 	end

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

@@ -11,9 +11,9 @@ newBirthDescriptor{
 			__ALL__ = "never",
 			["Arcane Blade"] = "allow",
 			Archmage = "allow",
+			Necromancer = "allow",
 		},
 	},
-	talents = { [ActorTalents.T_MANA_POOL]=1, },
 	copy = {
 		resolvers.generic(function(e)
 			e.hotkey[10] = {"inventory", "potion of lesser mana"}
@@ -49,6 +49,7 @@ newBirthDescriptor{
 		[ActorTalents.T_MANATHRUST] = 1,
 		[ActorTalents.T_FLAME] = 1,
 		[ActorTalents.T_FREEZE] = 1,
+		[ActorTalents.T_PHASE_DOOR] = 1,
 	},
 	copy = {
 		max_life = 80,
@@ -93,8 +94,8 @@ newBirthDescriptor{
 	talents = {
 		[ActorTalents.T_ARCANE_COMBAT] = 1,
 		[ActorTalents.T_FLAME] = 1,
+		[ActorTalents.T_STONE_SKIN] = 1,
 		[ActorTalents.T_WEAPON_COMBAT] = 1,
-		[ActorTalents.T_STAMINA_POOL]=1,
 	},
 	copy = {
 		max_life = 90,
@@ -112,3 +113,45 @@ newBirthDescriptor{
 		},
 	},
 }
+
+newBirthDescriptor{
+	type = "subclass",
+	name = "Necromancer",
+	desc = {
+		"Their most important stats are: Magic and Willpower",
+	},
+	stats = { mag=3, wil=2, cun=1, },
+	talents_types = {
+		["spell/arcane"]={true, 0.3},
+		["spell/fire"]={true, 0.3},
+		["spell/earth"]={true, 0.3},
+		["spell/water"]={true, 0.3},
+		["spell/air"]={true, 0.3},
+		["spell/phantasm"]={true, 0.3},
+		["spell/temporal"]={false, 0.3},
+		["spell/meta"]={false, 0.3},
+		["spell/divination"]={true, 0.3},
+		["spell/conveyance"]={true, 0.3},
+		["spell/nature"]={true, 0.3},
+		["spell/necromancy"]={true, 0.3},
+		["cunning/survival"]={false, -0.1},
+	},
+	talents = {
+		[ActorTalents.T_ABSORB_SOUL] = 1,
+		[ActorTalents.T_FLAME] = 1,
+		[ActorTalents.T_FREEZE] = 1,
+		[ActorTalents.T_PHASE_DOOR] = 1,
+	},
+	copy = {
+		max_life = 80,
+		life_rating = 7,
+		resolvers.equip{ id=true,
+			{type="weapon", subtype="staff", name="elm staff"},
+			{type="armor", subtype="cloth", name="robe"}
+		},
+		resolvers.inventory{ id=true,
+			{type="potion", subtype="potion", name="potion of lesser mana"},
+			{type="potion", subtype="potion", name="potion of lesser mana"},
+		},
+	},
+}

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

@@ -14,7 +14,6 @@ newBirthDescriptor{
 			Shadowblade = "allow",
 		},
 	},
-	talents = { [ActorTalents.T_STAMINA_POOL]=1, },
 	copy = {
 		max_life = 100,
 		life_rating = 9,
@@ -38,12 +37,12 @@ newBirthDescriptor{
 	talents_types = {
 		["technique/dualweapon-attack"]={true, 0.3},
 		["technique/dualweapon-training"]={true, 0.3},
-		["technique/combat-training-active"]={true, 0.3},
+		["technique/combat-training-active"]={false, 0.3},
 		["technique/combat-training-passive"]={false, 0.3},
 		["technique/weapon-training"]={true, 0.3},
 		["cunning/stealth"]={true, 0.3},
 		["cunning/traps"]={false, 0.3},
-		["cunning/dirty"]={false, 0.3},
+		["cunning/dirty"]={true, 0.3},
 		["cunning/survival"]={true, 0.3},
 	},
 	talents = {
@@ -73,14 +72,14 @@ newBirthDescriptor{
 		["technique/combat-training-active"]={true, 0.2},
 		["technique/combat-training-passive"]={false, 0.2},
 		["technique/weapon-training"]={true, 0.2},
-		["cunning/stealth"]={true, 0.3},
+		["cunning/stealth"]={false, 0.3},
 		["cunning/survival"]={true, 0.1},
+		["cunning/dirty"]={true, 0.3},
 	},
 	talents = {
-		[ActorTalents.T_STEALTH] = 1,
+		[ActorTalents.T_DUAL_STRIKE] = 1,
 		[ActorTalents.T_WEAPON_COMBAT] = 1,
 		[ActorTalents.T_KNIFE_MASTERY] = 1,
 		[ActorTalents.T_PHASE_DOOR] = 1,
-		[ActorTalents.T_MANA_POOL] = 1,
 	},
 }

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

@@ -13,7 +13,6 @@ newBirthDescriptor{
 			Berserker = "allow",
 		},
 	},
-	talents = { [ActorTalents.T_STAMINA_POOL]=1, },
 	copy = {
 		max_life = 120,
 		life_rating = 10,
@@ -44,6 +43,7 @@ newBirthDescriptor{
 	},
 	talents = {
 		[ActorTalents.T_SHIELD_PUMMEL] = 1,
+		[ActorTalents.T_SHIELD_WALL] = 1,
 		[ActorTalents.T_WEAPON_COMBAT] = 1,
 		[ActorTalents.T_HEAVY_ARMOUR_TRAINING] = 1,
 	},
@@ -80,6 +80,7 @@ newBirthDescriptor{
 	},
 	talents = {
 		[ActorTalents.T_BERSERKER] = 1,
+		[ActorTalents.T_STUNNING_BLOW] = 1,
 		[ActorTalents.T_WEAPON_COMBAT] = 1,
 		[ActorTalents.T_HEAVY_ARMOUR_TRAINING] = 1,
 	},

game/modules/tome/data/talents/misc/misc.lua

@@ -13,6 +13,13 @@ newTalent{
 	mode = "passive",
 	hide = true,
 }
+newTalent{
+	name = "Soul Pool",
+	type = {"base/class", 1},
+	info = "Allows you to have a soul pool. Souls are used by necromantic spells.",
+	mode = "passive",
+	hide = true,
+}
 newTalent{
 	name = "Stamina Pool",
 	type = {"base/class", 1},

game/modules/tome/data/talents/spells/necromancy.lua

+newTalent{
+	name = "Absorb Soul",
+	type = {"spell/necromancy",1},
+	require = spells_req1,
+	points = 5,
+	mode = "passive",
+	on_learn = function(self, t)
+		-- learn soul pool, gain capacity of 4, or increase with each talent
+		if not self:knowTalent(self.T_SOUL_POOL) then
+			self:learnTalent(self.T_SOUL_POOL)
+			self:incSoul(-1000000)
+		end
+		self.max_soul = 4 + self:getTalentLevelRaw(t)
+		return true
+	end,
+	on_unlearn = function(self, t, p)
+		if self:knowTalent(self.T_SOUL_POOL) and self:getTalentLevelRaw(t) == 0 then
+			self:unlearnTalent(self.T_SOUL_POOL)
+		end
+		self.max_soul = 4 + self:getTalentLevelRaw(t)
+		return true
+	end,
+	info = function(self, t)
+		return ([[Absorbing souls is the base of the necromantic arts. Whenever you slay a foe that grants experience you absorb its life-force, or soul for sentient beings.
+		This energy is is used to fuel all other necromantic spells.
+		]]):format()
+	end,
+}

game/modules/tome/data/talents/techniques/dualweapon.lua

@@ -118,7 +118,7 @@ newTalent{
 		return true
 	end,
 	info = function(self, t)
-		return ([[Lashes out a flurry of blows, hitting your target three times with each weapons for %d%% damage.]]):format(100 * (1.8 + self:getTalentLevel(t) / 10))
+		return ([[Hit wit your offhand weapon for %d%% damage, if the attack hits the target is stunned and you hit it with your mainhand weapon.]]):format(100 * (1.8 + self:getTalentLevel(t) / 10))
 	end,
 }
 

game/modules/tome/load.lua

@@ -34,13 +34,18 @@ ActorInventory:defineInventory("TOOL", "Tool", true, "This is your readied tool,
 
 -- Damage types
 DamageType:loadDefinition("/data/damage_types.lua")
+
 -- Talents
 ActorTalents:loadDefinition("/data/talents.lua")
+
 -- Timed Effects
 ActorTemporaryEffects:loadDefinition("/data/timed_effects.lua")
+
 -- Actor resources
 ActorResource:defineResource("Mana", "mana", ActorTalents.T_MANA_POOL, "mana_regen", "Mana represents your reserve of magical energies. Each spell cast consumes mana and each sustained spell reduces your maximun mana.")
 ActorResource:defineResource("Stamina", "stamina", ActorTalents.T_STAMINA_POOL, "stamina_regen", "Stamina represents your physical fatigue. Each physical ability used reduces it.")
+ActorResource:defineResource("Soul", "soul", ActorTalents.T_SOUL_POOL, "soul_regen", "Soul represents the amount of life energies/souls you have stolen. Each Necromantic spell requires some.")
+
 -- Actor stats
 ActorStats:defineStat("Strength",	"str", 10, 1, 100, "Strength defines your character's ability to apply physical force. It increases your melee damage, damage with heavy weapons, your chance to resist physical effects, and carrying capacity.")
 ActorStats:defineStat("Dexterity",	"dex", 10, 1, 100, "Dexterity defines your character's ability to be agile and alert. It increases your chance to hit, your ability to avoid attacks and your damage with light weapons.")
@@ -50,8 +55,10 @@ ActorStats:defineStat("Cunning",	"cun", 10, 1, 100, "Cunning defines your charac
 ActorStats:defineStat("Constitution",	"con", 10, 1, 100, "Constitution defines your character's ability to withstand and resist damage. It increases your maximun life and physical resistance.")
 -- Luck is hidden and start at half max value (50) which is considered the standard
 ActorStats:defineStat("Luck",		"lck", 50, 1, 100, "Luck defines your character's chance when dealing with unknown events. It increases your critical strike chances, your chance for random encounters, ...")
+
 -- Actor autolevel schemes
 dofile("/data/autolevel_schemes.lua")
+
 -- Actor AIs
 ActorAI:loadDefinition("/engine/ai/")
 ActorAI:loadDefinition("/mod/ai/")