plop

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

--- TE4 - T-Engine 4
--- Copyright (C) 2009, 2010, 2011 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
-
--- Defines AIs that can use talents, either smartly or "dumbly"
-
-newAI("angband", function(self)
-	if self:runAI(self.ai_state.ai_target or "target_simple") then
-		-- One in "talent_in" chance of using a talent
-		if (not self.ai_state.no_talents or self.ai_state.no_talents == 0) and rng.chance(self.ai_state.talent_in or 6) and self:reactionToward(self.ai_target.actor) < 0 then
-			self:runAI("dumb_talented")
-		end
-		if not self.energy.used then
-			self:runAI(self.ai_state.ai_move or "move_simple")
-		end
-		return true
-	end

--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009, 2010, 2011 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
-
-require "engine.class"
-require "engine.Actor"
-require "engine.Autolevel"
-require "engine.interface.ActorTemporaryEffects"
-require "engine.interface.ActorLife"
-require "engine.interface.ActorProject"
-require "engine.interface.ActorLevel"
-require "engine.interface.ActorStats"
-require "engine.interface.ActorTalents"
-require "engine.interface.ActorResource"
-require "engine.interface.ActorFOV"
-local Map = require "engine.Map"
-
-module(..., package.seeall, class.inherit(
-	engine.Actor,
-	engine.interface.ActorTemporaryEffects,
-	engine.interface.ActorLife,
-	engine.interface.ActorProject,
-	engine.interface.ActorLevel,
-	engine.interface.ActorStats,
-	engine.interface.ActorTalents,
-	engine.interface.ActorResource,
-	engine.interface.ActorFOV
-))
-
-_M._noalpha = true
-
-function _M:init(t, no_default)
-	-- Define some basic combat stats
-	self.combat_armor = 0
-
-	-- Default regen
-	t.power_regen = t.power_regen or 1
-	t.life_regen = t.life_regen or 0.25 -- Life regen real slow
-
-	t.esp = {}
-	t.speed = t.speed or 0
-
-	-- Default melee barehanded damage
-	self.combat = { dam=1 }
-
-	engine.Actor.init(self, t, no_default)
-	engine.interface.ActorTemporaryEffects.init(self, t)
-	engine.interface.ActorLife.init(self, t)
-	engine.interface.ActorProject.init(self, t)
-	engine.interface.ActorTalents.init(self, t)
-	engine.interface.ActorResource.init(self, t)
-	engine.interface.ActorStats.init(self, t)
-	engine.interface.ActorLevel.init(self, t)
-	engine.interface.ActorFOV.init(self, t)
-
-	self:computeEnergyMod()
-end
-
-function _M:act()
-	if not engine.Actor.act(self) then return end
-
-	self.changed = true
-
-	-- Cooldown talents
-	self:cooldownTalents()
-	-- Regen resources
-	self:regenLife()
-	self:regenResources()
-	-- Compute timed effects
-	self:timedEffects()
-
-	-- Still enough energy to act ?
-	if self.energy.value < game.energy_to_act then return false end
-
-	return true
-end
-
-function _M:move(x, y, force)
-	local moved = false
-	if force or self:enoughEnergy() then
-		-- Never move but tries to attack ? ok
-		if not force and self:attr("never_move") then
-			-- A bit weird, but this simple asks the collision code to detect an attack
-			if not game.level.map:checkAllEntities(x, y, "block_move", self, true) then
-				game.logPlayer(self, "You are unable to move!")
-			end
-		else
-			moved = engine.Actor.move(self, x, y, force)
-		end
-		if not force and moved and not self.did_energy then self:useEnergy() end
-	end
-	self.did_energy = nil
-	return moved
-end
-
-local extract_energy =
-{
-	     1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-	     1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-	     1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-	     1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-	     1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-	     1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-	     1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
-	     2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
-	     2,  2,  2,  2,  2,  2,  2,  3,  3,  3,
-	     3,  3,  3,  3,  3,  4,  4,  4,  4,  4,
-	     5,  5,  5,  5,  6,  6,  7,  7,  8,  9,
-	    10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-	    20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
-	    30, 31, 32, 33, 34, 35, 36, 36, 37, 37,
-	    38, 38, 39, 39, 40, 40, 40, 41, 41, 41,
-	    42, 42, 42, 43, 43, 43, 44, 44, 44, 44,
-	    45, 45, 45, 45, 45, 46, 46, 46, 46, 46,
-	    47, 47, 47, 47, 47, 48, 48, 48, 48, 48,
-	    49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
-	    49, 49, 49, 49, 49, 49, 49, 49, 49, 49,
-}
-
---- Compute energy mod based on speed
-function _M:computeEnergyMod()
-	self.energy.mod = extract_energy[self.speed + 111] / 10
-end
-
---- Called when a temporary value changes (added or deleted)
--- Takes care to compute energy mod
--- @param prop the property changing
--- @param v the value of the change
--- @param base the base table of prop
-function _M:onTemporaryValueChange(prop, v, base)
-	if prop == "speed" and base == self then
-		self:computeEnergyMod()
-	end
-end
-
---- Reveals location surrounding the actor
-function _M:magicMap(radius, x, y)
-	x = x or self.x
-	y = y or self.y
-	radius = math.floor(radius)
-
-	local ox, oy
-
-	self.x, self.y, ox, oy = x, y, self.x, self.y
-	self:computeFOV(radius, "block_sense", function(x, y)
-		game.level.map.remembers(x, y, true)
-		game.level.map.has_seens(x, y, true)
-	end, true, true, true)
-
-	self.x, self.y = ox, oy
-end
-
-function _M:tooltip()
-	return ([[%s%s
-#00ffff#Level: %d
-#ff0000#HP: %d (%d%%)
-Stats: %d /  %d / %d
-%s]]):format(
-	self:getDisplayString(),
-	self.name,
-	self.level,
-	self.life, self.life * 100 / self.max_life,
-	self:getStr(),
-	self:getDex(),
-	self:getCon(),
-	self.desc or ""
-	)
-end
-
-function _M:onTakeHit(value, src)
-	return value
-end
-
-function _M:die(src)
-	engine.interface.ActorLife.die(self, src)
-
-	-- Gives the killer some exp for the kill
-	if src and src.gainExp then
-		src:gainExp(self:worthExp(src))
-	end
-
-	return true
-end
-
-function _M:levelup()
-	self.max_life = self.max_life + 2
-
-	self:incMaxPower(3)
-
-	-- Healp up on new level
-	self.life = self.max_life
-	self.power = self.max_power
-end
-
---- Notifies a change of stat value
-function _M:onStatChange(stat, v)
-	if stat == self.STAT_CON then
-		self.max_life = self.max_life + 2
-	end
-end
-
-function _M:attack(target)
-	self:bumpInto(target)
-end
-
-
---- Called before a talent is used
--- Check the actor can cast it
--- @param ab the talent (not the id, the table)
--- @return true to continue, false to stop
-function _M:preUseTalent(ab, silent)
-	if not self:enoughEnergy() then print("fail energy") return false end
-
-	if ab.mode == "sustained" then
-		if ab.sustain_power and self.max_power < ab.sustain_power and not self:isTalentActive(ab.id) then
-			game.logPlayer(self, "You do not have enough power to activate %s.", ab.name)
-			return false
-		end
-	else
-		if ab.power and self:getPower() < ab.power then
-			game.logPlayer(self, "You do not have enough power to cast %s.", ab.name)
-			return false
-		end
-	end
-
-	if not silent then
-		-- Allow for silent talents
-		if ab.message ~= nil then
-			if ab.message then
-				game.logSeen(self, "%s", self:useTalentMessage(ab))
-			end
-		elseif ab.mode == "sustained" and not self:isTalentActive(ab.id) then
-			game.logSeen(self, "%s activates %s.", self.name:capitalize(), ab.name)
-		elseif ab.mode == "sustained" and self:isTalentActive(ab.id) then
-			game.logSeen(self, "%s deactivates %s.", self.name:capitalize(), ab.name)
-		else
-			game.logSeen(self, "%s uses %s.", self.name:capitalize(), ab.name)
-		end
-	end
-	return true
-end
-
---- Called before a talent is used
--- Check if it must use a turn, mana, stamina, ...
--- @param ab the talent (not the id, the table)
--- @param ret the return of the talent action
--- @return true to continue, false to stop
-function _M:postUseTalent(ab, ret)
-	if not ret then return end
-
-	self:useEnergy()
-
-	if ab.mode == "sustained" then
-		if not self:isTalentActive(ab.id) then
-			if ab.sustain_power then
-				self.max_power = self.max_power - ab.sustain_power
-			end
-		else
-			if ab.sustain_power then
-				self.max_power = self.max_power + ab.sustain_power
-			end
-		end
-	else
-		if ab.power then
-			self:incPower(-ab.power)
-		end
-	end
-
-	return true
-end
-
---- Return the full description of a talent
--- You may overload it to add more data (like power usage, ...)
-function _M:getTalentFullDescription(t)
-	local d = {}
-
-	if t.mode == "passive" then d[#d+1] = "#6fff83#Use mode: #00FF00#Passive"
-	elseif t.mode == "sustained" then d[#d+1] = "#6fff83#Use mode: #00FF00#Sustained"
-	else d[#d+1] = "#6fff83#Use mode: #00FF00#Activated"
-	end
-
-	if t.power or t.sustain_power then d[#d+1] = "#6fff83#Power cost: #7fffd4#"..(t.power or t.sustain_power) end
-	if self:getTalentRange(t) > 1 then d[#d+1] = "#6fff83#Range: #FFFFFF#"..self:getTalentRange(t)
-	else d[#d+1] = "#6fff83#Range: #FFFFFF#melee/personal"
-	end
-	if t.cooldown then d[#d+1] = "#6fff83#Cooldown: #FFFFFF#"..t.cooldown end
-
-	return table.concat(d, "\n").."\n#6fff83#Description: #FFFFFF#"..t.info(self, t)
-end
-
---- How much experience is this actor worth
--- @param target to whom is the exp rewarded
--- @return the experience rewarded
-function _M:worthExp(target)
-	return self.exp_worth * self.level / target.level
-end
-
---- Can the actor see the target actor
--- This does not check LOS or such, only the actual ability to see it.<br/>
--- Check for telepathy, invisibility, stealth, ...
-function _M:canSee(actor, def, def_pct)
-	if not actor then return false, 0 end
-
-	-- Check for stealth. Checks against the target cunning and level
-	if actor:attr("stealth") and actor ~= self then
-		local def = self.level / 2 + self:getCun(25)
-		local hit, chance = self:checkHit(def, actor:attr("stealth") + (actor:attr("inc_stealth") or 0), 0, 100)
-		if not hit then
-			return false, chance
-		end
-	end
-
-	if def ~= nil then
-		return def, def_pct
-	else
-		return true, 100
-	end
-end
-
---- Can the target be applied some effects
--- @param what a string describing what is being tried
-function _M:canBe(what)
-	if what == "poison" and rng.percent(100 * (self:attr("poison_immune") or 0)) then return false end
-	if what == "cut" and rng.percent(100 * (self:attr("cut_immune") or 0)) then return false end
-	if what == "confusion" and rng.percent(100 * (self:attr("confusion_immune") or 0)) then return false end
-	if what == "blind" and rng.percent(100 * (self:attr("blind_immune") or 0)) then return false end
-	if what == "stun" and rng.percent(100 * (self:attr("stun_immune") or 0)) then return false end
-	if what == "fear" and rng.percent(100 * (self:attr("fear_immune") or 0)) then return false end
-	if what == "instakill" and rng.percent(100 * (self:attr("instakill_immune") or 0)) then return false end
-	return true

--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009, 2010, 2011 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
-
-require "engine.class"
-require "engine.GameTurnBased"
-require "engine.interface.GameTargeting"
-require "engine.KeyBind"
-local Savefile = require "engine.Savefile"
-local DamageType = require "engine.DamageType"
-local Zone = require "engine.Zone"
-local Map = require "engine.Map"
-local Level = require "engine.Level"
-local Birther = require "engine.Birther"
-
-local Grid = require "mod.class.Grid"
-local Actor = require "mod.class.Actor"
-local Player = require "mod.class.Player"
-local NPC = require "mod.class.NPC"
-
-local PlayerDisplay = require "mod.class.PlayerDisplay"
-
-local HotkeysDisplay = require "engine.HotkeysDisplay"
-local ActorsSeenDisplay = require "engine.ActorsSeenDisplay"
-local LogDisplay = require "engine.LogDisplay"
-local LogFlasher = require "engine.LogFlasher"
-local DebugConsole = require "engine.DebugConsole"
-local FlyingText = require "engine.FlyingText"
-local Tooltip = require "engine.Tooltip"
-
-local QuitDialog = require "mod.dialogs.Quit"
-
-module(..., package.seeall, class.inherit(engine.GameTurnBased, engine.interface.GameTargeting))
-
-function _M:init()
-	engine.GameTurnBased.init(self, engine.KeyBind.new(), 1000, 100)
-
-	-- Pause at birth
-	self.paused = true
-
-	-- Same init as when loaded from a savefile
-	self:loaded()
-end
-
-function _M:run()
-	self.flash = LogFlasher.new(0, 0, self.w, 20, nil, nil, nil, {255,255,255}, {0,0,0})
-	self.logdisplay = LogDisplay.new(0, self.h * 0.8, self.w * 0.5, self.h * 0.2, nil, nil, nil, {255,255,255}, "/data/gfx/ui/message-log.png")
-	self.player_display = PlayerDisplay.new(0, 220, 200, self.h * 0.8 - 220, {30,30,0})
-	self.hotkeys_display = HotkeysDisplay.new(nil, self.w * 0.5, self.h * 0.8, self.w * 0.5, self.h * 0.2, "/data/gfx/ui/talents-list.png")
-	self.npcs_display = ActorsSeenDisplay.new(nil, self.w * 0.5, self.h * 0.8, self.w * 0.5, self.h * 0.2, "/data/gfx/ui/talents-list.png")
-	self.tooltip = Tooltip.new(nil, nil, {255,255,255}, {30,30,30})
-	self.flyers = FlyingText.new()
-	self:setFlyingText(self.flyers)
-	self.minimap_bg, self.minimap_bg_w, self.minimap_bg_h = core.display.loadImage("/data/gfx/ui/minimap.png"):glTexture()
-	self:createSeparators()
-
-	self.log = function(style, ...) if type(style) == "number" then self.logdisplay(...) self.flash(style, ...) else self.logdisplay(style, ...) self.flash(self.flash.NEUTRAL, style, ...) end end
-	self.logSeen = function(e, style, ...) if e and self.level.map.seens(e.x, e.y) then self.log(style, ...) end end
-	self.logPlayer = function(e, style, ...) if e == self.player then self.log(style, ...) end end
-
-	self.log(self.flash.GOOD, "Welcome to #00FF00#the Pits of Angband!")
-
-	-- Setup inputs
-	self:setupCommands()
-	self:setupMouse()
-
-	-- Starting from here we create a new game
-	if not self.player then self:newGame() end
-
-	self.hotkeys_display.actor = self.player
-	self.npcs_display.actor = self.player
-
-	-- Setup the targetting system
-	engine.interface.GameTargeting.init(self)
-
-	-- Ok everything is good to go, activate the game in the engine!
-	self:setCurrent()
-
-	if self.level then self:setupDisplayMode() end
-end
-
-function _M:newGame()
-	self.player = Player.new{name=self.player_name, game_ender=true}
-	Map:setViewerActor(self.player)
-	self:setupDisplayMode()
-
-	self.creating_player = true
-	local birth = Birther.new(nil, self.player, {"base", "race", "class" }, function()
-		self:changeLevel(1, "dungeon")
-		print("[PLAYER BIRTH] resolve...")
-		self.player:resolve()
-		self.player:resolve(nil, true)
-		self.player.energy.value = self.energy_to_act
-		self.paused = true
-		self.creating_player = false
-		print("[PLAYER BIRTH] resolved!")
-	end)
-	self:registerDialog(birth)
-end
-
-function _M:loaded()
-	engine.GameTurnBased.loaded(self)
-	Zone:setup{npc_class="mod.class.NPC", grid_class="mod.class.Grid", object_class="mod.class.Object", ood_factor=7}
-	Map:setViewerActor(self.player)
-	Map:setViewPort(200, 20, self.w - 200, math.floor(self.h * 0.80) - 20, 12, 16, "/data/font/FSEX300.ttf", 16, true)
-	self.key = engine.KeyBind.new()
-end
-
-function _M:createSeparators()
-	self.bottom_separator, self.bottom_separator_w, self.bottom_separator_h = self:createVisualSeparator("horizontal", self.w)
-	self.split_separator, self.split_separator_w, self.split_separator_h = self:createVisualSeparator("vertical", math.floor(self.h * 0.2))
-	self.player_separator, self.player_separator_w, self.player_separator_h = self:createVisualSeparator("vertical", math.floor(self.h * 0.8) - 20)
-end
-
-function _M:setupDisplayMode()
-	Map:setViewPort(200, 20, self.w - 200, math.floor(self.h * 0.80) - 20, 12, 16, "/data/font/FSEX300.ttf", 16, true)
-	Map:resetTiles()
-	Map.tiles.use_images = false
-
-	if self.level then
-		self.level.map:recreate()
-		engine.interface.GameTargeting.init(self)
-		self.level.map:moveViewSurround(self.player.x, self.player.y, 8, 8)
-	end
-end
-
-function _M:save()
-	return class.save(self, self:defaultSavedFields{}, true)
-end
-
-function _M:getSaveDescription()
-	return {
-		name = self.player.name,
-		description = ([[Exploring level %d of %s.]]):format(self.level.level, self.zone.name),
-	}
-end
-
-function _M:leaveLevel(level, lev, old_lev)
-	if level:hasEntity(self.player) then
-		level.exited = level.exited or {}
-		if lev > old_lev then
-			level.exited.down = {x=self.player.x, y=self.player.y}
-		else
-			level.exited.up = {x=self.player.x, y=self.player.y}
-		end
-		level.last_turn = game.turn
-		level:removeEntity(self.player)
-	end
-end
-
-function _M:changeLevel(lev, zone)
-	local old_lev = (self.level and not zone) and self.level.level or -1000
-	if zone then
-		if self.zone then
-			self.zone:leaveLevel(false, lev, old_lev)
-			self.zone:leave()
-		end
-		if type(zone) == "string" then
-			self.zone = Zone.new(zone)
-		else
-			self.zone = zone
-		end
-	end
-	self.zone:getLevel(self, lev, old_lev)
-
-	if lev > old_lev then
-		self.player:move(self.level.default_up.x, self.level.default_up.y, true)
-	else
-		self.player:move(self.level.default_down.x, self.level.default_down.y, true)
-	end
-	self.level:addEntity(self.player)
-
---	self.level.map:setZoom(1.2, self.player.x, self.player.y)
-end
-
-function _M:getPlayer()
-	return self.player
-end
-
-function _M:tick()
-	if self.level then
-		self:targetOnTick()
-
-		engine.GameTurnBased.tick(self)
-		-- Fun stuff: this can make the game realtime, although callit it in display() will make it work better
-		-- (since display is on a set FPS while tick() ticks as much as possible
-		-- engine.GameEnergyBased.tick(self)
-	end
-	-- When paused (waiting for player input) we return true: this means we wont be called again until an event wakes us
-	if self.paused and not savefile_pipe.saving then return true end
-end
-
---- Called every game turns
--- Does nothing, you can override it
-function _M:onTurn()
-	-- The following happens only every 10 game turns (once for every turn of 1 mod speed actors)
-	if self.turn % 10 ~= 0 then return end
-
-	-- Process overlay effects
-	self.level.map:processEffects()
-end
-
-function _M:display(nb_keyframe)
-	-- If switching resolution, blank everything but the dialog
-	if self.change_res_dialog then engine.GameTurnBased.display(self, nb_keyframe) return end
-
-	-- Now the map, if any
-	if self.level and self.level.map and self.level.map.finished and self.player.x and self.player.y then
-		-- Display the map and compute FOV for the player if needed
-		if self.level.map.changed then
-			self.player:playerFOV()
-		end
-
-		self.level.map:display(nil, nil, nb_keyframe)
-
-		-- Display the targetting system if active
-		self.target:display()
-
-		-- Minimap display
-		self.minimap_bg:toScreenFull(0, 20, 200, 200, self.minimap_bg_w, self.minimap_bg_h)
-		self.level.map:minimapDisplay(0, 20, util.bound(self.player.x - 25, 0, self.level.map.w - 50), util.bound(self.player.y - 25, 0, self.level.map.h - 50), 50, 50, 1)
-	end
-
-	-- We display the player's interface
-	self.flash:toScreen(nb_keyframe)
-	self.logdisplay:toScreen()
-	self.player_display:toScreen()
-	if self.show_npc_list then
-		self.npcs_display:toScreen()
-	else
-		self.hotkeys_display:toScreen()
-	end
-	if self.player then self.player.changed = false end
-
-	-- Separators
-	self.bottom_separator:toScreenFull(0, 20 - 3, self.w, 6, self.bottom_separator_w, self.bottom_separator_h)
-	self.bottom_separator:toScreenFull(0, self.h * 0.8 - 3, self.w, 6, self.bottom_separator_w, self.bottom_separator_h)
-	self.split_separator:toScreenFull(self.w * 0.5 - 3 - 15, self.h * 0.8, 6, self.h * 0.2, self.split_separator_w, self.split_separator_h)
-	self.split_separator:toScreenFull(self.w * 0.5 - 3, self.h * 0.8, 6, self.h * 0.2, self.split_separator_w, self.split_separator_h)
-	self.player_separator:toScreenFull(200 - 3, 20, 6, self.h * 0.8 - 20, self.player_separator_w, self.player_separator_h)
-
-	-- Tooltip is displayed over all else
-	self:targetDisplayTooltip()
-
-	engine.GameTurnBased.display(self, nb_keyframe)
-end
-
---- Setup the keybinds
-function _M:setupCommands()
-	-- Make targeting work
-	self.normal_key = self.key
-	self:targetSetupKey()
-
-	-- Debug mode
-	self.key:addCommands{
-		[{"_a","ctrl"}] = function() if config.settings.cheat then game:registerDialog(require("mod.dialogs.debug.DebugMain").new()) end end,
-	}
-
-	-- One key handled for normal function
-	self.key:addBinds
-	{
-		-- Movements
-		MOVE_LEFT = function() self.player:moveDir(4) end,
-		MOVE_RIGHT = function() self.player:moveDir(6) end,
-		MOVE_UP = function() self.player:moveDir(8) end,
-		MOVE_DOWN = function() self.player:moveDir(2) end,
-		MOVE_LEFT_UP = function() self.player:moveDir(7) end,
-		MOVE_LEFT_DOWN = function() self.player:moveDir(1) end,
-		MOVE_RIGHT_UP = function() self.player:moveDir(9) end,
-		MOVE_RIGHT_DOWN = function() self.player:moveDir(3) end,
-		MOVE_STAY = function() self.player:useEnergy() end,
-
-		RUN_LEFT = function() self.player:runInit(4) end,
-		RUN_RIGHT = function() self.player:runInit(6) end,
-		RUN_UP = function() self.player:runInit(8) end,
-		RUN_DOWN = function() self.player:runInit(2) end,
-		RUN_LEFT_UP = function() self.player:runInit(7) end,
-		RUN_LEFT_DOWN = function() self.player:runInit(1) end,
-		RUN_RIGHT_UP = function() self.player:runInit(9) end,
-		RUN_RIGHT_DOWN = function() self.player:runInit(3) end,
-
-		-- Hotkeys
-		HOTKEY_1 = function() self.player:activateHotkey(1) end,
-		HOTKEY_2 = function() self.player:activateHotkey(2) end,
-		HOTKEY_3 = function() self.player:activateHotkey(3) end,
-		HOTKEY_4 = function() self.player:activateHotkey(4) end,
-		HOTKEY_5 = function() self.player:activateHotkey(5) end,
-		HOTKEY_6 = function() self.player:activateHotkey(6) end,
-		HOTKEY_7 = function() self.player:activateHotkey(7) end,
-		HOTKEY_8 = function() self.player:activateHotkey(8) end,
-		HOTKEY_9 = function() self.player:activateHotkey(9) end,
-		HOTKEY_10 = function() self.player:activateHotkey(10) end,
-		HOTKEY_11 = function() self.player:activateHotkey(11) end,
-		HOTKEY_12 = function() self.player:activateHotkey(12) end,
-		HOTKEY_SECOND_1 = function() self.player:activateHotkey(13) end,
-		HOTKEY_SECOND_2 = function() self.player:activateHotkey(14) end,
-		HOTKEY_SECOND_3 = function() self.player:activateHotkey(15) end,
-		HOTKEY_SECOND_4 = function() self.player:activateHotkey(16) end,
-		HOTKEY_SECOND_5 = function() self.player:activateHotkey(17) end,
-		HOTKEY_SECOND_6 = function() self.player:activateHotkey(18) end,
-		HOTKEY_SECOND_7 = function() self.player:activateHotkey(19) end,
-		HOTKEY_SECOND_8 = function() self.player:activateHotkey(20) end,
-		HOTKEY_SECOND_9 = function() self.player:activateHotkey(21) end,
-		HOTKEY_SECOND_10 = function() self.player:activateHotkey(22) end,
-		HOTKEY_SECOND_11 = function() self.player:activateHotkey(23) end,
-		HOTKEY_SECOND_12 = function() self.player:activateHotkey(24) end,
-		HOTKEY_THIRD_1 = function() self.player:activateHotkey(25) end,
-		HOTKEY_THIRD_2 = function() self.player:activateHotkey(26) end,
-		HOTKEY_THIRD_3 = function() self.player:activateHotkey(27) end,
-		HOTKEY_THIRD_4 = function() self.player:activateHotkey(28) end,
-		HOTKEY_THIRD_5 = function() self.player:activateHotkey(29) end,
-		HOTKEY_THIRD_6 = function() self.player:activateHotkey(30) end,
-		HOTKEY_THIRD_7 = function() self.player:activateHotkey(31) end,
-		HOTKEY_THIRD_8 = function() self.player:activateHotkey(31) end,
-		HOTKEY_THIRD_9 = function() self.player:activateHotkey(33) end,
-		HOTKEY_THIRD_10 = function() self.player:activateHotkey(34) end,
-		HOTKEY_THIRD_11 = function() self.player:activateHotkey(35) end,
-		HOTKEY_THIRD_12 = function() self.player:activateHotkey(36) end,
-		HOTKEY_PREV_PAGE = function() self.player:prevHotkeyPage() end,
-		HOTKEY_NEXT_PAGE = function() self.player:nextHotkeyPage() end,
-
-		-- Actions
-		CHANGE_LEVEL = function()
-			local e = self.level.map(self.player.x, self.player.y, Map.TERRAIN)
-			if self.player:enoughEnergy() and e.change_level then
-				self:changeLevel(e.change_zone and e.change_level or self.level.level + e.change_level, e.change_zone)
-			else
-				self.log("There is no way out of this level here.")
-			end
-		end,
-
-		REST = function()
-			self.player:restInit()
-		end,
-
-		PICKUP_FLOOR = function()
-			self.player:playerPickup()
-		end,
-		DROP_FLOOR = function()
-			self.player:playerDrop()
-		end,
-		SHOW_INVENTORY = function()
-			local d
-			local titleupdator = self.player:getEncumberTitleUpdator("Inventory")
-			d = self.player:showEquipInven(titleupdator(), nil, function(o, inven, item, button, event)
-				if not o then return end
-				local ud = require("mod.dialogs.UseItemDialog").new(event == "button", self.player, o, item, inven, function(_, _, _, stop)
-					d:generateList()
-					d.title = titleupdator()
-					if stop then self:unregisterDialog(d) end
-				end)
-				self:registerDialog(ud)
-			end)
-		end,
-		SHOW_EQUIPMENT = "SHOW_INVENTORY",
-		WEAR_ITEM = function()
-			self.player:playerWear()
-		end,
-		TAKEOFF_ITEM = function()
-			self.player:playerTakeoff()
-		end,
-		USE_ITEM = function()
-			self.player:playerUseItem()
-		end,
-
-		USE_TALENTS = function()
-			self.player:useTalents()
-		end,
-
-		SAVE_GAME = function()
-			self:saveGame()
-		end,
-
-		SHOW_CHARACTER_SHEET = function()
-			self:registerDialog(require("mod.dialogs.CharacterSheet").new(self.player))
-		end,
-
-		-- Exit the game
-		QUIT_GAME = function()
-			self:onQuit()
-		end,
-
-		EXIT = function()
-			local menu menu = require("engine.dialogs.GameMenu").new{
-				"resume",
-				"keybinds",
-				"video",
-				"save",
-				"quit"
-			}
-			self:registerDialog(menu)
-		end,
-
-		-- Lua console, you probably want to disable it for releases
-		LUA_CONSOLE = function()
-			self:registerDialog(DebugConsole.new())
-		end,
-
-		-- Toggle monster list
-		TOGGLE_NPC_LIST = function()
-			self.show_npc_list = not self.show_npc_list
-			self.player.changed = true
-		end,
-
-		TACTICAL_DISPLAY = function()
-			if Map.view_faction then
-				self.always_target = nil
-				Map:setViewerFaction(nil)
-			else
-				self.always_target = true
-				Map:setViewerFaction("players")
-			end
-		end,
-
-		LOOK_AROUND = function()
-			self.flash:empty(true)
-			self.flash(self.flash.GOOD, "Looking around... (direction keys to select interresting things, shift+direction keys to move freely)")
-			local co = coroutine.create(function() self.player:getTarget{type="hit", no_restrict=true, range=2000} end)
-			local ok, err = coroutine.resume(co)
-			if not ok and err then print(debug.traceback(co)) error(err) end
-		end,
-	}
-	self.key:setCurrent()
-end
-
-function _M:setupMouse(reset)
-	if reset then self.mouse:reset() end
-	self.mouse:registerZone(Map.display_x, Map.display_y, Map.viewport.width, Map.viewport.height, function(button, mx, my, xrel, yrel, bx, by, event)
-		-- Handle targeting
-		if self:targetMouse(button, mx, my, xrel, yrel, event) then return end
-
-		-- Handle the mouse movement/scrolling
-		self.player:mouseHandleDefault(self.key, self.key == self.normal_key, button, mx, my, xrel, yrel, event)
-	end)
-	-- Scroll message log
-	self.mouse:registerZone(self.logdisplay.display_x, self.logdisplay.display_y, self.w, self.h, function(button)
-		if button == "wheelup" then self.logdisplay:scrollUp(1) end
-		if button == "wheeldown" then self.logdisplay:scrollUp(-1) end
-	end, {button=true})
-	-- Tooltip over the player pane
-	self.mouse:registerZone(self.player_display.display_x, self.player_display.display_y, self.player_display.w, self.player_display.h, function(button, mx, my, xrel, yrel, bx, by, event)
-		self.player_display.mouse:delegate(button, mx, my, xrel, yrel, bx, by, event)
-	end)
-	-- Use hotkeys with mouse
-	self.mouse:registerZone(self.hotkeys_display.display_x, self.hotkeys_display.display_y, self.w, self.h, function(button, mx, my, xrel, yrel, bx, by, event)
-		self.hotkeys_display:onMouse(button, mx, my, event == "button", function(text) self.tooltip:displayAtMap(nil, nil, self.w, self.h, tostring(text)) end)
-	end)
-	self.mouse:setCurrent()
-end
-
---- Ask if we realy want to close, if so, save the game first
-function _M:onQuit()
-	self.player:restStop()
-
-	if not self.quit_dialog then
-		self.quit_dialog = QuitDialog.new()
-		self:registerDialog(self.quit_dialog)
-	end
-end
-
---- Requests the game to save
-function _M:saveGame()
-	-- savefile_pipe is created as a global by the engine
-	savefile_pipe:push(self.save_name, "game", self)
-	self.log("Saving game...")
-end
-
---------------------------------------------------------------
--- UI stuff
---------------------------------------------------------------
-
---- Create a visual separator
-local _sep_left = core.display.loadImage("/data/gfx/ui/separator-left.png") _sep_left:alpha()
-local _sep_right = core.display.loadImage("/data/gfx/ui/separator-right.png") _sep_right:alpha()
-local _sep_horiz = core.display.loadImage("/data/gfx/ui/separator-hori.png") _sep_horiz:alpha()
-local _sep_top = core.display.loadImage("/data/gfx/ui/separator-top.png") _sep_top:alpha()
-local _sep_bottom = core.display.loadImage("/data/gfx/ui/separator-bottom.png") _sep_bottom:alpha()
-local _sep_vert = core.display.loadImage("/data/gfx/ui/separator-vert.png") _sep_vert:alpha()
-function _M:createVisualSeparator(dir, size)
-	if dir == "horizontal" then
-		local sep = core.display.newSurface(size, 6)
-		sep:erase(0, 0, 0)
-		sep:merge(_sep_left, 0, 0)
-		for i = 7, size - 7, 9 do sep:merge(_sep_horiz, i, 0) end
-		sep:merge(_sep_right, size - 6, 0)
-		return sep:glTexture()
-	else
-		local sep = core.display.newSurface(6, size)
-		sep:erase(0, 0, 0)
-		sep:merge(_sep_top, 0, 0)
-		for i = 7, size - 7, 9 do sep:merge(_sep_vert, 0, i) end
-		sep:merge(_sep_bottom, 0, size - 6)
-		return sep:glTexture()
-	end

--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009, 2010, 2011 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
-
-require "engine.class"
-require "engine.Grid"
-local DamageType = require "engine.DamageType"
-
-module(..., package.seeall, class.inherit(engine.Grid))
-
-function _M:init(t, no_default)
-	engine.Grid.init(self, t, no_default)
-end
-
-function _M:block_move(x, y, e, act, couldpass)
-	-- Open doors
-	if self.door_opened and act then
-		game.level.map(x, y, engine.Map.TERRAIN, game.zone.grid_list[self.door_opened])
-		return true
-	elseif self.door_opened and not couldpass then
-		return true
-	end
-
-	-- 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()
-	if self.show_tooltip then
-		local name = ((self.show_tooltip == true) and self.name or self.show_tooltip)
-		if self.desc then
-			return self:getDisplayString()..name.."\n"..self.desc
-		else
-			return self:getDisplayString()..name
-		end
-	else
-		return self:getDisplayString()..self.name
-	end

--- ToME - Tales of Middle-Earth
--- Copyright (C) 2009, 2010, 2011 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
-
-require "engine.class"
-local ActorAI = require "engine.interface.ActorAI"
-local MonsterCombat = require "mod.class.interface.MonsterCombat"
-local Faction = require "engine.Faction"
-require "mod.class.Actor"
-
-module(..., package.seeall, class.inherit(mod.class.Actor, engine.interface.ActorAI, MonsterCombat))
-
-function _M:init(t, no_default)
-	mod.class.Actor.init(self, t, no_default)
-	ActorAI.init(self, t)
-end
-
-function _M:act()
-	-- Do basic actor stuff
-	if not mod.class.Actor.act(self) then return end
-
-	-- Compute FOV, if needed
-	self:computeFOV(self.sight or 20)
-
-	-- Let the AI think .... beware of Shub !
-	-- If AI did nothing, use energy anyway
-	self:doAI()
-	if not self.energy.used then self:useEnergy() end
-end
-
---- Called by ActorLife interface
--- We use it to pass aggression values to the AIs
-function _M:onTakeHit(value, src)
-	if not self.ai_target.actor and src.targetable then
-		self.ai_target.actor = src
-	end
-
-	return mod.class.Actor.onTakeHit(self, value, src)
-end
-
-function _M:tooltip()
-	local str = mod.class.Actor.tooltip(self)
-	return str..([[
-
-Target: %s
-UID: %d]]):format(
-	self.ai_target.actor and self.ai_target.actor.name or "none",
-	self.uid)

--- ToME - Tales of Maj'Eyal
--- Copyright (C) 2009, 2010, 2011 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
-
-require "engine.class"
-require "engine.Object"
-require "engine.interface.ObjectActivable"
-require "engine.interface.ObjectIdentify"
-
-local Stats = require("engine.interface.ActorStats")
-local Talents = require("engine.interface.ActorTalents")
-local DamageType = require("engine.DamageType")
-
-module(..., package.seeall, class.inherit(
-	engine.Object,
-	engine.interface.ObjectActivable,
-	engine.interface.ObjectIdentify,
-	engine.interface.ActorTalents
-))
-
-_M._noalpha = true
-
-function _M:init(t, no_default)
-	t.encumber = t.encumber or 0
-
-	engine.Object.init(self, t, no_default)
-	engine.interface.ObjectActivable.init(self, t)
-	engine.interface.ObjectIdentify.init(self, t)
-	engine.interface.ActorTalents.init(self, t)
-end
-
---- Can this object act at all
--- Most object will want to anwser false, only recharging and stuff needs them
-function _M:canAct()
-	if self.power_regen or self.use_talent then return true end
-	return false
-end
-
---- Do something when its your turn
--- For objects this mostly is to recharge them
--- By default, does nothing at all
-function _M:act()
-	self:regenPower()
-	self:cooldownTalents()
-	self:useEnergy()
-end
-
---- Use the object (quaff, read, ...)
-function _M:use(who, typ, inven, item)
-	inven = who:getInven(inven)
-
-	if self.use_no_blind and who:attr("blind") then
-		game.logPlayer(who, "You cannot see!")
-		return
-	end
-	if self.use_no_silence and who:attr("silence") then
-		game.logPlayer(who, "You are silenced!")
-		return
-	end
-	if self:wornInven() and not self.wielded and not self.use_no_wear then
-		game.logPlayer(who, "You must wear this object to use it!")
-		return
-	end
-	if who:hasEffect(self.EFF_UNSTOPPABLE) then
-		game.logPlayer(who, "You can not use items during a battle frenzy!")
-		return
-	end
-
-	local types = {}
-	if self:canUseObject() then types[#types+1] = "use" end
-
-	if not typ and #types == 1 then typ = types[1] end
-
-	if typ == "use" then
-		who:useEnergy(game.energy_to_act * (inven.use_speed or 1))
-		if self.use_sound then game:playSoundNear(who, self.use_sound) end
-		return self:useObject(who, inven, item)
-	end
-end
-
---- Returns a tooltip for the object
-function _M:tooltip()
-	return tostring(self:getDesc{do_color=true})
-end
-
---- Describes an attribute, to expand object name
-function _M:descAttribute(attr)
-	if attr == "MASTERY" then
-		local tms = {}
-		for ttn, i in pairs(self.wielder.talents_types_mastery) do
-			local tt = Talents.talents_types_def[ttn]
-			local cat = tt.type:gsub("/.*", "")
-			local name = cat:capitalize().." / "..tt.name:capitalize()
-			tms[#tms+1] = ("%0.2f %s"):format(i, name)
-		end
-		return table.concat(tms, ",")
-	elseif attr == "STATBONUS" then
-		local stat, i = next(self.wielder.inc_stats)
-		return i > 0 and "+"..i or tostring(i)
-	elseif attr == "DAMBONUS" then
-		local stat, i = next(self.wielder.inc_damage)
-		return (i > 0 and "+"..i or tostring(i)).."%"
-	elseif attr == "RESIST" then
-		local stat, i = next(self.wielder.resists)
-		return (i > 0 and "+"..i or tostring(i)).."%"
-	elseif attr == "REGEN" then
-		local i = self.wielder.mana_regen or self.wielder.stamina_regen or self.wielder.life_regen
-		return ("%s%0.2f/turn"):format(i > 0 and "+" or "-", math.abs(i))
-	elseif attr == "COMBAT" then
-		local c = self.combat
-		return c.dam.."-"..(c.dam*(c.damrange or 1.1)).." power, "..(c.apr or 0).." apr"
-	elseif attr == "COMBAT_DAMTYPE" then
-		local c = self.combat
-		return c.dam.."-"..(c.dam*(c.damrange or 1.1)).." power, "..(c.apr or 0).." apr, "..DamageType:get(c.damtype).name.." damage"
-	elseif attr == "ARMOR" then
-		return (self.wielder and self.wielder.combat_def or 0).." def, "..(self.wielder and self.wielder.combat_armor or 0).." armor"
-	elseif attr == "ATTACK" then
-		return (self.wielder and self.wielder.combat_atk or 0).." attack, "..(self.wielder and self.wielder.combat_apr or 0).." apr, "..(self.wielder and self.wielder.combat_dam or 0).." power"
-	elseif attr == "MONEY" then
-		return ("worth %0.2f"):format(self.money_value / 10)
-	elseif attr == "USE_TALENT" then
-		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
-
---- Gets the "power rank" of an object
--- Possible values are 0 (normal, lore), 1 (ego), 2 (greater ego), 3 (artifact)
-function _M:getPowerRank()
-	if self.unique then return 2 end
-	if self.egoed then return 1 end
-	return 0
-end
-
---- Gets the color in which to display the object in lists
-function _M:getDisplayColor()
-	if not self:isIdentified() then return {180, 180, 180}, "#B4B4B4#" end
-	if self.egoed then
-		return {0, 255, 128}, "#00FF80#"
-	elseif self.unique then
-		return {255, 215, 0}, "#FFD700#"
-	else return {255, 255, 255}, "#FFFFFF#"
-	end
-end
-
-_M.tval_table = {
-	[1] = {"skeleton"},
-	[2] = {"bottle"},
-	[3] = {"junk"},
-	[5] = {"spike"},
-	[7] = {"chest"},
-	[16] = {"shot", slot="QUIVER", show_weapon=true},
-	[17] = {"arrow", slot="QUIVER", show_weapon=true},
-	[18] = {"bolt", slot="QUIVER", show_weapon=true},
-	[19] = {"bow", slot="SHOOTER"},
-	[20] = {"digging"},
-	[21] = {"hafted", slot="WEAPON", show_weapon=true},
-	[22] = {"polearm", slot="WEAPON", show_weapon=true},
-	[23] = {"sword", slot="WEAPON", show_weapon=true},
-	[30] = {"boots", slot="FEET"},
-	[31] = {"gloves", slot="HANDS"},
-	[32] = {"helm", slot="HEAD"},
-	[33] = {"crown", slot="HEAD"},
-	[34] = {"shield", slot="SHIELD"},
-	[35] = {"cloak", slot="CLOAK"},
-	[36] = {"soft armor", slot="BODY"},
-	[37] = {"hard armor", slot="BODY"},
-	[38] = {"drag armor", slot="BODY"},
-	[39] = {"light", slot="LITE", wielder={lite=2}},
-	[40] = {"amulet", slot="NECK", name_gen=function(e) return "& Amulet~ of "..e.name end},
-	[45] = {"ring", slot="FINGER", name_gen=function(e) return "& Ring~ of "..e.name end},
-	[55] = {"staff", name_gen=function(e) return "& Staff~ of "..e.name end},
-	[65] = {"wand", name_gen=function(e) return "& Wand~ of "..e.name end},
-	[66] = {"rod", name_gen=function(e) return "& Rod~ of "..e.name end},
-	[70] = {"scroll", name_gen=function(e) return "& Scroll~ of "..e.name end},
-	[75] = {"potion", random_color=true, name_gen=function(e) return "& Potion~ of "..e.name end},
-	[77] = {"flask"},
-	[80] = {"food", random_color=true},
-	[90] = {"magic book", name_gen=function(e) return "& Magic Book~ ["..e.name.."]" end},
-	[91] = {"prayer book", name_gen=function(e) return "& Prayer Book~ ["..e.name.."]" end},
-	[100] = {"gold"},
-}
-
---- Gets the full name of the object
-function _M:getName(t)
-	t = t or {}
-	local qty = self:getNumber()
-	local name = self.name
-
-	if not self:isIdentified() and not t.force_id and self:getUnidentifiedName() then name = self:getUnidentifiedName() end
-
-	-- To extend later
-	name = name:gsub("~", ""):gsub("&", "a"):gsub("#([^#]+)#", function(attr)
-		return self:descAttribute(attr)
-	end)
-
-	if not t.no_add_name and self.add_name and self:isIdentified() then
-		name = name .. self.add_name:gsub("#([^#]+)#", function(attr)
-			return self:descAttribute(attr)
-		end)
-	end
-
-	local tval = self.tval_table[self.tval] or {"misc"}
-	if tval.show_weapon and self.damage then
-		name = name.." ("..self.damage[1].."d"..self.damage[2]..")"
-	end