From 7a972937da8a116e1d285531749c4c3f47341f96 Mon Sep 17 00:00:00 2001 From: TenPlus1 Date: Thu, 22 Mar 2018 14:25:31 +0000 Subject: [PATCH] added sliced bread, toast, toast sandwich. changed some recipes --- barley.lua | 6 +++- donut.lua | 25 ++++++------- rhubarb.lua | 5 +-- textures/farming_bread_slice.png | Bin 0 -> 159 bytes textures/farming_toast.png | Bin 0 -> 159 bytes textures/farming_toast_sandwich.png | Bin 0 -> 175 bytes wheat.lua | 53 +++++++++++++++++++++++++++- 7 files changed, 70 insertions(+), 19 deletions(-) create mode 100644 textures/farming_bread_slice.png create mode 100644 textures/farming_toast.png create mode 100644 textures/farming_toast_sandwich.png diff --git a/barley.lua b/barley.lua index 66ba071..4005d2c 100644 --- a/barley.lua +++ b/barley.lua @@ -30,7 +30,11 @@ minetest.register_craftitem("farming:barley", { minetest.register_craft({ type = "shapeless", output = "farming:flour", - recipe = {"farming:barley", "farming:barley", "farming:barley", "farming:barley"} + recipe = { + "farming:barley", "farming:barley", "farming:barley", + "farming:barley", "farming:mortar_pestle" + }, + replacements = {{"farming:mortar_pestle", "farming:mortar_pestle"}}, }) -- barley definition diff --git a/donut.lua b/donut.lua index 8c66da5..f3dfbce 100644 --- a/donut.lua +++ b/donut.lua @@ -51,31 +51,26 @@ minetest.register_craft({ minetest.register_craftitem("farming:porridge", { description = S("Porridge"), inventory_image = "farming_porridge.png", - on_use = minetest.item_eat(6), + on_use = minetest.item_eat(6, "farming:bowl"), }) minetest.after(0, function() + local fluid = "bucket:bucket_water" + local fluid_return = "bucket:bucket_water" + if minetest.get_modpath("mobs") and mobs and mobs.mod == "redo" then + fluid = "group:food_milk" + fluid_return = "mobs:bucket_milk" + end minetest.register_craft({ - output = "farming:porridge", type = "shapeless", + output = "farming:porridge", recipe = { "group:food_barley", "group:food_barley", "group:food_wheat", - "group:food_wheat", "group:food_milk" + "group:food_wheat", "group:food_bowl", fluid }, - replacements = {{"mobs:bucket_milk", "bucket:bucket_empty"}} + replacements = {{fluid_return, "bucket:bucket_empty"}} }) -else - minetest.register_craft({ - output = "farming:porridge", - type = "shapeless", - recipe = { - "group:food_barley", "group:food_barley", "group:food_wheat", - "group:food_wheat", "bucket:bucket_water" - }, - replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}} - }) - end end) diff --git a/rhubarb.lua b/rhubarb.lua index 014ccf9..1fa897f 100644 --- a/rhubarb.lua +++ b/rhubarb.lua @@ -22,10 +22,11 @@ minetest.register_craftitem("farming:rhubarb_pie", { minetest.register_craft({ output = "farming:rhubarb_pie", recipe = { - {"", "group:food_sugar", ""}, + {"farming:baking_tray", "group:food_sugar", ""}, {"group:food_rhubarb", "group:food_rhubarb", "group:food_rhubarb"}, {"group:food_wheat", "group:food_wheat", "group:food_wheat"}, - } + }, + replacements = {{"farming:baking_tray", "farming:baking_tray"}} }) -- rhubarb definition diff --git a/textures/farming_bread_slice.png b/textures/farming_bread_slice.png new file mode 100644 index 0000000000000000000000000000000000000000..ff2714d1d2baa3bba2d955afdfbdae818375a072 GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?bO)b#{GFK+c%`6Xlabc&h zuCynR&sY-V7tG-B>_!@pW9RAO7{YNqIe~%6(UHwSz$8ql;gVjT!z@9MX30ZtdU|>a znu(&~D>!-%X0+%zH9X`nW%n^QSmlthU}=IBgVk<+{yW~^Wq>9zc)I$ztaD0e0ste2 BD`)@! literal 0 HcmV?d00001 diff --git a/textures/farming_toast.png b/textures/farming_toast.png new file mode 100644 index 0000000000000000000000000000000000000000..8a4524e256f465beaba5defb1449054afd7be319 GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?bO)b#{GTZ&cS0>9HYV&1U zV)+5cXDkWw3ubV5b|VeQvGa6s4B@z*oWQ{3=*VUu5Mm_Oa7nMvVV0mrv!v50Jv}`I zO+{hx6&yVWSM=yPH9X`nW%n^QnB|bMU}=IBgLgcC#q9Myfk2ZOJYD@<);T3K0RRP= BD*^xj literal 0 HcmV?d00001 diff --git a/textures/farming_toast_sandwich.png b/textures/farming_toast_sandwich.png new file mode 100644 index 0000000000000000000000000000000000000000..c60ff5a77dd1968d2d588c2f37c6ee1470c22fa7 GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ%`eIYGTZ&c7sbh}OqQEj z9`@qG&gfec{s2W8OM?7@862M7NCR>_JY5_^IIbrrG%z~~FkI@%R8Tl@K%wcBhf7+E z<5QQ|g*=MkD`XZINlXz;k>X-$X<_UM+%E3W24dqz6m}n7$&U^U|`s2D*4?= Sfb$E`Oa@O^KbLh*2~7a)zcokz literal 0 HcmV?d00001 diff --git a/wheat.lua b/wheat.lua index 494b543..1b22723 100644 --- a/wheat.lua +++ b/wheat.lua @@ -61,7 +61,11 @@ minetest.register_craftitem("farming:flour", { minetest.register_craft({ type = "shapeless", output = "farming:flour", - recipe = {"farming:wheat", "farming:wheat", "farming:wheat", "farming:wheat"} + recipe = { + "farming:wheat", "farming:wheat", "farming:wheat", + "farming:wheat", "farming:mortar_pestle" + }, + replacements = {{"farming:mortar_pestle", "farming:mortar_pestle"}}, }) -- bread @@ -79,6 +83,53 @@ minetest.register_craft({ recipe = "farming:flour" }) +-- sliced bread +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}, +}) + +minetest.register_craft({ + type = "shapeless", + output = "farming:bread_slice 5", + recipe = {"farming:bread", "group:food_cutting_board"}, + replacements = {{"farming:cutting_board", "farming:cutting_board"}}, +}) + +-- toast +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}, +}) + +minetest.register_craft({ + type = "cooking", + cooktime = 3, + output = "farming:toast", + recipe = "farming:bread_slice" +}) + +-- toast sandwich +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}, +}) + +minetest.register_craft({ + output = "farming:toast_sandwich", + recipe = { + {"farming:bread_slice"}, + {"farming:toast"}, + {"farming:bread_slice"}, + } +}) + -- wheat definition local crop_def = { drawtype = "plantlike",