sixam/creatura
1
0
Fork 0
mirror of https://github.com/ElCeejo/creatura.git synced 2025-03-21 07:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11 from JordanL2/texture_mod_2

Browse source 
Fix for texture mod issue
This commit is contained in:
ElCeejo 2022-03-22 13:42:43 -07:00 • committed by GitHub
commit 8542912775
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
api.lua
View file

@ -68,7 +68,7 @@ local function get_node_height(pos)
return pos.y + node.node_box.fixed[1][5] return pos.y + node.node_box.fixed[1][5]
else else
return pos.y + 0.5 return pos.y + 0.5
end end
elseif node.node_box elseif node.node_box
and node.node_box.type == 'leveled' then and node.node_box.type == 'leveled' then
return minetest.get_node_level(pos) / 64 - 0.5 + pos.y return minetest.get_node_level(pos) / 64 - 0.5 + pos.y
@ -297,9 +297,9 @@ end
function creatura.is_valid(mob) function creatura.is_valid(mob)
if not mob then return false end if not mob then return false end
if type(mob) == "table" then mob = mob.object end if type(mob) == "table" then mob = mob.object end
if type(mob) == "userdata" then if type(mob) == "userdata" then
if mob:is_player() then if mob:is_player() then
if mob:get_look_horizontal() then return mob end if mob:get_look_horizontal() then return mob end
else else
if mob:get_yaw() then return mob end if mob:get_yaw() then return mob end
end end
@ -432,4 +432,4 @@ end
local path = minetest.get_modpath("creatura") local path = minetest.get_modpath("creatura")
dofile(path.."/mob_meta.lua") dofile(path.."/mob_meta.lua")

22
mob_meta.lua
View file

@ -203,13 +203,11 @@ local function index_box_border(self)
end end
function mob:indicate_damage() function mob:indicate_damage()
local texture_mod = self.object:get_texture_mod() self._original_texture_mod = self._original_texture_mod or self.object:get_texture_mod()
self.object:set_texture_mod("^[colorize:#FF000040") self.object:set_texture_mod(self._original_texture_mod .. "^[colorize:#FF000040")
self.object:set_texture_mod(texture_mod .. "^[colorize:#FF000040")
core.after(0.2, function() core.after(0.2, function()
if creatura.is_alive(self) then if creatura.is_alive(self) then
self.object:set_texture_mod("") self.object:set_texture_mod(self._original_texture_mod)
self.object:set_texture_mod(texture_mod)
end end
end) end)
end end
@ -249,12 +247,12 @@ function mob:turn_to(tyaw, rate)
yaw = yaw + pi yaw = yaw + pi
tyaw = (tyaw + pi) % pi2 tyaw = (tyaw + pi) % pi2
local step = math.min(self.dtime * weight, abs(tyaw - yaw) % pi2) local step = math.min(self.dtime * weight, abs(tyaw - yaw) % pi2)
local dir = abs(tyaw - yaw) > pi and -1 or 1 local dir = abs(tyaw - yaw) > pi and -1 or 1
dir = tyaw > yaw and dir * 1 or dir * -1 dir = tyaw > yaw and dir * 1 or dir * -1
local nyaw = (yaw + step * dir) % pi2 local nyaw = (yaw + step * dir) % pi2
self.object:set_yaw(nyaw - pi) self.object:set_yaw(nyaw - pi)
self.last_yaw = self.object:get_yaw() self.last_yaw = self.object:get_yaw()
@ -299,7 +297,7 @@ end
-- Punch 'target' -- Punch 'target'
function mob:punch_target(target) -- function mob:punch_target(target) --
target:punch(self.object, 1.0, { target:punch(self.object, 1.0, {
full_punch_interval = 1.0, full_punch_interval = 1.0,
damage_groups = {fleshy = self.damage or 5}, damage_groups = {fleshy = self.damage or 5},
@ -620,7 +618,7 @@ end
function mob:get_height() function mob:get_height()
local hitbox = self:get_hitbox() local hitbox = self:get_hitbox()
return hitbox[5] - hitbox[2] return hitbox[5] - hitbox[2]
end end
-- Return current visual size -- Return current visual size
@ -653,7 +651,7 @@ function mob:follow_wielded_item(player)
and (is_value_in_table(self.follow, name) and (is_value_in_table(self.follow, name)
or is_group_in_table(self.follow, name)) then or is_group_in_table(self.follow, name)) then
return item, name return item, name
end end
end end
function mob:get_target(target) function mob:get_target(target)
@ -744,7 +742,7 @@ function mob:activate(staticdata, dtime)
-- Staticdata -- Staticdata
if staticdata then if staticdata then
local data = minetest.deserialize(staticdata) local data = minetest.deserialize(staticdata)
if data then if data then
for k, v in pairs(data) do for k, v in pairs(data) do
self[k] = v self[k] = v
end end