diff --git a/README.md b/README.md index 92c07b5..353d6f9 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ This mod works by adding your new plant to the {growing=1} group and numbering t ### Changelog: -- 1.45 - Dirt and Hoes are more in line with default by using dry/wet/base, added cactus juice, added pasta and spaghetti +- 1.45 - Dirt and Hoes are more in line with default by using dry/wet/base, added cactus juice, added pasta, spaghetti, cabbage, korean bibimbap, code tidy options, onion soup added (thanks edcrypt), Added apple pie, added wild cotton to savanna - 1.44 - Added 'farming_stage_length' in mod settings for speed of crop growth, also thanks to TheDarkTiger for translation updates - 1.43 - Scythe works on use instead of right-click, added seed=1 groups to actual seeds and seed=2 group for plantable food items. diff --git a/compatibility.lua b/compatibility.lua index dc9aff6..9841f4c 100644 --- a/compatibility.lua +++ b/compatibility.lua @@ -12,13 +12,13 @@ end minetest.override_item("default:apple", { groups = {food_apple = 1, fleshy = 3, dig_immediate = 3, flammable = 2, - leafdecay = 3, leafdecay_drop = 1}, + leafdecay = 3, leafdecay_drop = 1} }) if minetest.registered_nodes["flowers:mushroom_brown"] then minetest.override_item("flowers:mushroom_brown", { light_source = 1, - groups = {food_mushroom = 1, snappy = 3, attached_node = 1, flammable = 2}, + groups = {food_mushroom = 1, snappy = 3, attached_node = 1, flammable = 2} }) end @@ -45,7 +45,7 @@ else }, groups = {food_banana = 1, fleshy = 3, dig_immediate = 3, flammable = 2}, on_use = minetest.item_eat(2), - sounds = default.node_sound_leaves_defaults(), + sounds = default.node_sound_leaves_defaults() }) minetest.register_node(":ethereal:bananaleaves", { @@ -56,7 +56,7 @@ else paramtype = "light", waving = 1, groups = {snappy = 3, leafdecay = 3, leaves = 1, flammable = 2}, - sounds = default.node_sound_leaves_defaults(), + sounds = default.node_sound_leaves_defaults() }) alias("farming_plus:banana_sapling", "default:sapling") @@ -103,7 +103,7 @@ else }, groups = {food_orange = 1, fleshy = 3, dig_immediate = 3, flammable = 2}, on_use = minetest.item_eat(4), - sounds = default.node_sound_leaves_defaults(), + sounds = default.node_sound_leaves_defaults() }) alias("farming_plus:orange_item", "ethereal:orange") @@ -151,7 +151,7 @@ else inventory_image = "strawberry.png", wield_image = "strawberry.png", groups = {food_strawberry = 1, flammable = 2}, - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(1) }) alias("farming_plus:strawberry_item", "ethereal:strawberry") diff --git a/crops/barley.lua b/crops/barley.lua index d896031..69b3056 100644 --- a/crops/barley.lua +++ b/crops/barley.lua @@ -16,14 +16,14 @@ minetest.register_node("farming:seed_barley", { selection_box = farming.select, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:barley_1") - end, + end }) -- harvested barley minetest.register_craftitem("farming:barley", { description = S("Barley"), inventory_image = "farming_barley.png", - groups = {food_barley = 1, flammable = 2}, + groups = {food_barley = 1, flammable = 2} }) -- flour @@ -34,11 +34,11 @@ minetest.register_craft({ "farming:barley", "farming:barley", "farming:barley", "farming:barley", "farming:mortar_pestle" }, - replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}, + replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) -- barley definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_barley_1.png"}, paramtype = "light", @@ -57,52 +57,52 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:barley_1", table.copy(crop_def)) +minetest.register_node("farming:barley_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"farming_barley_2.png"} -minetest.register_node("farming:barley_2", table.copy(crop_def)) +def.tiles = {"farming_barley_2.png"} +minetest.register_node("farming:barley_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"farming_barley_3.png"} -minetest.register_node("farming:barley_3", table.copy(crop_def)) +def.tiles = {"farming_barley_3.png"} +minetest.register_node("farming:barley_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"farming_barley_4.png"} -minetest.register_node("farming:barley_4", table.copy(crop_def)) +def.tiles = {"farming_barley_4.png"} +minetest.register_node("farming:barley_4", table.copy(def)) -- stage 5 -crop_def.tiles = {"farming_barley_5.png"} -crop_def.drop = { +def.tiles = {"farming_barley_5.png"} +def.drop = { items = { {items = {"farming:barley"}, rarity = 2}, - {items = {"farming:seed_barley"}, rarity = 2}, + {items = {"farming:seed_barley"}, rarity = 2} } } -minetest.register_node("farming:barley_5", table.copy(crop_def)) +minetest.register_node("farming:barley_5", table.copy(def)) -- stage 6 -crop_def.tiles = {"farming_barley_6.png"} -crop_def.drop = { +def.tiles = {"farming_barley_6.png"} +def.drop = { items = { {items = {"farming:barley"}, rarity = 2}, - {items = {"farming:seed_barley"}, rarity = 1}, + {items = {"farming:seed_barley"}, rarity = 1} } } -minetest.register_node("farming:barley_6", table.copy(crop_def)) +minetest.register_node("farming:barley_6", table.copy(def)) -- stage 7 (final) -crop_def.tiles = {"farming_barley_7.png"} -crop_def.groups.growing = 0 -crop_def.drop = { +def.tiles = {"farming_barley_7.png"} +def.groups.growing = nil +def.drop = { items = { {items = {"farming:barley"}, rarity = 1}, {items = {"farming:barley"}, rarity = 3}, {items = {"farming:seed_barley"}, rarity = 1}, - {items = {"farming:seed_barley"}, rarity = 3}, + {items = {"farming:seed_barley"}, rarity = 3} } } -minetest.register_node("farming:barley_7", table.copy(crop_def)) +minetest.register_node("farming:barley_7", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:barley"] = { @@ -114,9 +114,8 @@ farming.registered_plants["farming:barley"] = { } -- Fuel - minetest.register_craft({ type = "fuel", recipe = "farming:barley", - burntime = 1, + burntime = 1 }) diff --git a/crops/beans.lua b/crops/beans.lua index c35b2cf..b469d08 100644 --- a/crops/beans.lua +++ b/crops/beans.lua @@ -13,7 +13,6 @@ local function place_beans(itemstack, placer, pointed_thing, plantname) -- check if pointing at a node if not pt or pt.type ~= "node" then - return end @@ -74,17 +73,16 @@ minetest.register_craftitem("farming:beans", { inventory_image = "farming_beans.png", groups = {seed = 2, food_beans = 1, flammable = 2}, on_use = minetest.item_eat(1), - on_place = function(itemstack, placer, pointed_thing) return place_beans(itemstack, placer, pointed_thing, "farming:beanpole_1") - end, + end }) -- beans can be used for green dye minetest.register_craft({ output = "dye:green", recipe = { - {"farming:beans"}, + {"farming:beans"} } }) @@ -94,7 +92,7 @@ minetest.register_node("farming:beanpole", { drawtype = "plantlike", tiles = {"farming_beanpole.png"}, inventory_image = "farming_beanpole.png", - visual_scale = 1.90, -- 1.45, + visual_scale = 1.90, paramtype = "light", walkable = false, buildable_to = true, @@ -164,28 +162,28 @@ minetest.register_craft({ recipe = { {"", "", ""}, {"default:stick", "", "default:stick"}, - {"default:stick", "", "default:stick"}, + {"default:stick", "", "default:stick"} } }) minetest.register_craft({ type = "fuel", recipe = "farming:beanpole", - burntime = 10, + burntime = 10 }) -- green bean definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_beanpole_1.png"}, - visual_scale = 1.90, -- 1.45, + visual_scale = 1.90, paramtype = "light", walkable = false, buildable_to = true, sunlight_propagates = true, drop = { items = { - {items = {"farming:beanpole"}, rarity = 1}, + {items = {"farming:beanpole"}, rarity = 1} } }, selection_box = farming.select, @@ -197,32 +195,32 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:beanpole_1", table.copy(crop_def)) +minetest.register_node("farming:beanpole_1", table.copy(def)) -- stage2 -crop_def.tiles = {"farming_beanpole_2.png"} -minetest.register_node("farming:beanpole_2", table.copy(crop_def)) +def.tiles = {"farming_beanpole_2.png"} +minetest.register_node("farming:beanpole_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"farming_beanpole_3.png"} -minetest.register_node("farming:beanpole_3", table.copy(crop_def)) +def.tiles = {"farming_beanpole_3.png"} +minetest.register_node("farming:beanpole_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"farming_beanpole_4.png"} -minetest.register_node("farming:beanpole_4", table.copy(crop_def)) +def.tiles = {"farming_beanpole_4.png"} +minetest.register_node("farming:beanpole_4", table.copy(def)) -- stage 5 (final) -crop_def.tiles = {"farming_beanpole_5.png"} -crop_def.groups.growing = 0 -crop_def.drop = { +def.tiles = {"farming_beanpole_5.png"} +def.groups.growing = nil +def.drop = { items = { {items = {"farming:beanpole"}, rarity = 1}, {items = {"farming:beans 3"}, rarity = 1}, {items = {"farming:beans 2"}, rarity = 2}, - {items = {"farming:beans 2"}, rarity = 3}, + {items = {"farming:beans 2"}, rarity = 3} } } -minetest.register_node("farming:beanpole_5", table.copy(crop_def)) +minetest.register_node("farming:beanpole_5", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:beans"] = { @@ -246,13 +244,13 @@ minetest.register_node("farming:beanbush", { items = { {items = {"farming:beans 1"}, rarity = 1}, {items = {"farming:beans 1"}, rarity = 2}, - {items = {"farming:beans 1"}, rarity = 3}, + {items = {"farming:beans 1"}, rarity = 3} } }, selection_box = farming.select, groups = { snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory=1 + not_in_creative_inventory = 1 }, - sounds = default.node_sound_leaves_defaults(), + sounds = default.node_sound_leaves_defaults() }) diff --git a/crops/beetroot.lua b/crops/beetroot.lua index 0a20d88..f20cfea 100644 --- a/crops/beetroot.lua +++ b/crops/beetroot.lua @@ -9,7 +9,7 @@ minetest.register_craftitem("farming:beetroot", { on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:beetroot_1") end, - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(1) }) -- beetroot soup @@ -17,7 +17,7 @@ minetest.register_craftitem("farming:beetroot_soup", { description = S("Beetroot Soup"), inventory_image = "farming_beetroot_soup.png", groups = {flammable = 2}, - on_use = minetest.item_eat(6, "farming:bowl"), + on_use = minetest.item_eat(6, "farming:bowl") }) minetest.register_craft({ @@ -34,15 +34,13 @@ minetest.register_craft({ minetest.register_craft({ type = "shapeless", output = "dye:red", - recipe = {"group:food_beetroot"}, + recipe = {"group:food_beetroot"} }) -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_beetroot_1.png"}, paramtype = "light", --- paramtype2 = "meshoptions", --- place_param2 = 3, sunlight_propagates = true, waving = 1, walkable = false, @@ -57,32 +55,32 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:beetroot_1", table.copy(crop_def)) +minetest.register_node("farming:beetroot_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"farming_beetroot_2.png"} -minetest.register_node("farming:beetroot_2", table.copy(crop_def)) +def.tiles = {"farming_beetroot_2.png"} +minetest.register_node("farming:beetroot_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"farming_beetroot_3.png"} -minetest.register_node("farming:beetroot_3", table.copy(crop_def)) +def.tiles = {"farming_beetroot_3.png"} +minetest.register_node("farming:beetroot_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"farming_beetroot_4.png"} -minetest.register_node("farming:beetroot_4", table.copy(crop_def)) +def.tiles = {"farming_beetroot_4.png"} +minetest.register_node("farming:beetroot_4", table.copy(def)) -- stage 5 -crop_def.tiles = {"farming_beetroot_5.png"} -crop_def.groups.growing = 0 -crop_def.drop = { +def.tiles = {"farming_beetroot_5.png"} +def.groups.growing = nil +def.drop = { max_items = 4, items = { {items = {"farming:beetroot"}, rarity = 1}, {items = {"farming:beetroot"}, rarity = 2}, {items = {"farming:beetroot"}, rarity = 3}, - {items = {"farming:beetroot"}, rarity = 4}, + {items = {"farming:beetroot"}, rarity = 4} } } -minetest.register_node("farming:beetroot_5", table.copy(crop_def)) +minetest.register_node("farming:beetroot_5", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:beetroot"] = { diff --git a/crops/blueberry.lua b/crops/blueberry.lua index fec0c12..97beaed 100644 --- a/crops/blueberry.lua +++ b/crops/blueberry.lua @@ -10,30 +10,28 @@ minetest.register_craftitem("farming:blueberries", { on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:blueberry_1") end, - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(1) }) -- blueberry muffin (thanks to sosogirl123 @ deviantart.com for muffin image) - minetest.register_craftitem("farming:muffin_blueberry", { description = S("Blueberry Muffin"), inventory_image = "farming_blueberry_muffin.png", - on_use = minetest.item_eat(2), + on_use = minetest.item_eat(2) }) minetest.register_craft({ output = "farming:muffin_blueberry 2", recipe = { - {"group:food_blueberries", "group:food_bread", "group:food_blueberries"}, + {"group:food_blueberries", "group:food_bread", "group:food_blueberries"} } }) -- Blueberry Pie - minetest.register_craftitem("farming:blueberry_pie", { description = S("Blueberry Pie"), inventory_image = "farming_blueberry_pie.png", - on_use = minetest.item_eat(6), + on_use = minetest.item_eat(6) }) minetest.register_craft({ @@ -47,7 +45,7 @@ minetest.register_craft({ }) -- blueberry definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_blueberry_1.png"}, paramtype = "light", @@ -64,27 +62,27 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:blueberry_1", table.copy(crop_def)) +minetest.register_node("farming:blueberry_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"farming_blueberry_2.png"} -minetest.register_node("farming:blueberry_2", table.copy(crop_def)) +def.tiles = {"farming_blueberry_2.png"} +minetest.register_node("farming:blueberry_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"farming_blueberry_3.png"} -minetest.register_node("farming:blueberry_3", table.copy(crop_def)) +def.tiles = {"farming_blueberry_3.png"} +minetest.register_node("farming:blueberry_3", table.copy(def)) -- stage 4 (final) -crop_def.tiles = {"farming_blueberry_4.png"} -crop_def.groups.growing = 0 -crop_def.drop = { +def.tiles = {"farming_blueberry_4.png"} +def.groups.growing = nil +def.drop = { items = { {items = {"farming:blueberries 2"}, rarity = 1}, {items = {"farming:blueberries"}, rarity = 2}, {items = {"farming:blueberries"}, rarity = 3}, } } -minetest.register_node("farming:blueberry_4", table.copy(crop_def)) +minetest.register_node("farming:blueberry_4", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:blueberries"] = { diff --git a/crops/cabbage.lua b/crops/cabbage.lua index f8b74c4..834ee03 100644 --- a/crops/cabbage.lua +++ b/crops/cabbage.lua @@ -9,15 +9,13 @@ minetest.register_craftitem("farming:cabbage", { on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:cabbage_1") end, - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(1) }) -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_cabbage_1.png"}, paramtype = "light", --- paramtype2 = "meshoptions", --- place_param2 = 3, sunlight_propagates = true, waving = 1, walkable = false, @@ -32,34 +30,34 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:cabbage_1", table.copy(crop_def)) +minetest.register_node("farming:cabbage_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"farming_cabbage_2.png"} -minetest.register_node("farming:cabbage_2", table.copy(crop_def)) +def.tiles = {"farming_cabbage_2.png"} +minetest.register_node("farming:cabbage_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"farming_cabbage_3.png"} -minetest.register_node("farming:cabbage_3", table.copy(crop_def)) +def.tiles = {"farming_cabbage_3.png"} +minetest.register_node("farming:cabbage_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"farming_cabbage_4.png"} -minetest.register_node("farming:cabbage_4", table.copy(crop_def)) +def.tiles = {"farming_cabbage_4.png"} +minetest.register_node("farming:cabbage_4", table.copy(def)) -- stage 5 -crop_def.tiles = {"farming_cabbage_5.png"} -minetest.register_node("farming:cabbage_5", table.copy(crop_def)) +def.tiles = {"farming_cabbage_5.png"} +minetest.register_node("farming:cabbage_5", table.copy(def)) -- stage 6 -crop_def.tiles = {"farming_cabbage_6.png"} -crop_def.groups.growing = 0 -crop_def.drop = { +def.tiles = {"farming_cabbage_6.png"} +def.groups.growing = nil +def.drop = { max_items = 2, items = { {items = {"farming:cabbage"}, rarity = 1}, - {items = {"farming:cabbage"}, rarity = 4}, + {items = {"farming:cabbage"}, rarity = 5} } } -minetest.register_node("farming:cabbage_6", table.copy(crop_def)) +minetest.register_node("farming:cabbage_6", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:cabbage"] = { diff --git a/crops/carrot.lua b/crops/carrot.lua index a16dc5a..f19338c 100644 --- a/crops/carrot.lua +++ b/crops/carrot.lua @@ -14,7 +14,7 @@ minetest.register_craftitem("farming:carrot", { on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:carrot_1") end, - on_use = minetest.item_eat(4), + on_use = minetest.item_eat(4) }) -- carrot juice @@ -22,7 +22,7 @@ minetest.register_craftitem("farming:carrot_juice", { description = S("Carrot Juice"), inventory_image = "farming_carrot_juice.png", on_use = minetest.item_eat(4, "vessels:drinking_glass"), - groups = {vessel = 1, drink = 1}, + groups = {vessel = 1, drink = 1} }) minetest.register_craft({ @@ -32,15 +32,15 @@ minetest.register_craft({ "vessels:drinking_glass", "group:food_carrot", "farming:juicer" }, replacements = { - {"group:food_juicer", "farming:juicer"}, - }, + {"group:food_juicer", "farming:juicer"} + } }) -- golden carrot minetest.register_craftitem("farming:carrot_gold", { description = S("Golden Carrot"), inventory_image = "farming_carrot_gold.png", - on_use = minetest.item_eat(6), + on_use = minetest.item_eat(10) }) minetest.register_craft({ @@ -48,12 +48,12 @@ minetest.register_craft({ recipe = { {"", "default:gold_lump", ""}, {"default:gold_lump", "group:food_carrot", "default:gold_lump"}, - {"", "default:gold_lump", ""}, + {"", "default:gold_lump", ""} } }) -- carrot definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_carrot_1.png"}, paramtype = "light", @@ -71,48 +71,48 @@ local crop_def = { -- stage 1 -minetest.register_node("farming:carrot_1", table.copy(crop_def)) +minetest.register_node("farming:carrot_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"farming_carrot_2.png"} -minetest.register_node("farming:carrot_2", table.copy(crop_def)) +def.tiles = {"farming_carrot_2.png"} +minetest.register_node("farming:carrot_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"farming_carrot_3.png"} -minetest.register_node("farming:carrot_3", table.copy(crop_def)) +def.tiles = {"farming_carrot_3.png"} +minetest.register_node("farming:carrot_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"farming_carrot_4.png"} -minetest.register_node("farming:carrot_4", table.copy(crop_def)) +def.tiles = {"farming_carrot_4.png"} +minetest.register_node("farming:carrot_4", table.copy(def)) -- stage 5 -crop_def.tiles = {"farming_carrot_5.png"} -minetest.register_node("farming:carrot_5", table.copy(crop_def)) +def.tiles = {"farming_carrot_5.png"} +minetest.register_node("farming:carrot_5", table.copy(def)) -- stage 6 -crop_def.tiles = {"farming_carrot_6.png"} -minetest.register_node("farming:carrot_6", table.copy(crop_def)) +def.tiles = {"farming_carrot_6.png"} +minetest.register_node("farming:carrot_6", table.copy(def)) -- stage 7 -crop_def.tiles = {"farming_carrot_7.png"} -crop_def.drop = { +def.tiles = {"farming_carrot_7.png"} +def.drop = { items = { {items = {"farming:carrot"}, rarity = 1}, - {items = {"farming:carrot 2"}, rarity = 3}, + {items = {"farming:carrot 2"}, rarity = 3} } } -minetest.register_node("farming:carrot_7", table.copy(crop_def)) +minetest.register_node("farming:carrot_7", table.copy(def)) -- stage 8 (final) -crop_def.tiles = {"farming_carrot_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { +def.tiles = {"farming_carrot_8.png"} +def.groups.growing = nil +def.drop = { items = { {items = {"farming:carrot 2"}, rarity = 1}, - {items = {"farming:carrot 3"}, rarity = 2}, + {items = {"farming:carrot 3"}, rarity = 2} } } -minetest.register_node("farming:carrot_8", table.copy(crop_def)) +minetest.register_node("farming:carrot_8", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:carrot"] = { diff --git a/crops/chili.lua b/crops/chili.lua index cdcfa7e..867c945 100644 --- a/crops/chili.lua +++ b/crops/chili.lua @@ -9,14 +9,14 @@ minetest.register_craftitem("farming:chili_pepper", { on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:chili_1") end, - on_use = minetest.item_eat(2), + on_use = minetest.item_eat(2) }) -- bowl of chili minetest.register_craftitem("farming:chili_bowl", { description = S("Bowl of Chili"), inventory_image = "farming_chili_bowl.png", - on_use = minetest.item_eat(8, "farming:bowl"), + on_use = minetest.item_eat(8, "farming:bowl") }) minetest.register_craft({ @@ -25,19 +25,19 @@ minetest.register_craft({ recipe = { "group:food_chili_pepper", "group:food_barley", "group:food_tomato", "group:food_beans", "group:food_bowl" - }, + } }) -- chili can be used for red dye minetest.register_craft({ output = "dye:red", recipe = { - {"farming:chili_pepper"}, + {"farming:chili_pepper"} } }) -- chili definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_chili_1.png"}, paramtype = "light", @@ -54,42 +54,42 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:chili_1", table.copy(crop_def)) +minetest.register_node("farming:chili_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"farming_chili_2.png"} -minetest.register_node("farming:chili_2", table.copy(crop_def)) +def.tiles = {"farming_chili_2.png"} +minetest.register_node("farming:chili_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"farming_chili_3.png"} -minetest.register_node("farming:chili_3", table.copy(crop_def)) +def.tiles = {"farming_chili_3.png"} +minetest.register_node("farming:chili_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"farming_chili_4.png"} -minetest.register_node("farming:chili_4", table.copy(crop_def)) +def.tiles = {"farming_chili_4.png"} +minetest.register_node("farming:chili_4", table.copy(def)) -- stage 5 -crop_def.tiles = {"farming_chili_5.png"} -minetest.register_node("farming:chili_5", table.copy(crop_def)) +def.tiles = {"farming_chili_5.png"} +minetest.register_node("farming:chili_5", table.copy(def)) -- stage 6 -crop_def.tiles = {"farming_chili_6.png"} -minetest.register_node("farming:chili_6", table.copy(crop_def)) +def.tiles = {"farming_chili_6.png"} +minetest.register_node("farming:chili_6", table.copy(def)) -- stage 7 -crop_def.tiles = {"farming_chili_7.png"} -minetest.register_node("farming:chili_7", table.copy(crop_def)) +def.tiles = {"farming_chili_7.png"} +minetest.register_node("farming:chili_7", table.copy(def)) -- stage 8 (final) -crop_def.tiles = {"farming_chili_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { +def.tiles = {"farming_chili_8.png"} +def.groups.growing = nil +def.drop = { items = { {items = {"farming:chili_pepper 3"}, rarity = 1}, - {items = {"farming:chili_pepper 2"}, rarity = 2}, + {items = {"farming:chili_pepper 2"}, rarity = 2} } } -minetest.register_node("farming:chili_8", table.copy(crop_def)) +minetest.register_node("farming:chili_8", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:chili_pepper"] = { diff --git a/crops/cocoa.lua b/crops/cocoa.lua index 243814b..9e8a404 100644 --- a/crops/cocoa.lua +++ b/crops/cocoa.lua @@ -70,13 +70,13 @@ minetest.register_craftitem("farming:cocoa_beans", { groups = {seed = 2, food_cocoa = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return place_cocoa(itemstack, placer, pointed_thing, "farming:cocoa_1") - end, + end }) minetest.register_craft( { output = "dye:brown 2", recipe = { - { "farming:cocoa_beans" }, + { "farming:cocoa_beans" } } }) @@ -84,13 +84,13 @@ minetest.register_craft( { minetest.register_craftitem("farming:cookie", { description = S("Cookie"), inventory_image = "farming_cookie.png", - on_use = minetest.item_eat(2), + on_use = minetest.item_eat(2) }) minetest.register_craft( { output = "farming:cookie 8", recipe = { - {"group:food_wheat", "group:food_cocoa", "group:food_wheat" }, + {"group:food_wheat", "group:food_cocoa", "group:food_wheat" } } }) @@ -98,13 +98,13 @@ minetest.register_craft( { minetest.register_craftitem("farming:chocolate_dark", { description = S("Bar of Dark Chocolate"), inventory_image = "farming_chocolate_dark.png", - on_use = minetest.item_eat(3), + on_use = minetest.item_eat(3) }) minetest.register_craft( { output = "farming:chocolate_dark", recipe = { - {"group:food_cocoa", "group:food_cocoa", "group:food_cocoa"}, + {"group:food_cocoa", "group:food_cocoa", "group:food_cocoa"} } }) @@ -114,7 +114,7 @@ minetest.register_node("farming:chocolate_block", { tiles = {"farming_chocolate_block.png"}, is_ground_content = false, groups = {cracky = 2, oddly_breakable_by_hand = 2}, - sounds = default.node_sound_stone_defaults(), + sounds = default.node_sound_stone_defaults() }) minetest.register_craft({ @@ -122,19 +122,19 @@ minetest.register_craft({ recipe = { {"farming:chocolate_dark", "farming:chocolate_dark", "farming:chocolate_dark"}, {"farming:chocolate_dark", "farming:chocolate_dark", "farming:chocolate_dark"}, - {"farming:chocolate_dark", "farming:chocolate_dark", "farming:chocolate_dark"}, + {"farming:chocolate_dark", "farming:chocolate_dark", "farming:chocolate_dark"} } }) minetest.register_craft({ output = "farming:chocolate_dark 9", recipe = { - {"farming:chocolate_block"}, + {"farming:chocolate_block"} } }) -- cocoa definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_cocoa_1.png"}, paramtype = "light", @@ -150,7 +150,7 @@ local crop_def = { }, groups = { snappy = 3, flammable = 2, plant = 1, growing = 1, - not_in_creative_inventory=1, leafdecay = 1, leafdecay_drop = 1 + not_in_creative_inventory = 1, leafdecay = 1, leafdecay_drop = 1 }, sounds = default.node_sound_leaves_defaults(), growth_check = function(pos, node_name) @@ -158,37 +158,37 @@ local crop_def = { return false end return true - end, + end } -- stage 1 -minetest.register_node("farming:cocoa_1", table.copy(crop_def)) +minetest.register_node("farming:cocoa_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"farming_cocoa_2.png"} -minetest.register_node("farming:cocoa_2", table.copy(crop_def)) +def.tiles = {"farming_cocoa_2.png"} +minetest.register_node("farming:cocoa_2", table.copy(def)) -- stage3 -crop_def.tiles = {"farming_cocoa_3.png"} -crop_def.drop = { +def.tiles = {"farming_cocoa_3.png"} +def.drop = { items = { - {items = {"farming:cocoa_beans 1"}, rarity = 1}, + {items = {"farming:cocoa_beans 1"}, rarity = 1} } } -minetest.register_node("farming:cocoa_3", table.copy(crop_def)) +minetest.register_node("farming:cocoa_3", table.copy(def)) -- stage 4 (final) -crop_def.tiles = {"farming_cocoa_4.png"} -crop_def.groups.growing = 0 -crop_def.growth_check = nil -crop_def.drop = { +def.tiles = {"farming_cocoa_4.png"} +def.groups.growing = nil +def.growth_check = nil +def.drop = { items = { {items = {"farming:cocoa_beans 2"}, rarity = 1}, {items = {"farming:cocoa_beans 1"}, rarity = 2}, - {items = {"farming:cocoa_beans 1"}, rarity = 4}, + {items = {"farming:cocoa_beans 1"}, rarity = 4} } } -minetest.register_node("farming:cocoa_4", table.copy(crop_def)) +minetest.register_node("farming:cocoa_4", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:cocoa_beans"] = { @@ -218,27 +218,22 @@ minetest.register_on_generated(function(minp, maxp) dir = math.random(1, 80) - if dir == 1 then - pos.x = pos.x + 1 - elseif dir == 2 then - pos.x = pos.x - 1 - elseif dir == 3 then - pos.z = pos.z + 1 - elseif dir == 4 then - pos.z = pos.z -1 + if dir == 1 then pos.x = pos.x + 1 + elseif dir == 2 then pos.x = pos.x - 1 + elseif dir == 3 then pos.z = pos.z + 1 + elseif dir == 4 then pos.z = pos.z -1 end if dir < 5 and minetest.get_node(pos).name == "air" and minetest.get_node_light(pos) > 12 then - --print ("Cocoa Pod added at " .. minetest.pos_to_string(pos)) +--print ("Cocoa Pod added at " .. minetest.pos_to_string(pos)) minetest.swap_node(pos, { - name = "farming:cocoa_" .. tostring(math.random(1, 4)) + name = "farming:cocoa_" .. tostring(math.random(4)) }) end - end end end) diff --git a/crops/coffee.lua b/crops/coffee.lua index 2e47d6a..3fc49a2 100644 --- a/crops/coffee.lua +++ b/crops/coffee.lua @@ -8,13 +8,13 @@ minetest.register_craftitem("farming:coffee_beans", { groups = {seed = 2, food_coffee = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:coffee_1") - end, + end }) -- cold cup of coffee minetest.register_node("farming:coffee_cup", { description = S("Cup of Coffee"), - drawtype = "torchlike", --"plantlike", + drawtype = "torchlike", tiles = {"farming_coffee_cup.png"}, inventory_image = "farming_coffee_cup.png", wield_image = "farming_coffee_cup.png", @@ -26,7 +26,7 @@ minetest.register_node("farming:coffee_cup", { }, groups = {vessel = 1, dig_immediate = 3, attached_node = 1, drink = 1}, on_use = minetest.item_eat(2, "vessels:drinking_glass"), - sounds = default.node_sound_glass_defaults(), + sounds = default.node_sound_glass_defaults() }) minetest.register_alias("farming:coffee_cup_hot", "farming:coffee_cup") @@ -35,16 +35,17 @@ minetest.register_alias("farming:drinking_cup", "vessels:drinking_glass") minetest.register_craft( { output = "farming:coffee_cup", type = "shapeless", - recipe = {"vessels:drinking_glass", "group:food_coffee", + recipe = { + "vessels:drinking_glass", "group:food_coffee", "bucket:bucket_water", "group:food_saucepan"}, replacements = { {"bucket:bucket_water", "bucket:bucket_empty"}, - {"group:food_saucepan", "farming:saucepan"}, + {"group:food_saucepan", "farming:saucepan"} } }) -- coffee definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_coffee_1.png"}, paramtype = "light", @@ -61,31 +62,31 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:coffee_1", table.copy(crop_def)) +minetest.register_node("farming:coffee_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"farming_coffee_2.png"} -minetest.register_node("farming:coffee_2", table.copy(crop_def)) +def.tiles = {"farming_coffee_2.png"} +minetest.register_node("farming:coffee_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"farming_coffee_3.png"} -minetest.register_node("farming:coffee_3", table.copy(crop_def)) +def.tiles = {"farming_coffee_3.png"} +minetest.register_node("farming:coffee_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"farming_coffee_4.png"} -minetest.register_node("farming:coffee_4", table.copy(crop_def)) +def.tiles = {"farming_coffee_4.png"} +minetest.register_node("farming:coffee_4", table.copy(def)) -- stage 5 (final) -crop_def.tiles = {"farming_coffee_5.png"} -crop_def.groups.growing = 0 -crop_def.drop = { +def.tiles = {"farming_coffee_5.png"} +def.groups.growing = nil +def.drop = { items = { {items = {"farming:coffee_beans 2"}, rarity = 1}, {items = {"farming:coffee_beans 2"}, rarity = 2}, - {items = {"farming:coffee_beans 2"}, rarity = 3}, + {items = {"farming:coffee_beans 2"}, rarity = 3} } } -minetest.register_node("farming:coffee_5", table.copy(crop_def)) +minetest.register_node("farming:coffee_5", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:coffee"] = { diff --git a/crops/corn.lua b/crops/corn.lua index 8e39fb7..4835281 100644 --- a/crops/corn.lua +++ b/crops/corn.lua @@ -14,7 +14,7 @@ minetest.register_craftitem("farming:corn", { on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:corn_1") end, - on_use = minetest.item_eat(3), + on_use = minetest.item_eat(3) }) -- corn on the cob (texture by TenPlus1) @@ -22,7 +22,7 @@ minetest.register_craftitem("farming:corn_cob", { description = S("Corn on the Cob"), inventory_image = "farming_corn_cob.png", groups = {food_corn_cooked = 1, flammable = 2}, - on_use = minetest.item_eat(5), + on_use = minetest.item_eat(5) }) minetest.register_craft({ @@ -36,7 +36,7 @@ minetest.register_craft({ minetest.register_craftitem("farming:cornstarch", { description = S("Cornstarch"), inventory_image = "farming_cornstarch.png", - groups = {food_cornstarch = 1, flammable = 2}, + groups = {food_cornstarch = 1, flammable = 2} }) minetest.register_craft({ @@ -66,7 +66,7 @@ minetest.register_node("farming:bottle_ethanol", { fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25} }, groups = {vessel = 1, dig_immediate = 3, attached_node = 1}, - sounds = default.node_sound_glass_defaults(), + sounds = default.node_sound_glass_defaults() }) minetest.register_craft( { @@ -74,19 +74,19 @@ minetest.register_craft( { recipe = { { "vessels:glass_bottle", "group:food_corn", "group:food_corn"}, { "group:food_corn", "group:food_corn", "group:food_corn"}, - { "group:food_corn", "group:food_corn", "group:food_corn"}, + { "group:food_corn", "group:food_corn", "group:food_corn"} } }) minetest.register_craft({ type = "fuel", recipe = "farming:bottle_ethanol", - burntime = 80, --240, + burntime = 80, replacements = {{ "farming:bottle_ethanol", "vessels:glass_bottle"}} }) -- corn definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_corn_1.png"}, paramtype = "light", @@ -103,51 +103,51 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:corn_1", table.copy(crop_def)) +minetest.register_node("farming:corn_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"farming_corn_2.png"} -minetest.register_node("farming:corn_2", table.copy(crop_def)) +def.tiles = {"farming_corn_2.png"} +minetest.register_node("farming:corn_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"farming_corn_3.png"} -minetest.register_node("farming:corn_3", table.copy(crop_def)) +def.tiles = {"farming_corn_3.png"} +minetest.register_node("farming:corn_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"farming_corn_4.png"} -minetest.register_node("farming:corn_4", table.copy(crop_def)) +def.tiles = {"farming_corn_4.png"} +minetest.register_node("farming:corn_4", table.copy(def)) -- stage 5 -crop_def.tiles = {"farming_corn_5.png"} -minetest.register_node("farming:corn_5", table.copy(crop_def)) +def.tiles = {"farming_corn_5.png"} +minetest.register_node("farming:corn_5", table.copy(def)) -- stage 6 -crop_def.tiles = {"farming_corn_6.png"} -crop_def.visual_scale = 1.9 -- 1.45 -minetest.register_node("farming:corn_6", table.copy(crop_def)) +def.tiles = {"farming_corn_6.png"} +def.visual_scale = 1.9 +minetest.register_node("farming:corn_6", table.copy(def)) -- stage 7 -crop_def.tiles = {"farming_corn_7.png"} -crop_def.drop = { +def.tiles = {"farming_corn_7.png"} +def.drop = { items = { {items = {"farming:corn"}, rarity = 1}, {items = {"farming:corn"}, rarity = 2}, - {items = {"farming:corn"}, rarity = 3}, + {items = {"farming:corn"}, rarity = 3} } } -minetest.register_node("farming:corn_7", table.copy(crop_def)) +minetest.register_node("farming:corn_7", table.copy(def)) -- stage 8 (final) -crop_def.tiles = {"farming_corn_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { +def.tiles = {"farming_corn_8.png"} +def.groups.growing = nil +def.drop = { items = { {items = {"farming:corn 2"}, rarity = 1}, {items = {"farming:corn 2"}, rarity = 2}, - {items = {"farming:corn 2"}, rarity = 2}, + {items = {"farming:corn 2"}, rarity = 2} } } -minetest.register_node("farming:corn_8", table.copy(crop_def)) +minetest.register_node("farming:corn_8", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:corn"] = { diff --git a/crops/cotton.lua b/crops/cotton.lua index c5baf5b..067b444 100644 --- a/crops/cotton.lua +++ b/crops/cotton.lua @@ -1,7 +1,7 @@ local S = farming.intllib --- wild cotton as a source of cotton seed +-- wild cotton as a source of cotton seed and a chance of cotton itself minetest.register_node("farming:cotton_wild", { description = S("Wild Cotton"), drawtype = "plantlike", @@ -14,12 +14,17 @@ minetest.register_node("farming:cotton_wild", { walkable = false, buildable_to = true, groups = {snappy = 3, attached_node = 1, flammable = 4}, - drop = "farming:seed_cotton", + drop = { + items = { + {items = {"farming:cotton"}, rarity = 2}, + {items = {"farming:seed_cotton"}, rarity = 1} + } + }, sounds = default.node_sound_leaves_defaults(), selection_box = { type = "fixed", - fixed = {-6 / 16, -8 / 16, -6 / 16, 6 / 16, 5 / 16, 6 / 16}, - }, + fixed = {-6 / 16, -8 / 16, -6 / 16, 6 / 16, 5 / 16, 6 / 16} + } }) -- cotton seeds @@ -37,21 +42,21 @@ minetest.register_node("farming:seed_cotton", { selection_box = farming.select, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:cotton_1") - end, + end }) --- cotton / string - +-- cotton minetest.register_craftitem("farming:cotton", { description = S("Cotton"), inventory_image = "farming_cotton.png", - groups = {flammable = 4}, + groups = {flammable = 4} }) +-- string minetest.register_craftitem("farming:string", { description = S("String"), inventory_image = "farming_string.png", - groups = {flammable = 2}, + groups = {flammable = 2} }) -- cotton to wool @@ -59,7 +64,7 @@ minetest.register_craft({ output = "wool:white", recipe = { {"farming:cotton", "farming:cotton"}, - {"farming:cotton", "farming:cotton"}, + {"farming:cotton", "farming:cotton"} } }) @@ -68,7 +73,7 @@ minetest.register_craft({ output = "farming:string 2", recipe = { {"farming:cotton"}, - {"farming:cotton"}, + {"farming:cotton"} } }) @@ -76,17 +81,17 @@ minetest.register_craft({ minetest.register_craft({ type = "fuel", recipe = "farming:string", - burntime = 1, + burntime = 1 }) minetest.register_craft({ type = "fuel", recipe = "farming:cotton", - burntime = 1, + burntime = 1 }) -- cotton definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_cotton_1.png"}, paramtype = "light", @@ -103,65 +108,65 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:cotton_1", table.copy(crop_def)) +minetest.register_node("farming:cotton_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"farming_cotton_2.png"} -minetest.register_node("farming:cotton_2", table.copy(crop_def)) +def.tiles = {"farming_cotton_2.png"} +minetest.register_node("farming:cotton_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"farming_cotton_3.png"} -minetest.register_node("farming:cotton_3", table.copy(crop_def)) +def.tiles = {"farming_cotton_3.png"} +minetest.register_node("farming:cotton_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"farming_cotton_4.png"} -minetest.register_node("farming:cotton_4", table.copy(crop_def)) +def.tiles = {"farming_cotton_4.png"} +minetest.register_node("farming:cotton_4", table.copy(def)) -- stage 5 -crop_def.tiles = {"farming_cotton_5.png"} -crop_def.drop = { +def.tiles = {"farming_cotton_5.png"} +def.drop = { items = { - {items = {"farming:seed_cotton"}, rarity = 1}, + {items = {"farming:seed_cotton"}, rarity = 1} } } -minetest.register_node("farming:cotton_5", table.copy(crop_def)) +minetest.register_node("farming:cotton_5", table.copy(def)) -- stage 6 -crop_def.tiles = {"farming_cotton_6.png"} -crop_def.drop = { +def.tiles = {"farming_cotton_6.png"} +def.drop = { items = { {items = {"farming:cotton"}, rarity = 1}, - {items = {"farming:cotton"}, rarity = 2}, + {items = {"farming:cotton"}, rarity = 2} } } -minetest.register_node("farming:cotton_6", table.copy(crop_def)) +minetest.register_node("farming:cotton_6", table.copy(def)) -- stage 7 -crop_def.tiles = {"farming_cotton_7.png"} -crop_def.drop = { +def.tiles = {"farming_cotton_7.png"} +def.drop = { items = { {items = {"farming:cotton"}, rarity = 1}, {items = {"farming:cotton"}, rarity = 2}, {items = {"farming:seed_cotton"}, rarity = 1}, - {items = {"farming:seed_cotton"}, rarity = 2}, + {items = {"farming:seed_cotton"}, rarity = 2} } } -minetest.register_node("farming:cotton_7", table.copy(crop_def)) +minetest.register_node("farming:cotton_7", table.copy(def)) -- stage 8 (final) -crop_def.tiles = {"farming_cotton_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { +def.tiles = {"farming_cotton_8.png"} +def.groups.growing = nil +def.drop = { items = { {items = {"farming:cotton"}, rarity = 1}, {items = {"farming:cotton"}, rarity = 2}, {items = {"farming:cotton"}, rarity = 3}, {items = {"farming:seed_cotton"}, rarity = 1}, {items = {"farming:seed_cotton"}, rarity = 2}, - {items = {"farming:seed_cotton"}, rarity = 3}, + {items = {"farming:seed_cotton"}, rarity = 3} } } -minetest.register_node("farming:cotton_8", table.copy(crop_def)) +minetest.register_node("farming:cotton_8", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:cotton"] = { @@ -172,7 +177,7 @@ farming.registered_plants["farming:cotton"] = { steps = 8 } ---[[ Cotton (example, is already registered in cotton.lua) +--[[ Cotton using api farming.register_plant("farming:cotton", { description = "Cotton seed", inventory_image = "farming_cotton_seed.png", diff --git a/crops/cucumber.lua b/crops/cucumber.lua index 8bd679a..fc15e47 100644 --- a/crops/cucumber.lua +++ b/crops/cucumber.lua @@ -14,11 +14,11 @@ minetest.register_craftitem("farming:cucumber", { on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:cucumber_1") end, - on_use = minetest.item_eat(4), + on_use = minetest.item_eat(4) }) -- cucumber definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_cucumber_1.png"}, paramtype = "light", @@ -34,26 +34,26 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:cucumber_1", table.copy(crop_def)) +minetest.register_node("farming:cucumber_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"farming_cucumber_2.png"} -minetest.register_node("farming:cucumber_2", table.copy(crop_def)) +def.tiles = {"farming_cucumber_2.png"} +minetest.register_node("farming:cucumber_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"farming_cucumber_3.png"} -minetest.register_node("farming:cucumber_3", table.copy(crop_def)) +def.tiles = {"farming_cucumber_3.png"} +minetest.register_node("farming:cucumber_3", table.copy(def)) -- stage 4 (final) -crop_def.tiles = {"farming_cucumber_4.png"} -crop_def.groups.growing = 0 -crop_def.drop = { +def.tiles = {"farming_cucumber_4.png"} +def.groups.growing = nil +def.drop = { items = { {items = {"farming:cucumber 2"}, rarity = 1}, - {items = {"farming:cucumber 2"}, rarity = 2}, + {items = {"farming:cucumber 2"}, rarity = 2} } } -minetest.register_node("farming:cucumber_4", table.copy(crop_def)) +minetest.register_node("farming:cucumber_4", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:cucumber"] = { diff --git a/crops/garlic.lua b/crops/garlic.lua index ee841e5..7fe7565 100644 --- a/crops/garlic.lua +++ b/crops/garlic.lua @@ -14,7 +14,7 @@ minetest.register_craftitem("farming:garlic_clove", { groups = {seed = 2, food_garlic_clove = 1, flammable = 3}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:garlic_1") - end, + end }) -- garlic bulb @@ -22,13 +22,13 @@ minetest.register_craftitem("farming:garlic", { description = S("Garlic"), inventory_image = "crops_garlic.png", on_use = minetest.item_eat(1), - groups = {food_garlic = 1, flammable = 3}, + groups = {food_garlic = 1, flammable = 3} }) minetest.register_craft({ type = "shapeless", output = "farming:garlic_clove 8", - recipe = { "farming:garlic" } + recipe = {"farming:garlic"} }) minetest.register_craft({ @@ -58,8 +58,8 @@ minetest.register_node("farming:garlic_braid", { node_box = { type = "fixed", fixed = { - {-0.13, -0.45, 0.5, 0.13, 0.45, 0.24}, - }, + {-0.13, -0.45, 0.5, 0.13, 0.45, 0.24} + } } }) @@ -75,11 +75,11 @@ minetest.register_craft({ minetest.register_craft({ type = "shapeless", output = "farming:garlic 9", - recipe = { "farming:garlic_braid" } + recipe = {"farming:garlic_braid"} }) -- crop definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"crops_garlic_plant_1.png"}, paramtype = "light", @@ -99,33 +99,31 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:garlic_1", table.copy(crop_def)) +minetest.register_node("farming:garlic_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"crops_garlic_plant_2.png"} -minetest.register_node("farming:garlic_2", table.copy(crop_def)) +def.tiles = {"crops_garlic_plant_2.png"} +minetest.register_node("farming:garlic_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"crops_garlic_plant_3.png"} -minetest.register_node("farming:garlic_3", table.copy(crop_def)) +def.tiles = {"crops_garlic_plant_3.png"} +minetest.register_node("farming:garlic_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"crops_garlic_plant_4.png"} -minetest.register_node("farming:garlic_4", table.copy(crop_def)) +def.tiles = {"crops_garlic_plant_4.png"} +minetest.register_node("farming:garlic_4", table.copy(def)) -- stage 5 -crop_def.tiles = {"crops_garlic_plant_5.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - max_items = 5, items = { - {items = {"farming:garlic"}, rarity = 1}, - {items = {"farming:garlic"}, rarity = 1}, - {items = {"farming:garlic"}, rarity = 1}, +def.tiles = {"crops_garlic_plant_5.png"} +def.groups.growing = nil +def.drop = { + items = { + {items = {"farming:garlic 3"}, rarity = 1}, {items = {"farming:garlic"}, rarity = 2}, - {items = {"farming:garlic"}, rarity = 5}, + {items = {"farming:garlic"}, rarity = 5} } } -minetest.register_node("farming:garlic_5", table.copy(crop_def)) +minetest.register_node("farming:garlic_5", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:garlic"] = { diff --git a/crops/grapes.lua b/crops/grapes.lua index cc9d8aa..5d13dc6 100644 --- a/crops/grapes.lua +++ b/crops/grapes.lua @@ -8,7 +8,6 @@ local function place_grapes(itemstack, placer, pointed_thing, plantname) -- check if pointing at a node if not pt or pt.type ~= "node" then - return end @@ -69,17 +68,16 @@ minetest.register_craftitem("farming:grapes", { inventory_image = "farming_grapes.png", on_use = minetest.item_eat(2), groups = {seed = 2, food_grapes = 1, flammable = 3}, - on_place = function(itemstack, placer, pointed_thing) return place_grapes(itemstack, placer, pointed_thing, "farming:grapes_1") - end, + end }) -- grapes can be used for violet dye minetest.register_craft({ output = "dye:violet", recipe = { - {"farming:grapes"}, + {"farming:grapes"} } }) @@ -89,7 +87,7 @@ minetest.register_node("farming:trellis", { drawtype = "plantlike", tiles = {"farming_trellis.png"}, inventory_image = "farming_trellis.png", - visual_scale = 1.9, -- 1.45, + visual_scale = 1.9, paramtype = "light", walkable = false, buildable_to = true, @@ -159,21 +157,21 @@ minetest.register_craft({ recipe = { {"default:stick", "default:stick", "default:stick"}, {"default:stick", "default:stick", "default:stick"}, - {"default:stick", "default:stick", "default:stick"}, + {"default:stick", "default:stick", "default:stick"} } }) minetest.register_craft({ type = "fuel", recipe = "farming:trellis", - burntime = 15, + burntime = 15 }) -- grapes definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_grapes_1.png"}, - visual_scale = 1.9, -- 1.45, + visual_scale = 1.9, paramtype = "light", walkable = false, buildable_to = true, @@ -192,44 +190,44 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:grapes_1", table.copy(crop_def)) +minetest.register_node("farming:grapes_1", table.copy(def)) -- stage2 -crop_def.tiles = {"farming_grapes_2.png"} -minetest.register_node("farming:grapes_2", table.copy(crop_def)) +def.tiles = {"farming_grapes_2.png"} +minetest.register_node("farming:grapes_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"farming_grapes_3.png"} -minetest.register_node("farming:grapes_3", table.copy(crop_def)) +def.tiles = {"farming_grapes_3.png"} +minetest.register_node("farming:grapes_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"farming_grapes_4.png"} -minetest.register_node("farming:grapes_4", table.copy(crop_def)) +def.tiles = {"farming_grapes_4.png"} +minetest.register_node("farming:grapes_4", table.copy(def)) -- stage 5 -crop_def.tiles = {"farming_grapes_5.png"} -minetest.register_node("farming:grapes_5", table.copy(crop_def)) +def.tiles = {"farming_grapes_5.png"} +minetest.register_node("farming:grapes_5", table.copy(def)) -- stage 6 -crop_def.tiles = {"farming_grapes_6.png"} -minetest.register_node("farming:grapes_6", table.copy(crop_def)) +def.tiles = {"farming_grapes_6.png"} +minetest.register_node("farming:grapes_6", table.copy(def)) -- stage 7 -crop_def.tiles = {"farming_grapes_7.png"} -minetest.register_node("farming:grapes_7", table.copy(crop_def)) +def.tiles = {"farming_grapes_7.png"} +minetest.register_node("farming:grapes_7", table.copy(def)) -- stage 8 (final) -crop_def.tiles = {"farming_grapes_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { +def.tiles = {"farming_grapes_8.png"} +def.groups.growing = nil +def.drop = { items = { {items = {"farming:trellis"}, rarity = 1}, {items = {"farming:grapes 3"}, rarity = 1}, {items = {"farming:grapes 1"}, rarity = 2}, - {items = {"farming:grapes 1"}, rarity = 3}, + {items = {"farming:grapes 1"}, rarity = 3} } } -minetest.register_node("farming:grapes_8", table.copy(crop_def)) +minetest.register_node("farming:grapes_8", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:grapes"] = { @@ -253,13 +251,13 @@ minetest.register_node("farming:grapebush", { items = { {items = {"farming:grapes 1"}, rarity = 1}, {items = {"farming:grapes 1"}, rarity = 2}, - {items = {"farming:grapes 1"}, rarity = 3}, + {items = {"farming:grapes 1"}, rarity = 3} } }, selection_box = farming.select, groups = { snappy = 3, flammable = 2, plant = 1, attached_node = 1, - not_in_creative_inventory=1 + not_in_creative_inventory = 1 }, - sounds = default.node_sound_leaves_defaults(), + sounds = default.node_sound_leaves_defaults() }) diff --git a/crops/hemp.lua b/crops/hemp.lua index 583b7da..08b54cd 100644 --- a/crops/hemp.lua +++ b/crops/hemp.lua @@ -16,13 +16,13 @@ minetest.register_node("farming:seed_hemp", { selection_box = farming.select, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:hemp_1") - end, + end }) -- harvested hemp minetest.register_craftitem("farming:hemp_leaf", { description = S("Hemp Leaf"), - inventory_image = "farming_hemp_leaf.png", + inventory_image = "farming_hemp_leaf.png" }) -- hemp oil @@ -40,7 +40,7 @@ minetest.register_node("farming:hemp_oil", { fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25} }, groups = {food_oil = 1, vessel = 1, dig_immediate = 3, attached_node = 1}, - sounds = default.node_sound_glass_defaults(), + sounds = default.node_sound_glass_defaults() }) minetest.register_craft( { @@ -71,7 +71,7 @@ minetest.register_craft({ -- hemp fibre minetest.register_craftitem("farming:hemp_fibre", { description = S("Hemp Fibre"), - inventory_image = "farming_hemp_fibre.png", + inventory_image = "farming_hemp_fibre.png" }) minetest.register_craft( { @@ -108,7 +108,7 @@ minetest.register_craft( { {"farming:hemp_fibre", "farming:hemp_fibre", "farming:hemp_fibre"}, {"farming:hemp_fibre", "farming:hemp_fibre", "farming:hemp_fibre"}, {"farming:hemp_fibre", "farming:hemp_fibre", "farming:hemp_fibre"} - }, + } }) -- check and register stairs @@ -136,7 +136,7 @@ end minetest.register_craft( { output = "default:paper 3", recipe = { - {"farming:hemp_fibre", "farming:hemp_fibre", "farming:hemp_fibre"}, + {"farming:hemp_fibre", "farming:hemp_fibre", "farming:hemp_fibre"} } }) @@ -146,7 +146,7 @@ minetest.register_craft( { recipe = { {"farming:hemp_fibre"}, {"farming:hemp_fibre"}, - {"farming:hemp_fibre"}, + {"farming:hemp_fibre"} } }) @@ -165,8 +165,8 @@ minetest.register_node("farming:hemp_rope", { sounds = default.node_sound_leaves_defaults(), selection_box = { type = "fixed", - fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, - }, + fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7} + } }) -- string @@ -175,12 +175,12 @@ minetest.register_craft( { recipe = { {"farming:hemp_fibre", "farming:hemp_fibre", "farming:hemp_fibre"}, {"farming:cotton", "farming:cotton", "farming:cotton"}, - {"farming:hemp_fibre", "farming:hemp_fibre", "farming:hemp_fibre"}, + {"farming:hemp_fibre", "farming:hemp_fibre", "farming:hemp_fibre"} } }) -- hemp definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_hemp_1.png"}, paramtype = "light", @@ -197,58 +197,58 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:hemp_1", table.copy(crop_def)) +minetest.register_node("farming:hemp_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"farming_hemp_2.png"} -minetest.register_node("farming:hemp_2", table.copy(crop_def)) +def.tiles = {"farming_hemp_2.png"} +minetest.register_node("farming:hemp_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"farming_hemp_3.png"} -minetest.register_node("farming:hemp_3", table.copy(crop_def)) +def.tiles = {"farming_hemp_3.png"} +minetest.register_node("farming:hemp_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"farming_hemp_4.png"} -minetest.register_node("farming:hemp_4", table.copy(crop_def)) +def.tiles = {"farming_hemp_4.png"} +minetest.register_node("farming:hemp_4", table.copy(def)) -- stage 5 -crop_def.tiles = {"farming_hemp_5.png"} -minetest.register_node("farming:hemp_5", table.copy(crop_def)) +def.tiles = {"farming_hemp_5.png"} +minetest.register_node("farming:hemp_5", table.copy(def)) -- stage 6 -crop_def.tiles = {"farming_hemp_6.png"} -crop_def.drop = { +def.tiles = {"farming_hemp_6.png"} +def.drop = { items = { {items = {"farming:hemp_leaf"}, rarity = 2}, - {items = {"farming:seed_hemp"}, rarity = 1}, + {items = {"farming:seed_hemp"}, rarity = 1} } } -minetest.register_node("farming:hemp_6", table.copy(crop_def)) +minetest.register_node("farming:hemp_6", table.copy(def)) -- stage 7 -crop_def.tiles = {"farming_hemp_7.png"} -crop_def.drop = { +def.tiles = {"farming_hemp_7.png"} +def.drop = { items = { {items = {"farming:hemp_leaf"}, rarity = 1}, {items = {"farming:hemp_leaf"}, rarity = 3}, {items = {"farming:seed_hemp"}, rarity = 1}, - {items = {"farming:seed_hemp"}, rarity = 3}, + {items = {"farming:seed_hemp"}, rarity = 3} } } -minetest.register_node("farming:hemp_7", table.copy(crop_def)) +minetest.register_node("farming:hemp_7", table.copy(def)) -- stage 8 (final) -crop_def.tiles = {"farming_hemp_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { +def.tiles = {"farming_hemp_8.png"} +def.groups.growing = nil +def.drop = { items = { {items = {"farming:hemp_leaf 2"}, rarity = 1}, {items = {"farming:hemp_leaf"}, rarity = 2}, {items = {"farming:seed_hemp"}, rarity = 1}, - {items = {"farming:seed_hemp"}, rarity = 2}, + {items = {"farming:seed_hemp"}, rarity = 2} } } -minetest.register_node("farming:hemp_8", table.copy(crop_def)) +minetest.register_node("farming:hemp_8", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:hemp"] = { diff --git a/crops/melon.lua b/crops/melon.lua index 88f4a1b..6495a13 100644 --- a/crops/melon.lua +++ b/crops/melon.lua @@ -9,14 +9,14 @@ minetest.register_craftitem("farming:melon_slice", { on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:melon_1") end, - on_use = minetest.item_eat(2), + on_use = minetest.item_eat(2) }) minetest.register_craft({ output = "farming:melon_8", recipe = { {"farming:melon_slice", "farming:melon_slice"}, - {"farming:melon_slice", "farming:melon_slice"}, + {"farming:melon_slice", "farming:melon_slice"} } }) @@ -24,11 +24,11 @@ minetest.register_craft({ type = "shapeless", output = "farming:melon_slice 4", recipe = {"farming:melon_8", "farming:cutting_board"}, - replacements = {{"farming:cutting_board", "farming:cutting_board"}}, + replacements = {{"farming:cutting_board", "farming:cutting_board"}} }) -- melon definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_melon_1.png"}, paramtype = "light", @@ -45,45 +45,44 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:melon_1", table.copy(crop_def)) +minetest.register_node("farming:melon_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"farming_melon_2.png"} -minetest.register_node("farming:melon_2", table.copy(crop_def)) +def.tiles = {"farming_melon_2.png"} +minetest.register_node("farming:melon_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"farming_melon_3.png"} -minetest.register_node("farming:melon_3", table.copy(crop_def)) +def.tiles = {"farming_melon_3.png"} +minetest.register_node("farming:melon_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"farming_melon_4.png"} -minetest.register_node("farming:melon_4", table.copy(crop_def)) +def.tiles = {"farming_melon_4.png"} +minetest.register_node("farming:melon_4", table.copy(def)) -- stage 5 -crop_def.tiles = {"farming_melon_5.png"} -minetest.register_node("farming:melon_5", table.copy(crop_def)) +def.tiles = {"farming_melon_5.png"} +minetest.register_node("farming:melon_5", table.copy(def)) -- stage 6 -crop_def.tiles = {"farming_melon_6.png"} -minetest.register_node("farming:melon_6", table.copy(crop_def)) +def.tiles = {"farming_melon_6.png"} +minetest.register_node("farming:melon_6", table.copy(def)) -- stage 7 -crop_def.tiles = {"farming_melon_7.png"} -minetest.register_node("farming:melon_7", table.copy(crop_def)) +def.tiles = {"farming_melon_7.png"} +minetest.register_node("farming:melon_7", table.copy(def)) -- stage 8 (final) -crop_def.drawtype = "nodebox" -crop_def.description = S("Melon") -crop_def.tiles = {"farming_melon_top.png", "farming_melon_top.png", "farming_melon_side.png"} -crop_def.selection_box = {-.5, -.5, -.5, .5, .5, .5} -crop_def.walkable = true -crop_def.groups = { +def.drawtype = "nodebox" +def.description = S("Melon") +def.tiles = {"farming_melon_top.png", "farming_melon_top.png", "farming_melon_side.png"} +def.selection_box = {-.5, -.5, -.5, .5, .5, .5} +def.walkable = true +def.groups = { food_melon = 1, snappy = 2, oddly_breakable_by_hand = 1, flammable = 2, plant = 1 } ---crop_def.drop = "farming:melon_slice 9" -crop_def.drop = "farming:melon_8" -minetest.register_node("farming:melon_8", table.copy(crop_def)) +def.drop = "farming:melon_8" +minetest.register_node("farming:melon_8", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:melon"] = { diff --git a/crops/mint.lua b/crops/mint.lua index 96b2f46..05af5de 100644 --- a/crops/mint.lua +++ b/crops/mint.lua @@ -16,7 +16,7 @@ minetest.register_craftitem("farming:seed_mint", { minetest.register_craftitem("farming:mint_leaf", { description = S("Mint Leaf"), inventory_image = "farming_mint_leaf.png", - groups = {food_mint = 1, flammable = 4}, + groups = {food_mint = 1, flammable = 4} }) -- mint tea @@ -24,7 +24,7 @@ minetest.register_craftitem("farming:mint_tea", { description = S("Mint Tea"), inventory_image = "farming_mint_tea.png", on_use = minetest.item_eat(2, "vessels:drinking_glass"), - groups = {flammable = 4}, + groups = {flammable = 4} }) minetest.register_craft({ @@ -37,12 +37,12 @@ minetest.register_craft({ }, replacements = { {"group:food_juicer", "farming:juicer"}, - {"bucket:bucket_water", "bucket:bucket_empty"}, - }, + {"bucket:bucket_water", "bucket:bucket_empty"} + } }) -- mint definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_mint_1.png"}, paramtype = "light", @@ -58,20 +58,20 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:mint_1", table.copy(crop_def)) +minetest.register_node("farming:mint_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"farming_mint_2.png"} -minetest.register_node("farming:mint_2", table.copy(crop_def)) +def.tiles = {"farming_mint_2.png"} +minetest.register_node("farming:mint_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"farming_mint_3.png"} -minetest.register_node("farming:mint_3", table.copy(crop_def)) +def.tiles = {"farming_mint_3.png"} +minetest.register_node("farming:mint_3", table.copy(def)) -- stage 4 (final) -crop_def.tiles = {"farming_mint_4.png"} -crop_def.groups.growing = 0 -crop_def.drop = { +def.tiles = {"farming_mint_4.png"} +def.groups.growing = nil +def.drop = { items = { {items = {"farming:mint_leaf 2"}, rarity = 1}, {items = {"farming:mint_leaf 2"}, rarity = 2}, @@ -79,7 +79,7 @@ crop_def.drop = { {items = {"farming:seed_mint 2"}, rarity = 2}, } } -minetest.register_node("farming:mint_4", table.copy(crop_def)) +minetest.register_node("farming:mint_4", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:mint"] = { diff --git a/crops/onion.lua b/crops/onion.lua index ba8c301..30c9bc3 100644 --- a/crops/onion.lua +++ b/crops/onion.lua @@ -15,7 +15,7 @@ minetest.register_craftitem("farming:onion", { on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:onion_1") end, - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(1) }) -- onion soup @@ -23,7 +23,7 @@ minetest.register_craftitem("farming:onion_soup", { description = S("Onion Soup"), inventory_image = "farming_onion_soup.png", groups = {flammable = 2}, - on_use = minetest.item_eat(6, "farming:bowl"), + on_use = minetest.item_eat(6, "farming:bowl") }) minetest.register_craft({ @@ -38,7 +38,7 @@ minetest.register_craft({ }) -- crop definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"crops_onion_plant_1.png"}, paramtype = "light", @@ -58,24 +58,24 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:onion_1", table.copy(crop_def)) +minetest.register_node("farming:onion_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"crops_onion_plant_2.png"} -minetest.register_node("farming:onion_2", table.copy(crop_def)) +def.tiles = {"crops_onion_plant_2.png"} +minetest.register_node("farming:onion_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"crops_onion_plant_3.png"} -minetest.register_node("farming:onion_3", table.copy(crop_def)) +def.tiles = {"crops_onion_plant_3.png"} +minetest.register_node("farming:onion_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"crops_onion_plant_4.png"} -minetest.register_node("farming:onion_4", table.copy(crop_def)) +def.tiles = {"crops_onion_plant_4.png"} +minetest.register_node("farming:onion_4", table.copy(def)) -- stage 5 -crop_def.tiles = {"crops_onion_plant_5.png"} -crop_def.groups.growing = 0 -crop_def.drop = { +def.tiles = {"crops_onion_plant_5.png"} +def.groups.growing = nil +def.drop = { max_items = 5, items = { {items = {"farming:onion"}, rarity = 1}, {items = {"farming:onion"}, rarity = 1}, @@ -84,7 +84,7 @@ crop_def.drop = { {items = {"farming:onion"}, rarity = 5}, } } -minetest.register_node("farming:onion_5", table.copy(crop_def)) +minetest.register_node("farming:onion_5", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:onion"] = { diff --git a/crops/peas.lua b/crops/peas.lua index ffe21b3..0c8e40c 100644 --- a/crops/peas.lua +++ b/crops/peas.lua @@ -31,7 +31,7 @@ minetest.register_craftitem("farming:pea_soup", { description = S("Pea Soup"), inventory_image = "farming_pea_soup.png", groups = {flammable = 2}, - on_use = minetest.item_eat(4, "farming:bowl"), + on_use = minetest.item_eat(4, "farming:bowl") }) minetest.register_craft({ @@ -40,7 +40,7 @@ minetest.register_craft({ recipe = {"group:food_peas", "group:food_peas", "group:food_bowl"} }) -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_pea_1.png"}, paramtype = "light", @@ -60,32 +60,32 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:pea_1", table.copy(crop_def)) +minetest.register_node("farming:pea_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"farming_pea_2.png"} -minetest.register_node("farming:pea_2", table.copy(crop_def)) +def.tiles = {"farming_pea_2.png"} +minetest.register_node("farming:pea_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"farming_pea_3.png"} -minetest.register_node("farming:pea_3", table.copy(crop_def)) +def.tiles = {"farming_pea_3.png"} +minetest.register_node("farming:pea_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"farming_pea_4.png"} -minetest.register_node("farming:pea_4", table.copy(crop_def)) +def.tiles = {"farming_pea_4.png"} +minetest.register_node("farming:pea_4", table.copy(def)) -- stage 5 -crop_def.tiles = {"farming_pea_5.png"} -crop_def.groups.growing = 0 -crop_def.drop = { +def.tiles = {"farming_pea_5.png"} +def.groups.growing = nil +def.drop = { max_items = 5, items = { {items = {"farming:pea_pod"}, rarity = 1}, {items = {"farming:pea_pod"}, rarity = 2}, {items = {"farming:pea_pod"}, rarity = 3}, - {items = {"farming:pea_pod"}, rarity = 5}, + {items = {"farming:pea_pod"}, rarity = 5} } } -minetest.register_node("farming:pea_5", table.copy(crop_def)) +minetest.register_node("farming:pea_5", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:pea_pod"] = { diff --git a/crops/pepper.lua b/crops/pepper.lua index ea07b4e..4d5baf8 100644 --- a/crops/pepper.lua +++ b/crops/pepper.lua @@ -14,7 +14,7 @@ minetest.register_craftitem("farming:peppercorn", { groups = {seed = 1, food_peppercorn = 1, flammable = 3}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:pepper_1") - end, + end }) -- green pepper @@ -22,7 +22,7 @@ minetest.register_craftitem("farming:pepper", { description = S("Pepper"), inventory_image = "crops_pepper.png", on_use = minetest.item_eat(2), - groups = {food_pepper = 1, flammable = 3}, + groups = {food_pepper = 1, flammable = 3} }) minetest.register_craft({ @@ -48,18 +48,18 @@ minetest.register_node("farming:pepper_ground", { selection_box = { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25} - }, + } }) minetest.register_craft( { output = "farming:pepper_ground", type = "shapeless", recipe = {"group:food_peppercorn", "vessels:glass_bottle", "farming:mortar_pestle"}, - replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}, + replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) -- crop definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"crops_pepper_plant_1.png"}, paramtype = "light", @@ -79,31 +79,31 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:pepper_1", table.copy(crop_def)) +minetest.register_node("farming:pepper_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"crops_pepper_plant_2.png"} -minetest.register_node("farming:pepper_2", table.copy(crop_def)) +def.tiles = {"crops_pepper_plant_2.png"} +minetest.register_node("farming:pepper_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"crops_pepper_plant_3.png"} -minetest.register_node("farming:pepper_3", table.copy(crop_def)) +def.tiles = {"crops_pepper_plant_3.png"} +minetest.register_node("farming:pepper_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"crops_pepper_plant_4.png"} -minetest.register_node("farming:pepper_4", table.copy(crop_def)) +def.tiles = {"crops_pepper_plant_4.png"} +minetest.register_node("farming:pepper_4", table.copy(def)) -- stage 5 -crop_def.tiles = {"crops_pepper_plant_5.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - max_items = 2, items = { +def.tiles = {"crops_pepper_plant_5.png"} +def.groups.growing = 0 +def.drop = { + items = { {items = {"farming:pepper 2"}, rarity = 1}, {items = {"farming:pepper"}, rarity = 2}, - {items = {"farming:pepper"}, rarity = 3}, + {items = {"farming:pepper"}, rarity = 3} } } -minetest.register_node("farming:pepper_5", table.copy(crop_def)) +minetest.register_node("farming:pepper_5", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:pepper"] = { diff --git a/crops/pineapple.lua b/crops/pineapple.lua index d1583ad..f57ccf0 100644 --- a/crops/pineapple.lua +++ b/crops/pineapple.lua @@ -8,7 +8,7 @@ minetest.register_craftitem("farming:pineapple_top", { groups = {seed = 2, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:pineapple_1") - end, + end }) -- pineapple @@ -25,7 +25,7 @@ minetest.register_node("farming:pineapple", { type = "fixed", fixed = {-0.27, -0.37, -0.27, 0.27, 0.44, 0.27} }, - groups = {food_pineapple = 1, fleshy = 3, dig_immediate = 3, flammable = 2}, + groups = {food_pineapple = 1, fleshy = 3, dig_immediate = 3, flammable = 2} }) -- pineapple @@ -33,7 +33,7 @@ minetest.register_craftitem("farming:pineapple_ring", { description = S("Pineapple Ring"), inventory_image = "farming_pineapple_ring.png", groups = {food_pineapple_ring = 1, flammable = 2}, - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(1) }) minetest.register_craft( { @@ -48,18 +48,19 @@ minetest.register_craftitem("farming:pineapple_juice", { description = S("Pineapple Juice"), inventory_image = "farming_pineapple_juice.png", on_use = minetest.item_eat(4, "vessels:drinking_glass"), - groups = {vessel = 1, drink = 1}, + groups = {vessel = 1, drink = 1} }) minetest.register_craft({ output = "farming:pineapple_juice", type = "shapeless", - recipe = {"vessels:drinking_glass", "group:food_pineapple_ring", - "group:food_pineapple_ring", "group:food_pineapple_ring", - "farming:juicer"}, + recipe = { + "vessels:drinking_glass", "group:food_pineapple_ring", + "group:food_pineapple_ring", "group:food_pineapple_ring", + "farming:juicer"}, replacements = { - {"group:food_juicer", "farming:juicer"}, - }, + {"group:food_juicer", "farming:juicer"} + } }) minetest.register_craft({ @@ -70,12 +71,12 @@ minetest.register_craft({ "group:food_pineapple", "farming:juicer" }, replacements = { - {"group:food_juicer", "farming:juicer"}, - }, + {"group:food_juicer", "farming:juicer"} + } }) -- crop definition -local crop_def = { +local def = { drawtype = "plantlike", visual_scale = 1.5, tiles = {"farming_pineapple_1.png"}, @@ -93,42 +94,42 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:pineapple_1", table.copy(crop_def)) +minetest.register_node("farming:pineapple_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"farming_pineapple_2.png"} -minetest.register_node("farming:pineapple_2", table.copy(crop_def)) +def.tiles = {"farming_pineapple_2.png"} +minetest.register_node("farming:pineapple_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"farming_pineapple_3.png"} -minetest.register_node("farming:pineapple_3", table.copy(crop_def)) +def.tiles = {"farming_pineapple_3.png"} +minetest.register_node("farming:pineapple_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"farming_pineapple_4.png"} -minetest.register_node("farming:pineapple_4", table.copy(crop_def)) +def.tiles = {"farming_pineapple_4.png"} +minetest.register_node("farming:pineapple_4", table.copy(def)) -- stage 5 -crop_def.tiles = {"farming_pineapple_5.png"} -minetest.register_node("farming:pineapple_5", table.copy(crop_def)) +def.tiles = {"farming_pineapple_5.png"} +minetest.register_node("farming:pineapple_5", table.copy(def)) -- stage 6 -crop_def.tiles = {"farming_pineapple_6.png"} -minetest.register_node("farming:pineapple_6", table.copy(crop_def)) +def.tiles = {"farming_pineapple_6.png"} +minetest.register_node("farming:pineapple_6", table.copy(def)) -- stage 7 -crop_def.tiles = {"farming_pineapple_7.png"} -minetest.register_node("farming:pineapple_7", table.copy(crop_def)) +def.tiles = {"farming_pineapple_7.png"} +minetest.register_node("farming:pineapple_7", table.copy(def)) -- stage 8 (final) -crop_def.tiles = {"farming_pineapple_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { +def.tiles = {"farming_pineapple_8.png"} +def.groups.growing = nil +def.drop = { items = { {items = {"farming:pineapple"}, rarity = 1}, - {items = {"farming:pineapple"}, rarity = 15}, + {items = {"farming:pineapple"}, rarity = 10} } } -minetest.register_node("farming:pineapple_8", table.copy(crop_def)) +minetest.register_node("farming:pineapple_8", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:pineapple"] = { diff --git a/crops/potato.lua b/crops/potato.lua index d9f3e14..8c087d0 100644 --- a/crops/potato.lua +++ b/crops/potato.lua @@ -14,23 +14,23 @@ minetest.register_craftitem("farming:potato", { on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:potato_1") end, --- on_use = minetest.item_eat(1), + -- 1 in 3 chance of being poisoned on_use = function(itemstack, user, pointed_thing) if user then - if math.random(1, 3) == 1 then + if math.random(3) == 1 then return minetest.do_item_eat(-1, nil, itemstack, user, pointed_thing) else return minetest.do_item_eat(1, nil, itemstack, user, pointed_thing) end end - end, + end }) -- baked potato minetest.register_craftitem("farming:baked_potato", { description = S("Baked Potato"), inventory_image = "farming_baked_potato.png", - on_use = minetest.item_eat(6), + on_use = minetest.item_eat(6) }) minetest.register_craft({ @@ -44,7 +44,7 @@ minetest.register_craft({ minetest.register_craftitem("farming:potato_salad", { description = S("Cucumber and Potato Salad"), inventory_image = "farming_potato_salad.png", - on_use = minetest.item_eat(10, "farming:bowl"), + on_use = minetest.item_eat(10, "farming:bowl") }) minetest.register_craft({ @@ -52,12 +52,12 @@ minetest.register_craft({ recipe = { {"group:food_cucumber"}, {"farming:baked_potato"}, - {"group:food_bowl"}, + {"group:food_bowl"} } }) -- potato definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_potato_1.png"}, paramtype = "light", @@ -75,32 +75,32 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:potato_1", table.copy(crop_def)) +minetest.register_node("farming:potato_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"farming_potato_2.png"} -minetest.register_node("farming:potato_2", table.copy(crop_def)) +def.tiles = {"farming_potato_2.png"} +minetest.register_node("farming:potato_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"farming_potato_3.png"} -crop_def.drop = { +def.tiles = {"farming_potato_3.png"} +def.drop = { items = { {items = {"farming:potato"}, rarity = 1}, - {items = {"farming:potato"}, rarity = 3}, + {items = {"farming:potato"}, rarity = 3} } } -minetest.register_node("farming:potato_3", table.copy(crop_def)) +minetest.register_node("farming:potato_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"farming_potato_4.png"} -crop_def.groups.growing = 0 -crop_def.drop = { +def.tiles = {"farming_potato_4.png"} +def.groups.growing = nil +def.drop = { items = { {items = {"farming:potato 2"}, rarity = 1}, - {items = {"farming:potato 3"}, rarity = 2}, + {items = {"farming:potato 3"}, rarity = 2} } } -minetest.register_node("farming:potato_4", table.copy(crop_def)) +minetest.register_node("farming:potato_4", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:potato"] = { diff --git a/crops/pumpkin.lua b/crops/pumpkin.lua index 57f8a14..1b0b8c4 100644 --- a/crops/pumpkin.lua +++ b/crops/pumpkin.lua @@ -13,14 +13,14 @@ minetest.register_craftitem("farming:pumpkin_slice", { on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:pumpkin_1") end, - on_use = minetest.item_eat(2), + on_use = minetest.item_eat(2) }) minetest.register_craft({ output = "farming:pumpkin", recipe = { {"farming:pumpkin_slice", "farming:pumpkin_slice"}, - {"farming:pumpkin_slice", "farming:pumpkin_slice"}, + {"farming:pumpkin_slice", "farming:pumpkin_slice"} } }) @@ -28,19 +28,16 @@ minetest.register_craft({ type = "shapeless", output = "farming:pumpkin_slice 4", recipe = {"farming:pumpkin", "farming:cutting_board"}, - replacements = {{"farming:cutting_board", "farming:cutting_board"}}, + replacements = {{"farming:cutting_board", "farming:cutting_board"}} }) -- jack 'o lantern minetest.register_node("farming:jackolantern", { description = S("Jack 'O Lantern (punch to turn on and off)"), tiles = { - "farming_pumpkin_top.png", - "farming_pumpkin_top.png", - "farming_pumpkin_side.png", - "farming_pumpkin_side.png", - "farming_pumpkin_side.png", - "farming_pumpkin_face_off.png" + "farming_pumpkin_top.png", "farming_pumpkin_top.png", + "farming_pumpkin_side.png", "farming_pumpkin_side.png", + "farming_pumpkin_side.png", "farming_pumpkin_face_off.png" }, paramtype2 = "facedir", groups = {choppy = 1, oddly_breakable_by_hand = 1, flammable = 2}, @@ -50,17 +47,14 @@ minetest.register_node("farming:jackolantern", { if minetest.is_protected(pos, name) then return end node.name = "farming:jackolantern_on" minetest.swap_node(pos, node) - end, + end }) minetest.register_node("farming:jackolantern_on", { tiles = { - "farming_pumpkin_top.png", - "farming_pumpkin_top.png", - "farming_pumpkin_side.png", - "farming_pumpkin_side.png", - "farming_pumpkin_side.png", - "farming_pumpkin_face_on.png" + "farming_pumpkin_top.png", "farming_pumpkin_top.png", + "farming_pumpkin_side.png", "farming_pumpkin_side.png", + "farming_pumpkin_side.png", "farming_pumpkin_face_on.png" }, light_source = default.LIGHT_MAX - 1, paramtype2 = "facedir", @@ -75,14 +69,14 @@ minetest.register_node("farming:jackolantern_on", { if minetest.is_protected(pos, name) then return end node.name = "farming:jackolantern" minetest.swap_node(pos, node) - end, + end }) minetest.register_craft({ output = "farming:jackolantern", recipe = { {"default:torch"}, - {"group:food_pumpkin"}, + {"group:food_pumpkin"} } }) @@ -99,17 +93,17 @@ minetest.register_node("farming:scarecrow_bottom", { fixed = { {-1/16, -8/16, -1/16, 1/16, 8/16, 1/16}, {-12/16, 4/16, -1/16, 12/16, 2/16, 1/16}, - }, + } }, - groups = {snappy = 3, flammable = 2}, + groups = {snappy = 3, flammable = 2} }) minetest.register_craft({ output = "farming:scarecrow_bottom", recipe = { - {"", "group:stick", "",}, - {"group:stick", "group:stick", "group:stick",}, - {"", "group:stick", "",} + {"", "group:stick", ""}, + {"group:stick", "group:stick", "group:stick"}, + {"", "group:stick", ""} } }) @@ -118,12 +112,12 @@ minetest.register_craftitem("farming:pumpkin_bread", { description = S("Pumpkin Bread"), inventory_image = "farming_pumpkin_bread.png", on_use = minetest.item_eat(8), - groups = {food_bread = 1, flammable = 2}, + groups = {food_bread = 1, flammable = 2} }) minetest.register_craftitem("farming:pumpkin_dough", { description = S("Pumpkin Dough"), - inventory_image = "farming_pumpkin_dough.png", + inventory_image = "farming_pumpkin_dough.png" }) minetest.register_craft({ @@ -140,7 +134,7 @@ minetest.register_craft({ }) -- pumpkin definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_pumpkin_1.png"}, paramtype = "light", @@ -158,44 +152,33 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:pumpkin_1", table.copy(crop_def)) +minetest.register_node("farming:pumpkin_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"farming_pumpkin_2.png"} -minetest.register_node("farming:pumpkin_2", table.copy(crop_def)) +def.tiles = {"farming_pumpkin_2.png"} +minetest.register_node("farming:pumpkin_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"farming_pumpkin_3.png"} -minetest.register_node("farming:pumpkin_3", table.copy(crop_def)) +def.tiles = {"farming_pumpkin_3.png"} +minetest.register_node("farming:pumpkin_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"farming_pumpkin_4.png"} -minetest.register_node("farming:pumpkin_4", table.copy(crop_def)) +def.tiles = {"farming_pumpkin_4.png"} +minetest.register_node("farming:pumpkin_4", table.copy(def)) -- stage 5 -crop_def.tiles = {"farming_pumpkin_5.png"} -minetest.register_node("farming:pumpkin_5", table.copy(crop_def)) +def.tiles = {"farming_pumpkin_5.png"} +minetest.register_node("farming:pumpkin_5", table.copy(def)) -- stage 6 -crop_def.tiles = {"farming_pumpkin_6.png"} -minetest.register_node("farming:pumpkin_6", table.copy(crop_def)) +def.tiles = {"farming_pumpkin_6.png"} +minetest.register_node("farming:pumpkin_6", table.copy(def)) -- stage 7 -crop_def.tiles = {"farming_pumpkin_7.png"} -minetest.register_node("farming:pumpkin_7", table.copy(crop_def)) +def.tiles = {"farming_pumpkin_7.png"} +minetest.register_node("farming:pumpkin_7", table.copy(def)) -- stage 8 (final) ---[[ -crop_def.tiles = {"farming_pumpkin_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { - items = { - {items = {"farming:pumpkin_slice 9"}, rarity = 1}, - } -} -minetest.register_node("farming:pumpkin_8", table.copy(crop_def)) -]] - minetest.register_node("farming:pumpkin_8", { description = S("Pumpkin"), tiles = { @@ -208,7 +191,7 @@ minetest.register_node("farming:pumpkin_8", { flammable = 2, plant = 1 }, drop = "farming:pumpkin_8", - sounds = default.node_sound_wood_defaults(), + sounds = default.node_sound_wood_defaults() }) minetest.register_alias("farming:pumpkin", "farming:pumpkin_8") diff --git a/crops/raspberry.lua b/crops/raspberry.lua index ba2b8ac..0914aa4 100644 --- a/crops/raspberry.lua +++ b/crops/raspberry.lua @@ -10,7 +10,7 @@ minetest.register_craftitem("farming:raspberries", { on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:raspberry_1") end, - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(1) }) -- raspberry smoothie @@ -18,7 +18,7 @@ minetest.register_craftitem("farming:smoothie_raspberry", { description = S("Raspberry Smoothie"), inventory_image = "farming_raspberry_smoothie.png", on_use = minetest.item_eat(2, "vessels:drinking_glass"), - groups = {vessel = 1, drink = 1}, + groups = {vessel = 1, drink = 1} }) minetest.register_craft({ @@ -26,12 +26,12 @@ minetest.register_craft({ recipe = { {"default:snow"}, {"group:food_raspberries"}, - {"vessels:drinking_glass"}, + {"vessels:drinking_glass"} } }) -- raspberries definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_raspberry_1.png"}, paramtype = "light", @@ -48,27 +48,27 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:raspberry_1", table.copy(crop_def)) +minetest.register_node("farming:raspberry_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"farming_raspberry_2.png"} -minetest.register_node("farming:raspberry_2", table.copy(crop_def)) +def.tiles = {"farming_raspberry_2.png"} +minetest.register_node("farming:raspberry_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"farming_raspberry_3.png"} -minetest.register_node("farming:raspberry_3", table.copy(crop_def)) +def.tiles = {"farming_raspberry_3.png"} +minetest.register_node("farming:raspberry_3", table.copy(def)) -- stage 4 (final) -crop_def.tiles = {"farming_raspberry_4.png"} -crop_def.groups.growing = 0 -crop_def.drop = { +def.tiles = {"farming_raspberry_4.png"} +def.groups.growing = nil +def.drop = { items = { {items = {"farming:raspberries 2"}, rarity = 1}, {items = {"farming:raspberries"}, rarity = 2}, - {items = {"farming:raspberries"}, rarity = 3}, + {items = {"farming:raspberries"}, rarity = 3} } } -minetest.register_node("farming:raspberry_4", table.copy(crop_def)) +minetest.register_node("farming:raspberry_4", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:raspberries"] = { diff --git a/crops/rhubarb.lua b/crops/rhubarb.lua index dafb7e7..bd44a71 100644 --- a/crops/rhubarb.lua +++ b/crops/rhubarb.lua @@ -9,14 +9,14 @@ minetest.register_craftitem("farming:rhubarb", { on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:rhubarb_1") end, - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(1) }) -- rhubarb pie minetest.register_craftitem("farming:rhubarb_pie", { description = S("Rhubarb Pie"), inventory_image = "farming_rhubarb_pie.png", - on_use = minetest.item_eat(6), + on_use = minetest.item_eat(6) }) minetest.register_craft({ @@ -24,13 +24,13 @@ minetest.register_craft({ recipe = { {"farming:baking_tray", "group:food_sugar", ""}, {"group:food_rhubarb", "group:food_rhubarb", "group:food_rhubarb"}, - {"group:food_wheat", "group:food_wheat", "group:food_wheat"}, + {"group:food_wheat", "group:food_wheat", "group:food_wheat"} }, replacements = {{"group:food_baking_tray", "farming:baking_tray"}} }) -- rhubarb definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_rhubarb_1.png"}, paramtype = "light", @@ -43,27 +43,29 @@ local crop_def = { snappy = 3, flammable = 2, plant = 1, attached_node = 1, not_in_creative_inventory = 1, growing = 1 }, - sounds = default.node_sound_leaves_defaults() + sounds = default.node_sound_leaves_defaults(), + minlight = 10, + maxlight = 12, } -- stage 1 -minetest.register_node("farming:rhubarb_1", table.copy(crop_def)) +minetest.register_node("farming:rhubarb_1", table.copy(def)) -- stage2 -crop_def.tiles = {"farming_rhubarb_2.png"} -minetest.register_node("farming:rhubarb_2", table.copy(crop_def)) +def.tiles = {"farming_rhubarb_2.png"} +minetest.register_node("farming:rhubarb_2", table.copy(def)) -- stage 3 (final) -crop_def.tiles = {"farming_rhubarb_3.png"} -crop_def.groups.growing = 0 -crop_def.drop = { +def.tiles = {"farming_rhubarb_3.png"} +def.groups.growing = nil +def.drop = { items = { {items = {"farming:rhubarb 2"}, rarity = 1}, {items = {"farming:rhubarb"}, rarity = 2}, - {items = {"farming:rhubarb"}, rarity = 3}, + {items = {"farming:rhubarb"}, rarity = 3} } } -minetest.register_node("farming:rhubarb_3", table.copy(crop_def)) +minetest.register_node("farming:rhubarb_3", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:rhubarb"] = { diff --git a/crops/ryeoatrice.lua b/crops/ryeoatrice.lua index d362d09..c565a65 100644 --- a/crops/ryeoatrice.lua +++ b/crops/ryeoatrice.lua @@ -10,7 +10,7 @@ farming.register_plant("farming:rye", { paramtype2 = "meshoptions", inventory_image = "farming_rye_seed.png", steps = 8, - place_param2 = 3, + place_param2 = 3 }) minetest.override_item("farming:rye", { @@ -25,7 +25,7 @@ minetest.register_craft({ "farming:rye", "farming:rye", "farming:rye", "farming:rye", "farming:mortar_pestle" }, - replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}, + replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) -- Oats @@ -35,7 +35,7 @@ farming.register_plant("farming:oat", { paramtype2 = "meshoptions", inventory_image = "farming_oat_seed.png", steps = 8, - place_param2 = 3, + place_param2 = 3 }) minetest.override_item("farming:oat", { @@ -50,7 +50,7 @@ minetest.register_craft({ "farming:oat", "farming:oat", "farming:oat", "farming:oat", "farming:mortar_pestle" }, - replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}, + replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) -- Rice @@ -60,7 +60,7 @@ farming.register_plant("farming:rice", { paramtype2 = "meshoptions", inventory_image = "farming_rice_seed.png", steps = 8, - place_param2 = 3, + place_param2 = 3 }) minetest.override_item("farming:rice", { @@ -72,13 +72,13 @@ minetest.register_craftitem("farming:rice_bread", { description = S("Rice Bread"), inventory_image = "farming_rice_bread.png", on_use = minetest.item_eat(5), - groups = {food_rice_bread = 1, flammable = 2}, + groups = {food_rice_bread = 1, flammable = 2} }) minetest.register_craftitem("farming:rice_flour", { description = S("Rice Flour"), inventory_image = "farming_rice_flour.png", - groups = {food_rice_flour = 1, flammable = 1}, + groups = {food_rice_flour = 1, flammable = 1} }) minetest.register_craft({ @@ -88,7 +88,7 @@ minetest.register_craft({ "farming:rice", "farming:rice", "farming:rice", "farming:rice", "farming:mortar_pestle" }, - replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}, + replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) minetest.register_craft({ @@ -113,7 +113,7 @@ minetest.register_craft({ "farming:wheat", "farming:barley", "farming:oat", "farming:rye", "farming:mortar_pestle" }, - replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}, + replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) -- Multigrain bread @@ -122,7 +122,7 @@ minetest.register_craftitem("farming:bread_multigrain", { description = S("Multigrain Bread"), inventory_image = "farming_bread_multigrain.png", on_use = minetest.item_eat(7), - groups = {food_bread = 1, flammable = 2}, + groups = {food_bread = 1, flammable = 2} }) minetest.register_craft({ @@ -137,29 +137,29 @@ minetest.register_craft({ minetest.register_craft({ type = "fuel", recipe = "farming:rice_bread", - burntime = 1, + burntime = 1 }) minetest.register_craft({ type = "fuel", recipe = "farming:bread_multigrain", - burntime = 1, + burntime = 1 }) minetest.register_craft({ type = "fuel", recipe = "farming:rye", - burntime = 1, + burntime = 1 }) minetest.register_craft({ type = "fuel", recipe = "farming:oat", - burntime = 1, + burntime = 1 }) minetest.register_craft({ type = "fuel", recipe = "farming:rice", - burntime = 1, + burntime = 1 }) diff --git a/crops/tomato.lua b/crops/tomato.lua index c082328..7905828 100644 --- a/crops/tomato.lua +++ b/crops/tomato.lua @@ -14,11 +14,11 @@ minetest.register_craftitem("farming:tomato", { on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:tomato_1") end, - on_use = minetest.item_eat(4), + on_use = minetest.item_eat(4) }) -- tomato definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_tomato_1.png"}, paramtype = "light", @@ -35,48 +35,49 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:tomato_1", table.copy(crop_def)) +minetest.register_node("farming:tomato_1", table.copy(def)) -- stage2 -crop_def.tiles = {"farming_tomato_2.png"} -minetest.register_node("farming:tomato_2", table.copy(crop_def)) +def.tiles = {"farming_tomato_2.png"} +minetest.register_node("farming:tomato_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"farming_tomato_3.png"} -minetest.register_node("farming:tomato_3", table.copy(crop_def)) +def.tiles = {"farming_tomato_3.png"} +minetest.register_node("farming:tomato_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"farming_tomato_4.png"} -minetest.register_node("farming:tomato_4", table.copy(crop_def)) +def.tiles = {"farming_tomato_4.png"} +minetest.register_node("farming:tomato_4", table.copy(def)) -- stage 5 -crop_def.tiles = {"farming_tomato_5.png"} -minetest.register_node("farming:tomato_5", table.copy(crop_def)) +def.tiles = {"farming_tomato_5.png"} +minetest.register_node("farming:tomato_5", table.copy(def)) -- stage 6 -crop_def.tiles = {"farming_tomato_6.png"} -minetest.register_node("farming:tomato_6", table.copy(crop_def)) +def.tiles = {"farming_tomato_6.png"} +minetest.register_node("farming:tomato_6", table.copy(def)) -- stage 7 -crop_def.tiles = {"farming_tomato_7.png"} -crop_def.drop = { +def.tiles = {"farming_tomato_7.png"} +def.drop = { items = { {items = {"farming:tomato"}, rarity = 1}, - {items = {"farming:tomato"}, rarity = 3}, + {items = {"farming:tomato"}, rarity = 3} } } -minetest.register_node("farming:tomato_7", table.copy(crop_def)) +minetest.register_node("farming:tomato_7", table.copy(def)) -- stage 8 (final) -crop_def.tiles = {"farming_tomato_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { +def.tiles = {"farming_tomato_8.png"} +def.groups.growing = nil +def.drop = { items = { {items = {"farming:tomato 3"}, rarity = 1}, - {items = {"farming:tomato 3"}, rarity = 2}, + {items = {"farming:tomato 2"}, rarity = 2}, + {items = {"farming:tomato 1"}, rarity = 3} } } -minetest.register_node("farming:tomato_8", table.copy(crop_def)) +minetest.register_node("farming:tomato_8", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:tomato"] = { diff --git a/crops/wheat.lua b/crops/wheat.lua index b047561..7a8f19b 100644 --- a/crops/wheat.lua +++ b/crops/wheat.lua @@ -16,14 +16,14 @@ minetest.register_node("farming:seed_wheat", { selection_box = farming.select, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:wheat_1") - end, + end }) -- harvested wheat minetest.register_craftitem("farming:wheat", { description = S("Wheat"), inventory_image = "farming_wheat.png", - groups = {food_wheat = 1, flammable = 4}, + groups = {food_wheat = 1, flammable = 4} }) -- straw @@ -32,7 +32,7 @@ minetest.register_node("farming:straw", { tiles = {"farming_straw.png"}, is_ground_content = false, groups = {snappy = 3, flammable = 4, fall_damage_add_percent = -30}, - sounds = default.node_sound_leaves_defaults(), + sounds = default.node_sound_leaves_defaults() }) minetest.register_craft({ @@ -40,14 +40,14 @@ minetest.register_craft({ recipe = { {"farming:wheat", "farming:wheat", "farming:wheat"}, {"farming:wheat", "farming:wheat", "farming:wheat"}, - {"farming:wheat", "farming:wheat", "farming:wheat"}, + {"farming:wheat", "farming:wheat", "farming:wheat"} } }) minetest.register_craft({ output = "farming:wheat 3", recipe = { - {"farming:straw"}, + {"farming:straw"} } }) @@ -76,7 +76,7 @@ end minetest.register_craftitem("farming:flour", { description = S("Flour"), inventory_image = "farming_flour.png", - groups = {food_flour = 1, flammable = 1}, + groups = {food_flour = 1, flammable = 1} }) minetest.register_craft({ @@ -86,7 +86,7 @@ minetest.register_craft({ "farming:wheat", "farming:wheat", "farming:wheat", "farming:wheat", "farming:mortar_pestle" }, - replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}, + replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}} }) -- bread @@ -94,7 +94,7 @@ minetest.register_craftitem("farming:bread", { description = S("Bread"), inventory_image = "farming_bread.png", on_use = minetest.item_eat(5), - groups = {food_bread = 1, flammable = 2}, + groups = {food_bread = 1, flammable = 2} }) minetest.register_craft({ @@ -109,14 +109,14 @@ minetest.register_craftitem("farming:bread_slice", { description = S("Sliced Bread"), inventory_image = "farming_bread_slice.png", on_use = minetest.item_eat(1), - groups = {food_bread_slice = 1, flammable = 2}, + groups = {food_bread_slice = 1, flammable = 2} }) minetest.register_craft({ type = "shapeless", output = "farming:bread_slice 5", recipe = {"farming:bread", "group:food_cutting_board"}, - replacements = {{"group:food_cutting_board", "farming:cutting_board"}}, + replacements = {{"group:food_cutting_board", "farming:cutting_board"}} }) -- toast @@ -124,7 +124,7 @@ minetest.register_craftitem("farming:toast", { description = S("Toast"), inventory_image = "farming_toast.png", on_use = minetest.item_eat(1), - groups = {food_toast = 1, flammable = 2}, + groups = {food_toast = 1, flammable = 2} }) minetest.register_craft({ @@ -139,7 +139,7 @@ minetest.register_craftitem("farming:toast_sandwich", { description = S("Toast Sandwich"), inventory_image = "farming_toast_sandwich.png", on_use = minetest.item_eat(4), - groups = {flammable = 2}, + groups = {flammable = 2} }) minetest.register_craft({ @@ -147,12 +147,12 @@ minetest.register_craft({ recipe = { {"farming:bread_slice"}, {"farming:toast"}, - {"farming:bread_slice"}, + {"farming:bread_slice"} } }) -- wheat definition -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"farming_wheat_1.png"}, paramtype = "light", @@ -171,64 +171,64 @@ local crop_def = { } -- stage 1 -minetest.register_node("farming:wheat_1", table.copy(crop_def)) +minetest.register_node("farming:wheat_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"farming_wheat_2.png"} -minetest.register_node("farming:wheat_2", table.copy(crop_def)) +def.tiles = {"farming_wheat_2.png"} +minetest.register_node("farming:wheat_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"farming_wheat_3.png"} -minetest.register_node("farming:wheat_3", table.copy(crop_def)) +def.tiles = {"farming_wheat_3.png"} +minetest.register_node("farming:wheat_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"farming_wheat_4.png"} -minetest.register_node("farming:wheat_4", table.copy(crop_def)) +def.tiles = {"farming_wheat_4.png"} +minetest.register_node("farming:wheat_4", table.copy(def)) -- stage 5 -crop_def.tiles = {"farming_wheat_5.png"} -crop_def.drop = { +def.tiles = {"farming_wheat_5.png"} +def.drop = { items = { {items = {"farming:wheat"}, rarity = 2}, - {items = {"farming:seed_wheat"}, rarity = 2}, + {items = {"farming:seed_wheat"}, rarity = 2} } } -minetest.register_node("farming:wheat_5", table.copy(crop_def)) +minetest.register_node("farming:wheat_5", table.copy(def)) -- stage 6 -crop_def.tiles = {"farming_wheat_6.png"} -crop_def.drop = { +def.tiles = {"farming_wheat_6.png"} +def.drop = { items = { {items = {"farming:wheat"}, rarity = 2}, - {items = {"farming:seed_wheat"}, rarity = 1}, + {items = {"farming:seed_wheat"}, rarity = 1} } } -minetest.register_node("farming:wheat_6", table.copy(crop_def)) +minetest.register_node("farming:wheat_6", table.copy(def)) -- stage 7 -crop_def.tiles = {"farming_wheat_7.png"} -crop_def.drop = { +def.tiles = {"farming_wheat_7.png"} +def.drop = { items = { {items = {"farming:wheat"}, rarity = 1}, {items = {"farming:wheat"}, rarity = 3}, {items = {"farming:seed_wheat"}, rarity = 1}, - {items = {"farming:seed_wheat"}, rarity = 3}, + {items = {"farming:seed_wheat"}, rarity = 3} } } -minetest.register_node("farming:wheat_7", table.copy(crop_def)) +minetest.register_node("farming:wheat_7", table.copy(def)) -- stage 8 (final) -crop_def.tiles = {"farming_wheat_8.png"} -crop_def.groups.growing = 0 -crop_def.drop = { +def.tiles = {"farming_wheat_8.png"} +def.groups.growing = nil +def.drop = { items = { {items = {"farming:wheat"}, rarity = 1}, {items = {"farming:wheat"}, rarity = 3}, {items = {"farming:seed_wheat"}, rarity = 1}, - {items = {"farming:seed_wheat"}, rarity = 3}, + {items = {"farming:seed_wheat"}, rarity = 3} } } -minetest.register_node("farming:wheat_8", table.copy(crop_def)) +minetest.register_node("farming:wheat_8", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:wheat"] = { @@ -243,11 +243,11 @@ farming.registered_plants["farming:wheat"] = { minetest.register_craft({ type = "fuel", recipe = "farming:straw", - burntime = 3, + burntime = 3 }) minetest.register_craft({ type = "fuel", recipe = "farming:wheat", - burntime = 1, + burntime = 1 }) diff --git a/food.lua b/food.lua index 16d5208..b8df3ba 100644 --- a/food.lua +++ b/food.lua @@ -6,14 +6,14 @@ local S = farming.intllib minetest.register_craftitem("farming:sugar", { description = S("Sugar"), inventory_image = "farming_sugar.png", - groups = {food_sugar = 1, flammable = 3}, + groups = {food_sugar = 1, flammable = 3} }) minetest.register_craft({ type = "cooking", cooktime = 3, output = "farming:sugar 2", - recipe = "default:papyrus", + recipe = "default:papyrus" }) @@ -33,7 +33,7 @@ minetest.register_node("farming:salt", { selection_box = { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25} - }, + } }) minetest.register_craft({ @@ -60,7 +60,7 @@ minetest.register_node("farming:rose_water", { selection_box = { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25} - }, + } }) minetest.register_craft({ @@ -68,11 +68,11 @@ minetest.register_craft({ recipe = { {"flowers:rose", "flowers:rose", "flowers:rose"}, {"flowers:rose", "flowers:rose", "flowers:rose"}, - {"bucket:bucket_water", "group:food_pot", "vessels:glass_bottle"}, + {"bucket:bucket_water", "group:food_pot", "vessels:glass_bottle"} }, replacements = { {"bucket:bucket_water", "bucket:bucket_empty"}, - {"group:food_pot", "farming:pot"}, + {"group:food_pot", "farming:pot"} } }) @@ -82,7 +82,7 @@ minetest.register_craftitem("farming:turkish_delight", { description = S("Turkish Delight"), inventory_image = "farming_turkish_delight.png", groups = {flammable = 3}, - on_use = minetest.item_eat(2), + on_use = minetest.item_eat(2) }) minetest.register_craft({ @@ -90,12 +90,12 @@ minetest.register_craft({ recipe = { {"group:food_gelatin", "group:food_sugar", "group:food_gelatin"}, {"group:food_sugar", "group:food_rose_water", "group:food_sugar"}, - {"group:food_cornstarch", "group:food_sugar", "dye:pink"}, + {"group:food_cornstarch", "group:food_sugar", "dye:pink"} }, replacements = { {"group:food_cornstarch", "farming:bowl"}, - {"group:food_rose_water", "vessels:glass_bottle"}, - }, + {"group:food_rose_water", "vessels:glass_bottle"} + } }) --= Garlic Bread @@ -104,13 +104,13 @@ minetest.register_craftitem("farming:garlic_bread", { description = S("Garlic Bread"), inventory_image = "farming_garlic_bread.png", groups = {flammable = 3}, - on_use = minetest.item_eat(2), + on_use = minetest.item_eat(2) }) minetest.register_craft({ type = "shapeless", output = "farming:garlic_bread", - recipe = {"group:food_toast", "group:food_garlic_clove", "group:food_garlic_clove"}, + recipe = {"group:food_toast", "group:food_garlic_clove", "group:food_garlic_clove"} }) --= Donuts (thanks to Bockwurst for making the donut images) @@ -118,7 +118,7 @@ minetest.register_craft({ minetest.register_craftitem("farming:donut", { description = S("Donut"), inventory_image = "farming_donut.png", - on_use = minetest.item_eat(4), + on_use = minetest.item_eat(4) }) minetest.register_craft({ @@ -126,35 +126,35 @@ minetest.register_craft({ recipe = { {"", "group:food_wheat", ""}, {"group:food_wheat", "group:food_sugar", "group:food_wheat"}, - {"", "group:food_wheat", ""}, + {"", "group:food_wheat", ""} } }) minetest.register_craftitem("farming:donut_chocolate", { description = S("Chocolate Donut"), inventory_image = "farming_donut_chocolate.png", - on_use = minetest.item_eat(6), + on_use = minetest.item_eat(6) }) minetest.register_craft({ output = "farming:donut_chocolate", recipe = { {"group:food_cocoa"}, - {"farming:donut"}, + {"farming:donut"} } }) minetest.register_craftitem("farming:donut_apple", { description = S("Apple Donut"), inventory_image = "farming_donut_apple.png", - on_use = minetest.item_eat(6), + on_use = minetest.item_eat(6) }) minetest.register_craft({ output = "farming:donut_apple", recipe = { {"default:apple"}, - {"farming:donut"}, + {"farming:donut"} } }) @@ -163,7 +163,7 @@ minetest.register_craft({ minetest.register_craftitem("farming:porridge", { description = S("Porridge"), inventory_image = "farming_porridge.png", - on_use = minetest.item_eat(6, "farming:bowl"), + on_use = minetest.item_eat(6, "farming:bowl") }) minetest.after(0, function() @@ -202,7 +202,7 @@ end) minetest.register_craftitem("farming:jaffa_cake", { description = S("Jaffa Cake"), inventory_image = "farming_jaffa_cake.png", - on_use = minetest.item_eat(6), + on_use = minetest.item_eat(6) }) minetest.register_craft({ @@ -224,7 +224,7 @@ minetest.register_craft({ minetest.register_craftitem("farming:apple_pie", { description = S("Apple Pie"), inventory_image = "farming_apple_pie.png", - on_use = minetest.item_eat(6), + on_use = minetest.item_eat(6) }) minetest.register_craft({ @@ -245,7 +245,7 @@ minetest.register_craftitem("farming:cactus_juice", { groups = {vessel = 1, drink = 1}, on_use = function(itemstack, user, pointed_thing) if user then - if math.random(1, 5) == 1 then + if math.random(5) == 1 then return minetest.do_item_eat(-1, "vessels:drinking_glass", itemstack, user, pointed_thing) else @@ -253,7 +253,7 @@ minetest.register_craftitem("farming:cactus_juice", { itemstack, user, pointed_thing) end end - end, + end }) minetest.register_craft({ @@ -264,8 +264,8 @@ minetest.register_craft({ "default:cactus", "farming:juicer" }, replacements = { - {"group:food_juicer", "farming:juicer"}, - }, + {"group:food_juicer", "farming:juicer"} + } }) -- Pasta @@ -273,7 +273,7 @@ minetest.register_craft({ minetest.register_craftitem("farming:pasta", { description = S("Pasta"), inventory_image = "farming_pasta.png", - groups = {food_pasta = 1}, + groups = {food_pasta = 1} }) if minetest.get_modpath("mobs_animal") or minetest.get_modpath("xanadu")then @@ -296,7 +296,7 @@ minetest.register_craft({ }, replacements = { {"group:food_mixing_bowl", "farming:mixing_bowl"}, - {"group:food_oil", "vessels:glass_bottle"}, + {"group:food_oil", "vessels:glass_bottle"} } }) end @@ -306,7 +306,7 @@ end minetest.register_craftitem("farming:spaghetti", { description = S("Spaghetti"), inventory_image = "farming_spaghetti.png", - on_use = minetest.item_eat(8), + on_use = minetest.item_eat(8) }) minetest.register_craft({ @@ -324,7 +324,7 @@ minetest.register_craft({ minetest.register_craftitem("farming:bibimbap", { description = S("Bibimbap"), inventory_image = "farming_bibimbap.png", - on_use = minetest.item_eat(8, "farming:bowl"), + on_use = minetest.item_eat(8, "farming:bowl") }) if minetest.get_modpath("mobs_animal") or minetest.get_modpath("xanadu")then diff --git a/grass.lua b/grass.lua index 6a9e94f..86e7ac5 100644 --- a/grass.lua +++ b/grass.lua @@ -1,7 +1,7 @@ for i = 4, 5 do - -- Override default grass and have it drop Wheat Seeds + -- Override default grass and have it drop Wheat and Oat Seeds minetest.override_item("default:grass_" .. i, { drop = { @@ -9,12 +9,12 @@ for i = 4, 5 do items = { {items = {"farming:seed_wheat"}, rarity = 5}, {items = {"farming:seed_oat"},rarity = 5}, - {items = {"default:grass_1"}}, + {items = {"default:grass_1"}} } - }, + } }) - -- Override default dry grass and have it drop Barley Seeds + -- Override default dry grass and have it drop Barley and Rye Seeds if minetest.registered_nodes["default:dry_grass_1"] then @@ -24,15 +24,15 @@ for i = 4, 5 do items = { {items = {"farming:seed_barley"}, rarity = 5}, {items = {"farming:seed_rye"},rarity = 5}, - {items = {"default:dry_grass_1"}}, + {items = {"default:dry_grass_1"}} } - }, + } }) end end --- Override default Jungle Grass and have it drop Cotton Seeds +-- Override default Jungle Grass and have it drop Cotton and Rice Seeds minetest.override_item("default:junglegrass", { drop = { @@ -40,7 +40,7 @@ minetest.override_item("default:junglegrass", { items = { {items = {"farming:seed_cotton"}, rarity = 8}, {items = {"farming:seed_rice"},rarity = 8}, - {items = {"default:junglegrass"}}, + {items = {"default:junglegrass"}} } - }, + } }) diff --git a/hoes.lua b/hoes.lua index c67b75b..21d435b 100644 --- a/hoes.lua +++ b/hoes.lua @@ -36,7 +36,7 @@ farming.register_hoe = function(name, def) return farming.hoe_on_use(itemstack, user, pointed_thing, def.max_uses) end, groups = def.groups, - sound = {breaks = "default_tool_breaks"}, + sound = {breaks = "default_tool_breaks"} }) -- Register its recipe @@ -149,7 +149,7 @@ farming.register_hoe(":farming:hoe_wood", { minetest.register_craft({ type = "fuel", recipe = "farming:hoe_wood", - burntime = 5, + burntime = 5 }) farming.register_hoe(":farming:hoe_stone", { @@ -170,7 +170,7 @@ farming.register_hoe(":farming:hoe_bronze", { description = S("Bronze Hoe"), inventory_image = "farming_tool_bronzehoe.png", max_uses = 500, - groups = {not_in_creative_inventory = 1}, + groups = {not_in_creative_inventory = 1} }) farming.register_hoe(":farming:hoe_mese", { @@ -184,7 +184,7 @@ farming.register_hoe(":farming:hoe_diamond", { description = S("Diamond Hoe"), inventory_image = "farming_tool_diamondhoe.png", max_uses = 500, - groups = {not_in_creative_inventory = 1}, + groups = {not_in_creative_inventory = 1} }) -- Toolranks support @@ -437,7 +437,7 @@ minetest.register_tool("farming:scythe_mithril", { obj:set_velocity({ x = math.random(-10, 10) / 9, y = 3, - z = math.random(-10, 10) / 9, + z = math.random(-10, 10) / 9 }) end end @@ -486,14 +486,14 @@ if minetest.get_modpath("moreores") then description = S("%s Hoe"):format(S("Silver")), inventory_image = "moreores_tool_silverhoe.png", max_uses = 300, - material = "moreores:silver_ingot", + material = "moreores:silver_ingot" }) farming.register_hoe(":moreores:hoe_mithril", { description = S("%s Hoe"):format(S("Mithril")), inventory_image = "moreores_tool_mithrilhoe.png", max_uses = 1000, - material = "moreores:mithril_ingot", + material = "moreores:mithril_ingot" }) -- Toolranks support diff --git a/init.lua b/init.lua index 050eaeb..68d134c 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,7 @@ farming = { mod = "redo", - version = "20200527", + version = "20200702", path = minetest.get_modpath("farming"), select = { type = "fixed", @@ -80,7 +80,7 @@ end -- Growth Logic local STAGE_LENGTH_AVG = tonumber( - minetest.settings:get("farming_stage_length")) or 160 + minetest.settings:get("farming_stage_length")) or 200 -- 160 local STAGE_LENGTH_DEV = STAGE_LENGTH_AVG / 6 @@ -315,7 +315,7 @@ function farming.plant_growth_timer(pos, elapsed, node_name) -- otherwise check for wet soil beneath crop else - local under = minetest.get_node({ x = pos.x, y = pos.y - 1, z = pos.z }) + local under = minetest.get_node({x = pos.x, y = pos.y - 1, z = pos.z}) if minetest.get_item_group(under.name, "soil") < 3 then return true @@ -582,7 +582,7 @@ farming.register_plant = function(name, def) sounds = default.node_sound_leaves_defaults(), minlight = def.minlight, maxlight = def.maxlight, - next_plant = next_plant, + next_plant = next_plant }) end @@ -693,7 +693,7 @@ ddoo("ryeoatrice.lua", farming.grains) ddoo("mint.lua", farming.mint) ddoo("cabbage.lua", farming.cabbage) -dofile(farming.path.."/food.lua") -dofile(farming.path.."/mapgen.lua") -dofile(farming.path.."/compatibility.lua") -- Farming Plus compatibility -dofile(farming.path.."/lucky_block.lua") +dofile(farming.path .. "/food.lua") +dofile(farming.path .. "/mapgen.lua") +dofile(farming.path .. "/compatibility.lua") -- Farming Plus compatibility +dofile(farming.path .. "/lucky_block.lua") diff --git a/mapgen.lua b/mapgen.lua index b76002d..ca7048d 100644 --- a/mapgen.lua +++ b/mapgen.lua @@ -26,7 +26,7 @@ local function register_plant(name, min, max, spawnon, spawnby, num, rarety) y_max = max, decoration = "farming:" .. name, spawn_by = spawnby, - num_spawn_by = num, + num_spawn_by = num }) end @@ -84,7 +84,7 @@ minetest.register_decoration({ y_max = 45, decoration = "farming:hemp_7", spawn_by = "group:tree", - num_spawn_by = 1, + num_spawn_by = 1 }) end @@ -105,7 +105,7 @@ minetest.register_decoration({ y_max = 35, decoration = {"farming:chili_8"}, spawn_by = "group:tree", - num_spawn_by = 1, + num_spawn_by = 1 }) end @@ -126,7 +126,7 @@ minetest.register_decoration({ y_max = 35, decoration = {"farming:pepper_5"}, spawn_by = "group:tree", - num_spawn_by = 1, + num_spawn_by = 1 }) end @@ -145,7 +145,7 @@ minetest.register_decoration({ }, y_min = 18, y_max = 30, - decoration = {"farming:pineapple_8"}, + decoration = {"farming:pineapple_8"} }) end @@ -165,5 +165,5 @@ minetest.register_decoration({ biomes = {"savanna"}, y_max = 31000, y_min = 1, - decoration = "farming:cotton_wild", + decoration = "farming:cotton_wild" }) diff --git a/soil.lua b/soil.lua index 4ecab29..ab8be15 100644 --- a/soil.lua +++ b/soil.lua @@ -172,5 +172,5 @@ minetest.register_abm({ and minetest.get_item_group(nn, "plant") == 0 then minetest.set_node(pos, {name = ndef.soil.base}) end - end, + end }) diff --git a/statistics.lua b/statistics.lua index c8defa2..b892867 100644 --- a/statistics.lua +++ b/statistics.lua @@ -12,6 +12,7 @@ local B = 4.0 / math.pi local C = 2.0/(math.pi * A) local D = 1.0 / A + erf = function(x) if x == 0 then return 0; end @@ -23,6 +24,7 @@ erf = function(x) return (x > 0 and v) or -v end + erf_inv = function(x) if x == 0 then return 0; end @@ -36,13 +38,16 @@ erf_inv = function(x) return (x > 0 and v) or -v end + local function std_normal(u) return ROOT_2 * erf_inv(2.0 * u - 1.0) end + local poisson local cdf_table = {} + local function generate_cdf(lambda_index, lambda) local max = math.ceil(4 * lambda) @@ -59,10 +64,12 @@ local function generate_cdf(lambda_index, lambda) return t end + for li = 1, 100 do cdf_table[li] = generate_cdf(li, 0.25 * li) end + poisson = function(lambda, max) if max < 2 then @@ -107,6 +114,7 @@ poisson = function(lambda, max) end end + -- Error function. statistics.erf = erf @@ -131,6 +139,7 @@ statistics.std_normal = function() return std_normal(u) end + --- Standard normal distribution function (mean 0, standard deviation 1). -- -- @param mu @@ -153,6 +162,7 @@ statistics.normal = function(mu, sigma) return mu + sigma * std_normal(u) end + --- Poisson distribution function. -- -- @param lambda @@ -171,4 +181,5 @@ statistics.poisson = function(lambda, max) return poisson(lambda, max) end + return statistics diff --git a/utensils.lua b/utensils.lua index 4a15298..8224e7d 100644 --- a/utensils.lua +++ b/utensils.lua @@ -6,14 +6,14 @@ local S = farming.intllib minetest.register_craftitem("farming:bowl", { description = S("Wooden Bowl"), inventory_image = "farming_bowl.png", - groups = {food_bowl = 1, flammable = 2}, + groups = {food_bowl = 1, flammable = 2} }) minetest.register_craft({ output = "farming:bowl 4", recipe = { {"group:wood", "", "group:wood"}, - {"", "group:wood", ""}, + {"", "group:wood", ""} } }) @@ -28,14 +28,14 @@ minetest.register_craft({ minetest.register_craftitem("farming:saucepan", { description = S("Saucepan"), inventory_image = "farming_saucepan.png", - groups = {food_saucepan = 1, flammable = 2}, + groups = {food_saucepan = 1, flammable = 2} }) minetest.register_craft({ output = "farming:saucepan", recipe = { {"default:steel_ingot", "", ""}, - {"", "group:stick", ""}, + {"", "group:stick", ""} } }) @@ -44,14 +44,14 @@ minetest.register_craft({ minetest.register_craftitem("farming:pot", { description = S("Cooking Pot"), inventory_image = "farming_pot.png", - groups = {food_pot = 1, flammable = 2}, + groups = {food_pot = 1, flammable = 2} }) minetest.register_craft({ output = "farming:pot", recipe = { {"group:stick", "default:steel_ingot", "default:steel_ingot"}, - {"", "default:steel_ingot", "default:steel_ingot"}, + {"", "default:steel_ingot", "default:steel_ingot"} } }) @@ -60,7 +60,7 @@ minetest.register_craft({ minetest.register_craftitem("farming:baking_tray", { description = S("Baking Tray"), inventory_image = "farming_baking_tray.png", - groups = {food_baking_tray = 1, flammable = 2}, + groups = {food_baking_tray = 1, flammable = 2} }) minetest.register_craft({ @@ -68,7 +68,7 @@ minetest.register_craft({ recipe = { {"default:clay_brick", "default:clay_brick", "default:clay_brick"}, {"default:clay_brick", "", "default:clay_brick"}, - {"default:clay_brick", "default:clay_brick", "default:clay_brick"}, + {"default:clay_brick", "default:clay_brick", "default:clay_brick"} } }) @@ -77,7 +77,7 @@ minetest.register_craft({ minetest.register_craftitem("farming:skillet", { description = S("Skillet"), inventory_image = "farming_skillet.png", - groups = {food_skillet = 1, flammable = 2}, + groups = {food_skillet = 1, flammable = 2} }) minetest.register_craft({ @@ -85,7 +85,7 @@ minetest.register_craft({ recipe = { {"default:steel_ingot", "", ""}, {"", "default:steel_ingot", ""}, - {"", "", "group:stick"}, + {"", "", "group:stick"} } }) @@ -94,14 +94,14 @@ minetest.register_craft({ minetest.register_craftitem("farming:mortar_pestle", { description = S("Mortar and Pestle"), inventory_image = "farming_mortar_pestle.png", - groups = {food_mortar_pestle = 1, flammable = 2}, + groups = {food_mortar_pestle = 1, flammable = 2} }) minetest.register_craft({ output = "farming:mortar_pestle", recipe = { {"default:stone", "group:stick", "default:stone"}, - {"", "default:stone", ""}, + {"", "default:stone", ""} } }) @@ -110,7 +110,7 @@ minetest.register_craft({ minetest.register_craftitem("farming:cutting_board", { description = S("Cutting Board"), inventory_image = "farming_cutting_board.png", - groups = {food_cutting_board = 1, flammable = 2}, + groups = {food_cutting_board = 1, flammable = 2} }) minetest.register_craft({ @@ -118,7 +118,7 @@ minetest.register_craft({ recipe = { {"default:steel_ingot", "", ""}, {"", "group:stick", ""}, - {"", "", "group:wood"}, + {"", "", "group:wood"} } }) @@ -127,14 +127,14 @@ minetest.register_craft({ minetest.register_craftitem("farming:juicer", { description = S("Juicer"), inventory_image = "farming_juicer.png", - groups = {food_juicer = 1, flammable = 2}, + groups = {food_juicer = 1, flammable = 2} }) minetest.register_craft({ output = "farming:juicer", recipe = { {"", "default:stone", ""}, - {"default:stone", "", "default:stone"}, + {"default:stone", "", "default:stone"} } }) @@ -143,14 +143,14 @@ minetest.register_craft({ minetest.register_craftitem("farming:mixing_bowl", { description = S("Glass Mixing Bowl"), inventory_image = "farming_mixing_bowl.png", - groups = {food_mixing_bowl = 1, flammable = 2}, + groups = {food_mixing_bowl = 1, flammable = 2} }) minetest.register_craft({ output = "farming:mixing_bowl", recipe = { {"default:glass", "group:stick", "default:glass"}, - {"", "default:glass", ""}, + {"", "default:glass", ""} } }) @@ -158,6 +158,6 @@ minetest.register_craft( { type = "shapeless", output = "vessels:glass_fragments", recipe = { - "farming:mixing_bowl", - }, + "farming:mixing_bowl" + } })