divine/glyphs

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

game/engine/Actor.lua

@@ -100,6 +100,7 @@ function _M:move(x, y, force)
 	else
 		print("[MOVE] actor moved without a starting position", self.name, x, y)
 	end
+	self.old_x, self.old_y = self.x or x, self.y or y
 	self.x, self.y = x, y
 	map(x, y, Map.ACTOR, self)
 

game/engine/Trap.lua

@@ -48,6 +48,18 @@ function _M:loaded()
 	setmetatable(self.known_by, {__mode="k"})
 end
 
+--- Do we have enough energy
+function _M:enoughEnergy(val)
+	val = val or game.energy_to_act
+	return self.energy.value >= val
+end
+
+--- Use some energy
+function _M:useEnergy(val)
+	val = val or game.energy_to_act
+	self.energy.value = self.energy.value - val
+end
+
 --- Get trap name
 -- Can be overloaded to do trap identification if needed
 function _M:getName()

game/modules/tome/class/Trap.lua

@@ -82,3 +82,8 @@ function _M:resolveSource()
 		return self
 	end
 end
+
+--- Identify the trap
+function _M:identify(id)
+	self.identified = id
+end

game/modules/tome/data/damage_types.lua

@@ -308,7 +308,7 @@ newDamageType{
 		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("knockback") then
-				target:knockback(src.x, src.y, 2)
+				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())

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

@@ -56,6 +56,7 @@ load("/data/talents/divine/chants.lua")
 load("/data/talents/divine/sun.lua")
 load("/data/talents/divine/combat.lua")
 load("/data/talents/divine/light.lua")
+load("/data/talents/divine/glyphs.lua")
 
 load("/data/talents/divine/twilight.lua")
 load("/data/talents/divine/hymns.lua")

game/modules/tome/data/talents/divine/glyphs.lua

+-- 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 Trap = require "mod.class.Trap"
+
+newTalent{
+	name = "Glyph of Fatigue",
+	type = {"divine/glyphs", 1},
+	require = spells_req1,
+	points = 5,
+	cooldown = 20,
+	positive = -10,
+	action = function(self, t)
+		local dam = -1 + 1 / (1 + (self:getTalentLevel(t) * 0.07 + 0.2))
+		local trap = Trap.new{
+			name = "glyph of fatigue",
+			type = "elemental", id_by_type=true, unided_name = "trap",
+			display = '^', color=colors.GOLD,
+			dam = dam,
+			canTrigger = function(self, x, y, who)
+				if who:reactionToward(self.summoner) < 0 then return mod.class.Trap.canTrigger(self, x, y, who) end
+				return false
+			end,
+			triggered = function(self, x, y, who)
+				who:setEffect(who.EFF_SLOW, 5, {power=-self.dam})
+				return true
+			end,
+			temporary = 5 + self:getTalentLevel(t),
+			x = self.x, y = self.y,
+			canAct = false,
+			energy = {value=0},
+			act = function(self)
+				self:useEnergy()
+				self.temporary = self.temporary - 1
+				if self.temporary <= 0 then
+					game.level.map:remove(self.x, self.y, engine.Map.TRAP)
+					game.level:removeEntity(self)
+				end
+			end,
+			summoner = self,
+			summoner_gain_exp = true,
+		}
+		game.level:addEntity(trap)
+		trap:identify(true)
+		trap:setKnown(self, true)
+		game.zone:addEntity(game.level, trap, "trap", self.x, self.y)
+		game:playSoundNear(self, "talents/heal")
+		return true
+	end,
+	info = function(self, t)
+		return ([[You bind light in a glyph on the floor, the all targets passing by will be slowed by %d%%.
+		The glyph lasts for %d turns.]]):format(self:getTalentLevel(t) * 7 + 20, 5 + self:getTalentLevel(t))
+	end,
+}
+
+newTalent{
+	name = "Glyph of Explosion",
+	type = {"divine/glyphs", 2},
+	require = spells_req2,
+	points = 5,
+	cooldown = 20,
+	positive = -10,
+	action = function(self, t)
+		local dam = 15 + self:combatSpellpower(0.37) * self:getTalentLevel(t)
+		local trap = Trap.new{
+			name = "glyph of explosion",
+			type = "elemental", id_by_type=true, unided_name = "trap",
+			display = '^', color=colors.GOLD,
+			dam = dam,
+			canTrigger = function(self, x, y, who)
+				if who:reactionToward(self.summoner) < 0 then return mod.class.Trap.canTrigger(self, x, y, who) end
+				return false
+			end,
+			triggered = function(self, x, y, who)
+				self:project({type="hit",x=x,y=y}, x, y, engine.DamageType.LIGHT, self.dam, {type="light"})
+				return true, true
+			end,
+			temporary = 2 + self:getTalentLevel(t),
+			x = self.x, y = self.y,
+			canAct = false,
+			energy = {value=0},
+			act = function(self)
+				self:useEnergy()
+				self.temporary = self.temporary - 1
+				if self.temporary <= 0 then
+					game.level.map:remove(self.x, self.y, engine.Map.TRAP)
+					game.level:removeEntity(self)
+				end
+			end,
+			summoner = self,
+			summoner_gain_exp = true,
+		}
+		game.level:addEntity(trap)
+		trap:identify(true)
+		trap:setKnown(self, true)
+		game.zone:addEntity(game.level, trap, "trap", self.x, self.y)
+		game:playSoundNear(self, "talents/heal")
+		return true
+	end,
+	info = function(self, t)
+		return ([[You bind light in a glyph on the floor, the first target passing by will be hit by a blast of light doing %0.2f damage.
+		The glyph lasts for %d turns.
+		The damage will increase with the Magic stat]]):format(15 + self:combatSpellpower(0.37) * self:getTalentLevel(t), 2 + self:getTalentLevel(t))
+	end,
+}
+
+newTalent{
+	name = "Glyph of Repulsion",
+	type = {"divine/glyphs", 3},
+	require = spells_req3,
+	points = 5,
+--	mana = 30,
+	positive = -10,
+	cooldown = 20,
+	action = function(self, t)
+		local dam = 15 + self:combatSpellpower(0.12) * self:getTalentLevel(t)
+		local sp = self:combatSpellpower()
+		local trap = Trap.new{
+			name = "glyph of repulsion",
+			type = "elemental", id_by_type=true, unided_name = "trap",
+			display = '^', color=colors.GOLD,
+			dam = dam,
+			canTrigger = function(self, x, y, who)
+				if who:reactionToward(self.summoner) < 0 then return mod.class.Trap.canTrigger(self, x, y, who) end
+				return false
+			end,
+			triggered = function(self, x, y, who)
+				local ox, oy = self.x, self.y
+				local dir = util.getDir(who.x, who.y, who.old_x, who.old_y)
+				self.x, self.y = util.coordAddDir(self.x, self.y, dir)
+				self:project({type="hit",x=x,y=y}, x, y, engine.DamageType.SPELLKNOCKBACK, self.dam)
+				self.x, self.y = ox, oy
+				return true
+			end,
+			temporary = 5 + self:getTalentLevel(t),
+			x = self.x, y = self.y,
+			canAct = false,
+			energy = {value=0},
+			combatSpellpower = function(self) return self.sp end, sp = sp,
+			act = function(self)
+				self:useEnergy()
+				self.temporary = self.temporary - 1
+				if self.temporary <= 0 then
+					game.level.map:remove(self.x, self.y, engine.Map.TRAP)
+					game.level:removeEntity(self)
+				end
+			end,
+			summoner = self,
+			summoner_gain_exp = true,
+		}
+		game.level:addEntity(trap)
+		trap:identify(true)
+		trap:setKnown(self, true)
+		game.zone:addEntity(game.level, trap, "trap", self.x, self.y)
+		game:playSoundNear(self, "talents/heal")
+		return true
+	end,
+	info = function(self, t)
+		return ([[You bind light in a glyph on the floor, the all targets passing by will be hit by a blast of light doing %0.2f damage and knocked back.
+		The glyph lasts for %d turns.
+		The damage will increase with the Magic stat]]):format(15 + self:combatSpellpower(0.12) * self:getTalentLevel(t), 2 + self:getTalentLevel(t))
+	end,
+}
+
+newTalent{
+	name = "Glyph of Paralysis",
+	type = {"divine/glyphs", 4},
+	require = spells_req4,
+	points = 5,
+	cooldown = 20,
+	positive = -10,
+	action = function(self, t)
+		local dam = 2 + self:getTalentLevelRaw(t)
+		local trap = Trap.new{
+			name = "glyph of paralysis",
+			type = "elemental", id_by_type=true, unided_name = "trap",
+			display = '^', color=colors.GOLD,
+			dam = dam,
+			canTrigger = function(self, x, y, who)
+				if who:reactionToward(self.summoner) < 0 then return mod.class.Trap.canTrigger(self, x, y, who) end
+				return false
+			end,
+			triggered = function(self, x, y, who)
+				who:setEffect(who.EFF_DAZED, self.dam, {})
+				return true
+			end,
+			temporary = 5 + self:getTalentLevel(t),
+			x = self.x, y = self.y,
+			canAct = false,
+			energy = {value=0},
+			act = function(self)
+				self:useEnergy()
+				self.temporary = self.temporary - 1
+				if self.temporary <= 0 then
+					game.level.map:remove(self.x, self.y, engine.Map.TRAP)
+					game.level:removeEntity(self)
+				end
+			end,
+			summoner = self,
+			summoner_gain_exp = true,
+		}
+		game.level:addEntity(trap)
+		trap:identify(true)
+		trap:setKnown(self, true)
+		game.zone:addEntity(game.level, trap, "trap", self.x, self.y)
+		game:playSoundNear(self, "talents/heal")
+		return true
+	end,
+	info = function(self, t)
+		return ([[You bind light in a glyph on the floor, the all targets passing by will be dazed for %d turns.
+		The glyph lasts for %d turns.]]):format(3 + self:getTalentLevelRaw(t), 5 + self:getTalentLevel(t))
+	end,
+}

game/modules/tome/data/talents/divine/light.lua

@@ -76,7 +76,6 @@ newTalent{
 	type = {"divine/light", 3},
 	require = spells_req3,
 	points = 5,
---	mana = 30,
 	positive = -20,
 	cooldown = 60,
 	action = function(self, t)