From 7d3e3c869efced4843931a1757d22dc299de0b54 Mon Sep 17 00:00:00 2001 From: sys4 Date: Sun, 5 Jan 2020 17:19:06 +0100 Subject: [PATCH] Ajoute support de plus de nourriture + corrections --- depends.txt | 4 ++- init.lua | 102 +++++++++++++++++++++++++++++++++------------------- 2 files changed, 69 insertions(+), 37 deletions(-) diff --git a/depends.txt b/depends.txt index 69191ea..a2098ff 100644 --- a/depends.txt +++ b/depends.txt @@ -27,6 +27,8 @@ mobs? moretrees? mtfoods? mush45? -mushroom? +flowers? nsspf? seaplants? +zombie? +riesenpilz? diff --git a/init.lua b/init.lua index 4655d56..02f0038 100644 --- a/init.lua +++ b/init.lua @@ -195,15 +195,23 @@ if minetest.get_modpath("mobs") ~= nil then overwrite("mobs:cheese", 4) overwrite("mobs:meat", 8) overwrite("mobs:meat_raw", 4) - overwrite("mobs:rat_cooked", 4) + overwrite("mobs:rat_cooked", 3) overwrite("mobs:honey", 2) - overwrite("mobs:pork_raw", 3, "", 3) + overwrite("mobs:pork_raw", 4, "", 4) overwrite("mobs:pork_cooked", 8) overwrite("mobs:chicken_cooked", 6) overwrite("mobs:chicken_raw", 2, "", 3) overwrite("mobs:chicken_egg_fried", 2) + overwrite("mobs:mutton_raw", 2) + overwrite("mobs:mutton_cooked", 6) + overwrite("mobs:rabbit_raw", 3) + overwrite("mobs:rabbit_cooked", 5) if minetest.get_modpath("bucket") then overwrite("mobs:bucket_milk", 3, "bucket:bucket_empty") + overwrite("mobs:butter", 2) + if minetest.get_modpath("vessels") then + overwrite("mobs:glass_milk", 2, "vessels:drinking_glass") + end end else overwrite("mobs:meat", 6) @@ -213,12 +221,17 @@ if minetest.get_modpath("mobs") ~= nil then end if minetest.get_modpath("moretrees") ~= nil then - overwrite("moretrees:coconut_milk", 1) - overwrite("moretrees:raw_coconut", 2) - overwrite("moretrees:acorn_muffin", 3) + overwrite("moretrees:coconut_milk", 2) + overwrite("moretrees:raw_coconut", 4) + overwrite("moretrees:acorn_muffin", 4) overwrite("moretrees:spruce_nuts", 1) overwrite("moretrees:pine_nuts", 1) overwrite("moretrees:fir_nuts", 1) + overwrite("moretrees:cedar_nuts", 1) + overwrite("moretrees:date", 1) + overwrite("moretrees:date_nut_bar", 4) + overwrite("moretrees:date_nut_cake", 32) + overwrite("moretrees:date_nut_snack", 4) end if minetest.get_modpath("dwarves") ~= nil then @@ -247,12 +260,18 @@ end if minetest.get_modpath("fishing") ~= nil then overwrite("fishing:fish_raw", 2) - overwrite("fishing:fish_cooked", 5) + overwrite("fishing:fish_cooked", 4) overwrite("fishing:sushi", 6) - overwrite("fishing:shark", 4) - overwrite("fishing:shark_cooked", 8) - overwrite("fishing:pike", 4) - overwrite("fishing:pike_cooked", 8) + overwrite("fishing:clownfish_raw", 2) + overwrite("fishing:bluewhite_raw", 2) + overwrite("fishing:exoticfish_raw", 2) + overwrite("fishing:carp_raw", 2) + overwrite("fishing:perch_raw", 2) + overwrite("fishing:catfish_raw", 2) + overwrite("fishing:shark_row", 2) + overwrite("fishing:shark_cooked", 6) + overwrite("fishing:pike_raw", 2) + overwrite("fishing:pike_cooked", 6) end if minetest.get_modpath("glooptest") ~= nil then @@ -280,16 +299,16 @@ if minetest.get_modpath("bushes_classic") then if berry ~= "mixed_berry" then overwrite("bushes:"..berry, 1) end - overwrite("bushes:"..berry.."_pie_raw", 2) - overwrite("bushes:"..berry.."_pie_cooked", 5) + overwrite("bushes:"..berry.."_pie_raw", 4) + overwrite("bushes:"..berry.."_pie_cooked", 6) overwrite("bushes:"..berry.."_pie_slice", 1) - overwrite("bushes:basket_"..berry, 15) + overwrite("bushes:basket_"..berry, 18) end end -if minetest.get_modpath("mushroom") ~= nil then - overwrite("mushroom:brown", 1) - overwrite("mushroom:red", 1, "", 3) +if minetest.get_modpath("flowers") ~= nil then + overwrite("flowers:mushroom_brown", 1) + overwrite("flowers:mushroom_red", 1, "", 5) -- mushroom potions: red = strong poison, brown = light restorative if minetest.get_modpath("vessels") then overwrite("mushroom:brown_essence", 1, "vessels:glass_bottle", nil, 4) @@ -320,30 +339,29 @@ end if minetest.get_modpath("mtfoods") ~= nil then overwrite("mtfoods:dandelion_milk", 1) overwrite("mtfoods:sugar", 1) - overwrite("mtfoods:short_bread", 4) - overwrite("mtfoods:cream", 1) + overwrite("mtfoods:short_bread", 3.5) + overwrite("mtfoods:cream", 1.5) overwrite("mtfoods:chocolate", 2) - overwrite("mtfoods:cupcake", 2) - overwrite("mtfoods:strawberry_shortcake", 2) + overwrite("mtfoods:cupcake", 3.5) + overwrite("mtfoods:strawberry_shortcake", 3.5) overwrite("mtfoods:cake", 3) - overwrite("mtfoods:chocolate_cake", 3) - overwrite("mtfoods:carrot_cake", 3) - overwrite("mtfoods:pie_crust", 3) - overwrite("mtfoods:apple_pie", 3) - overwrite("mtfoods:rhubarb_pie", 2) - overwrite("mtfoods:banana_pie", 3) - overwrite("mtfoods:pumpkin_pie", 3) - overwrite("mtfoods:cookies", 2) - overwrite("mtfoods:mlt_burger", 5) + overwrite("mtfoods:chocolate_cake", 5) + overwrite("mtfoods:boston_cream", 5) + overwrite("mtfoods:carrot_cake", 4) + overwrite("mtfoods:pie_crust", 3.5) + overwrite("mtfoods:apple_pie", 5) + overwrite("mtfoods:rhubarb_pie", 5) + overwrite("mtfoods:banana_pie", 5) + overwrite("mtfoods:pumpkin_pie", 5) + overwrite("mtfoods:cookies", 3) + overwrite("mtfoods:mlt_burger", 6.5) overwrite("mtfoods:potato_slices", 2) overwrite("mtfoods:potato_chips", 3) - --mtfoods:medicine - overwrite("mtfoods:casserole", 3) - overwrite("mtfoods:glass_flute", 2) - overwrite("mtfoods:orange_juice", 2) - overwrite("mtfoods:apple_juice", 2) - overwrite("mtfoods:apple_cider", 2) - overwrite("mtfoods:cider_rack", 2) + overwrite("mtfoods:medicine", 0.5, "", nil, 8) + overwrite("mtfoods:casserole", 5) + overwrite("mtfoods:orange_juice", 0.5) + overwrite("mtfoods:apple_juice", 0.5) + overwrite("mtfoods:apple_cider", 1) end if minetest.get_modpath("fruit") ~= nil then @@ -357,6 +375,10 @@ if minetest.get_modpath("mush45") ~= nil then overwrite("mush45:meal", 4) end +if minetest.get_modpath("riesenpilz") then + overwrite("riesenpilz:mush45_meal", 6) +end + if minetest.get_modpath("seaplants") ~= nil then overwrite("seaplants:sand_with_kelp_green", 1) overwrite("seaplants:sand_with_kelp_brown", 1) @@ -415,6 +437,8 @@ if minetest.get_modpath("farming") and farming.mod == "redo" then overwrite("farming:bread_slice", 1) overwrite("farming:toast", 1) overwrite("farming:toast_sandwich", 4) + overwrite("farming:bread_multigrain", 7) + overwrite("farming:rice_bread", 5) overwrite("farming:potato", 1) overwrite("farming:baked_potato", 6) overwrite("farming:potato_salad", 10, "farming:bowl") @@ -446,6 +470,7 @@ if minetest.get_modpath("farming") and farming.mod == "redo" then overwrite("farming:rhubarb", 1) overwrite("farming:rhubarb_pie", 6) overwrite("farming:turkish_delight", 2) + overwrite("farming:garlic", 1) overwrite("farming:garlic_bread", 2) overwrite("farming:porridge", 6, "farming:bowl") overwrite("farming:beans", 1) @@ -459,6 +484,7 @@ if minetest.get_modpath("farming") and farming.mod == "redo" then overwrite("farming:pea_soup", 4, "farming:bowl") overwrite("farming:pepper", 2) overwrite("farming:pineapple_ring", 1) + overwrite("farming:jaffa_cake", 6) end if minetest.get_modpath("kpgmobs") ~= nil then @@ -578,4 +604,8 @@ if minetest.get_modpath("nsspf") ~= nil then overwrite("nsspf:cooked_plectania_nannfeldtii", -20) end +if minetest.get_modpath("zombie") then + overwrite("zombie:rotten_flesh", -5, "", nil, 5) +end + minetest.log("action", "[diet] loaded.")