Tune eating particles even further

[Crafter.git] / mods / player / player_mechanics.lua

diff --git a/mods/player/player_mechanics.lua b/mods/player/player_mechanics.lua
index 6d89bcded3f4ce75bf907dc3d292fd4303d25209..21899e1a62afc3dd689d8c61ce0d10554830123c 100644 (file)
--- a/mods/player/player_mechanics.lua
+++ b/mods/player/player_mechanics.lua
@@ -8,10 +8,18 @@ minetest.register_on_modchannel_message(function(channel_name, sender, message)
        end
 end)
 
+minetest.register_on_joinplayer(function(player)
+       player:set_physics_override({jump=1.25,gravity=1.25})
+       local meta = player:get_meta()
+       meta:set_string("player.player_movement_state", "0")
+end)
+
 minetest.register_globalstep(function(dtime)
        for _,player in ipairs(minetest.get_connected_players()) do
                local meta = player:get_meta()
                
+               local hunger = meta:get_int("hunger")
+               
                local running = (meta:get_string("player.player_movement_state") == "1")
                local bunny_hopping = (meta:get_string("player.player_movement_state") == "2")
                local sneaking = (meta:get_string("player.player_movement_state") == "3")
@@ -20,39 +28,25 @@ minetest.register_globalstep(function(dtime)
                
                
                --running FOV modifier
-               if running or bunny_hopping then
-                       local fov = player:get_fov()
-                       if fov == 0 then
-                               fov = 1
-                       end
-
-                       if fov+dtime < 1.2 then
-                               player:set_fov(fov + dtime, true)
-                       elseif fov-dtime > 1.2 then
-                               player:set_fov(fov - dtime, true)
-                       elseif fov+dtime > 1.2 then
-                               player:set_fov(1.2, true)
-                       end
+               if hunger > 6 and (running or bunny_hopping) then
+                       player:set_fov(1.25, true,0.15)
+                       
                        if bunny_hopping == true then
+                --player:set_fov(1.45, true,0.15)
                                player:set_physics_override({speed=1.75})
                        else
+                --player:set_fov(1.25, true,0.15)
                                player:set_physics_override({speed=1.5})
                        end
                else
-                       local meta = player:get_meta()
-                       local fov = player:get_fov()
-                       if fov-dtime > 1 then
-                               player:set_fov(fov - dtime, true)
-                       elseif fov-dtime < 1 then
-                               player:set_fov(1, true)
-                       end
-                       
+            player:set_fov(1, true,0.15)
                        player:set_physics_override({speed=1})
                        --meta:set_float("running_timer", 0)
                end
                
                --sneaking
                if sneaking then
+            --player:set_fov(0.8, true,0.1)
                        player:set_eye_offset({x=0,y=-1,z=0},{x=0,y=-1,z=0})
                else
                        player:set_eye_offset({x=0,y=0,z=0},{x=0,y=0,z=0})
@@ -62,35 +56,58 @@ minetest.register_globalstep(function(dtime)
                
                --eating
                if player:get_player_control().RMB then
-                       local health = player:get_wielded_item():get_definition().health
-                       if health then
-                               local meta = player:get_meta()
+               
+                       local item = player:get_wielded_item():get_name()
+                       local satiation = minetest.get_item_group(item, "satiation")
+                       local hunger = minetest.get_item_group(item, "hunger")
+                       
+                       local meta = player:get_meta()
+                       if meta:get_int("hunger") == 20 then
+                               return 
+                       end
+                       
+                       if hunger > 0 and satiation > 0  then                           
                                local eating = meta:get_float("eating")
                                local eating_timer = meta:get_float("eating_timer")
                                
                                eating = eating + dtime
                                eating_timer = eating_timer + dtime
                                
+                               local pos = player:get_pos()
+
+                               if sneaking then
+                                       pos.y = pos.y + 1.425
+                               else
+                                       pos.y = pos.y + 1.625
+                               end
+
+                               local dir = vector.multiply(player:get_look_dir(),0.3)
+                               local newpos = vector.add(pos,dir)
+
+                               local vel = player:get_player_velocity()
+
                                local ps = minetest.add_particlespawner({
-                                       amount = 30,
+                                       amount = 6,
                                        time = 0.00001,
-                                       minpos = {x=-0.2, y=-1.5, z=0.5},
-                                       maxpos = {x=0.2, y=1.7, z=0.5},
-                                       minvel = vector.new(-0.5,0,-0.5),
-                                       maxvel = vector.new(0.5,0,0.5),
+                                       minpos = {x=newpos.x-0.2, y=newpos.y+0.2, z=newpos.z-0.2},
+                                       maxpos = {x=newpos.x+0.2, y=newpos.y-0.2, z=newpos.z+0.2},
+                                       minvel = vector.new(vel.x-0.5,0.2,vel.z-0.5),
+                                       maxvel = vector.new(vel.x+0.5,0.6,vel.z+0.5),
                                        minacc = {x=0, y=-9.81, z=1},
                                        maxacc = {x=0, y=-9.81, z=1},
                                        minexptime = 0.5,
                                        maxexptime = 1.5,
-                                       minsize = 0.5,
-                                       maxsize = 1,
-                                       attached = player,
+                                       minsize = 0,
+                                       maxsize = 0,
+                                       --attached = player,
                                        collisiondetection = true,
                                        collision_removal = true,
                                        vertical = false,
-                                       texture = "eat_particles_1.png"
+                                       node = {name= item.."node"},
+                                       --texture = "eat_particles_1.png"
                                })
-                               
+
+
                                if eating_timer + dtime > 0.25 then
                                        minetest.sound_play("eat", {
                                                to_player = player:get_player_name(),
@@ -103,8 +120,7 @@ minetest.register_globalstep(function(dtime)
                                if eating + dtime >= 1 then
                                        local stack = player:get_wielded_item()
                                        stack:take_item(1)
-                                       player:set_wielded_item(stack)
-                                       player:set_hp(player:get_hp() + health)
+                                       minetest.eat_food(player,item)
                                        eating = 0
                                        minetest.sound_play("eat_finish", {
                                                to_player = player:get_player_name(),