Skip to content
Snippets Groups Projects
Commit 43b5bc7e authored by dg's avatar dg
Browse files

fix

git-svn-id: http://svn.net-core.org/repos/t-engine4@777 51575b47-30f0-44d4-a5cc-537603b46e54
parent b3e65ec6
No related branches found
No related tags found
No related merge requests found
......@@ -133,9 +133,9 @@ end
function _M:freemove(dir)
local d = dir_to_coord[dir]
self.target.entity = nil
self.target.x = self.target.x + d[1]
self.target.y = self.target.y + d[2]
self.target.entity = game.level.map(self.target.x, self.target.y, engine.Map.ACTOR)
end
function _M:scan(dir, radius, sx, sy)
......
......@@ -345,10 +345,11 @@ newTalent{
action = function(self, t)
local tg = {type="hit", range=self:getTalentRange(t), nolock=true, talent=t}
local tx, ty, target = self:getTarget(tg)
if not tx or not ty or not target then return nil end
if not tx or not ty or not target then print("1") return nil end
local _ _, tx, ty = self:canProject(tg, tx, ty)
if target == self then target = nil end
if not target.summoner == game.player then return nil end
target = game.level.map(tx, ty, Map.ACTOR)
if target == self then print("2") return nil end
if not target.summoner == game.player then print("3") return nil end
local ot = target
target = mod.class.Player.new(target)
......
......@@ -20,7 +20,7 @@
newTalent{
name = "Rituals Capacity",
type = {"rituals/rituals", 1},
points = 5
points = 5,
mode = "passive",
info = function(self, t)
return ([[Allows you to learn up to %d rituals.]]):
......@@ -31,10 +31,10 @@ newTalent{
newTalent{
name = "Rituals Study",
type = {"rituals/rituals", 1},
points = 5
points = 5,
mode = "passive",
info = function(self, t)
return ([[Allows you to learn rituals of level %d at most.]]):
format(math.ceil(self:getTalentLevelRaw(t))
format(math.ceil(self:getTalentLevelRaw(t)))
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