From 2a41f1e9d51fa8d9a91b50d6136fa1f281cb0e42 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 15 Sep 2022 08:03:41 +0100 Subject: [PATCH] increase selection box to show crop has matured, fix strawberry plant issue, add step to rhubarb growth --- crops/artichoke.lua | 1 + crops/asparagus.lua | 2 + crops/barley.lua | 1 + crops/beans.lua | 1 + crops/beetroot.lua | 1 + crops/blackberry.lua | 1 + crops/blueberry.lua | 1 + crops/cabbage.lua | 1 + crops/carrot.lua | 1 + crops/chili.lua | 1 + crops/coffee.lua | 1 + crops/corn.lua | 1 + crops/cotton.lua | 1 + crops/cucumber.lua | 1 + crops/eggplant.lua | 1 + crops/garlic.lua | 1 + crops/grapes.lua | 1 + crops/hemp.lua | 1 + crops/lettuce.lua | 1 + crops/melon.lua | 2 +- crops/mint.lua | 1 + crops/onion.lua | 1 + crops/parsley.lua | 1 + crops/peas.lua | 1 + crops/pepper.lua | 1 + crops/pineapple.lua | 1 + crops/potato.lua | 1 + crops/pumpkin.lua | 6 +-- crops/raspberry.lua | 1 + crops/rhubarb.lua | 11 ++++-- crops/rice.lua | 1 + crops/soy.lua | 1 + crops/spinach.lua | 1 + crops/strawberry.lua | 68 +++++++++++++++++---------------- crops/sunflower.lua | 1 + crops/tomato.lua | 1 + crops/vanilla.lua | 1 + crops/wheat.lua | 1 + init.lua | 11 +++++- textures/farming_rhubarb_1.png | Bin 119 -> 116 bytes textures/farming_rhubarb_2.png | Bin 152 -> 119 bytes textures/farming_rhubarb_3.png | Bin 167 -> 152 bytes textures/farming_rhubarb_4.png | Bin 0 -> 167 bytes 43 files changed, 92 insertions(+), 41 deletions(-) create mode 100644 textures/farming_rhubarb_4.png diff --git a/crops/artichoke.lua b/crops/artichoke.lua index 4a29157..c42384f 100644 --- a/crops/artichoke.lua +++ b/crops/artichoke.lua @@ -46,6 +46,7 @@ minetest.register_node("farming:artichoke_4", table.copy(def)) -- stage 5 (final) def.tiles = {"farming_artichoke_5.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:artichoke 2"}, rarity = 1}, diff --git a/crops/asparagus.lua b/crops/asparagus.lua index 39cbb04..169f321 100644 --- a/crops/asparagus.lua +++ b/crops/asparagus.lua @@ -53,6 +53,8 @@ minetest.register_node("farming:asparagus_4", table.copy(def)) -- stage 5 def.tiles = {"farming_asparagus_5.png"} +def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:asparagus"}, rarity = 1}, diff --git a/crops/barley.lua b/crops/barley.lua index e7f3840..eb9d12a 100644 --- a/crops/barley.lua +++ b/crops/barley.lua @@ -93,6 +93,7 @@ minetest.register_node("farming:barley_6", table.copy(def)) -- stage 7 (final) def.tiles = {"farming_barley_7.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:barley"}, rarity = 1}, diff --git a/crops/beans.lua b/crops/beans.lua index 7ab204e..90a30bd 100644 --- a/crops/beans.lua +++ b/crops/beans.lua @@ -210,6 +210,7 @@ minetest.register_node("farming:beanpole_4", table.copy(def)) -- stage 5 (final) def.tiles = {"farming_beanpole_5.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:beanpole"}, rarity = 1}, diff --git a/crops/beetroot.lua b/crops/beetroot.lua index 9409d8d..b8be3ef 100644 --- a/crops/beetroot.lua +++ b/crops/beetroot.lua @@ -69,6 +69,7 @@ minetest.register_node("farming:beetroot_4", table.copy(def)) -- stage 5 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}, diff --git a/crops/blackberry.lua b/crops/blackberry.lua index 741865c..47dd08e 100644 --- a/crops/blackberry.lua +++ b/crops/blackberry.lua @@ -43,6 +43,7 @@ minetest.register_node("farming:blackberry_3", table.copy(def)) -- stage 4 def.tiles = {"farming_blackberry_4.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {'farming:blackberry 2'}, rarity = 1}, diff --git a/crops/blueberry.lua b/crops/blueberry.lua index 0e92374..1713bd1 100644 --- a/crops/blueberry.lua +++ b/crops/blueberry.lua @@ -80,6 +80,7 @@ minetest.register_node("farming:blueberry_3", table.copy(def)) -- stage 4 (final) def.tiles = {"farming_blueberry_4.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:blueberries 2"}, rarity = 1}, diff --git a/crops/cabbage.lua b/crops/cabbage.lua index f0c617f..622782b 100644 --- a/crops/cabbage.lua +++ b/crops/cabbage.lua @@ -51,6 +51,7 @@ minetest.register_node("farming:cabbage_5", table.copy(def)) -- stage 6 def.tiles = {"farming_cabbage_6.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { max_items = 2, items = { {items = {"farming:cabbage 2"}, rarity = 1}, diff --git a/crops/carrot.lua b/crops/carrot.lua index 61910c6..da81fb5 100644 --- a/crops/carrot.lua +++ b/crops/carrot.lua @@ -103,6 +103,7 @@ minetest.register_node("farming:carrot_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_carrot_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:carrot 2"}, rarity = 1}, diff --git a/crops/chili.lua b/crops/chili.lua index 7793558..9e52870 100644 --- a/crops/chili.lua +++ b/crops/chili.lua @@ -96,6 +96,7 @@ minetest.register_node("farming:chili_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_chili_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:chili_pepper 3"}, rarity = 1}, diff --git a/crops/coffee.lua b/crops/coffee.lua index 8184326..728d307 100644 --- a/crops/coffee.lua +++ b/crops/coffee.lua @@ -78,6 +78,7 @@ minetest.register_node("farming:coffee_4", table.copy(def)) -- stage 5 (final) def.tiles = {"farming_coffee_5.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:coffee_beans 2"}, rarity = 1}, diff --git a/crops/corn.lua b/crops/corn.lua index 55a7ab6..602e545 100644 --- a/crops/corn.lua +++ b/crops/corn.lua @@ -159,6 +159,7 @@ minetest.register_node("farming:corn_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_corn_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:corn 2"}, rarity = 1}, diff --git a/crops/cotton.lua b/crops/cotton.lua index 2b7079e..787eaec 100644 --- a/crops/cotton.lua +++ b/crops/cotton.lua @@ -156,6 +156,7 @@ minetest.register_node("farming:cotton_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_cotton_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:cotton"}, rarity = 1}, diff --git a/crops/cucumber.lua b/crops/cucumber.lua index f5520ad..3494b16 100644 --- a/crops/cucumber.lua +++ b/crops/cucumber.lua @@ -47,6 +47,7 @@ minetest.register_node("farming:cucumber_3", table.copy(def)) -- stage 4 (final) def.tiles = {"farming_cucumber_4.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:cucumber 2"}, rarity = 1}, diff --git a/crops/eggplant.lua b/crops/eggplant.lua index 9d6426f..818b490 100644 --- a/crops/eggplant.lua +++ b/crops/eggplant.lua @@ -50,6 +50,7 @@ minetest.register_node("farming:eggplant_3", table.copy(def)) -- stage 4 def.tiles = {"farming_eggplant_4.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:eggplant 2"}, rarity = 1}, diff --git a/crops/garlic.lua b/crops/garlic.lua index 7560321..bf929d0 100644 --- a/crops/garlic.lua +++ b/crops/garlic.lua @@ -117,6 +117,7 @@ minetest.register_node("farming:garlic_4", table.copy(def)) -- stage 5 def.tiles = {"crops_garlic_plant_5.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:garlic 3"}, rarity = 1}, diff --git a/crops/grapes.lua b/crops/grapes.lua index 5771e37..7622c0e 100644 --- a/crops/grapes.lua +++ b/crops/grapes.lua @@ -217,6 +217,7 @@ minetest.register_node("farming:grapes_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_grapes_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:trellis"}, rarity = 1}, diff --git a/crops/hemp.lua b/crops/hemp.lua index 60d2ffe..b5b86d2 100644 --- a/crops/hemp.lua +++ b/crops/hemp.lua @@ -243,6 +243,7 @@ minetest.register_node("farming:hemp_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_hemp_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:hemp_leaf 2"}, rarity = 1}, diff --git a/crops/lettuce.lua b/crops/lettuce.lua index 65e22cf..9e3d314 100644 --- a/crops/lettuce.lua +++ b/crops/lettuce.lua @@ -45,6 +45,7 @@ minetest.register_node("farming:lettuce_4", table.copy(def)) -- stage 5 def.tiles = {"farming_lettuce_5.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {'farming:lettuce 2'}, rarity = 1}, diff --git a/crops/melon.lua b/crops/melon.lua index 01d5c83..dd81ecb 100644 --- a/crops/melon.lua +++ b/crops/melon.lua @@ -79,7 +79,7 @@ minetest.register_node("farming:melon_8", { "farming_melon_side.png" }, groups = { - food_melon = 1, snappy = 2, oddly_breakable_by_hand = 1, + food_melon = 1, snappy = 3, choppy = 3, oddly_breakable_by_hand = 2, flammable = 2, plant = 1 }, drop = "farming:melon_8", diff --git a/crops/mint.lua b/crops/mint.lua index f1e2cac..58f0263 100644 --- a/crops/mint.lua +++ b/crops/mint.lua @@ -69,6 +69,7 @@ minetest.register_node("farming:mint_3", table.copy(def)) -- stage 4 (final) def.tiles = {"farming_mint_4.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:mint_leaf 2"}, rarity = 1}, diff --git a/crops/onion.lua b/crops/onion.lua index d801f42..049f869 100644 --- a/crops/onion.lua +++ b/crops/onion.lua @@ -74,6 +74,7 @@ minetest.register_node("farming:onion_4", table.copy(def)) -- stage 5 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}, diff --git a/crops/parsley.lua b/crops/parsley.lua index 21babdb..3399cfc 100644 --- a/crops/parsley.lua +++ b/crops/parsley.lua @@ -37,6 +37,7 @@ minetest.register_node("farming:parsley_2", table.copy(def)) -- stage 3 (final) def.tiles = {"farming_parsley_3.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:parsley 2"}, rarity = 1}, diff --git a/crops/peas.lua b/crops/peas.lua index 83445f6..00ff5e3 100644 --- a/crops/peas.lua +++ b/crops/peas.lua @@ -71,6 +71,7 @@ minetest.register_node("farming:pea_4", table.copy(def)) -- stage 5 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}, diff --git a/crops/pepper.lua b/crops/pepper.lua index 20f787b..a824bfd 100644 --- a/crops/pepper.lua +++ b/crops/pepper.lua @@ -113,6 +113,7 @@ minetest.register_node("farming:pepper_4", table.copy(def)) -- stage 5 (green pepper) def.tiles = {"crops_pepper_plant_5.png"} +def.selection_box = farming.select_final def.drop = { max_items = 2, items = { {items = {"farming:pepper 2"}, rarity = 1}, diff --git a/crops/pineapple.lua b/crops/pineapple.lua index 69afba4..63c3ca5 100644 --- a/crops/pineapple.lua +++ b/crops/pineapple.lua @@ -123,6 +123,7 @@ minetest.register_node("farming:pineapple_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_pineapple_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:pineapple"}, rarity = 1}, diff --git a/crops/potato.lua b/crops/potato.lua index 5a28fb4..dc69bff 100644 --- a/crops/potato.lua +++ b/crops/potato.lua @@ -94,6 +94,7 @@ minetest.register_node("farming:potato_3", table.copy(def)) -- stage 4 def.tiles = {"farming_potato_4.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:potato 2"}, rarity = 1}, diff --git a/crops/pumpkin.lua b/crops/pumpkin.lua index 77e1932..89a9d16 100644 --- a/crops/pumpkin.lua +++ b/crops/pumpkin.lua @@ -39,7 +39,7 @@ minetest.register_node("farming:jackolantern", { "farming_pumpkin_side.png", "farming_pumpkin_face_off.png" }, paramtype2 = "facedir", - groups = {choppy = 1, oddly_breakable_by_hand = 1, flammable = 2}, + groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, sounds = default.node_sound_wood_defaults(), on_punch = function(pos, node, puncher) local name = puncher:get_player_name() or "" @@ -58,7 +58,7 @@ minetest.register_node("farming:jackolantern_on", { light_source = default.LIGHT_MAX - 1, paramtype2 = "facedir", groups = { - choppy = 1, oddly_breakable_by_hand = 1, flammable = 2, + snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, not_in_creative_inventory = 1 }, sounds = default.node_sound_wood_defaults(), @@ -187,7 +187,7 @@ minetest.register_node("farming:pumpkin_8", { "farming_pumpkin_side.png" }, groups = { - food_pumpkin = 1, choppy = 2, oddly_breakable_by_hand = 1, + food_pumpkin = 1, snappy = 3, choppy = 3, oddly_breakable_by_hand = 2, flammable = 2, plant = 1 }, drop = "farming:pumpkin_8", diff --git a/crops/raspberry.lua b/crops/raspberry.lua index f7e3b61..6d85461 100644 --- a/crops/raspberry.lua +++ b/crops/raspberry.lua @@ -61,6 +61,7 @@ minetest.register_node("farming:raspberry_3", table.copy(def)) -- stage 4 (final) def.tiles = {"farming_raspberry_4.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:raspberries 2"}, rarity = 1}, diff --git a/crops/rhubarb.lua b/crops/rhubarb.lua index cd4f074..9ae2fa1 100644 --- a/crops/rhubarb.lua +++ b/crops/rhubarb.lua @@ -55,9 +55,14 @@ minetest.register_node("farming:rhubarb_1", table.copy(def)) def.tiles = {"farming_rhubarb_2.png"} minetest.register_node("farming:rhubarb_2", table.copy(def)) --- stage 3 (final) +-- stage3 def.tiles = {"farming_rhubarb_3.png"} +minetest.register_node("farming:rhubarb_3", table.copy(def)) + +-- stage 4 (final) +def.tiles = {"farming_rhubarb_4.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:rhubarb 2"}, rarity = 1}, @@ -65,7 +70,7 @@ def.drop = { {items = {"farming:rhubarb"}, rarity = 3} } } -minetest.register_node("farming:rhubarb_3", table.copy(def)) +minetest.register_node("farming:rhubarb_4", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:rhubarb"] = { @@ -73,7 +78,7 @@ farming.registered_plants["farming:rhubarb"] = { seed = "farming:rhubarb", minlight = 10, maxlight = 12, - steps = 3 + steps = 4 } -- mapgen diff --git a/crops/rice.lua b/crops/rice.lua index 6b8e2be..3b87003 100644 --- a/crops/rice.lua +++ b/crops/rice.lua @@ -108,6 +108,7 @@ minetest.register_node("farming:rice_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_rice_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:rice 2"}, rarity = 1}, diff --git a/crops/soy.lua b/crops/soy.lua index 268c3dc..13c20af 100644 --- a/crops/soy.lua +++ b/crops/soy.lua @@ -171,6 +171,7 @@ minetest.register_node("farming:soy_6", table.copy(def)) -- stage 7 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}, diff --git a/crops/spinach.lua b/crops/spinach.lua index 93832e8..8a69830 100644 --- a/crops/spinach.lua +++ b/crops/spinach.lua @@ -50,6 +50,7 @@ minetest.register_node("farming:spinach_3", table.copy(def)) -- stage 4 def.tiles = {"farming_spinach_4.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:spinach 2"}, rarity = 1}, diff --git a/crops/strawberry.lua b/crops/strawberry.lua index 4db37b1..6649bad 100644 --- a/crops/strawberry.lua +++ b/crops/strawberry.lua @@ -2,19 +2,22 @@ local S = farming.intllib -- Strawberry (can also be planted as seed) -minetest.register_craftitem(":ethereal:strawberry", { +minetest.register_craftitem("farming:strawberry", { description = S("Strawberry"), inventory_image = "ethereal_strawberry.png", - wield_image = "ethereal_strawberry.png", - groups = {food_strawberry = 1, food_berry = 1, flammable = 2}, + groups = {seed = 2, food_strawberry = 1, food_berry = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "ethereal:strawberry_1") end, on_use = minetest.item_eat(1) }) +-- weird engine bug stops us from using on_place for ethereal: item when mod not active +-- so instead use farming:strawberry and do quick alias for compatibility. +minetest.register_alias("farming:strawberry", "ethereal:strawberry") + -- Define Strawberry Bush growth stages -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"ethereal_strawberry_1.png"}, paramtype = "light", @@ -35,59 +38,60 @@ local crop_def = { } --stage 1 -minetest.register_node(":ethereal:strawberry_1", table.copy(crop_def)) +minetest.register_node(":ethereal:strawberry_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"ethereal_strawberry_2.png"} -minetest.register_node(":ethereal:strawberry_2", table.copy(crop_def)) +def.tiles = {"ethereal_strawberry_2.png"} +minetest.register_node(":ethereal:strawberry_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"ethereal_strawberry_3.png"} -minetest.register_node(":ethereal:strawberry_3", table.copy(crop_def)) +def.tiles = {"ethereal_strawberry_3.png"} +minetest.register_node(":ethereal:strawberry_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"ethereal_strawberry_4.png"} -minetest.register_node(":ethereal:strawberry_4", table.copy(crop_def)) +def.tiles = {"ethereal_strawberry_4.png"} +minetest.register_node(":ethereal:strawberry_4", table.copy(def)) -- stage 5 -crop_def.tiles = {"ethereal_strawberry_5.png"} -minetest.register_node(":ethereal:strawberry_5", table.copy(crop_def)) +def.tiles = {"ethereal_strawberry_5.png"} +minetest.register_node(":ethereal:strawberry_5", table.copy(def)) -- stage 6 -crop_def.tiles = {"ethereal_strawberry_6.png"} -crop_def.drop = { +def.tiles = {"ethereal_strawberry_6.png"} +def.drop = { items = { - {items = {"ethereal:strawberry 1"}, rarity = 2}, - {items = {"ethereal:strawberry 2"}, rarity = 3} + {items = {"farming:strawberry 1"}, rarity = 2}, + {items = {"farming:strawberry 2"}, rarity = 3} } } -minetest.register_node(":ethereal:strawberry_6", table.copy(crop_def)) +minetest.register_node(":ethereal:strawberry_6", table.copy(def)) -- stage 7 -crop_def.tiles = {"ethereal_strawberry_7.png"} -crop_def.drop = { +def.tiles = {"ethereal_strawberry_7.png"} +def.drop = { items = { - {items = {"ethereal:strawberry 1"}, rarity = 1}, - {items = {"ethereal:strawberry 2"}, rarity = 3} + {items = {"farming:strawberry 1"}, rarity = 1}, + {items = {"farming:strawberry 2"}, rarity = 3} } } -minetest.register_node(":ethereal:strawberry_7", table.copy(crop_def)) +minetest.register_node(":ethereal:strawberry_7", table.copy(def)) -- stage 8 -crop_def.tiles = {"ethereal_strawberry_8.png"} -crop_def.groups.growing = nil -crop_def.drop = { +def.tiles = {"ethereal_strawberry_8.png"} +def.groups.growing = nil +def.selection_box = farming.select_final +def.drop = { items = { - {items = {"ethereal:strawberry 2"}, rarity = 1}, - {items = {"ethereal:strawberry 3"}, rarity = 3} + {items = {"farming:strawberry 2"}, rarity = 1}, + {items = {"farming:strawberry 3"}, rarity = 3} } } -minetest.register_node(":ethereal:strawberry_8", table.copy(crop_def)) +minetest.register_node(":ethereal:strawberry_8", table.copy(def)) -- add to registered_plants farming.registered_plants["ethereal:strawberry"] = { - crop = "ethereal:strawberry", - seed = "ethereal:strawberry", + crop = "farming:strawberry", + seed = "farming:strawberry", minlight = farming.min_light, maxlight = farming.max_light, steps = 8 @@ -108,5 +112,5 @@ minetest.register_decoration({ }, y_min = 20, y_max = 55, - decoration = "farming:strawberry_7" + decoration = "ethereal:strawberry_7" }) diff --git a/crops/sunflower.lua b/crops/sunflower.lua index a51f1d6..03604c4 100644 --- a/crops/sunflower.lua +++ b/crops/sunflower.lua @@ -137,6 +137,7 @@ minetest.register_node("farming:sunflower_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_sunflower_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:sunflower"}, rarity = 1}, diff --git a/crops/tomato.lua b/crops/tomato.lua index a18401e..8362c68 100644 --- a/crops/tomato.lua +++ b/crops/tomato.lua @@ -87,6 +87,7 @@ minetest.register_node("farming:tomato_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_tomato_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:tomato 3"}, rarity = 1}, diff --git a/crops/vanilla.lua b/crops/vanilla.lua index a64a836..4e048e1 100644 --- a/crops/vanilla.lua +++ b/crops/vanilla.lua @@ -102,6 +102,7 @@ minetest.register_node("farming:vanilla_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_vanilla_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:vanilla 2"}, rarity = 1}, diff --git a/crops/wheat.lua b/crops/wheat.lua index 1a7de8a..3bb0b7a 100644 --- a/crops/wheat.lua +++ b/crops/wheat.lua @@ -216,6 +216,7 @@ minetest.register_node("farming:wheat_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_wheat_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:wheat"}, rarity = 1}, diff --git a/init.lua b/init.lua index 5a20ae0..82712bd 100644 --- a/init.lua +++ b/init.lua @@ -7,12 +7,16 @@ farming = { mod = "redo", - version = "20220913", + version = "20220915", path = minetest.get_modpath("farming"), select = { type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5} }, + select_final = { + type = "fixed", + fixed = {-0.5, -0.5, -0.5, 0.5, -2.5/16, 0.5} + }, registered_plants = {}, min_light = 12, max_light = 15, @@ -575,13 +579,16 @@ farming.register_plant = function(name, def) } } + local sel = farming.select local g = { snappy = 3, flammable = 2, plant = 1, growing = 1, attached_node = 1, not_in_creative_inventory = 1, } -- Last step doesn't need growing=1 so Abm never has to check these + -- also increase selection box for visual indication plant has matured if i == def.steps then + sel = farming.select_final g.growing = 0 end @@ -604,7 +611,7 @@ farming.register_plant = function(name, def) buildable_to = true, sunlight_propagates = true, drop = drop, - selection_box = farming.select, + selection_box = sel, groups = g, sounds = default.node_sound_leaves_defaults(), minlight = def.minlight, diff --git a/textures/farming_rhubarb_1.png b/textures/farming_rhubarb_1.png index 01585b1bee3fcf44ad3e39e1cd562728576e0616..5ebf11605e3a449a93a03d47738c0127fc8b27b2 100644 GIT binary patch delta 85 zcmXRfnV=HD6W|l#%D}+zaT`O{LC-hm&)?Yf<28`aSQ6wH%;50sMjDVK=IP=X!f`!0 nVSz+}1_P%ox5B}i21W+9m5c#DG*`f(dW)@(X5gcy=QV$dU1MaSY+Oo}8c{ q+|k9v$U5|(Cy6V#K0gT$rvrHrN{_W$KdJe=d#Wzp$P!m{uiqN diff --git a/textures/farming_rhubarb_2.png b/textures/farming_rhubarb_2.png index 71845c750563c2898831177777aef51105c85b4a..01585b1bee3fcf44ad3e39e1cd562728576e0616 100644 GIT binary patch delta 101 zcmbQiSUy1_o{5=(fgx$G_$MI68Q>G*`f(dW)q B8QlN? delta 135 zcmXS)!8k#po`so#f#L1lM?pY}Kfou%m6M5KldEgcBKvdA%~=OM&%0_z0;L#Bg8YIR z9G=}s19HqgT^vI=t|uob@NclNG%&Dako42h;?vVoP;_Gxa}^V4mh5rhVb*9q*lJ5PR=G**PuoA=bD?d4tkz<)sAFfU|=i>@(X5gcy=QV$T9bHaSY+Oo}8e- zzrn)Nz`&A0(oaW=Pftrh(Tz>aRZO5+vd4jkS)=)2!$FB-1`S3t9`dlMurXYgWj?!y SS9}rB2nJ7AKbLh*2~7Ye$0BC{ delta 130 zcmV-|0Db?M0jB|wEPGufB(gY kHXCwag*}=LE64#KJm_czS@%>8M*si-07*qoM6N<$f&s!ap8x;= diff --git a/textures/farming_rhubarb_4.png b/textures/farming_rhubarb_4.png new file mode 100644 index 0000000000000000000000000000000000000000..b412f7e0105cdf29452d5c44e378ae73745dd3c0 GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?bKe4jKI@=o z!oo>#3(3IS&|cxLoW%%h0DVbHM{9#=G^)+7>Mg zc=+Jp+zIjmLhQNf#xw+RozDKEWt&^CE*a@_PucJJ3W1 MPgg&ebxsLQ0P7VvcmMzZ literal 0 HcmV?d00001