From 3b9f7ab82e2b0c34639890390b3cbcf85160cb5a Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 12 Apr 2025 14:55:25 +0100 Subject: [PATCH] tweak crop drops to something more sensible --- crops/asparagus.lua | 4 ++-- crops/beans.lua | 4 ++-- crops/beetroot.lua | 7 +++---- crops/blackberry.lua | 6 +++--- crops/cabbage.lua | 4 ++-- crops/carrot.lua | 5 +++-- crops/cocoa.lua | 6 +++--- crops/coffee.lua | 4 ++-- crops/corn.lua | 3 +-- crops/cucumber.lua | 3 ++- crops/eggplant.lua | 3 ++- crops/garlic.lua | 4 ++-- crops/ginger.lua | 3 ++- crops/grapes.lua | 7 ++++--- crops/lettuce.lua | 2 +- crops/mint.lua | 6 +++--- crops/onion.lua | 8 +++----- crops/peas.lua | 6 +++--- crops/pepper.lua | 6 +++--- crops/potato.lua | 5 +++-- crops/rice.lua | 5 +++-- crops/soy.lua | 11 +++++------ crops/spinach.lua | 5 +++-- crops/strawberry.lua | 9 ++++++--- crops/tomato.lua | 7 ++++--- crops/vanilla.lua | 6 +++--- crops/wheat.lua | 8 ++++---- 27 files changed, 77 insertions(+), 70 deletions(-) diff --git a/crops/asparagus.lua b/crops/asparagus.lua index 10ae3ba..71962ad 100644 --- a/crops/asparagus.lua +++ b/crops/asparagus.lua @@ -71,8 +71,8 @@ def.groups.growing = nil def.selection_box = farming.select_final def.drop = { items = { - {items = {"farming:asparagus"}, rarity = 1}, - {items = {"farming:asparagus 2"}, rarity = 2} + {items = {"farming:asparagus 2"}, rarity = 1}, + {items = {"farming:asparagus"}, rarity = 2} } } minetest.register_node("farming:asparagus_5", table.copy(def)) diff --git a/crops/beans.lua b/crops/beans.lua index 0ebba69..1bb9f62 100644 --- a/crops/beans.lua +++ b/crops/beans.lua @@ -190,8 +190,8 @@ def.drop = { items = { {items = {"farming:beanpole"}, rarity = 1}, {items = {"farming:beans 3"}, rarity = 1}, - {items = {"farming:beans 2"}, rarity = 2}, - {items = {"farming:beans 2"}, rarity = 3} + {items = {"farming:beans"}, rarity = 2}, + {items = {"farming:beans"}, rarity = 3} } } minetest.register_node("farming:beanpole_5", table.copy(def)) diff --git a/crops/beetroot.lua b/crops/beetroot.lua index 179e796..43ffdf4 100644 --- a/crops/beetroot.lua +++ b/crops/beetroot.lua @@ -64,11 +64,10 @@ def.tiles = {"farming_beetroot_5.png"} def.groups.growing = nil def.selection_box = farming.select_final def.drop = { - max_items = 4, items = { - {items = {"farming:beetroot"}, rarity = 1}, + items = { + {items = {"farming:beetroot 2"}, rarity = 1}, {items = {"farming:beetroot"}, rarity = 2}, - {items = {"farming:beetroot"}, rarity = 3}, - {items = {"farming:beetroot"}, rarity = 4} + {items = {"farming:beetroot"}, rarity = 3} } } minetest.register_node("farming:beetroot_5", table.copy(def)) diff --git a/crops/blackberry.lua b/crops/blackberry.lua index d21c3ba..de61f8d 100644 --- a/crops/blackberry.lua +++ b/crops/blackberry.lua @@ -61,9 +61,9 @@ def.groups.growing = nil def.selection_box = farming.select_final def.drop = { items = { - {items = {'farming:blackberry 2'}, rarity = 1}, - {items = {'farming:blackberry'}, rarity = 2}, - {items = {'farming:blackberry'}, rarity = 3}, + {items = {"farming:blackberry 2"}, rarity = 1}, + {items = {"farming:blackberry"}, rarity = 2}, + {items = {"farming:blackberry"}, rarity = 3}, } } minetest.register_node("farming:blackberry_4", table.copy(def)) diff --git a/crops/cabbage.lua b/crops/cabbage.lua index b42eda7..884dacf 100644 --- a/crops/cabbage.lua +++ b/crops/cabbage.lua @@ -68,9 +68,9 @@ def.tiles = {"farming_cabbage_6.png"} def.groups.growing = nil def.selection_box = farming.select_final def.drop = { - max_items = 2, items = { + items = { {items = {"farming:cabbage 2"}, rarity = 1}, - {items = {"farming:cabbage 1"}, rarity = 2} + {items = {"farming:cabbage"}, rarity = 3} } } minetest.register_node("farming:cabbage_6", table.copy(def)) diff --git a/crops/carrot.lua b/crops/carrot.lua index 41911a2..c0feb91 100644 --- a/crops/carrot.lua +++ b/crops/carrot.lua @@ -77,7 +77,7 @@ def.tiles = {"farming_carrot_7.png"} def.drop = { items = { {items = {"farming:carrot"}, rarity = 1}, - {items = {"farming:carrot 2"}, rarity = 3} + {items = {"farming:carrot"}, rarity = 3} } } minetest.register_node("farming:carrot_7", table.copy(def)) @@ -90,7 +90,8 @@ def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:carrot 2"}, rarity = 1}, - {items = {"farming:carrot 3"}, rarity = 2} + {items = {"farming:carrot"}, rarity = 2}, + {items = {"farming:carrot"}, rarity = 3}, } } minetest.register_node("farming:carrot_8", table.copy(def)) diff --git a/crops/cocoa.lua b/crops/cocoa.lua index ee1cfce..f1971e6 100644 --- a/crops/cocoa.lua +++ b/crops/cocoa.lua @@ -113,7 +113,7 @@ minetest.register_node("farming:cocoa_2", table.copy(def)) def.tiles = {"farming_cocoa_3.png"} def.drop = { items = { - {items = {"farming:cocoa_beans_raw 1"}, rarity = 1} + {items = {"farming:cocoa_beans_raw"}, rarity = 1} } } minetest.register_node("farming:cocoa_3", table.copy(def)) @@ -126,8 +126,8 @@ def.growth_check = nil def.drop = { items = { {items = {"farming:cocoa_beans_raw 2"}, rarity = 1}, - {items = {"farming:cocoa_beans_raw 1"}, rarity = 2}, - {items = {"farming:cocoa_beans_raw 1"}, rarity = 4} + {items = {"farming:cocoa_beans_raw"}, rarity = 2}, + {items = {"farming:cocoa_beans_raw"}, rarity = 4} } } minetest.register_node("farming:cocoa_4", table.copy(def)) diff --git a/crops/coffee.lua b/crops/coffee.lua index 6b9f024..124aa5e 100644 --- a/crops/coffee.lua +++ b/crops/coffee.lua @@ -62,8 +62,8 @@ def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:coffee_beans 2"}, rarity = 1}, - {items = {"farming:coffee_beans 2"}, rarity = 2}, - {items = {"farming:coffee_beans 2"}, rarity = 3} + {items = {"farming:coffee_beans"}, rarity = 2}, + {items = {"farming:coffee_beans"}, rarity = 3} } } minetest.register_node("farming:coffee_5", table.copy(def)) diff --git a/crops/corn.lua b/crops/corn.lua index 114c0bd..1b9e9f3 100644 --- a/crops/corn.lua +++ b/crops/corn.lua @@ -79,8 +79,7 @@ def.tiles = {"farming_corn_7.png"} def.drop = { items = { {items = {"farming:corn"}, rarity = 1}, - {items = {"farming:corn"}, rarity = 2}, - {items = {"farming:corn"}, rarity = 3} + {items = {"farming:corn"}, rarity = 2} } } minetest.register_node("farming:corn_7", table.copy(def)) diff --git a/crops/cucumber.lua b/crops/cucumber.lua index 871eb43..d4b3180 100644 --- a/crops/cucumber.lua +++ b/crops/cucumber.lua @@ -63,7 +63,8 @@ def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:cucumber 2"}, rarity = 1}, - {items = {"farming:cucumber 2"}, rarity = 2} + {items = {"farming:cucumber"}, rarity = 2}, + {items = {"farming:cucumber"}, rarity = 3} } } minetest.register_node("farming:cucumber_4", table.copy(def)) diff --git a/crops/eggplant.lua b/crops/eggplant.lua index a6877fb..288e3b9 100644 --- a/crops/eggplant.lua +++ b/crops/eggplant.lua @@ -67,7 +67,8 @@ def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:eggplant 2"}, rarity = 1}, - {items = {"farming:eggplant 2"}, rarity = 2} + {items = {"farming:eggplant"}, rarity = 2}, + {items = {"farming:eggplant"}, rarity = 3} } } minetest.register_node("farming:eggplant_4", table.copy(def)) diff --git a/crops/garlic.lua b/crops/garlic.lua index 350e1f0..f552d3e 100644 --- a/crops/garlic.lua +++ b/crops/garlic.lua @@ -63,9 +63,9 @@ def.groups.growing = nil def.selection_box = farming.select_final def.drop = { items = { - {items = {"farming:garlic 3"}, rarity = 1}, + {items = {"farming:garlic 2"}, rarity = 1}, {items = {"farming:garlic"}, rarity = 2}, - {items = {"farming:garlic"}, rarity = 5} + {items = {"farming:garlic"}, rarity = 3} } } minetest.register_node("farming:garlic_5", table.copy(def)) diff --git a/crops/ginger.lua b/crops/ginger.lua index 7bc6ff5..2f845a2 100644 --- a/crops/ginger.lua +++ b/crops/ginger.lua @@ -66,7 +66,8 @@ def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:ginger 2"}, rarity = 1}, - {items = {"farming:ginger 2"}, rarity = 2} + {items = {"farming:ginger"}, rarity = 2}, + {items = {"farming:ginger"}, rarity = 3} } } minetest.register_node("farming:ginger_4", table.copy(def)) diff --git a/crops/grapes.lua b/crops/grapes.lua index 55104d7..3a77d3e 100644 --- a/crops/grapes.lua +++ b/crops/grapes.lua @@ -202,9 +202,10 @@ def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:trellis"}, rarity = 1}, - {items = {"farming:grapes 3"}, rarity = 1}, - {items = {"farming:grapes 1"}, rarity = 2}, - {items = {"farming:grapes 1"}, rarity = 3} + {items = {"farming:grapes 2"}, rarity = 1}, + {items = {"farming:grapes"}, rarity = 2}, + {items = {"farming:grapes"}, rarity = 3}, + {items = {"farming:grapes"}, rarity = 4} } } minetest.register_node("farming:grapes_8", table.copy(def)) diff --git a/crops/lettuce.lua b/crops/lettuce.lua index 43c6e6d..017a216 100644 --- a/crops/lettuce.lua +++ b/crops/lettuce.lua @@ -64,7 +64,7 @@ def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:lettuce 2"}, rarity = 1}, - {items = {"farming:lettuce 1"}, rarity = 2} + {items = {"farming:lettuce"}, rarity = 2} } } minetest.register_node("farming:lettuce_5", table.copy(def)) diff --git a/crops/mint.lua b/crops/mint.lua index 00a99c0..decaaef 100644 --- a/crops/mint.lua +++ b/crops/mint.lua @@ -82,9 +82,9 @@ def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:mint_leaf 2"}, rarity = 1}, - {items = {"farming:mint_leaf 2"}, rarity = 2}, - {items = {"farming:seed_mint 1"}, rarity = 1}, - {items = {"farming:seed_mint 2"}, rarity = 2} + {items = {"farming:mint_leaf"}, rarity = 2}, + {items = {"farming:seed_mint 2"}, rarity = 1}, + {items = {"farming:seed_mint"}, rarity = 2} } } minetest.register_node("farming:mint_4", table.copy(def)) diff --git a/crops/onion.lua b/crops/onion.lua index e62eb44..78ec214 100644 --- a/crops/onion.lua +++ b/crops/onion.lua @@ -72,12 +72,10 @@ def.tiles = {"crops_onion_plant_5.png"} def.groups.growing = nil def.selection_box = farming.select_final def.drop = { - max_items = 5, items = { - {items = {"farming:onion"}, rarity = 1}, - {items = {"farming:onion"}, rarity = 1}, + items = { + {items = {"farming:onion 2"}, rarity = 1}, {items = {"farming:onion"}, rarity = 2}, - {items = {"farming:onion"}, rarity = 2}, - {items = {"farming:onion"}, rarity = 5} + {items = {"farming:onion"}, rarity = 4} } } minetest.register_node("farming:onion_5", table.copy(def)) diff --git a/crops/peas.lua b/crops/peas.lua index 4dc1ec3..9f24c9e 100644 --- a/crops/peas.lua +++ b/crops/peas.lua @@ -71,11 +71,11 @@ def.tiles = {"farming_pea_5.png"} def.groups.growing = nil def.selection_box = farming.select_final def.drop = { - max_items = 5, items = { - {items = {"farming:pea_pod"}, rarity = 1}, + items = { + {items = {"farming:pea_pod 2"}, rarity = 1}, {items = {"farming:pea_pod"}, rarity = 2}, {items = {"farming:pea_pod"}, rarity = 3}, - {items = {"farming:pea_pod"}, rarity = 5} + {items = {"farming:pea_pod"}, rarity = 4} } } minetest.register_node("farming:pea_5", table.copy(def)) diff --git a/crops/pepper.lua b/crops/pepper.lua index df24ac8..d09d372 100644 --- a/crops/pepper.lua +++ b/crops/pepper.lua @@ -107,7 +107,7 @@ minetest.register_node("farming:pepper_4", table.copy(def)) def.tiles = {"crops_pepper_plant_5.png"} def.selection_box = farming.select_final def.drop = { - max_items = 2, items = { + items = { {items = {"farming:pepper 2"}, rarity = 1}, {items = {"farming:pepper"}, rarity = 2}, {items = {"farming:pepper"}, rarity = 3} @@ -119,7 +119,7 @@ minetest.register_node("farming:pepper_5", table.copy(def)) def.tiles = {"crops_pepper_plant_6.png"} def.drop = { - max_items = 2, items = { + items = { {items = {"farming:pepper_yellow 2"}, rarity = 1}, {items = {"farming:pepper_yellow"}, rarity = 2}, {items = {"farming:pepper_yellow"}, rarity = 3} @@ -132,7 +132,7 @@ minetest.register_node("farming:pepper_6", table.copy(def)) def.tiles = {"crops_pepper_plant_7.png"} def.groups.growing = nil def.drop = { - max_items = 2, items = { + items = { {items = {"farming:pepper_red 2"}, rarity = 1}, {items = {"farming:pepper_red"}, rarity = 2}, {items = {"farming:pepper_red"}, rarity = 3} diff --git a/crops/potato.lua b/crops/potato.lua index f32ca93..228d302 100644 --- a/crops/potato.lua +++ b/crops/potato.lua @@ -69,7 +69,7 @@ minetest.register_node("farming:potato_2", table.copy(def)) def.tiles = {"farming_potato_3.png"} def.drop = { items = { - {items = {"farming:potato"}, rarity = 1}, + {items = {"farming:potato"}, rarity = 2}, {items = {"farming:potato"}, rarity = 3} } } @@ -83,7 +83,8 @@ def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:potato 2"}, rarity = 1}, - {items = {"farming:potato 3"}, rarity = 2} + {items = {"farming:potato"}, rarity = 2}, + {items = {"farming:potato"}, rarity = 3} } } minetest.register_node("farming:potato_4", table.copy(def)) diff --git a/crops/rice.lua b/crops/rice.lua index 66c0c04..3447ae9 100644 --- a/crops/rice.lua +++ b/crops/rice.lua @@ -131,8 +131,9 @@ def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:seed_rice 2"}, rarity = 1}, - {items = {"farming:seed_rice 2"}, rarity = 2}, - {items = {"farming:seed_rice"}, rarity = 3} + {items = {"farming:seed_rice"}, rarity = 2}, + {items = {"farming:seed_rice"}, rarity = 3}, + {items = {"farming:seed_rice"}, rarity = 4} } } minetest.register_node("farming:rice_8", table.copy(def)) diff --git a/crops/soy.lua b/crops/soy.lua index 194243c..3d366e7 100644 --- a/crops/soy.lua +++ b/crops/soy.lua @@ -64,7 +64,7 @@ minetest.register_node("farming:soy_4", table.copy(def)) def.tiles = {"farming_soy_5.png"} def.drop = { - max_items = 1, items = { + items = { {items = {"farming:soy_pod"}, rarity = 1}, } } @@ -74,7 +74,7 @@ minetest.register_node("farming:soy_5", table.copy(def)) def.tiles = {"farming_soy_6.png"} def.drop = { - max_items = 3, items = { + items = { {items = {"farming:soy_pod"}, rarity = 1}, {items = {"farming:soy_pod"}, rarity = 2}, {items = {"farming:soy_pod"}, rarity = 3} @@ -88,12 +88,11 @@ def.tiles = {"farming_soy_7.png"} def.groups.growing = nil def.selection_box = farming.select_final def.drop = { - max_items = 5, items = { - {items = {"farming:soy_pod"}, rarity = 1}, + items = { + {items = {"farming:soy_pod 2"}, rarity = 1}, {items = {"farming:soy_pod"}, rarity = 2}, {items = {"farming:soy_pod"}, rarity = 3}, - {items = {"farming:soy_pod"}, rarity = 4}, - {items = {"farming:soy_pod"}, rarity = 5} + {items = {"farming:soy_pod"}, rarity = 4} } } minetest.register_node("farming:soy_7", table.copy(def)) diff --git a/crops/spinach.lua b/crops/spinach.lua index 56a8455..2bc2560 100644 --- a/crops/spinach.lua +++ b/crops/spinach.lua @@ -66,8 +66,9 @@ def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:spinach 2"}, rarity = 1}, - {items = {"farming:spinach 2"}, rarity = 2}, - {items = {"farming:spinach 2"}, rarity = 3} + {items = {"farming:spinach"}, rarity = 2}, + {items = {"farming:spinach"}, rarity = 3}, + {items = {"farming:spinach"}, rarity = 4} } } minetest.register_node("farming:spinach_4", table.copy(def)) diff --git a/crops/strawberry.lua b/crops/strawberry.lua index 8c95ff5..0873049 100644 --- a/crops/strawberry.lua +++ b/crops/strawberry.lua @@ -81,8 +81,9 @@ minetest.register_node(":ethereal:strawberry_6", table.copy(def)) def.tiles = {"ethereal_strawberry_7.png"} def.drop = { items = { - {items = {"ethereal:strawberry 1"}, rarity = 1}, - {items = {"ethereal:strawberry 2"}, rarity = 3} + {items = {"ethereal:strawberry"}, rarity = 1}, + {items = {"ethereal:strawberry"}, rarity = 2}, + {items = {"ethereal:strawberry"}, rarity = 3} } } minetest.register_node(":ethereal:strawberry_7", table.copy(def)) @@ -95,7 +96,9 @@ def.selection_box = farming.select_final def.drop = { items = { {items = {"ethereal:strawberry 2"}, rarity = 1}, - {items = {"ethereal:strawberry 3"}, rarity = 3} + {items = {"ethereal:strawberry"}, rarity = 2}, + {items = {"ethereal:strawberry"}, rarity = 3}, + {items = {"ethereal:strawberry"}, rarity = 4}, } } minetest.register_node(":ethereal:strawberry_8", table.copy(def)) diff --git a/crops/tomato.lua b/crops/tomato.lua index a53b8bf..946dbee 100644 --- a/crops/tomato.lua +++ b/crops/tomato.lua @@ -90,9 +90,10 @@ def.groups.growing = nil def.selection_box = farming.select_final def.drop = { items = { - {items = {"farming:tomato 3"}, rarity = 1}, - {items = {"farming:tomato 2"}, rarity = 2}, - {items = {"farming:tomato 1"}, rarity = 3} + {items = {"farming:tomato 2"}, rarity = 1}, + {items = {"farming:tomato"}, rarity = 2}, + {items = {"farming:tomato"}, rarity = 3}, + {items = {"farming:tomato"}, rarity = 4} } } minetest.register_node("farming:tomato_8", table.copy(def)) diff --git a/crops/vanilla.lua b/crops/vanilla.lua index d07680c..4e95491 100644 --- a/crops/vanilla.lua +++ b/crops/vanilla.lua @@ -88,9 +88,9 @@ def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:vanilla 2"}, rarity = 1}, - {items = {"farming:vanilla 2"}, rarity = 2}, - {items = {"farming:vanilla 2"}, rarity = 2}, - {items = {"farming:vanilla 2"}, rarity = 3} + {items = {"farming:vanilla"}, rarity = 2}, + {items = {"farming:vanilla"}, rarity = 3}, + {items = {"farming:vanilla"}, rarity = 4} } } minetest.register_node("farming:vanilla_8", table.copy(def)) diff --git a/crops/wheat.lua b/crops/wheat.lua index c00208b..3ced7fa 100644 --- a/crops/wheat.lua +++ b/crops/wheat.lua @@ -123,10 +123,10 @@ def.groups.growing = nil def.selection_box = farming.select_final def.drop = { items = { - {items = {"farming:wheat"}, rarity = 1}, - {items = {"farming:wheat"}, rarity = 3}, - {items = {"farming:seed_wheat"}, rarity = 1}, - {items = {"farming:seed_wheat"}, rarity = 3} + {items = {"farming:wheat 2"}, rarity = 1}, + {items = {"farming:wheat"}, rarity = 2}, + {items = {"farming:seed_wheat 2"}, rarity = 1}, + {items = {"farming:seed_wheat"}, rarity = 2} } } minetest.register_node("farming:wheat_8", table.copy(def))