Walking on a level changer popups a flyer to notify you

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

@@ -87,7 +87,7 @@ end
 
 --- Get the known status for the given actor
 function _M:knownBy(actor)
-	return self.known_by[actor]
+	return self.known_by[actor] or self.all_know
 end
 
 --- Can we disarm this trap?

@@ -24,8 +24,9 @@ module(..., package.seeall, class.inherit(engine.Generator))
 
 function _M:init(zone, map, level, data)
 	engine.Generator.init(self, zone, map, level)
+	self.data = data
 	self.grid_list = zone.grid_list
-	self.floor = self:resolve("floor")
+	self.floor = self:resolve("floor") or self:resolve(".")
 	self.up = self:resolve("up")
 end
 

@@ -77,6 +77,8 @@ _M.temporary_values_conf.combat_spellspeed = "mult0"
 -- Damage cap takes the lowest
 _M.temporary_values_conf.flat_damage_cap = "lowest"
 
+_M.projectile_class = "mod.class.Projectile"
+
 function _M:init(t, no_default)
 	-- Define some basic combat stats
 	self.energyBase = 0
@@ -3740,7 +3742,7 @@ function _M:on_project(tx, ty, who, t, x, y, damtype, dam, particles)
 	end
 
 	-- LOS check (this is also caught by canProject)
-	if not t.pass_terain and not t.pass_block_sight then
+	if not t.pass_terain and not t.pass_block_sight and who.hasLOS then
 		if not who:hasLOS(tx, ty) then
 			return true
 		end

@@ -316,7 +316,6 @@ function _M:loaded()
 	engine.GameTurnBased.loaded(self)
 	engine.interface.GameMusic.loaded(self)
 	engine.interface.GameSound.loaded(self)
-	Actor.projectile_class = "mod.class.Projectile"
 	Zone:setup{
 		npc_class="mod.class.NPC", grid_class="mod.class.Grid", object_class="mod.class.Object", trap_class="mod.class.Trap",
 		on_setup = function(zone)

@@ -35,6 +35,8 @@ module(..., package.seeall, class.inherit(
 	engine.interface.ActorTalents
 ))
 
+_M.projectile_class = "mod.class.Projectile"
+
 function _M:init(t, no_default)
 	t.encumber = t.encumber or 0
 

@@ -188,7 +188,11 @@ function _M:describeFloor(x, y)
 	end
 
 	local g = game.level.map(x, y, game.level.map.TERRAIN)
-	if g and g.change_level then game.logPlayer(self, "#YELLOW_GREEN#There is "..g.name:a_an().." here (press '<', '>' or right click to use).") end
+	if g and g.change_level then
+		game.logPlayer(self, "#YELLOW_GREEN#There is "..g.name:a_an().." here (press '<', '>' or right click to use).")
+		local sx, sy = game.level.map:getTileToScreen(x, y)
+		game.flyers:add(sx, sy, 60, 0, -1.5, ("Level change (%s)!"):format(g.name), colors.simple(colors.YELLOW_GREEN), true)
+	end
 end
 
 function _M:move(x, y, force)

@@ -33,8 +33,16 @@ function _M:move(x, y, force)
 
 	local moved = engine.Projectile.move(self, x, y, force)
 	if moved and not force and ox and oy and (ox ~= self.x or oy ~= self.y) and config.settings.tome.smooth_move > 0 then
-		self:setMoveAnim(ox, oy, config.settings.tome.smooth_move)
+		self:setMoveAnim(ox, oy, config.settings.tome.smooth_move, self.project and self.project.def and self.project.def.typ.blur_move)
 	end
 
 	return moved
 end
+function _M:tooltip(x, y)
+	local tstr = tstring("Projectile: ", self.name)
+
+	if config.settings.cheat then
+		tstr:add(true, "UID: ", tostring(self.uid), true, "Coords: ", tostring(x), "x", tostring(y))
+	end
+	return tstr
+end

@@ -21,6 +21,7 @@ require "engine.class"
 require "engine.Trap"
 require "engine.interface.ActorProject"
 require "engine.interface.ObjectIdentify"
+local Faction = require "engine.Faction"
 
 module(..., package.seeall, class.inherit(
 	engine.Trap,
@@ -28,7 +29,10 @@ module(..., package.seeall, class.inherit(
 	engine.interface.ActorProject
 ))
 
+_M.projectile_class = "mod.class.Projectile"
+
 function _M:init(t, no_default)
+	self.faction = "enemies"
 	engine.Trap.init(self, t, no_default)
 	engine.interface.ObjectIdentify.init(self, t)
 	engine.interface.ActorProject.init(self, t)
@@ -50,6 +54,12 @@ function _M:tooltip()
 	end
 end
 
+--- What is our reaction toward the target
+-- See Faction:factionReaction()
+function _M:reactionToward(target)
+	return Faction:factionReaction(self.faction, target.faction)
+end
+
 --- Can we disarm this trap?
 function _M:canDisarm(x, y, who)
 	if not engine.Trap.canDisarm(self, x, y, who) then return false end

@@ -976,7 +976,7 @@ newDamageType{
 			tmp[target] = true
 			DamageType:get(DamageType.PHYSICAL).projector(src, x, y, DamageType.PHYSICAL, dam.dam)
 			if target:checkHit(src:combatPhysicalpower(), target:combatPhysicalResist(), 0, 95, 15) and target:canBe("knockback") then
-				target:knockback(src.x, src.y, dam.dist)
+				target:knockback(dam.x or src.x, dam.y or src.y, dam.dist)
 				target:crossTierEffect(target.EFF_OFFBALANCE, src:combatPhysicalpower())
 				game.logSeen(target, "%s is knocked back!", target.name:capitalize())
 			else

@@ -47,21 +47,69 @@ newEntity{ base = "TRAP_COMPLEX",
 				walls[#walls+1] = {x=i, y=j}
 			end
 		end
-		if #walls == 0 then game.level.map:remove(i, j, engine.Map.TRAP) return end
+		if #walls == 0 then game.level.map:remove(x, y, engine.Map.TRAP) return end
 
 		local spot = rng.table(walls)
 		local l = line.new(spot.x, spot.y, x, y)
 		self.spawn_x, self.spawn_y = l()
 		print("Boulder trap spawn", self.spawn_x, self.spawn_y)
 		self.x, self.y = x, y
+		self.on_added = nil
 	end,
 	str = resolvers.mbonus(200, 30),
 	dam = resolvers.mbonus_level(300, 5),
-	combatAttackStr = function(self) return self.str end,
+	combatPhysicalpower = function(self) return mod.class.interface.Combat:rescaleCombatStats(self.str) end,
 	triggered = function(self, x, y, who)
 		if not self.spawn_x then return end
-		local tg = {name="huge boulder", type="bolt", range=5, x=self.spawn_x, y=self.spawn_y, speed=2, display={image="trap/trap_big_boulder_01.png"}}
-		self:projectile(tg, x, y, engine.DamageType.PHYSKNOCKBACK, {dam=self.dam, dist=3})
+		local tg = {name="huge boulder", type="bolt", range=core.fov.distance(x, y, self.spawn_x, self.spawn_y), x=self.spawn_x, y=self.spawn_y, speed=2, display={image="trap/trap_big_boulder_01.png"}, blur_move=4}
+		self:projectile(tg, x, y, engine.DamageType.PHYSKNOCKBACK, {dam=self.dam, dist=3, x=self.spawn_x, y=self.spawn_y})
 		return true
 	end,
 }
+
+newEntity{ base = "TRAP_COMPLEX",
+	subtype = "arcane",
+	name = "spinning beam", image = "trap/trap_glyph_explosion_01_64.png",
+	detect_power = 6, disarm_power = 6,
+	rarity = 3, level_range = {1, 30},
+	color_r=40, color_g=220, color_b=0,
+	message = "@Target@ walks on a trap, the beam intensifies.",
+	on_added = function(self, level, x, y)
+		self.x, self.y = x, y
+		self.rad = rng.range(2, 8)
+		local tries = {}
+		local list = {i=1}
+		local sa = rng.range(0, 359)
+		local dir = rng.percent(50) and 1 or -1
+		for a = sa, sa + 359 * dir, dir do
+			local rx, ry = math.floor(math.cos(math.rad(a)) * self.rad), math.floor(math.sin(math.rad(a)) * self.rad)
+			if not tries[rx] or not tries[rx][ry] then
+				tries[rx] = tries[rx] or {}
+				tries[rx][ry] = true
+				list[#list+1] = {x=rx+x, y=ry+y}
+			end
+		end
+		self.list = list
+		game.level:addEntity(self)
+		self.on_added = nil
+	end,
+	all_know = true,
+	dam = resolvers.mbonus_level(300, 5),
+	triggered = function(self, x, y, who)
+		if self:reactionToward(who) < 0 then self.dam = self.dam * 1.5 end
+		return true
+	end,
+	canAct = false,
+	energy = {value=0},
+	act = function(self)
+		local x, y = self.list[self.list.i].x, self.list[self.list.i].y
+		self.list.i = util.boundWrap(self.list.i + 1, 1, #self.list)
+
+		local tg = {type="beam", range=self.rad, friendlyfire=false}
+		self:project(tg, x, y, engine.DamageType.ARCANE, self.dam, nil)
+		local _ _, x, y = self:canProject(tg, x, y)
+		game.level.map:particleEmitter(self.x, self.y, math.max(math.abs(x-self.x), math.abs(y-self.y)), "mana_beam", {tx=x-self.x, ty=y-self.y})
+
+		self:useEnergy()
+	end,
+}