overhaul mob jumping to use raycasting and moveresult

diff --git a/mods/mob/api/api_hook.lua b/mods/mob/api/api_hook.lua
index de8ae62bb69f7727efa570d437eb47ca043cb1fc..1232288e98e1be6aa79fc9ab05cb2e28506828d8 100644 (file)
--- a/mods/mob/api/api_hook.lua
+++ b/mods/mob/api/api_hook.lua
@@ -127,7 +127,7 @@ mobs.create_animation_functions(def,mob_register)
 mobs.create_timer_functions(def,mob_register)
 
 
-mob_register.on_step = function(self, dtime)
+mob_register.on_step = function(self, dtime,moveresult)
        if self.custom_function_begin then
                self.custom_function_begin(self,dtime)
        end
@@ -138,7 +138,7 @@ mob_register.on_step = function(self, dtime)
        end
        
        if self.dead == false and self.death_animation_timer == 0 then
-               self.move(self,dtime)
+               self.move(self,dtime,moveresult)
                --self.debug_nametag(self,dtime)
                self.manage_hurt_color_timer(self,dtime)
                self.set_animation(self)
@@ -152,6 +152,7 @@ mob_register.on_step = function(self, dtime)
                self.manage_death_animation(self,dtime)
                self.move_head(self,nil,dtime)
        end
+
        --fix zombie state again
        if self.dead == true and self.death_animation_timer <= 0 then
                self.on_death(self)

diff --git a/mods/mob/api/movement.lua b/mods/mob/api/movement.lua
index a64b8b8f93237403b581f120599d7ed8bfc907e8..4c6623d3118f62ade6d832b1476c61aa46592e46 100644 (file)
--- a/mods/mob/api/movement.lua
+++ b/mods/mob/api/movement.lua
@@ -41,12 +41,12 @@ mobs.create_movement_functions = function(def,mob_register)
 
        --This makes the mob walk at a certain speed and jump
        if def.movement_type == "walk" then
-               mob_register.move = function(self,dtime)
+               mob_register.move = function(self,dtime,moveresult)
                        self.manage_jump_timer(self,dtime)
                        self.timer = self.timer - dtime
-                       
+
                        --jump
-                       self.jump(self)
+                       self.jump(self,moveresult)
                        
                        --swim
                        self.swim(self,dtime)
@@ -70,32 +70,45 @@ mobs.create_movement_functions = function(def,mob_register)
                        acceleration = vector.multiply(acceleration, 0.05)
                        self.object:add_velocity(acceleration)
                end
-               mob_register.jump = function(self)
-                       local vel = self.object:get_velocity()
-                       if self.jump_timer <= 0 then
-                               if (vel.x == 0 and self.direction ~= 0) or (vel.z == 0 and self.direction ~= 0) then
-                                       if vel.y == 0 and self.oldvely and self.oldvely <= 0 then
-                                               local vel = self.object:get_velocity()
-                                               self.jump_timer = 1+math.random()
-                                               if self.hostile == true then
-                                                       self.jump_timer = 0.5
+               mob_register.jump = function(self,moveresult)
+                       if moveresult and moveresult.touching_ground and self.direction then
+                               local pos = self.object:get_pos()
+                               pos.y = pos.y+0.1
+                               --assume collisionbox is even x and z
+                               local modifier = self.object:get_properties().collisionbox[4]*3
+                               
+
+                               local pos2 = vector.add(vector.multiply(self.direction,modifier),pos)
+
+                               local ray = minetest.raycast(pos, pos2, false, false)
+
+                               if ray then
+                                       local pointed_thing = ray:next()
+                                       if pointed_thing then
+                                               if minetest.get_nodedef(minetest.get_node(pointed_thing.under).name, "walkable") then
+                                                       minetest.add_particle({
+                                                               pos = pointed_thing.intersection_point,
+                                                               velocity = {x=0, y=0, z=0},
+                                                               acceleration = {x=0, y=0, z=0},
+                                                               expirationtime = 5,
+                                                               size = 1,
+                                                               texture = "dirt.png",
+                                                       })
+                                                       local vel = self.object:get_velocity()
+                                                       self.jump_timer = 1+math.random()
+                                                       self.object:set_velocity(vector.new(vel.x,5,vel.z))
                                                end
-                                               self.object:set_velocity(vector.new(vel.x,5,vel.z))
                                        end
                                end
                        end
-                       --if vel.y == 0 and self.oldvely and self.oldvely < 0 then
-                       --      self.object:set_velocity(vector.new(0,0,0))
-                       --end
-                       self.oldvely = vel.y
                end
        elseif def.movement_type == "jump" then
-               mob_register.move = function(self,dtime)
+               mob_register.move = function(self,dtime,moveresult)
                        self.manage_jump_timer(self,dtime)
                        self.timer = self.timer - dtime
                        
                        --jump
-                       self.jump(self)
+                       self.jump(self,moveresult)
                        
                        --swim
                        self.swim(self,dtime)
@@ -122,26 +135,23 @@ mobs.create_movement_functions = function(def,mob_register)
                        end
                end
                
-               mob_register.jump = function(self)
-                       local vel = self.object:get_velocity()
-                       if self.jump_timer <= 0 then
-                               if vel.y == 0 and self.oldvely and self.oldvely <= 0 then --use <= on self.oldvely to make slime make landing sound
-                                       if self.make_jump_noise then
-                                               minetest.sound_play("slime_splat", {object=self.object, gain = 1.0, max_hear_distance = 10,pitch = math.random(80,100)/100})
-                                       end
-                                       local vel = self.object:get_velocity()
-                                       self.jump_timer = 1+math.random()
+               mob_register.jump = function(self,moveresult)
+                       if moveresult and moveresult.touching_ground and self.direction then
+                               if self.make_jump_noise then
+                                       minetest.sound_play("slime_splat", {object=self.object, gain = 1.0, max_hear_distance = 10,pitch = math.random(80,100)/100})
+                               end
+                               local vel = self.object:get_velocity()
+                               self.object:set_velocity(vector.new(vel.x,5,vel.z))
+                               if self.jump_timer <= 0 then
                                        if self.hostile == true then
                                                self.jump_timer = 0.5
+                                       else
+                                               self.jump_timer = 1+math.random()
                                        end
-                                       local goal = vector.multiply(self.direction,self.speed)
-                                       self.object:set_velocity(vector.new(goal.x,5,goal.z))
+                               else
+                                       self.object:set_velocity(vector.new(0,0,0))
                                end
                        end
-                       if vel.y == 0 and self.oldvely and self.oldvely < 0 then
-                               self.object:set_velocity(vector.new(0,0,0))
-                       end
-                       self.oldvely = vel.y
                end
        end
        

diff --git a/mods/new_functions/init.lua b/mods/new_functions/init.lua
index 1ae4dd069111904dc1bed540cf8beb850e1f26bf..5c4b961879e25fa04fb631fcdbcef71610693c50 100644 (file)
--- a/mods/new_functions/init.lua
+++ b/mods/new_functions/init.lua
@@ -309,3 +309,10 @@ minetest.register_on_mods_loaded(function()
                fix_breath_hack()
        end)
 end)
+
+function minetest.get_nodedef(nodename, fieldname)
+       if not minetest.registered_nodes[nodename] then
+               return nil
+       end
+       return minetest.registered_nodes[nodename][fieldname]
+end
\ No newline at end of file