Added wands. Yes they are costly and rare, this is wanted

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

game/engines/default/engine/Zone.lua

@@ -579,7 +579,7 @@ function _M:newLevel(level_data, lev, old_lev, game)
 
 	-- Add the entities we are told to
 	for i = 0, map.w - 1 do for j = 0, map.h - 1 do
-		if map.room_map[i][j] and map.room_map[i][j].add_entities then
+		if map.room_map[i] and map.room_map[i][j] and map.room_map[i][j].add_entities then
 			for z = 1, #map.room_map[i][j].add_entities do
 				local ae = map.room_map[i][j].add_entities[z]
 				self:addEntity(level, ae[2], ae[1], i, j)

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

@@ -44,7 +44,11 @@ end
 
 function _M:getUseDesc()
 	if self.use_power then
-		return ("It can be used to %s, costing %d power out of %d/%d."):format(self.use_power.name, self.use_power.power, self.power, self.max_power)
+		if self.show_charges then
+			return ("It can be used to %s, with %d charges out of %d."):format(self.use_power.name, math.floor(self.power / self.use_power.power), math.floor(self.max_power / self.use_power.power))
+		else
+			return ("It can be used to %s, costing %d power out of %d/%d."):format(self.use_power.name, self.use_power.power, self.power, self.max_power)
+		end
 	elseif self.use_simple then
 		return ("It can be used to %s."):format(self.use_simple.name)
 	elseif self.use_talent then

game/modules/tome/class/Game.lua

@@ -546,13 +546,24 @@ function _M:setupCommands()
 			if config.settings.tome.cheat then
 				self.player:incStat("str", 100) self.player:incStat("dex", 100) self.player:incStat("mag", 100) self.player:incStat("wil", 100) self.player:incStat("cun", 100) self.player:incStat("con", 100)
 				self.player:learnTalent(self.player.T_HEAVY_ARMOUR_TRAINING, true) self.player:learnTalent(self.player.T_MASSIVE_ARMOUR_TRAINING, true)
+--[[
 				for i, e in ipairs(self.zone.object_list) do
-					if e.unique and e.define_as ~= "VOICE_SARUMAN" then -- and e.rarity then
+					if e.unique and e.define_as ~= "VOICE_SARUMAN" then  and e.rarity then
 						local a = self.zone:finishEntity(self.level, "object", e)
 						a:identify(true)
 						self.zone:addEntity(self.level, a, "object", self.player.x, self.player.y)
 					end
 				end
+--]]
+-- [[
+				for i = 1, 50 do
+					local a = self.zone:makeEntity(self.level, "object", {type="wand"}, nil, true)
+					if a then
+						a:identify(true)
+						self.zone:addEntity(self.level, a, "object", self.player.x, self.player.y)
+					end
+				end
+--]]
 				self.logPlayer(self.player, "All world artifacts created.")
 			end
 		end,

game/modules/tome/class/Object.lua

@@ -135,6 +135,12 @@ function _M:descAttribute(attr)
 		return self:getTalentFromId(self.use_talent.id).name:lower()
 	elseif attr == "DIGSPEED" then
 		return ("dig speed %d turns"):format(self.digspeed)
+	elseif attr == "CHARGES" then
+		if self.use_power then
+			return (" (%d/%d)"):format(math.floor(self.power / self.use_power.power), math.floor(self.max_power / self.use_power.power))
+		else
+			return ""
+		end
 	end
 end
 

game/modules/tome/class/Trap.lua

@@ -53,7 +53,7 @@ function _M:canDisarm(x, y, who)
 	if not engine.Trap.canDisarm(self, x, y, who) then return false end
 
 	-- do we know how to disarm?
-	if who:knowTalent(who.T_TRAP_DISARM) then
+	if who:knowTalent(who.T_TRAP_DISARM) or who:attr("can_disarm") then
 		local power = who:getTalentLevel(who.T_TRAP_DISARM) * who:getCun(25) + (who:attr("disarm_bonus") or 0)
 		if who:checkHit(power, self.disarm_power) then
 			return true

game/modules/tome/data/chats/magic-store.lua

@@ -19,7 +19,7 @@
 
 local function recharge(npc, player)
 	player:showEquipInven("Select the item to recharge", function(o) return o.recharge_cost and o.power and o.max_power and o.power < o.max_power end, function(o, inven, item)
-		local cost = math.ceil(o.recharge_cost * (o.max_power / o.use_talent.power))
+		local cost = math.ceil(o.recharge_cost * (o.max_power / (o.use_talent and o.use_talent.power or o.use_power.power)))
 		if cost > player.money then require("engine.Dialog"):simplePopup("Not enough money", "This costs "..cost.." gold.") return true end
 		require("engine.Dialog"):yesnoPopup("Recharge?", "This will cost you "..cost.." gold.", function(ok) if ok then
 			o.power = o.max_power

game/modules/tome/data/general/objects/egos/wands.lua

@@ -21,13 +21,16 @@ local Stats = require "engine.interface.ActorStats"
 local DamageType = require "engine.DamageType"
 
 --[[
-detection
-teleportation
-trap destruction
-flame
-lightning
+*detection
+*identify
+*light
+*teleportation
+*trap destruction
+*flame
+*lightning
 digging (very rare)
 healing
+
 ]]
 
 newEntity{
@@ -36,10 +39,78 @@ newEntity{
 	rarity = 8,
 	cost_per_charge = 1,
 
-	use_power = { name = "teleport randomly", power = 6, use = function(self, who)
-		game.level.map:particleEmitter(who.x, who.y, 1, "teleport")
-		who:teleportRandom(who.x, who.y, 100)
-		game.level.map:particleEmitter(who.x, who.y, 1, "teleport")
+	use_power = { name = "detect the presence of creatures around you", power = 6, use = function(self, who)
+		local rad = 15 + who:getMag(20)
+		who:setEffect(who.EFF_SENSE, 2, {
+			range = rad,
+			actor = 1,
+		})
+		game.logSeen(who, "%s uses %s!", who.name:capitalize(), self:getName{no_count=true})
+		return nil, true
+	end}
+}
+
+newEntity{
+	name = " of illumination", suffix=true, instant_resolve=true,
+	level_range = {1, 50},
+	rarity = 8,
+	cost_per_charge = 0.4,
+
+	use_power = { name = "light the area", power = 3, use = function(self, who)
+		who:project({type="ball", range=0, friendlyfire=true, radius=15}, who.x, who.y, engine.DamageType.LITE, 1)
+		game.logSeen(who, "%s uses %s!", who.name:capitalize(), self:getName{no_count=true})
+		return nil, true
+	end}
+}
+
+newEntity{
+	name = " of identify", suffix=true, instant_resolve=true,
+	level_range = {10, 50},
+	rarity = 8,
+	cost_per_charge = 0.5,
+
+	use_power = { name = "identify objects", power = 4, use = function(self, who)
+		if who:getMag() < 28 then
+			who:showEquipInven("Identify object", function(o) return not o:isIdentified() end, function(o)
+				o:identify(true)
+				game.logPlayer(who, "You identify: %s", o:getName{do_color=true})
+				return true
+			end)
+		else
+			for inven_id, inven in pairs(who.inven) do
+				for i, o in ipairs(inven) do
+					o:identify(true)
+				end
+			end
+			game.logPlayer(who, "You identify all your inventory.")
+		end
+		game.logSeen(who, "%s uses %s!", who.name:capitalize(), self:getName{no_count=true})
+		return nil, true
+	end}
+}
+
+newEntity{
+	name = " of trap destruction", suffix=true, instant_resolve=true,
+	level_range = {1, 50},
+	rarity = 14,
+	cost_per_charge = 1,
+
+	use_power = { name = "try to disarm any known traps", power = 6, use = function(self, who)
+		local tg = {type="beam", range=2 + who:getMag(2)}
+		local x, y = who:getTarget(tg)
+		if not x or not y then return nil end
+		who:project(tg, x, y, function(px, py)
+			local trap = game.level.map(px, py, engine.Map.TRAP)
+			if not trap then return end
+			local inc = self.material_level * 5 + who:getMag(30)
+			who:attr("can_disarm", 1)
+			who:attr("disarm_bonus", inc)
+
+			trap:disarm(px, py, who)
+
+			who:attr("disarm_bonus", -inc)
+			who:attr("can_disarm", -1)
+		end)
 		game.logSeen(who, "%s uses %s!", who.name:capitalize(), self:getName{no_count=true})
 		return nil, true
 	end}
@@ -59,3 +130,59 @@ newEntity{
 		return nil, true
 	end}
 }
+
+newEntity{
+	name = " of lightning", suffix=true, instant_resolve=true,
+	level_range = {15, 50},
+	rarity = 10,
+	cost_per_charge = 1,
+
+	use_power = { name = "fire a beam of lightning", power = 6, use = function(self, who)
+		local tg = {type="beam", range=6 + who:getMag(4)}
+		local x, y = who:getTarget(tg)
+		if not x or not y then return nil end
+		local dam = (40 + who:getMag(20)) * self.material_level
+		who:project(tg, x, y, DamageType.LIGHTNING, rng.avg(dam / 3, dam, 3))
+		local _ _, x, y = who:canProject(tg, x, y)
+		game.level.map:particleEmitter(who.x, who.y, math.max(math.abs(x-who.x), math.abs(y-who.y)), "lightning", {tx=x-who.x, ty=y-who.y})
+		game:playSoundNear(who, "talents/lightning")
+		game.logSeen(who, "%s uses %s!", who.name:capitalize(), self:getName{no_count=true})
+		return nil, true
+	end}
+}
+
+newEntity{
+	name = " of flames", suffix=true, instant_resolve=true,
+	level_range = {15, 50},
+	rarity = 10,
+	cost_per_charge = 1,
+
+	use_power = { name = "fire a beam of fire", power = 6, use = function(self, who)
+		local tg = {type="beam", range=6 + who:getMag(4)}
+		local x, y = who:getTarget(tg)
+		if not x or not y then return nil end
+		local dam = (35 + who:getMag(20)) * self.material_level
+		who:project(tg, x, y, DamageType.FIRE, dam, {type="flame"})
+		game:playSoundNear(who, "talents/fire")
+		game.logSeen(who, "%s uses %s!", who.name:capitalize(), self:getName{no_count=true})
+		return nil, true
+	end}
+}
+
+newEntity{
+	name = " of healing", suffix=true, instant_resolve=true,
+	level_range = {25, 50},
+	rarity = 10,
+	cost_per_charge = 2,
+
+	use_power = { name = "heal", power = 7, use = function(self, who)
+		local tg = {default_target=who, type="hit", nowarning=true, range=6 + who:getMag(4), first_target="friend"}
+		local x, y = who:getTarget(tg)
+		if not x or not y then return nil end
+		local dam = (80 + who:getMag(50)) * self.material_level
+		who:project(tg, x, y, DamageType.HEAL, dam)
+		game:playSoundNear(who, "talents/heal")
+		game.logSeen(who, "%s uses %s!", who.name:capitalize(), self:getName{no_count=true})
+		return nil, true
+	end}
+}

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

@@ -24,6 +24,7 @@ newEntity{
 	display = "-", color=colors.WHITE,
 	encumber = 2,
 	rarity = 18,
+	add_name = "#CHARGES#",
 	use_sound = "talents/spell_generic",
 	elec_destroy = {{20,1}, {30,2}, {60,5}, {90,10}, {170,20}},
 	desc = [[Magical wands are made by powerful alchemists and archmages to store spells. Anybody can use them to release the spells.]],

game/modules/tome/data/general/objects/world-artifacts.lua

@@ -719,11 +719,12 @@ newEntity{ base = "BASE_WAND",
 	rarity = 220,
 	level_range = {15, 30},
 	elec_proof = true,
+	add_name = false,
 
 	max_power = 75, power_regen = 1,
 	use_power = { name = "shoot a cone of fire", power = 30,
 		use = function(self, who)
-			local tg = {type="cone", range=0, radius=4, talent=t}
+			local tg = {type="cone", range=0, radius=4}
 			local x, y = who:getTarget(tg)
 			if not x or not y then return nil end
 			who:project(tg, x, y, engine.DamageType.FIRE, 80 + who:getMag(), {type="flame"})

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

@@ -130,6 +130,7 @@ newEntity{
 		max_fill = 25,
 		filters = {
 			{type="weapon", subtype="staff", id=true},
+			{type="wand", subtype="wand", id=true},
 		},
 	},
 }

game/modules/tome/resolvers.lua

@@ -216,9 +216,12 @@ function resolvers.charges(min, max, cost)
 	return {__resolver="charges", __resolve_last=true, min, max, cost}
 end
 function resolvers.calc.charges(tt, e)
---	e.cost = e.cost + t.type[2] * 3 * level
---	e.recharge_cost = t.type[2] * 3 * level
 	e.max_power = rng.range(tt[1], tt[2])
+	e.power = e.max_power
+	print("creatin wand", e.name, e.egoed, e.max_power, e.cost_per_charge)
+	e.recharge_cost = (e.cost_per_charge or 0) * 4
+	e.cost = e.cost + (e.cost_per_charge or 0) * e.max_power
+	e.show_charges = true
 	return
 end