diff --git a/game/modules/tome/class/interface/ActorObjectUse.lua b/game/modules/tome/class/interface/ActorObjectUse.lua index 3bcf10dcb0b9912d991f8116c2b85ddbed561e6c..524f0e46ffee2c86f8e7d5b7c3526cdbf58d3df0 100644 --- a/game/modules/tome/class/interface/ActorObjectUse.lua +++ b/game/modules/tome/class/interface/ActorObjectUse.lua @@ -122,7 +122,8 @@ _M.useObjectBaseTalent ={ type = {"misc/objects", 1}, points = 1, image = "talents/charm_mastery.png", --temporary? Note:displayentity is not a function --- hide = "always", + hide = "always", + no_auto_hotkey = true, never_fail = true, -- most actor status effects will not prevent use innate = true, -- make sure this talent can't be put on cooldown by other talents or effects display_name = function(self, t) @@ -341,6 +342,7 @@ function _M:useObjectEnable(o, inven_id, slot, base_name) self:learnTalent(tid, true, talent_level) --****** temporary hotkeys for testing +--[[ t=self:getTalentFromId(tid) -- Hotkey if oldpos then @@ -350,7 +352,7 @@ function _M:useObjectEnable(o, inven_id, slot, base_name) end self.hotkey[oldpos] = {"talent", "T_"..name} end - +--]] return o, tid, t, talent_level end diff --git a/game/modules/tome/data/general/objects/egos/light-armor.lua b/game/modules/tome/data/general/objects/egos/light-armor.lua index eb8ae42179767e8ad6bf17ff5c423a081c1e3161..4a041a9790cb5d81892af673d171e46f3ef9e22d 100644 --- a/game/modules/tome/data/general/objects/egos/light-armor.lua +++ b/game/modules/tome/data/general/objects/egos/light-armor.lua @@ -196,7 +196,7 @@ newEntity{ charm_power = resolvers.mbonus_material(80, 20), charm_power_def = {add=5, max=10, floor=true}, resolvers.charm("blink to a nearby random location (rad %d)", 25, function(self, who) - game.logSeen(who, "%s uses %s!", who.name:capitalize(), self:getName{no_add_name=true, do_color=true}) + game.logSeen(who, "%s uses %s %s!", who.name:capitalize(), who:his_her(), self:getName{no_add_name=true, do_color=true}) game.level.map:particleEmitter(who.x, who.y, 1, "teleport") who:teleportRandom(who.x, who.y, self:getCharmPower(who)) game.level.map:particleEmitter(who.x, who.y, 1, "teleport")