diff --git a/depends.txt b/depends.txt index e699b0e..be04425 100644 --- a/depends.txt +++ b/depends.txt @@ -3,3 +3,4 @@ youngtrees? bushes? woodsoils? flowers? +moretrees? diff --git a/snow.lua b/snow.lua index 96c491f..4ab362d 100644 --- a/snow.lua +++ b/snow.lua @@ -77,27 +77,44 @@ for _,woodsoil in pairs(woodsoils) do end end -local nodebox = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5} - } -} -local leavesoverride = { --- drawtype = "nodebox", --- visual_scale = 1, --- tiles = {"snow.png", "christmas_craft_leaves_top.png", "christmas_craft_leaves_side.png"}, - tiles = {"christmas_craft_leaves_side.png"}, --- paramtype = "light", --- node_box = nodebox, --- selection_box = nodebox -} +-- Replace leaves +minetest.override_item("default:pine_needles", { + tiles = {"default_pine_needles.png^christmas_snow_leaves.png"} +}) +minetest.override_item("default:pine_bush_needles", { + tiles = {"default_pine_needles.png^christmas_snow_leaves.png"} +}) +minetest.override_item("default:bush_leaves", { + tiles = {"(default_leaves.png^[multiply:#c75000)^christmas_snow_leaves.png"} +}) --- replace leaves -minetest.override_item("default:leaves", leavesoverride) -minetest.override_item("default:aspen_leaves", leavesoverride) -minetest.override_item("default:jungleleaves", leavesoverride) -minetest.override_item("default:bush_leaves", leavesoverride) +for _, leaves in pairs({"leaves", "aspen_leaves", "jungleleaves"}) do + local tree_leaves = "default:"..leaves + minetest.override_item(tree_leaves, { + tiles = { + "(default_"..leaves..".png^[multiply:#c75000)^christmas_snow_leaves.png" + }}) +end + +if minetest.get_modpath("moretrees") then + -- replace moretrees leaves adding snow and brown mask + for _, leaves in pairs({"beech", "apple_tree", "oak", "birch", "poplar", "willow", "rubber_tree"}) do + local tree_leaves = "moretrees:"..leaves.."_leaves" + minetest.override_item(tree_leaves, { + tiles = { + "(moretrees_"..leaves.."_leaves.png^[multiply:#c75000)^christmas_snow_leaves.png" + }}) + end + + -- replace moretrees leaves adding snow + for _, leaves in pairs({"sequoia", "palm", "date_palm", "spruce", "cedar", "fir"}) do + local tree_leaves = "moretrees:"..leaves.."_leaves" + minetest.override_item(tree_leaves, { + tiles = { + "moretrees_"..leaves.."_leaves.png^christmas_snow_leaves.png" + }}) + end +end -- replace grass for i=1,5 do diff --git a/textures/christmas_aspen_leaves.png b/textures/christmas_aspen_leaves.png deleted file mode 100644 index c0e9747..0000000 Binary files a/textures/christmas_aspen_leaves.png and /dev/null differ diff --git a/textures/christmas_craft_leaves_side.png b/textures/christmas_craft_leaves_side.png deleted file mode 100644 index d5f4749..0000000 Binary files a/textures/christmas_craft_leaves_side.png and /dev/null differ diff --git a/textures/christmas_craft_leaves_top.png b/textures/christmas_craft_leaves_top.png deleted file mode 100644 index 3653df3..0000000 Binary files a/textures/christmas_craft_leaves_top.png and /dev/null differ diff --git a/textures/christmas_leaves_side.png b/textures/christmas_leaves_side.png deleted file mode 100644 index e42c657..0000000 Binary files a/textures/christmas_leaves_side.png and /dev/null differ diff --git a/textures/christmas_snow_leaves.png b/textures/christmas_snow_leaves.png new file mode 100644 index 0000000..5a6cb89 Binary files /dev/null and b/textures/christmas_snow_leaves.png differ