Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/BlockySurvival/cool_trees
Browse files Browse the repository at this point in the history
  • Loading branch information
@fluxionary
fluxionary committed Nov 20, 2019
2 parents d5f9f28 + cff21ad commit 70de7ef
Show file tree
Hide file tree
Showing 16 changed files with 53 additions and 26 deletions.
2 changes: 1 addition & 1 deletion bamboo/init.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ local function grow_new_bambootree_tree(pos)
minetest.get_node_timer(pos):start(math.random(240, 600))
return
end

minetest.remove_node(pos)
minetest.place_schematic({x = pos.x - 1, y = pos.y - 1, z = pos.z - 1},
bamboo.bambootree, "0", nil, false)
end
Expand Down
4 changes: 2 additions & 2 deletions birch/init.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ local function grow_new_birch_tree(pos)
minetest.get_node_timer(pos):start(math.random(240, 600))
return
end

minetest.place_schematic({x = pos.x - 2, y = pos.y, z = pos.z - 2}, birch.birchtree, "0", nil, true)
minetest.remove_node(pos)
minetest.place_schematic({x = pos.x - 2, y = pos.y, z = pos.z - 2}, birch.birchtree, "0", nil, false)
end

--
Expand Down
4 changes: 2 additions & 2 deletions cherrytree/init.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ local function grow_new_cherrytree_tree(pos)
minetest.get_node_timer(pos):start(math.random(240, 600))
return
end

minetest.place_schematic({x = pos.x-2, y = pos.y, z = pos.z-2}, modpath.."/schematics/cherrytree.mts", "0", nil, true)
minetest.remove_node(pos)
minetest.place_schematic({x = pos.x-2, y = pos.y, z = pos.z-2}, modpath.."/schematics/cherrytree.mts", "0", nil, false)
end

--
Expand Down
4 changes: 2 additions & 2 deletions chestnuttree/init.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ local function grow_new_chestnuttree_tree(pos)
minetest.get_node_timer(pos):start(math.random(240, 600))
return
end

minetest.place_schematic({x = pos.x-6, y = pos.y, z = pos.z-6}, modpath.."/schematics/chestnuttree.mts", "0", nil, true)
minetest.remove_node(pos)
minetest.place_schematic({x = pos.x-6, y = pos.y, z = pos.z-6}, modpath.."/schematics/chestnuttree.mts", "0", nil, false)
end

--
Expand Down
4 changes: 2 additions & 2 deletions clementinetree/init.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ local function grow_new_clementinetree_tree(pos)
minetest.get_node_timer(pos):start(math.random(240, 600))
return
end

minetest.place_schematic({x = pos.x-2, y = pos.y, z = pos.z-2}, modpath.."/schematics/clementinetree.mts", "0", nil, true)
minetest.remove_node(pos)
minetest.place_schematic({x = pos.x-2, y = pos.y, z = pos.z-2}, modpath.."/schematics/clementinetree.mts", "0", nil, false)
end

--
Expand Down
29 changes: 27 additions & 2 deletions ebony/init.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ local function grow_new_ebony_tree(pos)
minetest.get_node_timer(pos):start(math.random(240, 600))
return
end

minetest.place_schematic({x = pos.x-5, y = pos.y, z = pos.z-5}, modpath.."/schematics/ebony.mts", "0", nil, true)
minetest.remove_node(pos)
minetest.place_schematic({x = pos.x-5, y = pos.y, z = pos.z-5}, modpath.."/schematics/ebony.mts", "0", nil, false)
end

--
Expand Down Expand Up @@ -201,6 +201,31 @@ minetest.register_node("ebony:liana", {
sounds = default.node_sound_leaves_defaults(),
})

--Persimmon Kaki

minetest.register_node("ebony:persimmon", {
description = S("Persimmon"),
drawtype = "plantlike",
tiles = {"ebony_persimmon.png"},
inventory_image = "ebony_persimmon.png",
paramtype = "light",
sunlight_propagates = true,
walkable = false,
is_ground_content = false,
selection_box = {
type = "fixed",
fixed = {-3 / 16, -7 / 16, -3 / 16, 3 / 16, 4 / 16, 3 / 16}
},
groups = {fleshy = 3, dig_immediate = 3, flammable = 2,
leafdecay = 3, leafdecay_drop = 1},
on_use = minetest.item_eat(4),
sounds = default.node_sound_leaves_defaults(),

after_place_node = function(pos, placer, itemstack)
minetest.set_node(pos, {name = "ebony:persimmon", param2 = 1})
end,
})

--
-- Craftitems
--
Expand Down
1 change: 1 addition & 0 deletions ebony/locale/ebony.es.tr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ Ebony Stair=Escaleras de ébano
Inner Ebony Stair=Escaleras de ébano interior
Outer Ebony Stair=Escaleras de ébano exterior
Ebony Slab=Losa de ébano
Persimmon=Kaki
10 changes: 5 additions & 5 deletions ebony/schematics/ebony.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ schematic = {
{name="air", prob=0, param2=0},
{name="ebony:leaves", prob=126, param2=1},
{name="ebony:leaves", prob=254, param2=1},
{name="ebony:leaves", prob=126, param2=1},
{name="ebony:persimmon", prob=126, param2=1},
{name="air", prob=0, param2=0},
{name="air", prob=0, param2=0},
{name="air", prob=0, param2=0},
Expand Down Expand Up @@ -678,7 +678,7 @@ schematic = {
{name="air", prob=0, param2=0},
{name="ebony:leaves", prob=254, param2=1},
{name="ebony:leaves", prob=254, param2=1},
{name="ebony:leaves", prob=126, param2=1},
{name="ebony:persimmon", prob=126, param2=1},
{name="air", prob=0, param2=0},
{name="air", prob=0, param2=0},
{name="air", prob=0, param2=0},
Expand Down Expand Up @@ -876,7 +876,7 @@ schematic = {
{name="air", prob=0, param2=0},
{name="ebony:leaves", prob=254, param2=1},
{name="ebony:leaves", prob=254, param2=1},
{name="ebony:leaves", prob=126, param2=1},
{name="ebony:persimmon", prob=126, param2=1},
{name="air", prob=0, param2=0},
{name="air", prob=0, param2=0},
{name="air", prob=0, param2=0},
Expand All @@ -898,7 +898,7 @@ schematic = {
{name="ebony:leaves", prob=254, param2=1},
{name="ebony:leaves", prob=254, param2=1},
{name="ebony:leaves", prob=254, param2=1},
{name="ebony:leaves", prob=126, param2=1},
{name="ebony:persimmon", prob=126, param2=1},
{name="air", prob=0, param2=0},
{name="air", prob=0, param2=0},
{name="air", prob=0, param2=0},
Expand Down Expand Up @@ -1033,7 +1033,7 @@ schematic = {
{name="air", prob=0, param2=0},
{name="air", prob=0, param2=0},
{name="ebony:leaves", prob=254, param2=1},
{name="ebony:leaves", prob=126, param2=1},
{name="ebony:persimmon", prob=126, param2=1},
{name="ebony:leaves", prob=254, param2=1},
{name="ebony:liana", prob=254, param2=3},
{name="ebony:creeper", prob=254, param2=1},
Expand Down
Binary file modified ebony/schematics/ebony.mts
View file
Binary file not shown.
Binary file added ebony/textures/ebony_persimmon.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions jacaranda/init.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ local function grow_new_jacaranda_tree(pos)
minetest.get_node_timer(pos):start(math.random(240, 600))
return
end

minetest.place_schematic({x = pos.x-3, y = pos.y, z = pos.z-3}, modpath.."/schematics/jacaranda.mts", "0", nil, true)
minetest.remove_node(pos)
minetest.place_schematic({x = pos.x-3, y = pos.y, z = pos.z-3}, modpath.."/schematics/jacaranda.mts", "0", nil, false)
end

--
Expand Down
4 changes: 2 additions & 2 deletions larch/init.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ local function grow_new_larch_tree(pos)
minetest.get_node_timer(pos):start(math.random(240, 600))
return
end

minetest.place_schematic({x = pos.x-5, y = pos.y, z = pos.z-5}, modpath.."/schematics/larch.mts", "0", nil, true)
minetest.remove_node(pos)
minetest.place_schematic({x = pos.x-5, y = pos.y, z = pos.z-5}, modpath.."/schematics/larch.mts", "0", nil, false)
end

--
Expand Down
4 changes: 2 additions & 2 deletions lemontree/init.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ local function grow_new_lemontree_tree(pos)
minetest.get_node_timer(pos):start(math.random(240, 600))
return
end

minetest.place_schematic({x = pos.x-2, y = pos.y, z = pos.z-2}, modpath.."/schematics/lemontree.mts", "0", nil, true)
minetest.remove_node(pos)
minetest.place_schematic({x = pos.x-2, y = pos.y, z = pos.z-2}, modpath.."/schematics/lemontree.mts", "0", nil, false)
end

--
Expand Down
4 changes: 2 additions & 2 deletions mahogany/init.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ local function grow_new_mahogany_tree(pos)
minetest.get_node_timer(pos):start(math.random(240, 600))
return
end

minetest.place_schematic({x = pos.x-3, y = pos.y, z = pos.z-3}, modpath.."/schematics/mahogany.mts", "0", nil, true)
minetest.remove_node(pos)
minetest.place_schematic({x = pos.x-3, y = pos.y, z = pos.z-3}, modpath.."/schematics/mahogany.mts", "0", nil, false)
end

--
Expand Down
1 change: 1 addition & 0 deletions palm/init.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ local function grow_new_palm_tree(pos)
minetest.get_node_timer(pos):start(math.random(240, 600))
return
end
minetest.remove_node(pos)
minetest.place_schematic({x = pos.x - 4, y = pos.y, z = pos.z - 4},
palm.palmtree, "0", nil, false)
end
Expand Down
4 changes: 2 additions & 2 deletions pineapple/init.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ local function grow_new_pineapple_tree(pos)
minetest.get_node_timer(pos):start(math.random(240, 600))
return
end

minetest.place_schematic({x = pos.x, y = pos.y, z = pos.z}, modpath.."/schematics/pineapple.mts", "0", nil, true)
minetest.remove_node(pos)
minetest.place_schematic({x = pos.x, y = pos.y, z = pos.z}, modpath.."/schematics/pineapple.mts", "0", nil, false)
end

--
Expand Down

0 comments on commit 70de7ef

Please sign in to comment.