Tim7
/
VoxeLibre
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Fixed sweet berries bugs. 

Now they can only be placed a tile's upper part.
Also when destroyed bushes at stage 2 drop 1 or 2 berries, while bushes
at stage 3 drop 2 or 3 (instead of fixed numbers of 1 and 3
respectively).
Also harvesting sweet berries at stage 3 (final) brings them to stage 1
instead of just to stage 2. Number of dropped berries was adjusted.
This commit is contained in:
CyberMango 2022-12-24 19:38:55 +02:00 committed by CyberMango
parent fb51067c78
commit 8a7fcfde82
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mods/ITEMS/mcl_farming/sweet_berry.lua
View File

@ -9,6 +9,9 @@ for i=0, 3 do
if i > 0 then if i > 0 then
groups.sweet_berry_thorny = 1 groups.sweet_berry_thorny = 1
end end
local drop_berries = (i >= 2)
local berries_to_drop = drop_berries and {i - 1, i} or nil
minetest.register_node(node_name, { minetest.register_node(node_name, {
drawtype = "plantlike", drawtype = "plantlike",
tiles = {texture}, tiles = {texture},
@ -24,7 +27,14 @@ for i=0, 3 do
liquid_renewable = false, liquid_renewable = false,
liquid_range = 0, liquid_range = 0,
walkable = false, walkable = false,
drop = (i>=2) and ("mcl_farming:sweet_berry" .. (i==3 and " 3" or "")) or "", -- Dont even create a table if no berries are dropped.
drop = not drop_berries and "" or {
max_items = 1,
items = {
{ items = {"mcl_farming:sweet_berry " .. berries_to_drop[1] }, rarity = 2 },
{ items = {"mcl_farming:sweet_berry " .. berries_to_drop[2] } }
}
},
selection_box = { selection_box = {
type = "fixed", type = "fixed",
fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, (-0.30 + (i*0.25)), 6 / 16}, fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, (-0.30 + (i*0.25)), 6 / 16},
@ -46,17 +56,12 @@ for i=0, 3 do
itemstack:take_item() itemstack:take_item()
return return
end end
local stage
if node.name:find("_2") then if drop_berries then
stage = 2 for j=1, berries_to_drop[math.random(2)] do
elseif node.name:find("_3") then minetest.add_item(pos, "mcl_farming:sweet_berry")
stage = 3
end end
if stage then minetest.swap_node(pos, {name = "mcl_farming:sweet_berry_bush_" .. 1 })
for i=1,math.random(stage) do
minetest.add_item(pos,"mcl_farming:sweet_berry")
end
minetest.swap_node(pos,{name = "mcl_farming:sweet_berry_bush_" .. stage - 1 })
end end
return itemstack return itemstack
end, end,
@ -76,8 +81,11 @@ minetest.register_craftitem("mcl_farming:sweet_berry", {
minetest.record_protection_violation(pointed_thing.above, pn) minetest.record_protection_violation(pointed_thing.above, pn)
return itemstack return itemstack
end end
if pointed_thing.type == "node" and table.indexof(planton,minetest.get_node(pointed_thing.under).name) ~= -1 and minetest.get_node(pointed_thing.above).name == "air" then if pointed_thing.type == "node" and
minetest.set_node(pointed_thing.above,{name="mcl_farming:sweet_berry_bush_0"}) table.indexof(planton, minetest.get_node(pointed_thing.under).name) ~= -1 and
pointed_thing.above.y > pointed_thing.under.y and
minetest.get_node(pointed_thing.above).name == "air" then
minetest.set_node(pointed_thing.above, {name="mcl_farming:sweet_berry_bush_0"})
if not minetest.is_creative_enabled(placer:get_player_name()) then if not minetest.is_creative_enabled(placer:get_player_name()) then
itemstack:take_item() itemstack:take_item()
end end