1
0
mirror of https://codeberg.org/tenplus1/farming.git synced 2025-01-27 09:30:18 +01:00

crop deco with ethereal added.

This commit is contained in:
tenplus1 2024-09-24 12:31:06 +01:00
parent 9d471bf6d8
commit 2b31a87a32
38 changed files with 224 additions and 325 deletions

View File

@ -82,10 +82,15 @@ farming.registered_plants["farming:artichoke"] = {
-- mapgen -- mapgen
if not farming.eth then local spawn_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}
if farming.eth then
spawn_on = {"ethereal:grove_dirt"}
end
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = spawn_on,
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -95,10 +100,7 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 1, y_min = 1, y_max = 13,
y_max = 13,
decoration = "farming:artichoke_5", decoration = "farming:artichoke_5",
spawn_by = "group:tree", spawn_by = "group:tree", num_spawn_by = 1
num_spawn_by = 1
}) })
end

View File

@ -89,7 +89,6 @@ farming.registered_plants["farming:asparagus"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
name = "farming:asparagus_5", name = "farming:asparagus_5",
deco_type = "simple", deco_type = "simple",
@ -103,9 +102,7 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 8, y_min = 8, y_max = 32,
y_max = 32,
decoration = "farming:asparagus_5", decoration = "farming:asparagus_5",
param2 = 3 param2 = 3
}) })
end

View File

@ -235,7 +235,6 @@ minetest.register_node("farming:beanbush", {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
@ -248,8 +247,6 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 18, y_min = 18, y_max = 38,
y_max = 38,
decoration = "farming:beanbush" decoration = "farming:beanbush"
}) })
end

View File

@ -85,10 +85,15 @@ farming.registered_plants["farming:beetroot"] = {
-- mapgen -- mapgen
if not farming.eth then local spawn_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}
if farming.eth then
spawn_on = {"ethereal:prairie_dirt"}
end
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = spawn_on,
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -98,8 +103,6 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 1, y_min = 1, y_max = 20,
y_max = 20,
decoration = "farming:beetroot_5" decoration = "farming:beetroot_5"
}) })
end

View File

@ -80,10 +80,11 @@ farming.registered_plants["farming:blackberry"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {
"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -93,8 +94,6 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 3, y_min = 3, y_max = 20,
y_max = 20,
decoration = "farming:blackberry_4" decoration = "farming:blackberry_4"
}) })
end

View File

@ -79,10 +79,11 @@ farming.registered_plants["farming:blueberries"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {
"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -92,8 +93,6 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 3, y_min = 3, y_max = 15,
y_max = 15,
decoration = "farming:blueberry_4" decoration = "farming:blueberry_4"
}) })
end

View File

@ -87,7 +87,6 @@ farming.registered_plants["farming:cabbage"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
@ -100,8 +99,6 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 2, y_min = 2, y_max = 15,
y_max = 15,
decoration = "farming:cabbage_6" decoration = "farming:cabbage_6"
}) })
end

View File

@ -107,18 +107,11 @@ farming.registered_plants["farming:carrot"] = {
-- mapgen -- mapgen
local mg = farming.mapgen == "v6"
def = {
y_max = mg and 30 or 20,
near = mg and "group:water" or nil,
num = mg and 1 or -1,
}
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {
"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -128,10 +121,6 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 1, y_min = 1, y_max = 30,
y_max = def.y_max, decoration = "farming:carrot_7"
decoration = "farming:carrot_8",
spawn_by = def.near,
num_spawn_by = def.num
}) })
end

View File

@ -98,12 +98,11 @@ farming.registered_plants["farming:chili_pepper"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = { place_on = {
"default:dirt_with_grass", "default:dirt_with_rainforest_litter", "default:dirt_with_grass", "default:dirt_with_rainforest_litter",
"mcl_core:dirt_with_grass" "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
}, },
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
@ -114,10 +113,7 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 5, y_min = 5, y_max = 45,
y_max = 35,
decoration = "farming:chili_8", decoration = "farming:chili_8",
spawn_by = "group:tree", spawn_by = "group:tree", num_spawn_by = 1
num_spawn_by = 1
}) })
end

View File

@ -80,19 +80,19 @@ farming.registered_plants["farming:coffee"] = {
-- mapgen -- mapgen
local mg = farming.mapgen == "v6" local spawn_on = {
"default:dirt_with_dry_grass", "default:dirt_with_rainforest_litter",
def = { "default:dry_dirt_with_dry_grass", "mcl_core:dirt_with_grass",
y_max = mg and 50 or 55, "ethereal:prairie_dirt"
spawn_on = mg and {"default:dirt_with_grass"} or {"default:dirt_with_dry_grass",
"default:dirt_with_rainforest_litter", "default:dry_dirt_with_dry_grass",
"mcl_core:dirt_with_grass"}
} }
if not farming.eth then if farming.mapgen == "v6" then
spawn_on = {"default:dirt_with_grass"}
end
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = def.spawn_on, place_on = spawn_on,
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -102,8 +102,6 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 20, y_min = 20, y_max = 55,
y_max = def.y_max,
decoration = "farming:coffee_5" decoration = "farming:coffee_5"
}) })
end

View File

@ -111,10 +111,11 @@ farming.registered_plants["farming:corn"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {
"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -124,8 +125,6 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 12, y_min = 12, y_max = 27,
y_max = 25,
decoration = "farming:corn_7" decoration = "farming:corn_7"
}) })
end

View File

@ -172,34 +172,31 @@ minetest.register_node("farming:cotton_wild", {
-- mapgen -- mapgen
local mg = farming.mapgen == "v6" local spawn_on = {
"default:dry_dirt_with_dry_grass", "default:dirt_with_dry_grass",
def = { "mcl_core:dirt_with_grass"
grow_on = mg and {"default:dirt_with_grass"} or {"default:dry_dirt_with_dry_grass",
"mcl_core:dirt_with_grass"},
biome = mg and {"jungle"} or {"savanna"}
} }
if not farming.eth then if farming.mapgen == "v6" then
spawn_on = {"default:dirt_with_grass"}
end
minetest.register_decoration({ minetest.register_decoration({
name = "farming:cotton_wild", name = "farming:cotton_wild",
deco_type = "simple", deco_type = "simple",
place_on = def.grow_on, place_on = spawn_on,
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = -0.1, offset = 0,
scale = 0.1, scale = farming.cotton,
spread = {x = 50, y = 50, z = 50}, spread = {x = 100, y = 100, z = 100},
seed = 4242, seed = 4242,
octaves = 3, octaves = 3,
persist = 0.7 persist = 0.6
}, },
biomes = def.biome, y_min = 1, y_max = 120,
y_max = 31000,
y_min = 1,
decoration = "farming:cotton_wild" decoration = "farming:cotton_wild"
}) })
end
--[[ Cotton using api --[[ Cotton using api
farming.register_plant("farming:cotton", { farming.register_plant("farming:cotton", {

View File

@ -80,17 +80,11 @@ farming.registered_plants["farming:cucumber"] = {
-- mapgen -- mapgen
local mg = farming.mapgen == "v6"
def = {
near = mg and "group:water" or nil,
num = mg and 1 or -1,
}
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {
"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -100,10 +94,7 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 1, y_min = 1, y_max = 20,
y_max = 20,
decoration = "farming:cucumber_4", decoration = "farming:cucumber_4",
spawn_by = def.near, spawn_by = {"group:water", "group:sand"}, num_spawn_by = 1
num_spawn_by = def.num
}) })
end

View File

@ -84,7 +84,6 @@ farming.registered_plants["farming:eggplant"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
@ -97,10 +96,7 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
biomes = {"deciduous_forest"}, y_min = 1, y_max = 40,
y_max = 31000, decoration = "farming:eggplant_3",
y_min = 1,
decoration = "farming:eggplant_4",
param2 = 3 param2 = 3
}) })
end

View File

@ -82,10 +82,12 @@ farming.registered_plants["farming:garlic"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {
"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt",
"default:dirt_with_rainforest_litter"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -95,10 +97,7 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 3, y_min = 3, y_max = 45,
y_max = 35,
decoration = "farming:garlic_5", decoration = "farming:garlic_5",
spawn_by = "group:tree", spawn_by = "group:tree", num_spawn_by = 1
num_spawn_by = 1
}) })
end

View File

@ -83,11 +83,13 @@ farming.registered_plants["farming:ginger"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
name = "farming:ginger_4", name = "farming:ginger_4",
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_rainforest_litter", "mcl_core:dirt_with_grass"}, place_on = {
"default:dirt_with_rainforest_litter", "mcl_core:dirt_with_grass",
"ethereal:prairie_dirt"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -97,9 +99,7 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_max = 80, y_min = 1, y_max = 80,
y_min = 1,
decoration = "farming:ginger_3", decoration = "farming:ginger_3",
param2 = 3 param2 = 3
}) })
end

View File

@ -248,10 +248,11 @@ minetest.register_node("farming:grapebush", {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {
"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -261,8 +262,6 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 25, y_min = 25, y_max = 50,
y_max = 50,
decoration = "farming:grapebush" decoration = "farming:grapebush"
}) })
end

View File

@ -136,12 +136,11 @@ farming.registered_plants["farming:hemp"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = { place_on = {
"default:dirt_with_grass", "default:dirt_with_rainforest_litter", "default:dirt_with_grass", "default:dirt_with_rainforest_litter",
"mcl_core:dirt_with_grass" "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
}, },
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
@ -152,10 +151,7 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 3, y_min = 3, y_max = 45,
y_max = 45,
decoration = "farming:hemp_7", decoration = "farming:hemp_7",
spawn_by = "group:tree", spawn_by = "group:tree", num_spawn_by = 1
num_spawn_by = 1
}) })
end

View File

@ -81,10 +81,11 @@ farming.registered_plants["farming:lettuce"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {
"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -94,8 +95,6 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 5, y_min = 5, y_max = 35,
y_max = 35,
decoration = "farming:lettuce_5" decoration = "farming:lettuce_5"
}) })
end

View File

@ -105,20 +105,12 @@ farming.registered_plants["farming:melon"] = {
-- mapgen -- mapgen
local mg = farming.mapgen == "v6"
def = {
y_max = mg and 20 or 6,
spawn_on = mg and {"default:dirt_with_grass"} or {"default:dirt_with_dry_grass",
"default:dirt_with_rainforest_litter", "mcl_core:dirt_with_grass"},
near = mg and "group:water" or nil,
num = mg and 1 or -1,
}
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = def.spawn_on, place_on = {
"default:dirt_with_grass", "default:dirt_with_dry_grass",
"default:dirt_with_rainforest_litter", "mcl_core:dirt_with_grass"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -128,10 +120,7 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 1, y_min = 1, y_max = 6,
y_max = def.y_max,
decoration = "farming:melon_8", decoration = "farming:melon_8",
spawn_by = def.near, spawn_by = {"group:water", "group_sand"}, num_spawn_by = 1
num_spawn_by = def.num
}) })
end

View File

@ -101,12 +101,11 @@ farming.registered_plants["farming:mint"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = { place_on = {
"default:dirt_with_grass", "default:dirt_with_coniferous_litter", "default:dirt_with_grass", "default:dirt_with_coniferous_litter",
"mcl_core:dirt_with_grass" "mcl_core:dirt_with_grass", "ethereal:bamboo_dirt"
}, },
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
@ -117,10 +116,7 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 0, y_min = 1, y_max = 75,
y_max = 75,
decoration = "farming:mint_4", decoration = "farming:mint_4",
spawn_by = {"group:water", "group:sand"}, spawn_by = {"group:water", "group:sand"}, num_spawn_by = 1
num_spawn_by = 1
}) })
end

View File

@ -94,10 +94,11 @@ farming.registered_plants["farming:onion"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {
"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -107,8 +108,6 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 5, y_min = 5, y_max = 28,
y_max = 28,
decoration = "farming:onion_5" decoration = "farming:onion_5"
}) })
end

View File

@ -73,10 +73,12 @@ farming.registered_plants["farming:parsley"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {
"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt",
"ethereal:grove_dirt"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -86,8 +88,6 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 10, y_min = 10, y_max = 40,
y_max = 40,
decoration = "farming:parsley_3" decoration = "farming:parsley_3"
}) })
end

View File

@ -92,10 +92,11 @@ farming.registered_plants["farming:pea_pod"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {
"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -105,8 +106,6 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 25, y_min = 25, y_max = 55,
y_max = 55,
decoration = "farming:pea_5" decoration = "farming:pea_5"
}) })
end

View File

@ -152,17 +152,12 @@ farming.registered_plants["farming:pepper"] = {
-- mapgen -- mapgen
local mg = farming.mapgen == "v6"
def = {
grow_on = mg and {"default:dirt_with_grass"} or {
"default:dirt_with_rainforest_litter", "mcl_core:dirt_with_grass"}
}
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = def.grow_on, place_on = {
"default:dirt_with_grass", "default:dirt_with_rainforest_litter",
"mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -172,10 +167,7 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 5, y_min = 5, y_max = 35,
y_max = 35,
decoration = {"farming:pepper_5", "farming:pepper_6", "farming:pepper_7"}, decoration = {"farming:pepper_5", "farming:pepper_6", "farming:pepper_7"},
spawn_by = "group:tree", spawn_by = "group:tree", num_spawn_by = 1
num_spawn_by = 1
}) })
end

View File

@ -117,19 +117,18 @@ farming.registered_plants["farming:pineapple"] = {
-- mapgen -- mapgen
local mg = farming.mapgen == "v6" local spawn_on = {
"default:dirt_with_dry_grass", "default:dry_dirt_with_dry_grass",
def = { "mcl_core:dirt_with_grass"
grow_on = mg and {"default:dirt_with_grass"} or {"default:dirt_with_dry_grass",
"default:dry_dirt_with_dry_grass", "mcl_core:dirt_with_grass"},
grow_near = mg and "group:sand" or nil,
num = mg and 1 or -1
} }
if not farming.eth then if farming.mapgen == "v6" then
spawn_on = {"default:dirt_with_grass"}
end
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = def.grow_on, place_on = spawn_on,
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -139,10 +138,6 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 11, y_min = 11, y_max = 30,
y_max = 30, decoration = "farming:pineapple_8"
decoration = "farming:pineapple_8",
spawn_by = def.grow_near,
num_spawn_by = def.num
}) })
end

View File

@ -100,10 +100,12 @@ farming.registered_plants["farming:potato"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {
"default:dirt_with_grass", "default:dirt_with_rainforest_litter",
"mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -113,8 +115,6 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 15, y_min = 5, y_max = 40,
y_max = 40,
decoration = "farming:potato_3" decoration = "farming:potato_3"
}) })
end

View File

@ -108,18 +108,12 @@ farming.registered_plants["farming:pumpkin"] = {
-- mapgen -- mapgen
local mg = farming.mapgen == "v6"
def = {
y_max = mg and 20 or 6,
near = mg and "group:water" or nil,
num = mg and 1 or -1,
}
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {
"default:dirt_with_grass", "default:dirt_with_rainforest_litter",
"mcl_core:dirt_with_grass"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -129,10 +123,7 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 1, y_min = 1, y_max = 6,
y_max = def.y_max,
decoration = "farming:pumpkin_8", decoration = "farming:pumpkin_8",
spawn_by = def.near, spawn_by = {"group:water", "group:sand"}, num_spawn_by = 1
num_spawn_by = def.num
}) })
end

View File

@ -80,10 +80,11 @@ farming.registered_plants["farming:raspberries"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {
"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -93,8 +94,6 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 3, y_min = 3, y_max = 15,
y_max = 15,
decoration = "farming:raspberry_4" decoration = "farming:raspberry_4"
}) })
end

View File

@ -85,10 +85,11 @@ farming.registered_plants["farming:rhubarb"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {
"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -98,8 +99,6 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 3, y_min = 3, y_max = 20,
y_max = 20,
decoration = "farming:rhubarb_3" decoration = "farming:rhubarb_3"
}) })
end

View File

@ -110,18 +110,13 @@ farming.registered_plants["farming:soy_pod"] = {
-- mapgen -- mapgen
local mg = farming.mapgen == "v6"
def = {
spawn_on = mg and {"default:dirt_with_grass"} or {"default:dirt_with_dry_grass",
"default:dirt_with_rainforest_litter", "default:dry_dirt_with_dry_grass",
"mcl_core:dirt_with_grass"}
}
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = def.spawn_on, place_on = {
"default:dirt_with_grass", "default:dirt_with_dry_grass",
"default:dirt_with_rainforest_litter", "default:dry_dirt_with_dry_grass",
"mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -131,8 +126,6 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 20, y_min = 20, y_max = 50,
y_max = 50, decoration = "farming:soy_5"
decoration = "farming:soy_6"
}) })
end

View File

@ -84,7 +84,6 @@ farming.registered_plants["farming:spinach"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"},
@ -97,10 +96,7 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
biomes = {"deciduous_forest"}, y_min = 1, y_max = 100,
y_max = 31000,
y_min = 1,
decoration = "farming:spinach_4", decoration = "farming:spinach_4",
param2 = 3 param2 = 3
}) })
end

View File

@ -112,10 +112,11 @@ farming.registered_plants["ethereal:strawberry"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {
"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -125,8 +126,6 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 20, y_min = 15, y_max = 55,
y_max = 55,
decoration = "ethereal:strawberry_7" decoration = "ethereal:strawberry_7"
}) })
end

View File

@ -130,10 +130,11 @@ farming.registered_plants["farming:sunflower"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {
"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -143,8 +144,6 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 10, y_min = 10, y_max = 40,
y_max = 40,
decoration = "farming:sunflower_8" decoration = "farming:sunflower_8"
}) })
end

View File

@ -109,10 +109,11 @@ farming.registered_plants["farming:tomato"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {
"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:prairie_dirt"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -122,8 +123,6 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 5, y_min = 5, y_max = 25,
y_max = 25,
decoration = "farming:tomato_7" decoration = "farming:tomato_7"
}) })
end

View File

@ -107,10 +107,11 @@ farming.registered_plants["farming:vanilla"] = {
-- mapgen -- mapgen
if not farming.eth then
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",
place_on = {"default:dirt_with_grass", "mcl_core:dirt_with_grass"}, place_on = {
"default:dirt_with_grass", "mcl_core:dirt_with_grass", "ethereal:grove_dirt"
},
sidelen = 16, sidelen = 16,
noise_params = { noise_params = {
offset = 0, offset = 0,
@ -120,8 +121,6 @@ minetest.register_decoration({
octaves = 3, octaves = 3,
persist = 0.6 persist = 0.6
}, },
y_min = 5, y_min = 5, y_max = 35,
y_max = 35,
decoration = "farming:vanilla_7" decoration = "farming:vanilla_7"
}) })
end

View File

@ -9,39 +9,40 @@
farming.asparagus = 0.002 farming.asparagus = 0.002
farming.eggplant = 0.002 farming.eggplant = 0.002
farming.spinach = 0.002 farming.spinach = 0.002
farming.carrot = 0.001 farming.carrot = 0.002
farming.potato = 0.001 farming.potato = 0.002
farming.tomato = 0.001 farming.tomato = 0.002
farming.cucumber = 0.001 farming.cucumber = 0.002
farming.corn = 0.001 farming.corn = 0.002
farming.coffee = 0.001 farming.coffee = 0.002
farming.melon = 0.001 farming.melon = 0.009
farming.pumpkin = 0.001 farming.pumpkin = 0.009
farming.cocoa = true -- true or false only farming.cocoa = true -- true or false only
farming.raspberry = 0.001 farming.raspberry = 0.002
farming.blueberry = 0.001 farming.blueberry = 0.002
farming.rhubarb = 0.001 farming.rhubarb = 0.002
farming.beans = 0.001 farming.beans = 0.002
farming.grapes = 0.001 farming.grapes = 0.002
farming.barley = true -- true or false only farming.barley = true -- true or false only
farming.chili = 0.003 farming.chili = 0.003
farming.hemp = 0.003 farming.hemp = 0.003
farming.garlic = 0.001 farming.garlic = 0.002
farming.onion = 0.001 farming.onion = 0.002
farming.pepper = 0.002 farming.pepper = 0.002
farming.pineapple = 0.001 farming.pineapple = 0.003
farming.peas = 0.001 farming.peas = 0.002
farming.beetroot = 0.001 farming.beetroot = 0.002
farming.mint = 0.005 farming.mint = 0.005
farming.cabbage = 0.001 farming.cabbage = 0.002
farming.blackberry = 0.002 farming.blackberry = 0.002
farming.lettuce = 0.001 farming.lettuce = 0.002
farming.soy = 0.001 farming.soy = 0.002
farming.vanilla = 0.001 farming.vanilla = 0.002
farming.artichoke = 0.001 farming.artichoke = 0.002
farming.parsley = 0.002 farming.parsley = 0.002
farming.sunflower = 0.001 farming.sunflower = 0.002
farming.ginger = 0.002 farming.ginger = 0.002
farming.cotton = 0.003
farming.strawberry = not minetest.get_modpath("ethereal") and 0.002 farming.strawberry = not minetest.get_modpath("ethereal") and 0.002
farming.grains = true -- true or false only farming.grains = true -- true or false only
farming.rice = true farming.rice = true

View File

@ -12,7 +12,7 @@ local S = minetest.get_translator("farming")
farming = { farming = {
mod = "redo", mod = "redo",
version = "20240919", version = "20240924",
path = minetest.get_modpath("farming"), path = minetest.get_modpath("farming"),
select = {type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5}}, 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}}, select_final = {type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -2.5/16, 0.5}},
@ -656,40 +656,41 @@ end
farming.asparagus = 0.002 farming.asparagus = 0.002
farming.eggplant = 0.002 farming.eggplant = 0.002
farming.spinach = 0.002 farming.spinach = 0.002
farming.carrot = 0.001 farming.carrot = 0.002
farming.potato = 0.001 farming.potato = 0.002
farming.tomato = 0.001 farming.tomato = 0.002
farming.cucumber = 0.001 farming.cucumber = 0.002
farming.corn = 0.001 farming.corn = 0.002
farming.coffee = 0.001 farming.coffee = 0.002
farming.melon = 0.001 farming.melon = 0.009
farming.pumpkin = 0.001 farming.pumpkin = 0.009
farming.cocoa = true farming.cocoa = true
farming.raspberry = 0.001 farming.raspberry = 0.002
farming.blueberry = 0.001 farming.blueberry = 0.002
farming.rhubarb = 0.001 farming.rhubarb = 0.002
farming.beans = 0.001 farming.beans = 0.002
farming.grapes = 0.001 farming.grapes = 0.002
farming.barley = true farming.barley = true
farming.chili = 0.003 farming.chili = 0.003
farming.hemp = 0.003 farming.hemp = 0.003
farming.garlic = 0.001 farming.garlic = 0.002
farming.onion = 0.001 farming.onion = 0.002
farming.pepper = 0.002 farming.pepper = 0.002
farming.pineapple = 0.001 farming.pineapple = 0.003
farming.peas = 0.001 farming.peas = 0.002
farming.beetroot = 0.001 farming.beetroot = 0.002
farming.mint = 0.005 farming.mint = 0.005
farming.cabbage = 0.001 farming.cabbage = 0.002
farming.blackberry = 0.002 farming.blackberry = 0.002
farming.soy = 0.001 farming.soy = 0.002
farming.vanilla = 0.001 farming.vanilla = 0.002
farming.lettuce = 0.001 farming.lettuce = 0.002
farming.artichoke = 0.001 farming.artichoke = 0.002
farming.parsley = 0.002 farming.parsley = 0.002
farming.sunflower = 0.001 farming.sunflower = 0.002
farming.ginger = 0.002 farming.ginger = 0.002
farming.strawberry = 0.002 farming.strawberry = 0.002
farming.cotton = 0.003
farming.grains = true farming.grains = true
farming.rice = true farming.rice = true