From 9b0f4b2d00715bb306217f22e52e85bdbecf548a Mon Sep 17 00:00:00 2001 From: sys4 Date: Thu, 31 Dec 2020 18:04:00 +0100 Subject: [PATCH] Add bushes and fix woodsoils support --- depends.txt | 6 +- snow.lua | 82 ++++++++++++------ textures/christmas_bushes_branches_center.png | Bin 0 -> 218 bytes textures/christmas_bushes_branches_left.png | Bin 0 -> 220 bytes textures/christmas_bushes_branches_right.png | Bin 0 -> 221 bytes textures/christmas_bushes_leaves.png | Bin 0 -> 216 bytes textures/christmas_bushes_youngtree2trunk.png | Bin 0 -> 192 bytes .../christmas_bushes_youngtree2trunk_inv.png | Bin 0 -> 161 bytes 8 files changed, 62 insertions(+), 26 deletions(-) create mode 100644 textures/christmas_bushes_branches_center.png create mode 100644 textures/christmas_bushes_branches_left.png create mode 100644 textures/christmas_bushes_branches_right.png create mode 100644 textures/christmas_bushes_leaves.png create mode 100644 textures/christmas_bushes_youngtree2trunk.png create mode 100644 textures/christmas_bushes_youngtree2trunk_inv.png diff --git a/depends.txt b/depends.txt index 8383c10..07448a7 100644 --- a/depends.txt +++ b/depends.txt @@ -1,4 +1,8 @@ default youngtrees? -woodsoil? +bushes? +woodsoils? flowers? +moreplants? +moreflowers? +bakedclay? diff --git a/snow.lua b/snow.lua index 037b848..96c491f 100644 --- a/snow.lua +++ b/snow.lua @@ -58,6 +58,25 @@ minetest.override_item( sounds = data.sounds, }) +-- Replace woodsoils +local woodsoils = { + "woodsoils:grass_with_leaves_1", + "woodsoils:grass_with_leaves_2", + "woodsoils:dirt_with_leaves_1", + "woodsoils:dirt_with_leaves_2" +} + +for _,woodsoil in pairs(woodsoils) do + if minetest.registered_nodes[woodsoil] then + minetest.override_item( + woodsoil, { + tiles = { "default_snow.png", "default_dirt.png", "grass_w_snow_side.png" }, + sounds = data.sounds + }) + add_drop(minetest.registered_nodes[woodsoil]) + end +end + local nodebox = { type = "fixed", fixed = { @@ -65,12 +84,13 @@ local nodebox = { } } local leavesoverride = { - drawtype = "nodebox", - visual_scale = 1, - tiles = {"snow.png", "christmas_craft_leaves_top.png", "christmas_craft_leaves_side.png"}, - paramtype = "light", - node_box = nodebox, - selection_box = nodebox +-- 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 @@ -94,25 +114,37 @@ if minetest.registered_items["youngtrees:youngtree_top"] then minetest.override_item("youngtrees:youngtree_middle", {tiles = {"christmas_youngtree16xb.png"}}) end --- Replace woodsoils -if minetest.registered_items["woodsoils:grass_with_leaves_1"] then - minetest.override_item("woodsoils:grass_with_leaves_1", {tiles = {"snow.png", "default_dirt.png", "default_dirt.png^grass_w_snow_side.png"}}) - add_drop(minetest.registered_items["woodsoils:grass_with_leaves_1"]) -end - -if minetest.registered_items["woodsoils:grass_with_leaves_2"] then - minetest.override_item("woodsoils:grass_with_leaves_2", {tiles = {"snow.png", "default_dirt.png", "default_dirt.png^grass_w_snow_side.png"}}) - add_drop(minetest.registered_items["woodsoils:grass_with_leaves_2"]) -end - -if minetest.registered_items["woodsoils:dirt_with_leaves_1"] then - minetest.override_item("woodsoils:dirt_with_leaves_1", {tiles = {"snow.png", "default_dirt.png", "default_dirt.png^grass_w_snow_side.png^woodsoils_ground_cover_side.png"}}) - add_drop(minetest.registered_items["woodsoils:dirt_with_leaves_1"]) -end - -if minetest.registered_items["woodsoils:dirt_with_leaves_2"] then - minetest.override_item("woodsoils:dirt_with_leaves_2", {tiles = {"snow.png", "default_dirt.png", "default_dirt.png^grass_w_snow_side.png^woodsoils_ground_cover_side.png"}}) - add_drop(minetest.registered_items["woodsoils:dirt_with_leaves_2"]) +-- Replace bushes +if minetest.registered_items["bushes:BushLeaves1"] then + minetest.override_item("bushes:BushLeaves1", {tiles = {"christmas_bushes_leaves.png"}}) + minetest.override_item("bushes:BushLeaves2", {tiles = {"christmas_bushes_leaves.png"}}) + minetest.override_item("bushes:bushbranches1", + {tiles = {"christmas_bushes_leaves.png", "christmas_bushes_branches_center.png"}}) + minetest.override_item("bushes:bushbranches3", + {tiles = {"christmas_bushes_leaves.png", "christmas_bushes_branches_center.png"}}) + minetest.override_item("bushes:bushbranches2", { + tiles = { + "christmas_bushes_leaves.png", + "christmas_bushes_branches_center.png", + "christmas_bushes_branches_left.png", + "christmas_bushes_branches_right.png", + "christmas_bushes_branches_center.png", + "christmas_bushes_branches_right.png" + }}) + minetest.override_item("bushes:bushbranches4", { + tiles = { + "christmas_bushes_leaves.png", + "christmas_bushes_branches_center.png", + "christmas_bushes_branches_left.png", + "christmas_bushes_branches_right.png", + "christmas_bushes_branches_center.png", + "christmas_bushes_branches_right.png" + }}) + minetest.override_item("bushes:youngtree2_bottom", { + tiles = {"christmas_bushes_youngtree2trunk.png"}, + inventory_image = "christmas_bushes_youngtree2trunk_inv.png", + wield_image = "christmas_bushes_youngtree2trunk_inv.png" + }) end -- replace flowers diff --git a/textures/christmas_bushes_branches_center.png b/textures/christmas_bushes_branches_center.png new file mode 100644 index 0000000000000000000000000000000000000000..b8064a5d9f6ace2d2b8f64e16711f30439896e7a GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VWWysIjvt#>?UE7ZwJAD4s ziL)2ZYggheZPPZS)Y;d5?H6W$wd!EDpQMo8+oke%Z(QBW z`%Gf%T2gTe~DWM4fa5Pm> literal 0 HcmV?d00001 diff --git a/textures/christmas_bushes_branches_right.png b/textures/christmas_bushes_branches_right.png new file mode 100644 index 0000000000000000000000000000000000000000..abace024271ccc923deb8463d6ffe6def2d443f1 GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VWWysIjzJ2T7{dco;OXk; Jvd$@?2>>X%Q6c~U literal 0 HcmV?d00001 diff --git a/textures/christmas_bushes_youngtree2trunk.png b/textures/christmas_bushes_youngtree2trunk.png new file mode 100644 index 0000000000000000000000000000000000000000..1bf15a9d1c34415693c4de84dad4d31c4bcffee0 GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?boi=sy!iDo!ty;cy+vaoU z&qzz!6#%7jJY5_^IIfGHzR7#ofQRLx=pBZBwlzz+IW$ctc>KLC^7DOS17pX}?9a?C zXV%+un#{DcP*`ifHS&eQ>6^@2jd^bxR;}N`x%1NW(u1|S+WNLjPgFd-!pt1wT`D3K pIq&hCV=_jS33r6_uWX<8m(j_F?~8PU+%KTL44$rjF6*2UngB4rNtplu literal 0 HcmV?d00001 diff --git a/textures/christmas_bushes_youngtree2trunk_inv.png b/textures/christmas_bushes_youngtree2trunk_inv.png new file mode 100644 index 0000000000000000000000000000000000000000..6c52bf004d0e1f506feeb75677fe6f04b992dcc3 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VWWysH&F?rIw`E%B;UA=SH z_A}>BZ%{k-1Src`666=m;PC858i00Y literal 0 HcmV?d00001