Added some new "fun" traps

Reaver unlock can now be done over the course of multiple games, so people will naturally get it over time


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

game/modules/tome/data/achievements/kills.lua

@@ -49,7 +49,7 @@ newAchievement{
 newAchievement{
 	name = "Reaver",
 	desc = [[Killed 1000 humanoids]],
-	mode = "player",
+	mode = "world",
 	can_gain = function(self, who, target)
 		if target.type == "humanoid" then
 			self.nb = (self.nb or 0) + 1

game/modules/tome/data/general/traps/annoy.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
+
+newEntity{ define_as = "TRAP_ANNOY",
+	type = "annoy", subtype="annoy", id_by_type=true, unided_name = "trap",
+	display = '^',
+	triggered = function() end,
+}
+
+newEntity{ base = "TRAP_ANNOY",
+	name = "lethargy trap", auto_id = true,
+	detect_power = 20, disarm_power = 36,
+	rarity = 3, level_range = {1, 50},
+	color=colors.BLUE,
+	message = "@Target@ seems less active.",
+	triggered = function(self, x, y, who)
+		local tids = {}
+		for tid, lev in pairs(who.talents) do
+			if not who.talents_cd[tid] then tids[#tids+1] = tid end
+		end
+		for i = 1, 3 do
+			local tid = rng.tableRemove(tids)
+			if not tid then break end
+			who.talents_cd[tid] = rng.range(4, 7)
+		end
+		who.changed = true
+		return true, true
+	end
+}
+
+newEntity{ base = "TRAP_ANNOY",
+	name = "burning curse trap", auto_id = true,
+	detect_power = 50, disarm_power = 58,
+	rarity = 3, level_range = {30, 50},
+	color=colors.ORCHID,
+	message = "@Target@ triggers a burning curse!",
+	dam = resolvers.mbonus(80, 5),
+	triggered = function(self, x, y, who)
+		who:setEffect(who.EFF_BURNING_HEX, 7, {dam=self.dam})
+		return true, true
+	end
+}

game/modules/tome/data/zones/high-peak/traps.lua

@@ -18,3 +18,5 @@
 -- darkgod@te4.org
 
 load("/data/general/traps/elemental.lua")
+load("/data/general/traps/annoy.lua")
+load("/data/general/traps/alarm.lua")

game/modules/tome/data/zones/tol-falas/traps.lua

@@ -18,3 +18,5 @@
 -- darkgod@te4.org
 
 load("/data/general/traps/elemental.lua")
+load("/data/general/traps/annoy.lua")
+load("/data/general/traps/alarm.lua")