From faa6a045a4d78c17cc400a84bdb2361982281973 Mon Sep 17 00:00:00 2001 From: crabman77 Date: Tue, 22 Dec 2015 18:21:12 +0100 Subject: [PATCH] added rewrite texture woodsoils with christmas_craft --- mods/christmas_craft/crafts.lua | 10 +++++----- mods/christmas_craft/depends.txt | 3 ++- mods/christmas_craft/init.lua | 6 +++++- mods/christmas_craft/mods.lua | 8 ++++---- mods/christmas_craft/settings.lua | 24 +++++++++++++++++++++++- 5 files changed, 39 insertions(+), 12 deletions(-) diff --git a/mods/christmas_craft/crafts.lua b/mods/christmas_craft/crafts.lua index fa556616..25a1af28 100755 --- a/mods/christmas_craft/crafts.lua +++ b/mods/christmas_craft/crafts.lua @@ -27,16 +27,16 @@ minetest.register_craft({ minetest.register_craft({ output = "christmas_craft:snow_block", recipe = { - {"christmas_craft:snowball","christmas_craft:snowball"}, - {"christmas_craft:snowball","christmas_craft:snowball"}, + {"default:snow","default:snow"}, + {"default:snow","default:snow"}, } }) minetest.register_craft({ output = "christmas_craft:snowman", recipe = { - {"default:coal_lump","christmas_craft:snowball","default:coal_lump"}, - {"christmas_craft:snowball","christmas_craft:snowball","christmas_craft:snowball"}, + {"default:coal_lump","default:snow","default:coal_lump"}, + {"default:snow","default:snow","default:snow"}, {"default:coal_lump","default:coal_lump","default:coal_lump"}, } }) @@ -52,7 +52,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "christmas_craft:snowball 4", + output = "default:snow 4", recipe = { {"christmas_craft:snow_block"}, } diff --git a/mods/christmas_craft/depends.txt b/mods/christmas_craft/depends.txt index 04bb57b4..02de85a8 100755 --- a/mods/christmas_craft/depends.txt +++ b/mods/christmas_craft/depends.txt @@ -1,2 +1,3 @@ default -youngtrees? \ No newline at end of file +youngtrees? +woodsoils? diff --git a/mods/christmas_craft/init.lua b/mods/christmas_craft/init.lua index a0e1b181..6ac78bde 100755 --- a/mods/christmas_craft/init.lua +++ b/mods/christmas_craft/init.lua @@ -716,6 +716,9 @@ minetest.register_node("christmas_craft:silver_baubles", { -- complex node -- +-- disable christmas_craft:snowball and make alias to default:snow +minetest.register_alias("christmas_craft:snowball", "default:snow") +--[[ snowball_DAMAGE=0.5 snowball_GRAVITY=9 snowball_VELOCITY=19 @@ -777,6 +780,7 @@ minetest.register_craftitem("christmas_craft:snowball", { inventory_image = "snowball.png", on_use = snow_shoot_snowball, }) +--]] --Snow. minetest.register_node("christmas_craft:snow", { @@ -790,7 +794,7 @@ minetest.register_node("christmas_craft:snow", { --1 = Moss groups = {crumbly=3,melts=1,falling_node=1}, buildable_to = true, - drop = 'christmas_craft:snowball', + drop = 'default:snow', node_box = { type = "fixed", fixed = { diff --git a/mods/christmas_craft/mods.lua b/mods/christmas_craft/mods.lua index 9e46a8f4..b9b50cd3 100755 --- a/mods/christmas_craft/mods.lua +++ b/mods/christmas_craft/mods.lua @@ -29,7 +29,7 @@ minetest.register_node(":4seasons:grass_winter", { drop = { max_items = 2, items = { {items = {'default:dirt'}, rarity = 0,}, - {items = {'christmas_craft:snowball'}, rarity = 0,}, + {items = {'default:snow'}, rarity = 0,}, }}, sounds = default.node_sound_dirt_defaults({ footstep = {name="default_grass_footstep", gain=0.4}, @@ -45,7 +45,7 @@ minetest.register_node(":4seasons:sand_winter", { drop = {'default:sand', max_items = 2, items = { {items = {'default:sand'}, rarity = 0,}, - {items = {'christmas_craft:snowball'}, rarity = 0,}, + {items = {'default:snow'}, rarity = 0,}, }}, sounds = default.node_sound_dirt_defaults({ @@ -61,7 +61,7 @@ minetest.register_node(":4seasons:desertsand_winter", { drop = {'default:desert_sand', max_items = 2, items = { {items = {'default:desert_sand'}, rarity = 0,}, - {items = {'christmas_craft:snowball'}, rarity = 0,}, + {items = {'default:snow'}, rarity = 0,}, }}, sounds = default.node_sound_dirt_defaults({ footstep = {name="default_grass_footstep", gain=0.4}, @@ -78,7 +78,7 @@ minetest.register_node(":4seasons:cactus_winter", { drop = {'default:cactus', max_items = 2, items = { {items = {'default:cactus'}, rarity = 0,}, - {items = {'christmas_craft:snowball'}, rarity = 0,}, + {items = {'default:snow'}, rarity = 0,}, }}, sounds = default.node_sound_wood_defaults(), }) diff --git a/mods/christmas_craft/settings.lua b/mods/christmas_craft/settings.lua index ab0a62f0..53f9ec66 100755 --- a/mods/christmas_craft/settings.lua +++ b/mods/christmas_craft/settings.lua @@ -2,7 +2,7 @@ print (" ---- Overrider christmas_craft = true! ---- ") local dirttiles = {"snow.png", "default_dirt.png", {name = "default_dirt.png^grass_w_snow_side.png", tileable_vertical = false}} -local snowballdrop = {items = {'christmas_craft:snowball'}, rarity = 0} +local snowballdrop = {items = {'default:snow'}, rarity = 0} local add_drop = function (def) if type(def.drop) == "table" then @@ -53,5 +53,27 @@ 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"]) +end + + print (" ---- Overrider christmas_craft [OK] ---- ")