1
0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-12-26 02:30:38 +01:00

Merge branch 'mgl512-hunger'

This commit is contained in:
LeMagnesium 2014-12-03 19:16:04 +01:00
commit 163ef5e8e4
2 changed files with 21 additions and 0 deletions

View File

@ -9,6 +9,7 @@ dwarves?
ethereal? ethereal?
farming? farming?
farming_plus? farming_plus?
ferns?
fishing? fishing?
fruit? fruit?
glooptest? glooptest?

View File

@ -142,6 +142,11 @@ end
if minetest.get_modpath("mushroom") ~= nil then if minetest.get_modpath("mushroom") ~= nil then
overwrite("mushroom:brown", 1) overwrite("mushroom:brown", 1)
overwrite("mushroom:red", 1, "", 3) overwrite("mushroom:red", 1, "", 3)
-- mushroom potions: red = strong poison, brown = light restorative
if minetest.get_modpath("vessels") then
overwrite("mushroom:brown_essence", 1, "vessels:glass_bottle", nil, 2)
overwrite("mushroom:poison", 1, "vessels:glass_bottle", 10)
end
end end
if minetest.get_modpath("docfarming") ~= nil then if minetest.get_modpath("docfarming") ~= nil then
@ -280,6 +285,8 @@ if minetest.get_modpath("farming") and farming.mod == "redo" then
overwrite("farming:donut_chocolate", 6) overwrite("farming:donut_chocolate", 6)
overwrite("farming:donut_apple", 6) overwrite("farming:donut_apple", 6)
overwrite("farming:raspberries", 1) overwrite("farming:raspberries", 1)
overwrite("farming:blueberries", 1)
overwrite("farming:muffin_blueberry", 4)
if minetest.get_modpath("vessels") then if minetest.get_modpath("vessels") then
overwrite("farming:smoothie_raspberry", 2, "vessels:drinking_glass") overwrite("farming:smoothie_raspberry", 2, "vessels:drinking_glass")
end end
@ -292,15 +299,20 @@ if minetest.get_modpath("maptools") then
end end
if minetest.get_modpath("mobs") ~= nil then if minetest.get_modpath("mobs") ~= nil then
overwrite("mobs:cheese", 4)
overwrite("mobs:meat", 6) overwrite("mobs:meat", 6)
overwrite("mobs:meat_raw", 3) overwrite("mobs:meat_raw", 3)
overwrite("mobs:rat_cooked", 5) overwrite("mobs:rat_cooked", 5)
overwrite("mobs:honey", 2)
overwrite("mobs:pork_raw", 4) overwrite("mobs:pork_raw", 4)
overwrite("mobs:pork_cooked", 8) overwrite("mobs:pork_cooked", 8)
overwrite("mobs:chicken_raw", 2) overwrite("mobs:chicken_raw", 2)
overwrite("mobs:chicken_cooked", 4) overwrite("mobs:chicken_cooked", 4)
overwrite("mobs:egg", 1) overwrite("mobs:egg", 1)
overwrite("mobs:chicken_egg_fried", 2) overwrite("mobs:chicken_egg_fried", 2)
if minetest.get_modpath("bucket") then
overwrite("mobs:bucket_milk", 3, "bucket:bucket_empty")
end
end end
--- mes modifs /fin --- --- mes modifs /fin ---
@ -331,6 +343,14 @@ if minetest.get_modpath("jkwine") ~= nil then
overwrite("jkwine:winebottle", 1) overwrite("jkwine:winebottle", 1)
end end
-- Ferns mod of plantlife_modpack
if minetest.get_modpath("ferns") ~= nil then
overwrite("ferns:fiddlehead", 1, "", 1)
overwrite("ferns:fiddlehead_roasted", 3)
overwrite("ferns:ferntuber_roasted", 3)
overwrite("ferns:horsetail_01", 1)
end
-- player-action based hunger changes -- player-action based hunger changes
function hud.handle_node_actions(pos, oldnode, player, ext) function hud.handle_node_actions(pos, oldnode, player, ext)
if not player or not player:is_player() then if not player or not player:is_player() then