diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua index a0aa0281569832718252fa475c19dfa6a2a121a0..c99f53a95188e62f912b05424ca0e47e568a1da6 100644 --- a/game/modules/tome/class/Actor.lua +++ b/game/modules/tome/class/Actor.lua @@ -250,7 +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/data/general/npcs/naga.lua b/game/modules/tome/data/general/npcs/naga.lua index 1107d739d9341644e9e1aa525fdb8f5cf73cd3fb..5af02caf1db8f134a0b72bfb0803673adbe5dfec 100644 --- a/game/modules/tome/data/general/npcs/naga.lua +++ b/game/modules/tome/data/general/npcs/naga.lua @@ -45,7 +45,7 @@ newEntity{ } newEntity{ base = "BASE_NPC_NAGA", - name = "naga myrmidon", color=colors.DARK_UMBER, + name = "naga myrmidon", color=colors.DARK_UMBER, image="npc/naga_myrmidon.png", desc = [[A naga warrior, wielding a menacing trident. Myrmidons are the most devoted warriors, following the orders of Maglor whatever they may be.]], level_range = {30, nil}, exp_worth = 1, @@ -66,7 +66,7 @@ Myrmidons are the most devoted warriors, following the orders of Maglor whatever } newEntity{ base = "BASE_NPC_NAGA", - name = "naga tide huntress", color=colors.RED, + name = "naga tide huntress", color=colors.RED, image="npc/naga_tide_huntress.png", desc = [[A naga hunter, wielding a long bow. Tide huntress wield both magic and hunting skills, making them terrible foes.]], level_range = {34, nil}, exp_worth = 1, @@ -91,7 +91,7 @@ Tide huntress wield both magic and hunting skills, making them terrible foes.]], } newEntity{ base = "BASE_NPC_NAGA", - name = "naga psyren", color=colors.YELLOW, + name = "naga psyren", color=colors.YELLOW, image="npc/naga_psyren.png", desc = [[A naga psyren, she looks at you with great intensity. Psyrens are dangerous naga that can directly assault your mind.]], level_range = {36, nil}, exp_worth = 1, diff --git a/game/modules/tome/data/gfx/npc/naga_myrmidon.png b/game/modules/tome/data/gfx/npc/naga_myrmidon.png new file mode 100644 index 0000000000000000000000000000000000000000..a7f5cea8d00f0e8715007bf5ab97ef0fd2bb5a50 Binary files /dev/null and b/game/modules/tome/data/gfx/npc/naga_myrmidon.png differ diff --git a/game/modules/tome/data/gfx/npc/naga_psyren.png b/game/modules/tome/data/gfx/npc/naga_psyren.png new file mode 100644 index 0000000000000000000000000000000000000000..e8a4227191ca5c19facfd66cb4ea096f6013a355 Binary files /dev/null and b/game/modules/tome/data/gfx/npc/naga_psyren.png differ diff --git a/game/modules/tome/data/gfx/npc/naga_tide_huntress.png b/game/modules/tome/data/gfx/npc/naga_tide_huntress.png new file mode 100644 index 0000000000000000000000000000000000000000..7d422e6c0d5778f6c3938d64c2ccd5183b9a435f Binary files /dev/null and b/game/modules/tome/data/gfx/npc/naga_tide_huntress.png differ diff --git a/game/modules/tome/data/talents/cunning/packing.lua b/game/modules/tome/data/talents/cunning/packing.lua index 81037929b9f808db18012dc64b0d6777dcfd88c0..21876cbada9f11275aa1fece56e913e460480582 100644 --- a/game/modules/tome/data/talents/cunning/packing.lua +++ b/game/modules/tome/data/talents/cunning/packing.lua @@ -41,16 +41,6 @@ newTalent{ require = cuns_req2, mode = "passive", points = 5, - on_learn = function(self, t) - self.heightened_senses = 4 + math.ceil(self:getTalentLevel(t)) - end, - on_unlearn = function(self, t) - if self:knowTalent(t) then - self.heightened_senses = 4 + math.ceil(self:getTalentLevel(t)) - else - self.heightened_senses = nil - end - end, info = function(self, t) 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)