Skip to content
Snippets Groups Projects
Commit 09ba678a authored by DarkGod's avatar DarkGod
Browse files

plop

parent 5f7d0491
No related branches found
No related tags found
No related merge requests found
......@@ -2300,7 +2300,9 @@ do return end
local mx, my = self.mouse.last_pos.x, self.mouse.last_pos.y
local tmx, tmy = self.level.map:getMouseTile(mx, my)
local a = self.level.map(tmx, tmy, Map.ACTOR)
self:registerDialog(require("mod.dialogs.CharacterSheet").new((config.settings.cheat or self.player:canSee(a)) and a or self.player))
a = (config.settings.cheat or self.player:canSee(a)) and a or self.player
if a.showCharacterSheet then a = a:showCharacterSheet() end
self:registerDialog(require("mod.dialogs.CharacterSheet").new(a))
end,
CENTER_ON_PLAYER = function()
......
......@@ -150,7 +150,7 @@ newTalent{
points = 5,
mana = 30,
cooldown = 20,
tactical = { DEFEND = 3,},
tactical = { DEFEND = 3, ATTACK = 2 },
getLife = function(self, t) return math.ceil(self:combatTalentScale(t, 5, 12)) end,
on_pre_use = function(self, t) return self.in_combat and not self:hasEffect(self.EFF_MIRROR_IMAGE_REAL) end,
action = function(self, t)
......@@ -191,7 +191,7 @@ newTalent{
combat_armor = 0,
max_mana = 10000,
mana = 10000,
rank = 1,
rank = self.rank,
difficulty_boosted = 1,
life_rating = 0,
life_regen = 0, no_life_regen = 1,
......@@ -253,9 +253,8 @@ newTalent{
image.ai_state.use_taunt = true
else
-- Dont reveal ourself to player
image.tooltip = function(self, x, y, seen_by)
return mod.class.NPC.tooltip(self.summoner, x, y, seen_by)
end
image.tooltip = function(self, x, y, seen_by) return mod.class.NPC.tooltip(self.summoner, x, y, seen_by) end
image.showCharacterSheet = function(self) return self.summoner end
image.ai_state.use_taunt = false
end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment