More updates

diff --git a/mods/farming/init.lua b/mods/farming/init.lua
index 731e779bd3f3148235e3f7867ca88f7df479a483..15ce1eaa0cdf7806edd4ca6ca39fb0e5aa05c9c4 100644 (file)
--- a/mods/farming/init.lua
+++ b/mods/farming/init.lua
@@ -22,7 +22,10 @@ for level,material in pairs(material) do
             tool_capabilities = {
                   --full_punch_interval = 1.2,
                   --max_drop_level=0,
-                  groupcaps={dirt = {times={[4]=4-level/4,[3]=3.5-level/4,[2]=3.0-level/4,[1]=2.8-level/4}, uses=(level/2)*3, maxlevel=level},},
+                  groupcaps={
+                  dirt = {times={[4]=4-level/4,[3]=3.5-level/4,[2]=3.0-level/4,[1]=2.8-level/4}, uses=(level/2)*3, maxlevel=level},
+                  sand = {times={[4]=4-level/4,[3]=3.5-level/4,[2]=3.0-level/4,[1]=2.8-level/4}, uses=(level/2)*3, maxlevel=level},
+                  },
                   damage_groups = {fleshy=1},
             },
             sound = {breaks = {name="tool_break",gain=0.4}}, -- change this
@@ -181,7 +184,35 @@ minetest.register_abm({
 })
 for i = 0,wheat_max do
       local drop = ""
-      if i == wheat_max then drop = "farming:wheat" end
+      if i == wheat_max then 
+            drop = {
+                  max_items = 2,
+                  items= {
+                   {
+                        -- Only drop if using a tool whose name is identical to one
+                        -- of these.
+                        --rarity = 10,
+                        items = {"farming:wheat"},
+                        -- Whether all items in the dropped item list inherit the
+                        -- hardware coloring palette color from the dug node.
+                        -- Default is 'false'.
+                        --inherit_color = true,
+                  },
+                  {
+                        -- Only drop if using a tool whose name is identical to one
+                        -- of these.
+                        rarity = 3,
+                        items = {"farming:seeds"},
+                        -- Whether all items in the dropped item list inherit the
+                        -- hardware coloring palette color from the dug node.
+                        -- Default is 'false'.
+                        --inherit_color = true,
+                  },
+                  },
+                  }
+            
+           
+      end
       
       minetest.register_node("farming:wheat_"..i, {
           description = "Wheat Stage "..i,

diff --git a/mods/hand/init.lua b/mods/hand/init.lua
index 8e2d19a9b219f160af04d883e7b1189662ab2056..9bd6f65e94258f7392f9db00d71a5a4d8376c802 100644 (file)
--- a/mods/hand/init.lua
+++ b/mods/hand/init.lua
@@ -15,7 +15,7 @@ minetest.register_item(":", {
                   wood = {times={[4]=11.5,[3]=8.5,[2]=6.70,[1]=5.5}, uses=0, maxlevel=1},
                   leaves = {times={[4]=4.5,[3]=3.2,[2]=2.20,[1]=1.2}, uses=0, maxlevel=0},
                   instant = {times={[1]=0.1,},uses=0,maxlevel=1},
-                  dig_immediate = {times={[1]=0,},uses=0,maxlevel=1},
+                  dig_immediate = {times={[2]=0,[3]=0,[1]=0,},uses=0,maxlevel=1},
             },
             damage_groups = {fleshy=1},
       }

diff --git a/mods/main/bucket.lua b/mods/main/bucket.lua
index f10ed86df4f60d194567b36f2abdf83c6f2ac544..4ad8c5ee7630aca7a0cffc776b8be2fd12402a30 100644 (file)
--- a/mods/main/bucket.lua
+++ b/mods/main/bucket.lua
@@ -19,12 +19,18 @@ minetest.register_craftitem("main:bucket_water", {
       description = "Bucket with Water",
       inventory_image = "bucket_water.png",
       --wield_image = "bucket.png",
-      liquids_pointable = true,
+      liquids_pointable = false,
       on_place = function(itemstack, placer, pointed_thing)
             --set it to water
-            if minetest.get_node(pointed_thing.above).name == "air" then
-                  itemstack:replace(ItemStack("main:bucket"))
+            local is_farmland = minetest.get_node(pointed_thing.under).name == "farming:farmland_dry"
+            local node = minetest.get_node(pointed_thing.above).name
+            if node == "air" or node == "main:water" or node == "main:waterflow" then
                   minetest.set_node(pointed_thing.above,{name="main:water"})
+                  itemstack:replace(ItemStack("main:bucket"))
+                  return(itemstack)
+            elseif is_farmland then
+                  minetest.set_node(pointed_thing.under,{name="farming:farmland_wet"})
+                  itemstack:replace(ItemStack("main:bucket"))
                   return(itemstack)
             end
       end

diff --git a/mods/torch/init.lua b/mods/torch/init.lua
index 8d5906a31f1bc9e73526c6e665aa7f746662ba1e..f980335523f0102ba25b3a91122cb2eddebb7fc5 100644 (file)
--- a/mods/torch/init.lua
+++ b/mods/torch/init.lua
@@ -23,9 +23,9 @@ end
 
 --add in smoke and fire
 local function create_ps(pos)
+      local meta = minetest.get_meta(pos)
       local dir = get_offset(minetest.get_node(pos).param2)
       local ppos = vector.add(dir,pos)
-      local meta = minetest.get_meta(pos)
       local psf = minetest.add_particlespawner({
             amount = 2,
             time = 0,
@@ -75,17 +75,32 @@ local function create_ps(pos)
       meta:set_int("pss", pss)
 end
 
---[[
+
 --reload smoke and flame on load
-minetest.register_lbm({
-      name = "torch:torch",
-      nodenames = {"torch:floor","torch:wall"},
-      run_at_every_load = true,
-      action = function(pos, node)
-            create_ps(pos)
+minetest.register_abm({
+      label = "Torch Particle",
+      nodenames = {"group:torch"},
+      neighbors = {"air"},
+      interval = 0.1,
+      chance = 1,
+      action = function(pos, node, active_object_count, active_object_count_wider)
+            local found_player = false
+            for _,object in ipairs(minetest.get_objects_inside_radius(pos, 3)) do
+                  local pos2 = object:getpos()
+                  if object:is_player() then
+                        found_player = true
+                  end
+            end
+            if found_player == true then
+                  print("creating ps")
+                  create_ps(pos)
+            else
+                  print("deleting ps")
+                  delete_ps(pos)
+            end
       end,
 })
-]]--
+
 -- Item definitions
 minetest.register_craftitem("torch:torch", {
       description = "Torch",

diff --git a/todo.txt b/todo.txt
index 0f8deb9e686cae4692a6b2609b76c8e1ba4df826..2acf5bc7ce449cf07bafa65fba82d698e7ab2de3 100644 (file)
--- a/todo.txt
+++ b/todo.txt
@@ -33,12 +33,11 @@ ALPHA STATE CHANGELOG
 --make item collection move with the player's speed
 --made saplings
 --make grass spread
-buckets
+--water buckets
+--buckets water farmland
 
 crafting bench
 
-make torches abm that checks if player in area
-make furnace abm that checks if player in area
 
 
 farming - 
@@ -52,6 +51,8 @@ farming -
 - make sandwich with bread and cooked porkchop
 - fertilizer used on saplings randomly make tree grow (make sapling growth a function)
 
+make torches abm that checks if player in area
+make furnace abm that checks if player in area
 
 
 fishing