manaflow & heal spells

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

game/engine/interface/ActorLife.lua

@@ -29,6 +29,11 @@ function _M:regenLife()
 	end
 end
 
+--- Heal some
+function _M:heal(value, src)
+	self.life = util.bound(self.life + value, 0, self.max_life)
+end
+
 --- Remove some HP from an actor
 -- If HP is reduced to 0 then remove from the level and call the die method.<br/>
 -- When an actor dies its dead property is set to true, to wait until garbage collection deletes it

game/engine/interface/ActorTemporaryEffects.lua

@@ -46,6 +46,7 @@ function _M:timedEffects()
 		p.dur = p.dur - 1
 		if p.dur <= 0 then
 			self.tmp[eff] = nil
+			self.changed = true
 			if _M.tempeffect_def[eff].on_lose then
 				local ret, fly = _M.tempeffect_def[eff].on_lose(self, p)
 				if ret then
@@ -56,6 +57,7 @@ function _M:timedEffects()
 					game.flyers:add(sx, sy, 20, (rng.range(0,2)-1) * 0.5, -3, fly, {255,100,80})
 				end
 			end
+			if _M.tempeffect_def[eff].deactivate then _M.tempeffect_def[eff].deactivate(self, p) end
 		else
 			if _M.tempeffect_def[eff].on_timeout then
 				_M.tempeffect_def[eff].on_timeout(self, p)
@@ -83,6 +85,8 @@ function _M:setEffect(eff_id, dur, p)
 			local sx, sy = game.level.map:getTileToScreen(self.x, self.y)
 			game.flyers:add(sx, sy, 20, (rng.range(0,2)-1) * 0.5, -3, fly, {255,100,80})
 		end
+		if _M.tempeffect_def[eff_id].activate then _M.tempeffect_def[eff_id].activate(self, p) end
+		self.changed = true
 	end
 end
 

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

@@ -61,6 +61,7 @@ newBirthDescriptor{
 		["spell/cold"]=true,
 		["spell/air"]=true,
 		["spell/conveyance"]=false,
+		["spell/nature"]=false,
 	},
 	talents = {
 		ActorTalents.T_MANATHRUST,

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

@@ -5,6 +5,7 @@ newTalentType{ type="spell/earth", name = "earth", description = "Harness the po
 newTalentType{ type="spell/cold", name = "cold", description = "Harness the power of winter to shatter your foes." }
 newTalentType{ type="spell/air", name = "air", description = "Harness the power of the air to fry your foes." }
 newTalentType{ type="spell/conveyance", name = "conveyance", description = "Conveyance is the school of travel. It allows you to travel faster and to track others." }
+newTalentType{ type="spell/nature", name = "nature", description = "Summons the power of nature to rejuvenate yourself and the world." }
 
 newTalent{
 	name = "Manathrust",
@@ -160,3 +161,43 @@ newTalent{
 		The damage and duration will increase with the Magic stat]]):format(4 + self:getMag(30), 5 + self:getMag(10))
 	end,
 }
+
+newTalent{
+	name = "Manaflow",
+	type = {"spell/arcane", 2},
+	mana = 10,
+	cooldown = 300,
+	tactical = {
+		MANA = 20,
+	},
+	action = function(self)
+		if not self:hasEffect(self.EFF_MANAFLOW) then
+			self:setEffect(self.EFF_MANAFLOW, 10, {power=5+self:getMag(30)})
+		end
+		return true
+	end,
+	require = { stat = { mag=10 }, },
+	info = function(self)
+		return ([[Engulf yourself into a surge of mana, quickly restoring %d mana every turns for 10 turns.
+		The mana restored will increase with the Magic stat]]):format(5 + self:getMag(30))
+	end,
+}
+
+newTalent{
+	name = "Heal",
+	type = {"spell/nature", 1},
+	mana = 30,
+	cooldown = 10,
+	tactical = {
+		HEAL = 10,
+	},
+	action = function(self)
+		self:heal(10 + self:getMag(200), self)
+		return true
+	end,
+	require = { stat = { mag=10 }, },
+	info = function(self)
+		return ([[Call upon the forces of nature to heal your body for %d life.
+		The life healed will increase with the Magic stat]]):format(10 + self:getMag(200))
+	end,
+}

game/modules/tome/data/timed_effects.lua

@@ -3,10 +3,26 @@ newEffect{
 	desc = "Bleeding",
 	type = "physical",
 	status = "detrimental",
-	parameters = { power=0 },
-	on_gain = function(self, err) return "#Target# start to bleed.", "+Bleeds" end,
-	on_lose = function(self, err) return "#Target# stop bleeding.", "-Bleeds" end,
+	parameters = { power=1 },
+	on_gain = function(self, err) return "#Target# starts to bleed.", "+Bleeds" end,
+	on_lose = function(self, err) return "#Target# stops bleeding.", "-Bleeds" end,
 	on_timeout = function(self, eff)
 		self:takeHit(eff.power, self)
 	end,
 }
+
+newEffect{
+	name = "MANAFLOW",
+	desc = "Surging mana",
+	type = "magical",
+	status = "beneficial",
+	parameters = { power=10 },
+	on_gain = function(self, err) return "#Target# starts to surge mana.", "+Manaflow" end,
+	on_lose = function(self, err) return "#Target# stops surging mana.", "-Manaflow" end,
+	activate = function(self, eff)
+		self.mana_regen = self.mana_regen + eff.power
+	end,
+	deactivate = function(self, eff)
+		self.mana_regen = self.mana_regen - eff.power
+	end,
+}