Players with Trap Mastery would do well to investigate the maze, they might...

Players with Trap Mastery would do well to investigate the maze, they might find something interresting down there


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

game/engines/default/engine/interface/ActorProject.lua

@@ -38,11 +38,6 @@ end
 -- @param dam damage to be done
 -- @param particles particles effect configuration, or nil
 function _M:project(t, x, y, damtype, dam, particles)
-	-- Call the on project of the target grid if possible
-	if not t.bypass and game.level.map:checkAllEntities(x, y, "on_project", self, t, x, y, damtype, dam, particles) then
-		return
-	end
-
 	if type(particles) ~= "table" then particles = nil end
 
 --	if type(dam) == "number" and dam < 0 then return end
@@ -70,6 +65,11 @@ function _M:project(t, x, y, damtype, dam, particles)
 		-- Deal damage: beam
 		if typ.line then addGrid(lx, ly) end
 
+		-- Call the on project of the target grid if possible
+		if not t.bypass and game.level.map:checkAllEntities(lx, ly, "on_project", self, t, lx, ly, damtype, dam, particles) then
+			return
+		end
+
 		lx, ly = l()
 	end
 	-- Ok if we are at the end reset lx and ly for the next code
@@ -181,11 +181,6 @@ end
 -- @param dam damage to be done
 -- @param particles particles effect configuration, or nil
 function _M:projectile(t, x, y, damtype, dam, particles)
-	-- Call the on project of the target grid if possible
---	if not t.bypass and game.level.map:checkAllEntities(x, y, "on_project", self, t, x, y, damtype, dam, particles) then
---		return
---	end
-
 	if type(particles) ~= "function" and type(particles) ~= "table" then particles = nil end
 
 --	if type(dam) == "number" and dam < 0 then return end

game/modules/tome/data/general/objects/scrolls.lua

@@ -101,7 +101,7 @@ newEntity{
 
 newEntity{
 	define_as = "BASE_LORE",
-	type = "lore", subtype="lore", not_in_stores=true,
+	type = "lore", subtype="lore", not_in_stores=true, no_unique_lore=true,
 	unided_name = "scroll", identified=true,
 	display = "?", color=colors.ANTIQUE_WHITE, image="object/scroll-lore.png",
 	encumber = 0,

game/modules/tome/data/lore/maze.lua

@@ -88,3 +88,29 @@ newLore{
 
 #{italic}#This text is unreadable as it is thoroughly caked in blood.#{normal}#]],
 }
+
+newLore{
+	id = "maze-note-trap",
+	category = "maze",
+	name = "the perfect killing device",
+	lore = [[I have now devised the perfect trap for the horned beast that walks these halls! Truly he cannot avoid this amazing contraption - the perfect blend of technical mastery and using nature's lethal gifts. Ah, how I look forward to having that monster's head mounted on my walls - it shall be the pride of my collection!
+
+The contraption is elegant and simple, though many months I have spent getting the formula perfect. There are two vials attached together- one containing finely ground hemlock, the other containing a carefully prepared zinc compound. When the vials are broken the materials react with the air and pump out an amazing cloud of poisonous vapour! The poison is supremely effective, killing within minutes. All I have to do is carefully hide the vials beneath a thin piece of slate and wait for my prey to step upon the trap - then POOF, it's dead!
+
+I have prepared a great many vials to last me throughout the hunting season. By this time next year I will have a trophy collection to match the kings!
+
+I seem to have misplaced one though... I'm sure it must be close by.
+
+
+No, NO! I have - I --- acci--- pain, such pa--______
+
+
+#{italic}#You find a dusty case filled with many small vials of powder. They seem serviceable.#{normal}#]],
+	on_learn = function(who)
+		local p = game.party:findMember{main=true}
+		if p:knowTalent(p.T_TRAP_MASTERY) then
+			p:learnTalent(p.T_POISON_GAS_TRAP, 1)
+			game.log("#LIGHT_GREEN#You have learnt to create poison gas traps!")
+		end
+	end,
+}

game/modules/tome/data/zones/maze/objects.lua

@@ -25,7 +25,11 @@ newEntity{ base = "BASE_LORE",
 	name = "torn diary page", lore="maze-note-"..i,
 	desc = [[A diary, left by an adventurer.]],
 	rarity = false,
-	is_magic_device = false,
-	encumberance = 0,
 }
 end
+
+newEntity{ base = "BASE_LORE", define_as = "NOTE_LEARN_TRAP",
+	name = "the perfect killing device", lore="maze-note-trap", unique=true, no_unique_lore=true,
+	desc = [[Some notes describing how to create poison gas traps, left by an unfortunate rogue.]],
+	rarity = false,
+}

game/modules/tome/data/zones/maze/zone.lua

@@ -69,5 +69,18 @@ return {
 	post_process = function(level)
 		-- Place a lore note on each level
 		game:placeRandomLoreObject("NOTE"..level.level)
+
+		local p = game.party:findMember{main=true}
+		if level.level == 5 and p:knowTalent(p.T_TRAP_MASTERY) then
+			local l = game.zone:makeEntityByName(level, "object", "NOTE_LEARN_TRAP")
+			if not l then return end
+			for i = -1, 1 do for j = -1, 1 do
+				local x, y = level.default_down.x + i, level.default_down.y + j
+				if game.level.map:isBound(x, y) and (i ~= 0 or j ~= 0) and not game.level.map:checkEntity(x, y, engine.Map.TERRAIN, "block_move") then
+					game.zone:addEntity(level, l, "object", x, y)
+					return
+				end
+			end end
+		end
 	end,
 }