diff --git a/mod_files/crafts.lua b/mod_files/crafts.lua index f47c417..59612ba 100644 --- a/mod_files/crafts.lua +++ b/mod_files/crafts.lua @@ -83,7 +83,7 @@ minetest.register_craft({ output = "christmas_craft:snowman", recipe = { {"default:coal_lump","default:snow","default:coal_lump"}, - {"default:snow","christmas_craft:snowball","default:snow"}, + {"default:snow","default:snow","default:snow"}, {"default:coal_lump","default:coal_lump","default:coal_lump"}, } }) diff --git a/mod_files/multi-node.lua b/mod_files/multi-node.lua index 426dacd..6274061 100644 --- a/mod_files/multi-node.lua +++ b/mod_files/multi-node.lua @@ -21,9 +21,26 @@ minetest.register_node("christmas_craft:present_box", { -- coloured Present -- +local function register_paper(name, description, colorCode, dye) + + minetest.register_craftitem("christmas_craft:paper_".. name, { + description = description .."paper", + inventory_image = "default_paper.png^[colorize:#" .. colorCode, + stack_max = 99, + liquids_pointable = false, + }) + + minetest.register_craft({ + type = "shapeless", + output = 'christmas_craft:paper_'.. name, + recipe = {'dye:'..dye,'default:paper'}, + }) + +end + local function register_present(name, description, colorCode, dye) -minetest.register_node("christmas_craft:Christmas_present_"..name, { +minetest.register_node("christmas_craft:christmas_present_"..name, { description = description .." Christmas Present", tiles = { "christmas_present.png^[colorize:#" ..colorCode.. "^christmas_bow_top.png", @@ -154,23 +171,6 @@ local function register_baubles(name, description, colorCode, dye) }) end -local function register_paper(name, description, colorCode, dye) - - minetest.register_craftitem("christmas_craft:paper_".. name, { - description = description .."paper", - inventory_image = "default_paper.png^[colorize:#" .. colorCode, - stack_max = 99, - liquids_pointable = false, - }) - - minetest.register_craft({ - type = "shapeless", - output = 'christmas_craft:paper_'.. name, - recipe = {'dye:'..dye,'default:paper'}, - }) - -end - colours = { -- RGB Prime Colours -- {name="red", code="FF000099", description="Red", dye="red"}, @@ -183,7 +183,7 @@ colours = { -- RGB Other Colours -- {name="orange", code="E5940099", description="Orange", dye="orange"}, {name="darkgreen", code="004C0099", description="Dark Green", dye="dark_green"}, - {name="violet", code="80008099", description="Violet", dye="purple"}, + {name="violet", code="80008099", description="Violet", dye="violet"}, {name="pink", code="FFC0CB99", description="Pink", dye="pink"}, {name="brown", code="732c0b99", description="Brown", dye="brown"}, -- MonoChrome -- diff --git a/mod_files/node.lua b/mod_files/node.lua index 2261057..69dd8fa 100644 --- a/mod_files/node.lua +++ b/mod_files/node.lua @@ -6,7 +6,7 @@ minetest.register_alias("christmas_craft:snow_block", "default:snowblock") minetest.register_alias("christmas_craft:silver_baubles", "christmas_craft:white_baubles") -minetest.register_alias("christmas_craft:Christmas_present", "christmas_craft:Christmas_present_white") +minetest.register_alias("christmas_craft:Christmas_present", "christmas_craft:christmas_present_white") -- ========== -- -- misk nodes -- @@ -329,33 +329,11 @@ minetest.register_node("christmas_craft:candy_cane_tree", { on_place = minetest.rotate_node }) -minetest.register_node(":default:snow", { - description = "Snow", - tiles = {"default_snow.png"}, - inventory_image = "default_snowball.png", - wield_image = "default_snowball.png", - paramtype = "light", - buildable_to = true, - walkable = false, - floodable = true, - drawtype = "nodebox", +minetest.override_item("default:snow", { node_box = { type = "fixed", fixed = { {-0.5, -0.5, -0.5, 0.5, -0.125, 0.5}, }, }, - groups = {crumbly = 3, falling_node = 1, puts_out_fire = 1}, - sounds = default.node_sound_dirt_defaults({ - footstep = {name = "default_snow_footstep", gain = 0.15}, - dug = {name = "default_snow_footstep", gain = 0.2}, - dig = {name = "default_snow_footstep", gain = 0.2} - }), - - on_construct = function(pos) - pos.y = pos.y - 1 - if minetest.get_node(pos).name == "default:dirt_with_grass" then - minetest.set_node(pos, {name = "default:dirt_with_snow"}) - end - end, }) diff --git a/snow.lua b/snow.lua index 0b60912..037b848 100644 --- a/snow.lua +++ b/snow.lua @@ -38,6 +38,26 @@ minetest.override_item( sounds = data.sounds, }) +minetest.override_item( + "default:dry_dirt_with_dry_grass", { + tiles = {"default_snow.png", "default_dry_dirt.png", + {name = "default_dry_dirt.png^default_snow_side.png", + tileable_vertical = false}}, + sounds = data.sounds, +}) + +minetest.override_item( + "default:dirt_with_rainforest_litter", { + tiles = data.tiles, + sounds = data.sounds, +}) + +minetest.override_item( + "default:dirt_with_coniferous_litter", { + tiles = data.tiles, + sounds = data.sounds, +}) + local nodebox = { type = "fixed", fixed = { @@ -62,6 +82,7 @@ minetest.override_item("default:bush_leaves", leavesoverride) -- replace grass for i=1,5 do minetest.override_item("default:grass_" .. i, {tiles = {"christmas_grass_"..i..".png"}}) + minetest.override_item("default:dry_grass_" .. i, {tiles = {"christmas_dry_grass_"..i..".png"}}) end -- Replace junglegrass @@ -95,7 +116,7 @@ if minetest.registered_items["woodsoils:dirt_with_leaves_2"] then end -- replace flowers -for _,name in pairs({"dandelion_yellow", "geranium", "rose", "tulip", "dandelion_white", "viola"}) do +for _,name in pairs({"dandelion_yellow", "geranium", "rose", "tulip", "dandelion_white", "viola", "chrysanthemum_green", "tulip_black"}) do local flowername = "flowers:"..name local tiles = { "snow_" .. name .. ".png" } minetest.override_item(flowername, { tiles = tiles }) diff --git a/textures/blue_baubles.png b/textures/blue_baubles.png index 11eec2b..10738c1 100644 Binary files a/textures/blue_baubles.png and b/textures/blue_baubles.png differ diff --git a/textures/christmas-candy_cabe.png b/textures/christmas-candy_cabe.png index 6b1ba85..b3c50d5 100644 Binary files a/textures/christmas-candy_cabe.png and b/textures/christmas-candy_cabe.png differ diff --git a/textures/christmas-candy_cabe_top.png b/textures/christmas-candy_cabe_top.png index 46402e3..27273ea 100644 Binary files a/textures/christmas-candy_cabe_top.png and b/textures/christmas-candy_cabe_top.png differ diff --git a/textures/christmas_aspen_leaves.png b/textures/christmas_aspen_leaves.png index 7e8a576..c0e9747 100644 Binary files a/textures/christmas_aspen_leaves.png and b/textures/christmas_aspen_leaves.png differ diff --git a/textures/christmas_baubles-top.png b/textures/christmas_baubles-top.png index 43793b2..7319d06 100644 Binary files a/textures/christmas_baubles-top.png and b/textures/christmas_baubles-top.png differ diff --git a/textures/christmas_baubles.png b/textures/christmas_baubles.png index b663fa9..20fc236 100644 Binary files a/textures/christmas_baubles.png and b/textures/christmas_baubles.png differ diff --git a/textures/christmas_baubles_side.png b/textures/christmas_baubles_side.png index 5124cb2..49a5ccd 100644 Binary files a/textures/christmas_baubles_side.png and b/textures/christmas_baubles_side.png differ diff --git a/textures/christmas_candy_cain_stick.png b/textures/christmas_candy_cain_stick.png index ad86f23..194d9ea 100644 Binary files a/textures/christmas_candy_cain_stick.png and b/textures/christmas_candy_cain_stick.png differ diff --git a/textures/christmas_candy_cain_stick_wall.png b/textures/christmas_candy_cain_stick_wall.png index c82c450..6a35c3c 100644 Binary files a/textures/christmas_candy_cain_stick_wall.png and b/textures/christmas_candy_cain_stick_wall.png differ diff --git a/textures/christmas_craft_leaves_side.png b/textures/christmas_craft_leaves_side.png index 2b6c4a8..d5f4749 100644 Binary files a/textures/christmas_craft_leaves_side.png and b/textures/christmas_craft_leaves_side.png differ diff --git a/textures/christmas_craft_leaves_top.png b/textures/christmas_craft_leaves_top.png index da5302b..3653df3 100644 Binary files a/textures/christmas_craft_leaves_top.png and b/textures/christmas_craft_leaves_top.png differ diff --git a/textures/christmas_craft_pud-top.png b/textures/christmas_craft_pud-top.png index d7613a5..eeda9fe 100644 Binary files a/textures/christmas_craft_pud-top.png and b/textures/christmas_craft_pud-top.png differ diff --git a/textures/christmas_dry_grass_1.png b/textures/christmas_dry_grass_1.png new file mode 100644 index 0000000..498fe6d Binary files /dev/null and b/textures/christmas_dry_grass_1.png differ diff --git a/textures/christmas_dry_grass_2.png b/textures/christmas_dry_grass_2.png new file mode 100644 index 0000000..101a282 Binary files /dev/null and b/textures/christmas_dry_grass_2.png differ diff --git a/textures/christmas_dry_grass_3.png b/textures/christmas_dry_grass_3.png new file mode 100644 index 0000000..4894565 Binary files /dev/null and b/textures/christmas_dry_grass_3.png differ diff --git a/textures/christmas_dry_grass_4.png b/textures/christmas_dry_grass_4.png new file mode 100644 index 0000000..b252a60 Binary files /dev/null and b/textures/christmas_dry_grass_4.png differ diff --git a/textures/christmas_dry_grass_5.png b/textures/christmas_dry_grass_5.png new file mode 100644 index 0000000..dd0a7e9 Binary files /dev/null and b/textures/christmas_dry_grass_5.png differ diff --git a/textures/christmas_ginger-mix.png b/textures/christmas_ginger-mix.png index cdff429..4b0e0e3 100644 Binary files a/textures/christmas_ginger-mix.png and b/textures/christmas_ginger-mix.png differ diff --git a/textures/christmas_leaves_bot.png b/textures/christmas_leaves_bot.png index 47a7544..e57d975 100644 Binary files a/textures/christmas_leaves_bot.png and b/textures/christmas_leaves_bot.png differ diff --git a/textures/christmas_leaves_side.png b/textures/christmas_leaves_side.png index 821ca93..e42c657 100644 Binary files a/textures/christmas_leaves_side.png and b/textures/christmas_leaves_side.png differ diff --git a/textures/christmas_lights_animated.png b/textures/christmas_lights_animated.png index 7143061..b855d86 100644 Binary files a/textures/christmas_lights_animated.png and b/textures/christmas_lights_animated.png differ diff --git a/textures/christmas_present.png b/textures/christmas_present.png index 6b403f2..d8b65be 100644 Binary files a/textures/christmas_present.png and b/textures/christmas_present.png differ diff --git a/textures/christmas_pud-bot.png b/textures/christmas_pud-bot.png index b93e49e..9665f3a 100644 Binary files a/textures/christmas_pud-bot.png and b/textures/christmas_pud-bot.png differ diff --git a/textures/christmas_pud-mix.png b/textures/christmas_pud-mix.png index 9606d86..1f82f9b 100644 Binary files a/textures/christmas_pud-mix.png and b/textures/christmas_pud-mix.png differ diff --git a/textures/christmas_pud-side.png b/textures/christmas_pud-side.png index 3e1d21f..963a6ed 100644 Binary files a/textures/christmas_pud-side.png and b/textures/christmas_pud-side.png differ diff --git a/textures/christmas_pud-top.png b/textures/christmas_pud-top.png index ae544c7..8dde169 100644 Binary files a/textures/christmas_pud-top.png and b/textures/christmas_pud-top.png differ diff --git a/textures/christmas_stocking.png b/textures/christmas_stocking.png index e486de7..938f971 100644 Binary files a/textures/christmas_stocking.png and b/textures/christmas_stocking.png differ diff --git a/textures/christmas_sugar.png b/textures/christmas_sugar.png index 8c1d9e4..3a45ee2 100644 Binary files a/textures/christmas_sugar.png and b/textures/christmas_sugar.png differ diff --git a/textures/christmas_wreath.png b/textures/christmas_wreath.png index 6103e91..c3874b5 100644 Binary files a/textures/christmas_wreath.png and b/textures/christmas_wreath.png differ diff --git a/textures/christmas_youngtree16xa.png b/textures/christmas_youngtree16xa.png index 2210768..254953e 100644 Binary files a/textures/christmas_youngtree16xa.png and b/textures/christmas_youngtree16xa.png differ diff --git a/textures/ginger_bread_man.png b/textures/ginger_bread_man.png index 0c23cca..74b795d 100644 Binary files a/textures/ginger_bread_man.png and b/textures/ginger_bread_man.png differ diff --git a/textures/grass_w_snow_side.png b/textures/grass_w_snow_side.png index 450a9eb..c7684fc 100644 Binary files a/textures/grass_w_snow_side.png and b/textures/grass_w_snow_side.png differ diff --git a/textures/sand_w_snow_side.png b/textures/sand_w_snow_side.png index 477dff1..0a528f2 100644 Binary files a/textures/sand_w_snow_side.png and b/textures/sand_w_snow_side.png differ diff --git a/textures/snow.png b/textures/snow.png old mode 100755 new mode 100644 index d558746..304628d Binary files a/textures/snow.png and b/textures/snow.png differ diff --git a/textures/snow_chrysanthemum_green.png b/textures/snow_chrysanthemum_green.png new file mode 100644 index 0000000..589236a Binary files /dev/null and b/textures/snow_chrysanthemum_green.png differ diff --git a/textures/snow_footstep.png b/textures/snow_footstep.png index 9d68bd9..e8c58df 100644 Binary files a/textures/snow_footstep.png and b/textures/snow_footstep.png differ diff --git a/textures/snow_tulip_black.png b/textures/snow_tulip_black.png new file mode 100644 index 0000000..962dc11 Binary files /dev/null and b/textures/snow_tulip_black.png differ