diff --git a/game/modules/tome/class/Player.lua b/game/modules/tome/class/Player.lua index 5695992e69f8550009cdeba6977579ebab842b7c..ed60ecbdd4def04e10b231e6e0269aecd30bcb90 100644 --- a/game/modules/tome/class/Player.lua +++ b/game/modules/tome/class/Player.lua @@ -162,8 +162,8 @@ function _M:onWorldEncounter(target, x, y) end end -function _M:describeFloor(x, y) - if self.old_x == x and self.old_y == y then return end +function _M:describeFloor(x, y, force) + if self.old_x == x and self.old_y == y and not force then return end -- Autopickup money if self:getInven(self.INVEN_INVEN) and not self.no_inventory_access then diff --git a/game/modules/tome/class/interface/Combat.lua b/game/modules/tome/class/interface/Combat.lua index 00fae1237fe11c255f4d231cb84898cab96bef0e..bbf2712a7a918020fbd55f2c37bfca3c5c9b90fc 100644 --- a/game/modules/tome/class/interface/Combat.lua +++ b/game/modules/tome/class/interface/Combat.lua @@ -62,6 +62,8 @@ function _M:bumpInto(target, x, y) self.x = nil self.y = nil target:move(sx, sy, true) self:move(tx, ty, true) + if target.describeFloor then target:describeFloor(target.x, target.y, true) end + if self.describeFloor then self:describeFloor(self.x, self.y, true) end end end end