diff --git a/game/modules/tome/ai/escort.lua b/game/modules/tome/ai/escort.lua index 08904f8bb3fb21d70831d7e5c2718b35f349a95f..7cd42d65d4aa124f411a724298ace6b5e312606d 100644 --- a/game/modules/tome/ai/escort.lua +++ b/game/modules/tome/ai/escort.lua @@ -51,10 +51,11 @@ newAI("move_escort", function(self) return self:runAI("move_simple") else self.escort_path = {} - for i = 1, 3 do - if path[i+1] then self.escort_path[i] = path[i+1] end + local ret = self:move(path[1].x, path[1].y) + if self.x == path[1].x and self.y == path[1].y then + for i = 1, 3 do if path[i+1] then self.escort_path[i] = path[i+1] end end end - return self:move(path[1].x, path[1].y) + return ret end end end) diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua index a2e3e9554f762c40226a64cc4cbe710db83ff30b..a0aa0281569832718252fa475c19dfa6a2a121a0 100644 --- a/game/modules/tome/class/Actor.lua +++ b/game/modules/tome/class/Actor.lua @@ -250,6 +250,7 @@ end function _M:move(x, y, force) local moved = false + print("actor move", self.uid, self.name, "::", self.x, self.y, "=>", x, y) if force or self:enoughEnergy() then -- Confused ? if not force and self:attr("confused") then diff --git a/game/modules/tome/class/interface/Combat.lua b/game/modules/tome/class/interface/Combat.lua index 074fc820d7e1c11463969a7938cfa626fd266d99..d66cf63db70bd8967b66bda279c861bb52e71549 100644 --- a/game/modules/tome/class/interface/Combat.lua +++ b/game/modules/tome/class/interface/Combat.lua @@ -487,7 +487,7 @@ function _M:combatSpellpower(mod) if self:hasEffect(self.EFF_BLOODLUST) then add = add + self:hasEffect(self.EFF_BLOODLUST).dur end - + return (self.combat_spellpower + add + self:getMag()) * mod end @@ -534,7 +534,7 @@ function _M:physicalCrit(dam, weapon, target) local chance = self:combatCrit(weapon) local crit = false if self:knowTalent(self.T_BACKSTAB) and target:attr("stunned") then chance = chance + self:getTalentLevel(self.T_BACKSTAB) * 10 end - + if target:attr("combat_critical") then chance = chance + target:attr("combat_critical") end @@ -569,6 +569,7 @@ function _M:spellCrit(dam, add_chance) if rng.percent(chance) then dam = dam * 1.5 crit = true + game.logSeen(self, "%s's spell looks more powerful!", self.name:capitalize()) end return dam, crit end diff --git a/game/modules/tome/data/talents/cunning/packing.lua b/game/modules/tome/data/talents/cunning/packing.lua index b1e0db0f0e02e544f3d90ec12d072581cdb995ad..81037929b9f808db18012dc64b0d6777dcfd88c0 100644 --- a/game/modules/tome/data/talents/cunning/packing.lua +++ b/game/modules/tome/data/talents/cunning/packing.lua @@ -52,7 +52,7 @@ newTalent{ end end, info = function(self, t) - return ([[Arrange your items in better way, protecting those can can easily be destroyed reducing their chance to be destroyed by %d%%.]]): + return ([[Arrange your items in better way, protecting those that can easily be destroyed reducing their chance to be destroyed by %d%%.]]): format(self:getTalentLevel(t) * 14) end, } diff --git a/game/modules/tome/data/talents/techniques/field-control.lua b/game/modules/tome/data/talents/techniques/field-control.lua index da29c8ad3428d58aa79065ba63dee7f44ef3a5a2..9b52c43c02a801bbd3ccff6d7c2b5ff256b491be 100644 --- a/game/modules/tome/data/talents/techniques/field-control.lua +++ b/game/modules/tome/data/talents/techniques/field-control.lua @@ -92,7 +92,7 @@ newTalent{ end, info = function(self, t) return ([[A mighty kick that pushes your target away %d grids. - If an other creature is in the way it will also be pushed away.]]):format(math.floor(2 + self:getTalentLevel(t))) + If another creature is in the way it will also be pushed away.]]):format(math.floor(2 + self:getTalentLevel(t))) end, }