mirror of
https://git.minetest.land/MineClone2/MineClone2.git
synced 2024-08-19 21:44:12 +02:00
Merge pull request 'Add Lily of the Valley and Cornflower Flowers' (#3438) from lily_of_the_valley into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3438 Reviewed-by: Nicu <kneekoo@noreply.git.minetest.land>
This commit is contained in:
commit
84119d8f34
@ -456,6 +456,11 @@ minetest.register_craft({
|
|||||||
recipe = {{"mcl_core:lapis"}},
|
recipe = {{"mcl_core:lapis"}},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
minetest.register_craft({
|
||||||
|
output = "mcl_dye:blue",
|
||||||
|
recipe = {{"mcl_flowers:cornflower"}},
|
||||||
|
})
|
||||||
|
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
output = "mcl_dye:lightblue",
|
output = "mcl_dye:lightblue",
|
||||||
recipe = {{"mcl_flowers:blue_orchid"}},
|
recipe = {{"mcl_flowers:blue_orchid"}},
|
||||||
@ -526,6 +531,11 @@ minetest.register_craft({
|
|||||||
recipe = {{"mcl_flowers:rose_bush"}},
|
recipe = {{"mcl_flowers:rose_bush"}},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
minetest.register_craft({
|
||||||
|
output = "mcl_dye:white",
|
||||||
|
recipe = {{"mcl_flowers:lily_of_the_valley"}},
|
||||||
|
})
|
||||||
|
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
type = "cooking",
|
type = "cooking",
|
||||||
output = "mcl_dye:dark_green",
|
output = "mcl_dye:dark_green",
|
||||||
|
@ -11,6 +11,9 @@ White Tulip=
|
|||||||
Allium=
|
Allium=
|
||||||
Azure Bluet=
|
Azure Bluet=
|
||||||
Blue Orchid=
|
Blue Orchid=
|
||||||
|
Wither Rose=
|
||||||
|
Lily of the Valley=
|
||||||
|
Cornflower=
|
||||||
Tall Grass=
|
Tall Grass=
|
||||||
Tall grass is a small plant which often occurs on the surface of grasslands. It can be harvested for wheat seeds. By using bone meal, tall grass can be turned into double tallgrass which is two blocks high.=
|
Tall grass is a small plant which often occurs on the surface of grasslands. It can be harvested for wheat seeds. By using bone meal, tall grass can be turned into double tallgrass which is two blocks high.=
|
||||||
Fern=
|
Fern=
|
||||||
|
@ -66,3 +66,15 @@ mcl_flowers.register_simple_flower("wither_rose", {
|
|||||||
selection_box = { -3/16, -0.5, -3/16, 3/16, 6/16, 3/16 },
|
selection_box = { -3/16, -0.5, -3/16, 3/16, 6/16, 3/16 },
|
||||||
potted = true,
|
potted = true,
|
||||||
})
|
})
|
||||||
|
mcl_flowers.register_simple_flower("lily_of_the_valley", {
|
||||||
|
desc = S("Lily of the Valley"),
|
||||||
|
image = "mcl_flowers_lily_of_the_valley.png",
|
||||||
|
selection_box = { -5/16, -0.5, -5/16, 4/16, 5/16, 5/16 },
|
||||||
|
potted = true,
|
||||||
|
})
|
||||||
|
mcl_flowers.register_simple_flower("cornflower", {
|
||||||
|
desc = S("Cornflower"),
|
||||||
|
image = "mcl_flowers_cornflower.png",
|
||||||
|
selection_box = { -4/16, -0.5, -4/16, 4/16, 3/16, 4/16 },
|
||||||
|
potted = true,
|
||||||
|
})
|
||||||
|
@ -6,10 +6,10 @@ local eat = minetest.item_eat(6, "mcl_core:bowl") --6 hunger points, player rece
|
|||||||
|
|
||||||
local flower_effect = {
|
local flower_effect = {
|
||||||
[ "mcl_flowers:allium" ] = "fire_resistance",
|
[ "mcl_flowers:allium" ] = "fire_resistance",
|
||||||
[ "mcl_flowers:tulip_white" ] = "poison",
|
[ "mcl_flowers:lily_of_the_valley" ] = "poison",
|
||||||
[ "mcl_flowers:blue_orchid" ] = "hunger",
|
[ "mcl_flowers:blue_orchid" ] = "hunger",
|
||||||
[ "mcl_flowers:dandelion" ] = "hunger",
|
[ "mcl_flowers:dandelion" ] = "hunger",
|
||||||
[ "mcl_flowers:peony" ] = "jump",
|
[ "mcl_flowers:cornflower" ] = "jump",
|
||||||
[ "mcl_flowers:oxeye_daisy" ] = "regeneration",
|
[ "mcl_flowers:oxeye_daisy" ] = "regeneration",
|
||||||
[ "mcl_flowers:poppy" ] = "night_vision"
|
[ "mcl_flowers:poppy" ] = "night_vision"
|
||||||
}
|
}
|
||||||
@ -108,7 +108,7 @@ minetest.register_craft({
|
|||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
type = "shapeless",
|
type = "shapeless",
|
||||||
output = "mcl_sus_stew:stew",
|
output = "mcl_sus_stew:stew",
|
||||||
recipe = {"mcl_mushrooms:mushroom_red", "mcl_mushrooms:mushroom_brown", "mcl_core:bowl", "mcl_flowers:tulip_white"},
|
recipe = {"mcl_mushrooms:mushroom_red", "mcl_mushrooms:mushroom_brown", "mcl_core:bowl", "mcl_flowers:lily_of_the_valley"},
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
@ -126,7 +126,7 @@ minetest.register_craft({
|
|||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
type = "shapeless",
|
type = "shapeless",
|
||||||
output = "mcl_sus_stew:stew",
|
output = "mcl_sus_stew:stew",
|
||||||
recipe = {"mcl_mushrooms:mushroom_red", "mcl_mushrooms:mushroom_brown", "mcl_core:bowl", "mcl_flowers:peony"},
|
recipe = {"mcl_mushrooms:mushroom_red", "mcl_mushrooms:mushroom_brown", "mcl_core:bowl", "mcl_flowers:cornflower"},
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
|
@ -5288,6 +5288,8 @@ local function register_decorations()
|
|||||||
register_flower("allium", nil, 0) -- flower Forest only
|
register_flower("allium", nil, 0) -- flower Forest only
|
||||||
register_flower("blue_orchid", {"Swampland"}, 64500, false)
|
register_flower("blue_orchid", {"Swampland"}, 64500, false)
|
||||||
|
|
||||||
|
register_flower("lily_of_the_valley", nil, 325)
|
||||||
|
register_flower("cornflower", flower_biomes2, 486)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Decorations in non-Overworld dimensions
|
-- Decorations in non-Overworld dimensions
|
||||||
|
BIN
textures/mcl_flowers_cornflower.png
Normal file
BIN
textures/mcl_flowers_cornflower.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 292 B |
BIN
textures/mcl_flowers_lily_of_the_valley.png
Normal file
BIN
textures/mcl_flowers_lily_of_the_valley.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 230 B |
Loading…
Reference in New Issue
Block a user