Commit 60f97d46 authored by Milan's avatar Milan
Browse files
parents 4a568237 19b9ca1a
......@@ -185,6 +185,18 @@ local function growth(pointed_thing)
elseif node.name == "ethereal:birch_sapling" then
ethereal.grow_birch_tree(pos)
elseif node.name == "illuna_ethereal:fierytree_sapling" then
illuna_ethereal.grow_fiery_tree(pos)
elseif node.name == "illuna_ethereal:douglasie_sapling" then
illuna_ethereal.grow_douglasie_tree(pos)
elseif node.name == "illuna_ethereal:iska_birch1_sapling" then
illuna_ethereal.grow_birch1_tree(pos)
elseif node.name == "illuna_ethereal:iska_birch2_sapling" then
illuna_ethereal.grow_birch2_tree(pos)
elseif node.name == "moretrees:rubber_tree_sapling" then
minetest.remove_node(pos)
......
......@@ -3,8 +3,8 @@ local S = ethereal.intllib
-- override default dirt (to stop caves cutting away dirt)
minetest.override_item("default:dirt", {is_ground_content = ethereal.cavedirt})
--[[ green dirt
minetest.override_item("default:dirt_with_grass", {groups = {crumbly = 3, soil = 1, grass = 1}})
-- green dirt
minetest.register_node("ethereal:green_dirt", {
description = S("Green Dirt"),
tiles = {
......@@ -23,7 +23,7 @@ minetest.register_node("ethereal:green_dirt", {
sounds = default.node_sound_dirt_defaults({
footstep = {name = "default_grass_footstep", gain = 0.25},
}),
})]]
})
minetest.register_alias("ethereal:green_dirt", "default:dirt_with_grass")
-- dry dirt
......@@ -81,25 +81,25 @@ dirts = {
"ethereal:bamboo_dirt", "ethereal:jungle_dirt", "ethereal:grove_dirt",
"ethereal:prairie_dirt", "ethereal:cold_dirt", "ethereal:crystal_dirt",
"ethereal:mushroom_dirt", "ethereal:fiery_dirt", "ethereal:gray_dirt",
"default:dirt_with_grass", "default:dirt_with_dry_grass", "ethereal:green_dirt",
"default:dirt_with_snow", "default:dirt_with_dry_grass", "ethereal:mesa_dirt",
"default:dirt_with_dry_grass", "default:dirt_with_grass", "ethereal:green_dirt",
"default:dirt_with_snow", "ethereal:mesa_dirt",
"ethereal:swamp_dirt"
}
-- check surrounding grass and change dirt to same colour
local grass_spread = function(pos, node)
-- not enough light
local above = {x = pos.x, y = pos.y + 1, z = pos.z}
-- not enough light
if (minetest.get_node_light(above) or 0) < 13 then
return
end
-- water above grass
local name = minetest.get_node(above).name
local def = minetest.registered_nodes[name]
-- water above grass
if name == "ignore" or not def or def.liquidtype ~= "none" then
return
end
......@@ -109,10 +109,7 @@ local grass_spread = function(pos, node)
-- find all default and ethereal grasses in area around dirt
local positions, grasses = minetest.find_nodes_in_area(
{x = pos.x - 1, y = pos.y - 2, z = pos.z - 1},
{x = pos.x + 1, y = pos.y + 2, z = pos.z + 1},
-- {"group:ethereal_grass", "default:dirt_with_grass",
-- "default:dirt_with_dry_grass", "default:dirt_with_snow"})
dirts)
{x = pos.x + 1, y = pos.y + 2, z = pos.z + 1}, dirts)
-- count new grass nodes
for n = 1, #dirts do
......@@ -130,11 +127,6 @@ local grass_spread = function(pos, node)
return
end
-- change default green grass to ethereal green grass
if curr_type == "default:dirt_with_grass" then
curr_type = "ethereal:green_dirt"
end
minetest.swap_node(pos, {name = curr_type})
end
......@@ -300,11 +292,11 @@ for _, ab in pairs(minetest.registered_abms) do
-- find dirt to grass abm and replace with spread function
if label == "Grass spread"
or (node1 == "default:dirt"
and neigh == "default:dirt_with_grass") then
and neigh == "group:grass") then
--ab.interval = 2
--ab.chance = 1
ab.nodenames = {"default:dirt_with_grass", "default:dirt"}
ab.nodenames = {"default:dirt"}
ab.neighbors = {"air"}
ab.action = grass_spread
......@@ -344,7 +336,7 @@ for _, ab in pairs(minetest.registered_abms) do
end
-- If Baked Clay mod not active, make Red, Orange and Grey nodes
if not minetest.get_modpath("bakedclay") then
if not minetest.get_modpath("illuna_extra") then
minetest.register_node(":bakedclay:red", {
description = S("Red Baked Clay"),
......
......@@ -103,22 +103,6 @@ add_biome("bacon", "bacon:cookedblock", "bacon:cookedblock", 1,
add_biome("candy", nil, "mtcandy:dotted_green", 1,
"mtcandy:dotted_yellow", 3, "mtcandy:dotted_orange", "mtcandy:candyrec_bluecyan", 10, nil, nil, 4, 80, 45, 45, ethereal.glacier)
--[[
add_biome("candytwo", nil, "mtcandy:daisy", 1,
"mtcandy:dotted_orange", 3, "mtcandy:dotted_yellow", "mtcandy:candyrec_bluecyan", 10, nil, nil, 16, 60, 0, 0, ethereal.glacier)
add_biome("candythree", nil, "mtcandy:dotted_green", 1,
"mtcandy:dotted_pink", 3, "mtcandy:orange", nil, 5, nil, nil, 6, 32, 0, 0, ethereal.glacier)
add_biome("candythreehalf", nil, "mtcandy:dotted_green", 1,
"mtcandy:dotted_pink", 3, "mtcandy:emenems", nil, 5, nil, nil, 16, 54, 0, 0, ethereal.glacier)
add_biome("candyfour", nil, "mtcandy:daisy", 1,
"mtcandy:dotted_pink", 3, "mtcandy:milk_choco", nil, 10, nil, nil, 28, 42, 0, 0, ethereal.glacier)
]]
add_biome("stone_grassland", nil, "ethereal:green_dirt", 1, "default:stone", 3,
nil, nil, nil, nil, nil, 1, 85, 35, 56, 1)
......@@ -217,16 +201,13 @@ add_biome("sandclay", nil, "default:sand", 3, "default:clay", 2,
nil, nil, nil, nil, nil, 1, 2, 72, 86, ethereal.sandclay)
add_biome("swamp", nil, "ethereal:swamp_dirt", 1, "default:dirt", 3,
nil, nil, nil, nil, nil, 2, 7, 80, 95, ethereal.swamp)
add_biome("swamp_ocean", nil, "default:sand", 2, "default:clay", 2,
nil, nil, nil, nil, nil, -192, 1, 80, 95, ethereal.swamp)
nil, nil, nil, nil, nil, 1, 7, 80, 95, ethereal.swamp)
add_biome("swamp", nil, "ethereal:green_dirt", 1, "default:dirt", 3,
nil, nil, nil, nil, nil, 1, 7, 80, 90, ethereal.swamp)
add_biome("swamp_shore", nil, "default:dirt", 1, "default:dirt", 3,
nil, nil, nil, nil, nil, -1, 0, 80, 90, ethereal.swamp)
add_biome("swamp_ocean", nil, "default:sand", 2, "default:clay", 2,
nil, nil, nil, nil, nil, -192, 1, 80, 90, ethereal.swamp)
nil, nil, nil, nil, nil, -192, -2, 80, 90, ethereal.swamp)
--= schematic decorations
......@@ -603,11 +584,11 @@ add_node({"ethereal:prairie_dirt"}, 0.05, {"prairie"}, 1, 200, {"farming:carrot_
"farming:raspberry_4", "farming:rhubarb_3", "farming:blueberry_4"}, nil, nil, nil, ethereal.prairie)
-- melon and pumpkin
add_node({"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"}, 0.015, {"junglee"}, 1, 1, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.junglee)
add_node({"ethereal:green_dirt"}, 0.015, {"grassy"}, 1, 1, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.grassy)
add_node({"ethereal:green_dirt"}, 0.015, {"grassytwo"}, 1, 1, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.grassytwo)
add_node({"ethereal:green_dirt"}, 0.015, {"jumble"}, 1, 1, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.jumble)
add_node({"ethereal:green_dirt"}, 0.015, {"plains"}, 1, 6, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.jumble)
add_node({"ethereal:jungle_dirt", "default:dirt_with_rainforest_litter"}, 0.015, {"junglee"}, 2, 8, {"farming:melon_8", "farming:pumpkin_8"}, nil, nil, nil, ethereal.junglee)
--add_node({"ethereal:green_dirt"}, 0.015, {"grassy"}, 1, 1, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.grassy)
--add_node({"ethereal:green_dirt"}, 0.015, {"grassytwo"}, 1, 1, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.grassytwo)
--add_node({"ethereal:green_dirt"}, 0.015, {"jumble"}, 1, 1, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.jumble)
--add_node({"ethereal:green_dirt"}, 0.015, {"plains"}, 1, 6, {"farming:melon_8", "farming:pumpkin_8"}, nil, "default:water_source", 1, ethereal.jumble)
-- green beans
add_node({"ethereal:green_dirt"}, 0.035, {"grassytwo", "sandstone_grassland"}, 1, 160, {"farming:beanbush"}, nil, nil, nil, ethereal.grassytwo)
......
......@@ -94,7 +94,7 @@ function ethereal.grow_frost_tree(pos)
end
function ethereal.grow_mushroom_tree(pos)
ethereal.add_tree(pos, 4, 0, 4, path .. "mushroomone.mts")
ethereal.add_tree(pos, 4, 7, 4, path .. "mushroomone.mts")
end
function ethereal.grow_palm_tree(pos)
......@@ -106,7 +106,7 @@ function ethereal.grow_willow_tree(pos)
end
function ethereal.grow_redwood_tree(pos)
ethereal.add_tree(pos, 8, 34, 8, path .. "redwood_tree.mts") -- iska
ethereal.add_tree(pos, 8, 47, 8, path .. "redwood_tree.mts") -- iska
end
function ethereal.grow_orange_tree(pos)
......
......@@ -56,6 +56,13 @@ stairs.register_all("frost_wood", "ethereal:frost_wood",
S("Frost Wood Slab"),
default.node_sound_wood_defaults())
stairs.register_all("frost_tree", "ethereal:frost_tree",
{choppy = 2, oddly_breakable_by_hand = 1, put_out_fire = 1},
{"frost_tree.png"},
S("Frost Tree Stair"),
S("Frost Tree Slab"),
default.node_sound_wood_defaults())
stairs.register_all("yellow_wood", "ethereal:yellow_wood",
{choppy = 2, oddly_breakable_by_hand = 1, put_out_fire = 1},
{"yellow_wood.png"},
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment