nalc/farming
1
0
Fork 0
forked from mtcontrib/farming
Code Issues Pull Requests Releases Wiki Activity

fix strawberry issue

Browse Source
This commit is contained in:
tenplus1 2022-09-15 08:25:44 +01:00
parent 2a41f1e9d5
commit c34bb8a5ed
2 changed files with 15 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
compatibility.lua
View File

@ -131,29 +131,12 @@ alias("farming_plus:rhubarb", "farming:rhubarb_3")
alias("farming_plus:rhubarb_item", "farming:rhubarb")
-- Strawberry
if eth then
alias("farming_plus:strawberry_item", "ethereal:strawberry")
alias("farming_plus:strawberry_seed", "ethereal:strawberry")
alias("farming_plus:strawberry_1", "ethereal:strawberry_1")
alias("farming_plus:strawberry_2", "ethereal:strawberry_3")
alias("farming_plus:strawberry_3", "ethereal:strawberry_5")
alias("farming_plus:strawberry", "ethereal:strawberry_7")
else
minetest.register_craftitem(":ethereal:strawberry", {
description = S("Strawberry"),
inventory_image = "farming_strawberry.png",
wield_image = "farming_strawberry.png",
groups = {food_strawberry = 1, flammable = 2},
on_use = minetest.item_eat(1)
})
alias("farming_plus:strawberry_item", "ethereal:strawberry")
alias("farming_plus:strawberry_seed", "ethereal:strawberry")
alias("farming_plus:strawberry_1", "farming:raspberry_1")
alias("farming_plus:strawberry_2", "farming:raspberry_2")
alias("farming_plus:strawberry_3", "farming:raspberry_3")
alias("farming_plus:strawberry", "farming:raspberry_4")
end
alias("farming_plus:strawberry_item", "ethereal:strawberry")
alias("farming_plus:strawberry_seed", "ethereal:strawberry")
alias("farming_plus:strawberry_1", "ethereal:strawberry_1")
alias("farming_plus:strawberry_2", "ethereal:strawberry_3")
alias("farming_plus:strawberry_3", "ethereal:strawberry_5")
alias("farming_plus:strawberry", "ethereal:strawberry_7")
-- Tomato
alias("farming_plus:tomato_seed", "farming:tomato")

22
crops/strawberry.lua
View File

@ -2,7 +2,7 @@
local S = farming.intllib
-- Strawberry (can also be planted as seed)
minetest.register_craftitem("farming:strawberry", {
minetest.register_craftitem(":ethereal:strawberry", {
description = S("Strawberry"),
inventory_image = "ethereal_strawberry.png",
groups = {seed = 2, food_strawberry = 1, food_berry = 1, flammable = 2},
@ -12,10 +12,6 @@ minetest.register_craftitem("farming:strawberry", {
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 def = {
drawtype = "plantlike",
@ -60,8 +56,8 @@ minetest.register_node(":ethereal:strawberry_5", table.copy(def))
def.tiles = {"ethereal_strawberry_6.png"}
def.drop = {
items = {
{items = {"farming:strawberry 1"}, rarity = 2},
{items = {"farming:strawberry 2"}, rarity = 3}
{items = {"ethereal:strawberry 1"}, rarity = 2},
{items = {"ethereal:strawberry 2"}, rarity = 3}
}
}
minetest.register_node(":ethereal:strawberry_6", table.copy(def))
@ -70,8 +66,8 @@ minetest.register_node(":ethereal:strawberry_6", table.copy(def))
def.tiles = {"ethereal_strawberry_7.png"}
def.drop = {
items = {
{items = {"farming:strawberry 1"}, rarity = 1},
{items = {"farming:strawberry 2"}, rarity = 3}
{items = {"ethereal:strawberry 1"}, rarity = 1},
{items = {"ethereal:strawberry 2"}, rarity = 3}
}
}
minetest.register_node(":ethereal:strawberry_7", table.copy(def))
@ -82,16 +78,16 @@ def.groups.growing = nil
def.selection_box = farming.select_final
def.drop = {
items = {
{items = {"farming:strawberry 2"}, rarity = 1},
{items = {"farming:strawberry 3"}, rarity = 3}
{items = {"ethereal:strawberry 2"}, rarity = 1},
{items = {"ethereal:strawberry 3"}, rarity = 3}
}
}
minetest.register_node(":ethereal:strawberry_8", table.copy(def))
-- add to registered_plants
farming.registered_plants["ethereal:strawberry"] = {
crop = "farming:strawberry",
seed = "farming:strawberry",
crop = "ethereal:strawberry",
seed = "ethereal:strawberry",
minlight = farming.min_light,
maxlight = farming.max_light,
steps = 8