pass wall possible

burrow & swallow working, all foo-drake talents OK


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

game/engine/interface/ActorLife.lua

@@ -43,14 +43,15 @@ function _M:takeHit(value, src)
 	self.life = self.life - value
 	if self.life <= 0 then
 		game.logSeen(self, "%s killed %s!", src.name:capitalize(), self.name)
-		game.level:removeEntity(self)
-		self.dead = true
 		return self:die(src)
 	end
 end
 
 --- Called when died
 function _M:die(src)
+	game.level:removeEntity(self)
+	self.dead = true
+
 	self:check("on_die", src)
 end
 

game/modules/tome/class/Actor.lua

@@ -63,6 +63,8 @@ function _M:init(t, no_default)
 
 	t.on_melee_hit = t.on_melee_hit or {}
 	t.melee_project = t.melee_project or {}
+	t.can_pass = t.can_pass or {}
+	t.move_project = t.move_project or {}
 
 	-- Resistances
 	t.resists = t.resists or {}
@@ -221,14 +223,14 @@ function _M:tooltip()
 	return ([[%s
 #00ffff#Level: %d
 Exp: %d/%d
-#ff0000#HP: %d
+#ff0000#HP: %d (%d%%)
 Stats: %d /  %d / %d / %d / %d / %d
 %s]]):format(
 	self.name,
 	self.level,
 	self.exp,
 	self:getExpChart(self.level+1) or "---",
-	self.life,
+	self.life, self.life * 100 / self.max_life,
 	self:getStr(),
 	self:getDex(),
 	self:getMag(),
@@ -434,7 +436,7 @@ function _M:learnTalent(t_id, force, nb)
 	-- 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, true) end
-	if t.type[1]:find("^wild-gift/") and not self:knowTalent(self.T_EQUILIBRIUM_POOL) then self:learnTalent(self.T_EQUILIBRIUM_POOL, true) end
+	if t.type[1]:find("^wild%-gift/") and not self:knowTalent(self.T_EQUILIBRIUM_POOL) then self:learnTalent(self.T_EQUILIBRIUM_POOL, true) end
 	if t.type[1]:find("^technique/") and not self:knowTalent(self.T_STAMINA_POOL) then self:learnTalent(self.T_STAMINA_POOL, true) end
 
 	-- If we learn an archery talent, also learn to shoot
@@ -647,8 +649,6 @@ function _M:suffocate(value, src)
 	self.air = self.air - value
 	if self.air <= 0 and not self:attr("no_breath") then
 		game.logSeen(self, "%s suffocates to death!", self.name:capitalize())
-		game.level:removeEntity(self)
-		self.dead = true
 		return self:die(src)
 	end
 end

game/modules/tome/class/Grid.lua

 require "engine.class"
 require "engine.Grid"
+local DamageType = require "engine.DamageType"
 
 module(..., package.seeall, class.inherit(engine.Grid))
 
@@ -15,7 +16,24 @@ function _M:block_move(x, y, e, act)
 	elseif self.door_opened then
 		return true
 	end
-	return false
+
+	-- Pass walls
+	if e and self.can_pass and e.can_pass then
+		for what, check in pairs(e.can_pass) do
+			if self.can_pass[what] and self.can_pass[what] <= check then return false end
+		end
+	end
+
+	return self.does_block_move
+end
+
+function _M:on_move(x, y, who, forced)
+	if forced then return end
+	if who.move_project and next(who.move_project) then
+		for typ, dam in pairs(who.move_project) do
+			DamageType:get(typ).projector(who, x, y, typ, dam)
+		end
+	end
 end
 
 function _M:tooltip()
@@ -28,3 +46,4 @@ function _M:tooltip()
 		end
 	end
 end
+

game/modules/tome/data/general/grids/basic.lua

@@ -37,7 +37,8 @@ newEntity{
 	name = "wall", image = "terrain/granite_wall1.png",
 	display = '#', color_r=255, color_g=255, color_b=255,
 	always_remember = true,
-	block_move = true,
+	does_block_move = true,
+	can_pass = {pass_wall=1},
 	block_sight = true,
 	air_level = -20,
 	dig = "FLOOR",
@@ -59,7 +60,5 @@ newEntity{
 	name = "open door", image = "terrain/granite_door1_open.png",
 	display = "'", color_r=238, color_g=154, color_b=77,
 	always_remember = true,
-	block_move = false,
-	block_sight = false,
 	door_closed = "DOOR",
 }

game/modules/tome/data/general/grids/forest.lua

@@ -9,7 +9,8 @@ newEntity{
 	name = "tree", image = "terrain/tree.png",
 	display = '#', color=colors.LIGHT_GREEN,
 	always_remember = true,
-	block_move = true,
+	can_pass = {pass_tree=1},
+	does_block_move = true,
 	block_sight = true,
 	dig = "GRASS",
 }
@@ -25,7 +26,8 @@ newEntity{
 	name = "tree", image = "terrain/tree_dark1.png",
 	display = '#', color=colors.GREEN,
 	always_remember = true,
-	block_move = true,
+	can_pass = {pass_tree=1},
+	does_block_move = true,
 	block_sight = true,
 	dig = "GRASS_DARK1",
 }

game/modules/tome/data/general/grids/sand.lua

@@ -9,7 +9,8 @@ newEntity{
 	name = "sandwall", image = "terrain/sandwall.png",
 	display = '#', color={r=203,g=189,b=72},
 	always_remember = true,
-	block_move = true,
+	can_pass = {pass_wall=1},
+	does_block_move = true,
 	block_sight = true,
 	air_level = -10,
 	-- Dig only makes unstable tunnels

game/modules/tome/data/talents/gifts/cold-drake.lua

@@ -72,7 +72,8 @@ newTalent{
 			name = "summoned ice wall",
 			display = '#', color=colors.LIGHT_BLUE,
 			always_remember = true,
-			block_move = true,
+			can_pass = {pass_wall=1},
+			does_block_move = true,
 			block_sight = false,
 			temporary = 4 + self:getTalentLevel(t),
 			x = x, y = y,

game/modules/tome/data/talents/gifts/sand-drake.lua

@@ -3,18 +3,26 @@ newTalent{
 	type = {"wild-gift/sand-drake", 1},
 	require = gifts_req1,
 	points = 5,
-	message = "@Source@ burrows into the ground!",
-	equilibrium = 10,
-	cooldown = 150,
+	mode = "sustained",
+	sustain_equilibrium = 30,
+	cooldown = 30,
 	range = 20,
-	tactical = {
-		DEFEND = 10,
-	},
-	action = function(self, t)
+	activate = function(self, t)
+		return {
+			pass = self:addTemporaryValue("can_pass", {pass_wall=1}),
+			dig = self:addTemporaryValue("move_project", {[DamageType.DIG]=1}),
+			drain = self:addTemporaryValue("equilibrium_regen", 8 - self:getTalentLevelRaw(t)),
+		}
+	end,
+	deactivate = function(self, t, p)
+		self:removeTemporaryValue("equilibrium_regen", p.drain)
+		self:removeTemporaryValue("move_project", p.dig)
+		self:removeTemporaryValue("can_pass", p.pass)
 		return true
 	end,
 	info = function(self, t)
-		return ([[Burrows into the ground to protect yourself and regenerate life.]]):format(100 * (1.5 + self:getTalentLevel(t) / 4))
+		return ([[Allows to burrow into walls, increasing equilibrium quickly.
+		Higher talent levels reduce equilibrium cost per turn.]])
 	end,
 }
 
@@ -24,19 +32,34 @@ newTalent{
 	require = gifts_req2,
 	points = 5,
 	equilibrium = 10,
-	cooldown = 10,
+	cooldown = 20,
 	range = 1,
+	message = "@Source@ swallows its target!",
 	tactical = {
-		DEFEND = 10,
+		ATTACK = 10,
 	},
-	activate = function(self, t)
-	end,
-	deactivate = function(self, t, p)
-		self:removeTemporaryValue("on_melee_hit", p.onhit)
+	action = function(self, t)
+		local tg = {type="hit", range=self:getTalentRange(t)}
+		local x, y, target = self:getTarget(tg)
+		if not x or not y or not target then return nil end
+		if math.floor(core.fov.distance(self.x, self.y, x, y)) > 1 then return nil end
+
+		if target.life * 100 / target.max_life > 10 + 3 * self:getTalentLevel(t) then
+			return nil
+		end
+
+		if target:checkHit(self:combatAttackStr(), target:combatPhysicalResist(), 0, 95, 15) and target:canBe("instakill") then
+			target:die(self)
+			self:incEquilibrium(-target.level - 5)
+			self:heal(target.level * 2 + 5)
+		else
+			game.logSeen(target, "%s resists!", target.name:capitalize())
+		end
 		return true
 	end,
 	info = function(self, t)
-		return ([[Your skin drips with acid, damaging all that hits your for %d acid damage.]]):format(10 + 5 * self:getTalentLevel(t))
+		return ([[When your target is below %d life you can try to swallow it, killing it automatically regaining life and equilibrium.]]):
+		format(10 + 3 * self:getTalentLevel(t))
 	end,
 }
 

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

@@ -102,7 +102,8 @@ newTalent{
 					name = "summoned wall", image = "terrain/granite_wall1.png",
 					display = '#', color_r=255, color_g=255, color_b=255,
 					always_remember = true,
-					block_move = true,
+					can_pass = {pass_wall=1},
+					does_block_move = true,
 					block_sight = true,
 					temporary = 2 + self:combatSpellpower(0.03) * self:getTalentLevel(t),
 					x = x + i, y = y + j,