FaceDeer
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update from master #1

Merged
FaceDeer merged 53 commits from VoxeLibre/VoxeLibre:master into master 2022-08-29 09:16:33 +02:00
Conversation 0 Commits 53 Files Changed 40 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a48664b8b3 - Show all commits

8
mods/ENTITIES/mobs_mc/pillager.lua
View File

@ -12,7 +12,7 @@ end
local function reset_animation(self, animation) local function reset_animation(self, animation)
if not self or not self.object or self.current_animation ~= animation then return end if not self or not self.object or self.current_animation ~= animation then return end
self.current_animation = "stand_reload" -- Mobs Redo won't set the animation unless we do this self.current_animation = "stand_reload" -- Mobs Redo won't set the animation unless we do this
mobs.set_mob_animation(self, animation) mcl_mobs.set_mob_animation(self, animation)
end end
pillager = { pillager = {
@ -135,15 +135,15 @@ pillager = {
self.object:set_properties(props) self.object:set_properties(props)
local old_anim = self.current_animation local old_anim = self.current_animation
if old_anim == "run" then if old_anim == "run" then
mobs.set_mob_animation(self, "reload_run") mcl_mobs.set_mob_animation(self, "reload_run")
end end
if old_anim == "stand" then if old_anim == "stand" then
mobs.set_mob_animation(self, "reload_stand") mcl_mobs.set_mob_animation(self, "reload_stand")
end end
self.current_animation = old_anim -- Mobs Redo will imediately reset the animation otherwise self.current_animation = old_anim -- Mobs Redo will imediately reset the animation otherwise
minetest.after(1, reload, self) minetest.after(1, reload, self)
minetest.after(2, reset_animation, self, old_anim) minetest.after(2, reset_animation, self, old_anim)
mobs.shoot_projectile_handling( mcl_mobs.shoot_projectile_handling(
"mcl_bows:arrow", pos, dir, self.object:get_yaw(), "mcl_bows:arrow", pos, dir, self.object:get_yaw(),
self.object, 30, math.random(3,4)) self.object, 30, math.random(3,4))