Mirrorlandia_minetest/MineClone2
1
0
Fork 0
mirror of https://git.minetest.land/MineClone2/MineClone2.git synced 2024-12-05 01:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

small code cleanups

Browse Source
This commit is contained in:
kno10 2024-09-26 17:32:17 +02:00
parent 63c83cf440
commit a67938904e
4 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mods/ENTITIES/mcl_mobs/effects.lua
View File

@ -250,9 +250,7 @@ end
-- set defined animation -- set defined animation
function mob_class:set_animation(anim, fixed_frame) function mob_class:set_animation(anim, fixed_frame)
if not self.animation or not anim then if not self.animation or not anim then return end
return
end
if self.jockey and self.object:get_attach() then if self.jockey and self.object:get_attach() then
anim = "jockey" anim = "jockey"
@ -260,11 +258,7 @@ function mob_class:set_animation(anim, fixed_frame)
self.jockey = nil self.jockey = nil
end end
if self.state == "die" and anim ~= "die" and anim ~= "stand" then if self.state == "die" and anim ~= "die" and anim ~= "stand" then return end
return
end
if self.fly and self:flight_check() and anim == "walk" then anim = "fly" end if self.fly and self:flight_check() and anim == "walk" then anim = "fly" end
@ -279,12 +273,7 @@ function mob_class:set_animation(anim, fixed_frame)
self._current_animation = anim self._current_animation = anim
local a_start = self.animation[anim .. "_start"] local a_start = self.animation[anim .. "_start"]
local a_end local a_end = fixed_frame and a_start or self.animation[anim .. "_end"]
if fixed_frame then
a_end = a_start
else
a_end = self.animation[anim .. "_end"]
end
if a_start and a_end then if a_start and a_end then
self.object:set_animation({ self.object:set_animation({
x = a_start, x = a_start,
@ -294,11 +283,6 @@ function mob_class:set_animation(anim, fixed_frame)
end end
end end
-- above function exported for mount.lua
function mcl_mobs:set_animation(self, anim)
self:set_animation(anim)
end
local function who_are_you_looking_at (self, dtime) local function who_are_you_looking_at (self, dtime)
if self.order == "sleep" then if self.order == "sleep" then
self._locked_object = nil self._locked_object = nil

8
mods/ENTITIES/mcl_mobs/mount.lua
View File

@ -142,10 +142,10 @@ function mcl_mobs.drive(entity, moving_anim, stand_anim, can_fly, dtime)
-- if not moving then set animation and return -- if not moving then set animation and return
if v == 0 and velo.x == 0 and velo.y == 0 and velo.z == 0 then if v == 0 and velo.x == 0 and velo.y == 0 and velo.z == 0 then
if stand_anim then mcl_mobs:set_animation(entity, stand_anim) end entity:set_animation(stand_anim)
return return
else else
if moving_anim then mcl_mobs:set_animation(entity, moving_anim) end entity:set_animation(moving_anim)
end end
-- enforce speed limit forward and reverse -- enforce speed limit forward and reverse
@ -254,9 +254,9 @@ function mcl_mobs.fly(entity, dtime, speed, shoots, arrow, moving_anim, stand_an
-- change animation if stopped -- change animation if stopped
if velo.x == 0 and velo.y == 0 and velo.z == 0 then if velo.x == 0 and velo.y == 0 and velo.z == 0 then
if stand_anim then mcl_mobs:set_animation(entity, stand_anim) end entity:set_animation(stand_anim)
else else
if moving_anim then mcl_mobs:set_animation(entity, moving_anim) end entity:set_animation(moving_anim)
end end
end end

5
mods/ENTITIES/mcl_mobs/physics.lua
View File

@ -295,11 +295,6 @@ function mob_class:check_smooth_rotation(dtime)
self:update_roll() self:update_roll()
end end
-- global function to set mob yaw
function mcl_mobs.yaw(self, yaw, delay, dtime)
return mob_class.set_yaw(self, yaw, delay, dtime)
end
-- are we flying in what we are suppose to? (taikedz) -- are we flying in what we are suppose to? (taikedz)
function mob_class:flight_check() function mob_class:flight_check()

1
mods/ENTITIES/mobs_mc/shulker.lua
View File

@ -83,7 +83,6 @@ mcl_mobs.register_mob("mobs_mc:shulker", {
local pos = self.object:get_pos() local pos = self.object:get_pos()
if math.floor(self.object:get_yaw()) ~=0 then if math.floor(self.object:get_yaw()) ~=0 then
self.object:set_yaw(0) self.object:set_yaw(0)
mcl_mobs:yaw(self, 0, 0, dtime)
end end
if self.state == "attack" then if self.state == "attack" then
self:set_animation("run") self:set_animation("run")