MAKE FURNACE MORE INTERACTIVE!

[Crafter.git] / mods / minecart / init.lua

diff --git a/mods/minecart/init.lua b/mods/minecart/init.lua
index 4aa5a908ec971116f0e448f9fa95239d6d4213b4..e58e22724082f019a6614887c207453367424533 100644 (file)
--- a/mods/minecart/init.lua
+++ b/mods/minecart/init.lua
@@ -12,6 +12,9 @@ make carts push each other away --repel axis
 
 make chest and furnace cart
 
+
+minetest.dir_to_facedir(dir, is6d) - to get player direction converted and to convert the minecart direction
+
 ]]--
 local path = minetest.get_modpath("minecart")
 dofile(path.."/rail.lua")
@@ -35,6 +38,7 @@ local minecart = {
 
        rider = nil,
        punched = false,
+       speed = 0,
        
 }
 
@@ -91,7 +95,7 @@ end
 --repel from players on track "push"
 function minecart:push(self)
        local pos = self.object:getpos()
-       for _,object in ipairs(minetest.get_objects_inside_radius(pos, 2)) do
+       for _,object in ipairs(minetest.get_objects_inside_radius(pos, 1)) do
                if object:is_player() and object:get_player_name() ~= self.rider then
                        local player_pos = object:getpos()
                        pos.y = 0
@@ -101,22 +105,25 @@ function minecart:push(self)
                        vel = vector.normalize(vel)
                        local distance = vector.distance(pos,player_pos)
                        
-                       distance = (2-distance)*3
+                       distance = (1-distance)*10
                        
                        vel = vector.multiply(vel,distance)
                        
-                       self.object:setvelocity(vel)
-                       
+                       --only push if it's faster than current speed
+                       if distance > self.speed then
+                               self.object:setvelocity(vel)
+                               self.speed = distance
+                       end             
                end
        end
 end
 
 function minecart:ride_rail(self)
-
-       --floor position!!!!
-       
        local pos = vector.floor(vector.add(self.object:getpos(),0.5))
-       local speed = 10 --change to the cart speed soon
+       local speed = self.speed
+       if self.speed > 10 then
+               self.speed = 10
+       end
        
        local vel = self.object:getvelocity()
        local x = math.abs(vel.x)
@@ -234,14 +241,22 @@ function minecart:ride_rail(self)
        --end
        self.oldpos=self.object:getpos()
        
-       
+       --make the cart move up and down on hills
        self.object:set_properties({mesh="minecart.obj"})
        if vel.y <0  then
                self.object:set_properties({mesh="minecart_down.obj"})
        elseif vel.y > 0 then
                self.object:set_properties({mesh="minecart_up.obj"})
        end
-       return(self.object:set_animation(anim, 1, 0))
+       
+       --slow it down
+       if self.speed > 0 then
+               self.speed = self.speed - 0.01
+       end
+       if self.speed < 0 then
+               self.speed = 0
+       end
+       
 end