diff --git a/crops/barley.lua b/crops/barley.lua index 6f3cb97..cc5ca0f 100644 --- a/crops/barley.lua +++ b/crops/barley.lua @@ -110,5 +110,13 @@ farming.registered_plants["farming:barley"] = { seed = "farming:seed_barley", minlight = 13, maxlight = 15, - steps = 8 + steps = 7 } + +-- Fuel + +minetest.register_craft({ + type = "fuel", + recipe = "farming:barley", + burntime = 1, +}) diff --git a/crops/ryeoatrice.lua b/crops/ryeoatrice.lua new file mode 100644 index 0000000..9344201 --- /dev/null +++ b/crops/ryeoatrice.lua @@ -0,0 +1,132 @@ + +--= A nice addition from Ademant's grain mod :) + +-- Rye + +farming.register_plant("farming:rye", { + description = "Rye seed", + paramtype2 = "meshoptions", + inventory_image = "farming_rye_seed.png", + steps = 8, + minlight = 13, + maxlight = default.LIGHT_MAX, + fertility = {"savannah"}, + groups = {flammable = 4}, + place_param2 = 3, +}) + +minetest.override_item("farming:rye", { + groups = {food_rye = 1, flammable = 4} +}) + +minetest.register_craft({ + type = "shapeless", + output = "farming:flour", + recipe = { + "farming:rye", "farming:rye", "farming:rye", "farming:rye", + "farming:mortar_pestle" + }, + replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}, +}) + +-- Oats + +farming.register_plant("farming:oat", { + description = "Oat seed", + paramtype2 = "meshoptions", + inventory_image = "farming_oat_seed.png", + steps = 8, + minlight = 13, + maxlight = default.LIGHT_MAX, + fertility = {"savannah"}, + groups = {flammable = 4}, + place_param2 = 3, +}) + +minetest.override_item("farming:oat", { + groups = {food_oats = 1, flammable = 4} +}) + +minetest.register_craft({ + type = "shapeless", + output = "farming:flour", + recipe = { + "farming:oat", "farming:oat", "farming:oat", "farming:oat", + "farming:mortar_pestle" + }, + replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}, +}) + +-- Rice + +farming.register_plant("farming:rice", { + description = "Rice grains", + paramtype2 = "meshoptions", + inventory_image = "farming_rice_seed.png", + steps = 8, + minlight = 13, + maxlight = default.LIGHT_MAX, + fertility = {"savannah"}, + groups = {flammable = 4}, + place_param2 = 3, +}) + +minetest.override_item("farming:rice", { + groups = {food_rice = 1, flammable = 4} +}) + +minetest.register_craftitem("farming:rice_bread", { + description = "Rice Bread", + inventory_image = "farming_rice_bread.png", + on_use = minetest.item_eat(5), + groups = {food_rice_bread = 1, flammable = 2}, +}) + +minetest.register_craftitem("farming:rice_flour", { + description = "Rice Flour", + inventory_image = "farming_rice_flour.png", + groups = {food_rice_flour = 1, flammable = 1}, +}) + +minetest.register_craft({ + type = "shapeless", + output = "farming:rice_flour", + recipe = { + "farming:rice", "farming:rice", "farming:rice", "farming:rice", + "farming:mortar_pestle" + }, + replacements = {{"group:food_mortar_pestle", "farming:mortar_pestle"}}, +}) + +minetest.register_craft({ + type = "cooking", + cooktime = 15, + output = "farming:rice_bread", + recipe = "farming:rice_flour" +}) + +-- Fuels + +minetest.register_craft({ + type = "fuel", + recipe = "farming:rice_bread", + burntime = 1, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "farming:rye", + burntime = 1, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "farming:oat", + burntime = 1, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "farming:rice", + burntime = 1, +}) diff --git a/farming.conf_example b/farming.conf_example index f652e9c..9d1769a 100644 --- a/farming.conf_example +++ b/farming.conf_example @@ -29,6 +29,7 @@ farming.pepper = true farming.pineapple = true farming.peas = true farming.beetroot = true +farming.grains = true -- rarety of crops on map, default is 0.001 (higher number = more crops) farming.rarety = 0.002 diff --git a/grass.lua b/grass.lua index 9644254..447926f 100644 --- a/grass.lua +++ b/grass.lua @@ -8,6 +8,7 @@ for i = 4, 5 do max_items = 1, items = { {items = {'farming:seed_wheat'}, rarity = 5}, + {items = {'farming:seed_oat'},rarity = 10}, {items = {'default:grass_1'}}, } }, @@ -21,7 +22,8 @@ for i = 4, 5 do drop = { max_items = 1, items = { - {items = {'farming:seed_barley'}, rarity = 6}, + {items = {'farming:seed_barley'}, rarity = 5}, + {items = {'farming:seed_rye'},rarity = 10}, {items = {'default:dry_grass_1'}}, } }, @@ -37,6 +39,7 @@ minetest.override_item("default:junglegrass", { max_items = 1, items = { {items = {'farming:seed_cotton'}, rarity = 8}, + {items = {'farming:seed_rice'},rarity = 16}, {items = {'default:junglegrass'}}, } }, diff --git a/init.lua b/init.lua index 04fe300..09c7592 100644 --- a/init.lua +++ b/init.lua @@ -591,7 +591,7 @@ farming.registered_plants[mname .. ":" .. pname] = { minlight = def.minlight, maxlight = def.maxlight } -print(dump(farming.registered_plants[mname .. ":" .. pname])) +--print(dump(farming.registered_plants[mname .. ":" .. pname])) -- Return info return {seed = mname .. ":seed_" .. pname, harvest = mname .. ":" .. pname} end @@ -621,6 +621,7 @@ farming.pepper = true farming.pineapple = true farming.peas = true farming.beetroot = true +farming.grains = true farming.rarety = 0.002 -- 0.006 @@ -685,6 +686,7 @@ ddoo("pineapple.lua", farming.pineapple) ddoo("peas.lua", farming.peas) ddoo("beetroot.lua", farming.beetroot) ddoo("chili.lua", farming.chili) +ddoo("ryeoatrice.lua", farming.grains) dofile(farming.path.."/food.lua") dofile(farming.path.."/mapgen.lua") diff --git a/license.txt b/license.txt index b7bb7a9..480aa8e 100644 --- a/license.txt +++ b/license.txt @@ -128,3 +128,8 @@ Created by TenPlus1 farming_rhubarb.png farming_rhubarb_pie.png farming_hemp*.png + +Created by ademant (CC-BY-3.0) + farming_rye*.png + farming_oat*.png + farming_rice*.png diff --git a/textures/farming_oat.png b/textures/farming_oat.png new file mode 100644 index 0000000..e8d5c23 Binary files /dev/null and b/textures/farming_oat.png differ diff --git a/textures/farming_oat_1.png b/textures/farming_oat_1.png new file mode 100644 index 0000000..177fbdf Binary files /dev/null and b/textures/farming_oat_1.png differ diff --git a/textures/farming_oat_2.png b/textures/farming_oat_2.png new file mode 100644 index 0000000..fe051ea Binary files /dev/null and b/textures/farming_oat_2.png differ diff --git a/textures/farming_oat_3.png b/textures/farming_oat_3.png new file mode 100644 index 0000000..5aba108 Binary files /dev/null and b/textures/farming_oat_3.png differ diff --git a/textures/farming_oat_4.png b/textures/farming_oat_4.png new file mode 100644 index 0000000..833b134 Binary files /dev/null and b/textures/farming_oat_4.png differ diff --git a/textures/farming_oat_5.png b/textures/farming_oat_5.png new file mode 100644 index 0000000..ec0803b Binary files /dev/null and b/textures/farming_oat_5.png differ diff --git a/textures/farming_oat_6.png b/textures/farming_oat_6.png new file mode 100644 index 0000000..847adc5 Binary files /dev/null and b/textures/farming_oat_6.png differ diff --git a/textures/farming_oat_7.png b/textures/farming_oat_7.png new file mode 100644 index 0000000..3552811 Binary files /dev/null and b/textures/farming_oat_7.png differ diff --git a/textures/farming_oat_8.png b/textures/farming_oat_8.png new file mode 100644 index 0000000..c7a5540 Binary files /dev/null and b/textures/farming_oat_8.png differ diff --git a/textures/farming_oat_seed.png b/textures/farming_oat_seed.png new file mode 100644 index 0000000..893c93c Binary files /dev/null and b/textures/farming_oat_seed.png differ diff --git a/textures/farming_rice.png b/textures/farming_rice.png new file mode 100644 index 0000000..3d64c7e Binary files /dev/null and b/textures/farming_rice.png differ diff --git a/textures/farming_rice_1.png b/textures/farming_rice_1.png new file mode 100644 index 0000000..715bb2e Binary files /dev/null and b/textures/farming_rice_1.png differ diff --git a/textures/farming_rice_2.png b/textures/farming_rice_2.png new file mode 100644 index 0000000..2662d42 Binary files /dev/null and b/textures/farming_rice_2.png differ diff --git a/textures/farming_rice_3.png b/textures/farming_rice_3.png new file mode 100644 index 0000000..fee87b2 Binary files /dev/null and b/textures/farming_rice_3.png differ diff --git a/textures/farming_rice_4.png b/textures/farming_rice_4.png new file mode 100644 index 0000000..97b026f Binary files /dev/null and b/textures/farming_rice_4.png differ diff --git a/textures/farming_rice_5.png b/textures/farming_rice_5.png new file mode 100644 index 0000000..c249851 Binary files /dev/null and b/textures/farming_rice_5.png differ diff --git a/textures/farming_rice_6.png b/textures/farming_rice_6.png new file mode 100644 index 0000000..c0e7233 Binary files /dev/null and b/textures/farming_rice_6.png differ diff --git a/textures/farming_rice_7.png b/textures/farming_rice_7.png new file mode 100644 index 0000000..9d251ee Binary files /dev/null and b/textures/farming_rice_7.png differ diff --git a/textures/farming_rice_8.png b/textures/farming_rice_8.png new file mode 100644 index 0000000..41b37e0 Binary files /dev/null and b/textures/farming_rice_8.png differ diff --git a/textures/farming_rice_bread.png b/textures/farming_rice_bread.png new file mode 100644 index 0000000..f14f741 Binary files /dev/null and b/textures/farming_rice_bread.png differ diff --git a/textures/farming_rice_flour.png b/textures/farming_rice_flour.png new file mode 100644 index 0000000..2722151 Binary files /dev/null and b/textures/farming_rice_flour.png differ diff --git a/textures/farming_rice_seed.png b/textures/farming_rice_seed.png new file mode 100644 index 0000000..854cd05 Binary files /dev/null and b/textures/farming_rice_seed.png differ diff --git a/textures/farming_rye.png b/textures/farming_rye.png new file mode 100644 index 0000000..ebc5b37 Binary files /dev/null and b/textures/farming_rye.png differ diff --git a/textures/farming_rye_1.png b/textures/farming_rye_1.png new file mode 100644 index 0000000..932b621 Binary files /dev/null and b/textures/farming_rye_1.png differ diff --git a/textures/farming_rye_2.png b/textures/farming_rye_2.png new file mode 100644 index 0000000..b6a69b7 Binary files /dev/null and b/textures/farming_rye_2.png differ diff --git a/textures/farming_rye_3.png b/textures/farming_rye_3.png new file mode 100644 index 0000000..aaa71c2 Binary files /dev/null and b/textures/farming_rye_3.png differ diff --git a/textures/farming_rye_4.png b/textures/farming_rye_4.png new file mode 100644 index 0000000..ea1246e Binary files /dev/null and b/textures/farming_rye_4.png differ diff --git a/textures/farming_rye_5.png b/textures/farming_rye_5.png new file mode 100644 index 0000000..b359673 Binary files /dev/null and b/textures/farming_rye_5.png differ diff --git a/textures/farming_rye_6.png b/textures/farming_rye_6.png new file mode 100644 index 0000000..749a2ef Binary files /dev/null and b/textures/farming_rye_6.png differ diff --git a/textures/farming_rye_7.png b/textures/farming_rye_7.png new file mode 100644 index 0000000..fc78198 Binary files /dev/null and b/textures/farming_rye_7.png differ diff --git a/textures/farming_rye_8.png b/textures/farming_rye_8.png new file mode 100644 index 0000000..0b7c33e Binary files /dev/null and b/textures/farming_rye_8.png differ diff --git a/textures/farming_rye_seed.png b/textures/farming_rye_seed.png new file mode 100644 index 0000000..e65ba9b Binary files /dev/null and b/textures/farming_rye_seed.png differ