diff --git a/README.md b/README.md index 723be52..c17ece7 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ TODO: #### Lucky Blocks -It provides 60 new lucky blocks if the mod is detected. +It provides 63 new lucky blocks if the mod is detected. ## Technical info ----------------- @@ -105,6 +105,7 @@ who helped make this mod bigger and better throughout it's release :) - Fixed willow leaves scaling and forced schematic trunk placement - Add 11 new lucky blocks - Caverealms' glow bait reduces wait time when fishing + - Add Basandra Bush and wood items, Add Spore Grass #### 1.29 - Use "stratum" to generate mesa biome for stripey goodness diff --git a/decor.lua b/decor.lua index d1c1f17..a81c20a 100644 --- a/decor.lua +++ b/decor.lua @@ -189,6 +189,11 @@ add_node({"default:desert_sand"}, 0.005, {"desert"}, 1, 100, add_node({"ethereal:mushroom_dirt"}, 0.01, {"mushroom"}, 1, 100, {"flowers:mushroom_red"}, nil, nil, nil, ethereal.mushroom) +-- spore grass +add_node({"ethereal:mushroom_dirt"}, 0.1, {"mushroom"}, 1, 100, + {"ethereal:spore_grass"}, nil, nil, nil, ethereal.mushroom) + + local list = { {"junglee", {"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"}, ethereal.junglee}, {"deciduous_forest", {"default:dirt_with_grass"}, ethereal.grassy}, diff --git a/fences.lua b/fences.lua index 55c9ca9..6655ca2 100644 --- a/fences.lua +++ b/fences.lua @@ -61,6 +61,7 @@ add_fence("mushroom", "mushroom_trunk", "Mushroom", "ethereal_mushroom_trunk") add_fence("birch", "birch_wood", "Birch", "moretrees_birch_wood") add_fence("sakura", "sakura_wood", "Sakura", "ethereal_sakura_wood") add_fence("olive", "olive_wood", "Olive", "ethereal_olive_wood") +add_fence("basandra", "basandra_wood", "Basandra", "ethereal_basandra_bush_wood") -- add compatibility for ethereal's to default wooden gates diff --git a/leaves.lua b/leaves.lua index 5a5f6f7..728d1fc 100644 --- a/leaves.lua +++ b/leaves.lua @@ -22,7 +22,7 @@ minetest.override_item("default:leaves", { -- ability to craft big tree sapling minetest.register_craft({ - recipe = {{"default:sapling", "default:sapling", "default:sapling"}}, + recipe = {{"default:sapling", "default:sapling", "default:sapling"}}, output = "ethereal:big_tree_sapling" }) @@ -487,6 +487,40 @@ minetest.register_craft({ burntime = 1 }) +-- basandra bush stem, leaves +minetest.register_node("ethereal:basandra_bush_stem", { + description = S("Basandra Bush Stem"), + drawtype = "plantlike", + visual_scale = 1.41, + damage_per_second = 2, + tiles = {"ethereal_basandra_bush_stem.png"}, + inventory_image = "ethereal_basandra_bush_stem.png", + wield_image = "ethereal_basandra_bush_stem.png", + paramtype = "light", + sunlight_propagates = true, + groups = {choppy = 2, oddly_breakable_by_hand = 1, flammable = 2}, + sounds = default.node_sound_wood_defaults(), + selection_box = { + type = "fixed", + fixed = {-7 / 16, -0.5, -7 / 16, 7 / 16, 0.5, 7 / 16}, + } +}) + +minetest.register_node("ethereal:basandra_bush_leaves", { + description = S("Basandra Bush Leaves"), + drawtype = "allfaces_optional", + tiles = {"ethereal_basandra_bush_leaves.png"}, + paramtype = "light", + groups = {snappy = 3, flammable = 2, leaves = 1}, + drop = { + max_items = 1, + items = { + {items = {"ethereal:basandra_bush_sapling"}, rarity = 5}, + {items = {"ethereal:basandra_bush_leaves"}} + } + }, + sounds = default.node_sound_leaves_defaults() +}) -- compatibility check for new mt version with leafdecay function if minetest.registered_nodes["default:dirt_with_rainforest_litter"] then diff --git a/license.txt b/license.txt index 4af8302..a8e4ce0 100644 --- a/license.txt +++ b/license.txt @@ -22,6 +22,11 @@ THE SOFTWARE. Textures by TenPlus1 (CC0) unless listed below... +Based on default_leaves.png (Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) + ethereal_frost_leaves.png [edited by TenPlus1] + ethereal_yellow_leaves.png [edited by TenPlus1] + ethereal_basandra_leaves.png [edited by TenPlus1] + Textures by BlueTangs Rock (CC BY-SA 3.0): ethereal_seaweed.png ethereal_fish_angler.png diff --git a/lucky_block.lua b/lucky_block.lua index 78f5a4e..f769121 100644 --- a/lucky_block.lua +++ b/lucky_block.lua @@ -6,10 +6,13 @@ lucky_block:add_schematics({ {"palmtree", ethereal.palmtree, {x = 4, y = 0, z = 4}}, {"bananatree", ethereal.bananatree, {x = 3, y = 0, z = 3}}, {"orangetree", ethereal.orangetree, {x = 2, y = 0, z = 2}}, - {"birchtree", ethereal.birchtree, {x = 2, y = 0, z = 2}} + {"birchtree", ethereal.birchtree, {x = 2, y = 0, z = 2}}, + {"basandrabush", ethereal.basandrabush, {x = 1, y = 0, z = 1}} }) lucky_block:add_blocks({ + {"sch", "basandrabush", 0, false}, + {"dro", {"ethereal:basandra_wood"}, 5}, {"dro", {"ethereal:firethorn"}, 3}, {"dro", {"ethereal:firethorn_jelly"}, 3}, {"nod", "ethereal:crystal_spike", 1}, @@ -42,6 +45,7 @@ lucky_block:add_blocks({ {"dro", {"ethereal:axe_crystal"}}, {"nod", "ethereal:fire_flower", 1}, {"dro", {"ethereal:sword_crystal"}}, + {"nod", "ethereal:basandra_bush_stem", 1}, {"dro", {"ethereal:pick_crystal"}}, {"sch", "birchtree", 0, false}, {"dro", {"ethereal:fish_raw"}}, diff --git a/plantlife.lua b/plantlife.lua index 8e59123..5103824 100644 --- a/plantlife.lua +++ b/plantlife.lua @@ -1,6 +1,25 @@ local S = ethereal.intllib +-- Spore Grass +minetest.register_node("ethereal:spore_grass", { + description = S("Spore Grass"), + drawtype = "plantlike", + tiles = {"ethereal_spore_grass.png"}, + inventory_image = "ethereal_spore_grass.png", + wield_image = "ethereal_spore_grass.png", + paramtype = "light", + sunlight_propagates = true, + waving = 1, + walkable = false, + buildable_to = true, + groups = {snappy = 3, flora = 1, attached_node = 1}, + sounds = default.node_sound_leaves_defaults(), + selection_box = { + type = "fixed", + fixed = {-5 / 16, -0.5, -5 / 16, 5 / 16, 4 / 16, 5 / 16} + } +}) -- Firethorn (poisonous when eaten raw, must be crushed and washed in flowing water 1st) minetest.register_node("ethereal:firethorn", { @@ -285,7 +304,7 @@ local add_moss = function(typ, descr, texture, receipe_item) end add_moss("crystal", "Crystal", "ethereal_grass_crystal_top.png", "ethereal:frost_leaves") -add_moss("mushroom", "Mushroom", "ethereal_grass_mushroom_top.png", "ethereal:mushroom") +add_moss("mushroom", "Mushroom", "ethereal_grass_mushroom_top.png", "ethereal:spore_grass") add_moss("fiery", "Fiery", "ethereal_grass_fiery_top.png", "ethereal:dry_shrub") add_moss("gray", "Gray", "ethereal_grass_gray_top.png", "ethereal:snowygrass") add_moss("green", "Green", "default_grass.png", "default:jungleleaves") diff --git a/sapling.lua b/sapling.lua index 618394e..ac59bff 100644 --- a/sapling.lua +++ b/sapling.lua @@ -1,6 +1,25 @@ local S = ethereal.intllib +-- Basandra Bush Sapling +minetest.register_node("ethereal:basandra_bush_sapling", { + description = S("Basandra Bush Sapling"), + drawtype = "plantlike", + tiles = {"ethereal_basandra_bush_sapling.png"}, + inventory_image = "ethereal_basandra_bush_sapling.png", + wield_image = "ethereal_basandra_bush_sapling.png", + paramtype = "light", + sunlight_propagates = true, + walkable = false, + selection_box = { + type = "fixed", + fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 2 / 16, 4 / 16} + }, + groups = {snappy = 2, dig_immediate = 3, attached_node = 1, ethereal_sapling = 1, + sapling = 1}, + sounds = default.node_sound_leaves_defaults(), + grown_height = 2 +}) -- Bamboo Sprout minetest.register_node("ethereal:bamboo_sprout", { @@ -89,6 +108,10 @@ local path = minetest.get_modpath("ethereal") .. "/schematics/" -- grow tree functions +function ethereal.grow_basandra_bush(pos) + add_tree(pos, 1, 0, 1, ethereal.basandrabush) +end + function ethereal.grow_yellow_tree(pos) add_tree(pos, 4, 0, 4, ethereal.yellowtree) end @@ -201,7 +224,11 @@ ethereal.grow_sapling = function(pos, node) end -- Check if Ethereal Sapling is growing on correct substrate - if node.name == "ethereal:yellow_tree_sapling" + if node.name == "ethereal:basandra_bush_sapling" + and under == "ethereal:fiery_dirt" then + ethereal.grow_basandra_bush(pos) + + elseif node.name == "ethereal:yellow_tree_sapling" and minetest.get_item_group(under, "soil") > 0 then ethereal.grow_yellow_tree(pos) diff --git a/schematics/basandra_bush.lua b/schematics/basandra_bush.lua new file mode 100644 index 0000000..00ca5d1 --- /dev/null +++ b/schematics/basandra_bush.lua @@ -0,0 +1,23 @@ + +local _ = {name = "air", param1 = 0} +local S = {name = "ethereal:basandra_bush_stem", param1 = 255, force_place = true} +local B = {name = "ethereal:basandra_bush_leaves", param1 = 255} +local b = {name = "ethereal:basandra_bush_leaves", param1 = 100} + +ethereal.basandrabush = { + + size = {x = 3, y = 2, z = 3}, + + data = { + + b,B,b, + b,b,b, + + B,S,B, + b,B,b, + + b,B,b, + b,b,b, + + } +} diff --git a/schems.lua b/schems.lua index 1896bdd..44681d7 100644 --- a/schems.lua +++ b/schems.lua @@ -26,6 +26,7 @@ dofile(path .. "sakura.lua") dofile(path .. "igloo.lua") dofile(path .. "lemon_tree.lua") dofile(path .. "olive_tree.lua") +dofile(path .. "basandra_bush.lua") -- helper function @@ -92,6 +93,10 @@ add_schem("ethereal:fiery_dirt", 0.01, {"fiery"}, 1, 100, add_schem("ethereal:fiery_dirt", 0.003, {"fiery"}, 1, 100, ethereal.volcanol, ethereal.fiery, nil, "ethereal:fiery_dirt", 8, "random") +-- basandra bush +add_schem("ethereal:fiery_dirt", 0.03, {"fiery"}, 1, 100, + ethereal.basandrabush, ethereal.fiery) + -- default jungle tree add_schem({"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"}, 0.08, {"junglee"}, 1, 100, dpath .. "jungle_tree.mts", ethereal.junglee) diff --git a/textures/ethereal_basandra_bush_leaves.png b/textures/ethereal_basandra_bush_leaves.png new file mode 100644 index 0000000..4ce4b42 Binary files /dev/null and b/textures/ethereal_basandra_bush_leaves.png differ diff --git a/textures/ethereal_basandra_bush_sapling.png b/textures/ethereal_basandra_bush_sapling.png new file mode 100644 index 0000000..5a7a371 Binary files /dev/null and b/textures/ethereal_basandra_bush_sapling.png differ diff --git a/textures/ethereal_basandra_bush_stem.png b/textures/ethereal_basandra_bush_stem.png new file mode 100644 index 0000000..00ade53 Binary files /dev/null and b/textures/ethereal_basandra_bush_stem.png differ diff --git a/textures/ethereal_basandra_bush_wood.png b/textures/ethereal_basandra_bush_wood.png new file mode 100644 index 0000000..16d6328 Binary files /dev/null and b/textures/ethereal_basandra_bush_wood.png differ diff --git a/textures/ethereal_spore_grass.png b/textures/ethereal_spore_grass.png new file mode 100644 index 0000000..c24b8b8 Binary files /dev/null and b/textures/ethereal_spore_grass.png differ diff --git a/wood.lua b/wood.lua index 0bebe9a..6ce5027 100644 --- a/wood.lua +++ b/wood.lua @@ -1,6 +1,21 @@ local S = ethereal.intllib +-- basandra wood +minetest.register_node("ethereal:basandra_wood", { + description = S("Basandra Wood"), + tiles = {"ethereal_basandra_bush_wood.png"}, + paramtype2 = "facedir", + is_ground_content = false, + groups = {choppy = 2, oddly_breakable_by_hand = 1}, + sounds = default.node_sound_wood_defaults(), + on_place = minetest.rotate_node +}) + +minetest.register_craft({ + output = "ethereal:basandra_wood 1", + recipe = {{"ethereal:basandra_bush_stem"}} +}) -- sakura trunk minetest.register_node("ethereal:sakura_trunk", {