From 54c8b741c68b8da954a9cbe91811f97686c0982d Mon Sep 17 00:00:00 2001 From: Martin Doege Date: Tue, 5 May 2015 20:27:21 +0200 Subject: [PATCH] cobblestone walls --- mods/default/crafting.lua | 22 ++++++++++++++--- mods/default/nodes.lua | 50 +++++++++++++++++++++++++++++++++++++++ mods/gate/init.lua | 9 ------- tools/tomtweschem.py | 3 ++- 4 files changed, 71 insertions(+), 13 deletions(-) diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua index a97c4bd..89fbc47 100644 --- a/mods/default/crafting.lua +++ b/mods/default/crafting.lua @@ -30,10 +30,26 @@ minetest.register_craft({ }) minetest.register_craft({ - output = 'default:fence_wood 2', + output = 'default:fence_wood 3', recipe = { - {'group:stick', 'group:stick', 'group:stick'}, - {'group:stick', 'group:stick', 'group:stick'}, + {'group:wood', 'group:stick', 'group:wood'}, + {'group:wood', 'group:stick', 'group:wood'}, + } +}) + +minetest.register_craft({ + output = 'default:wall_cobble 6', + recipe = { + {'default:cobble', 'default:cobble', 'default:cobble'}, + {'default:cobble', 'default:cobble', 'default:cobble'}, + } +}) + +minetest.register_craft({ + output = 'default:wall_mossycobble 6', + recipe = { + {'default:mossycobble', 'default:mossycobble', 'default:mossycobble'}, + {'default:mossycobble', 'default:mossycobble', 'default:mossycobble'}, } }) diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index ab5a3e8..7ccee48 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -1563,11 +1563,61 @@ minetest.register_node("default:fence_wood", { type = "fixed", fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, }, + node_box = { + type = "fixed", + fixed = { + {-0.2, -0.5, -0.2, 0.2, 1.0, 0.2}, + }, + }, groups = {choppy=2,oddly_breakable_by_hand=2,flammable=2}, sounds = default.node_sound_wood_defaults(), }) +local wall_cobble_texture = "default_fence_overlay.png^default_cobble.png^default_fence_overlay.png^[makealpha:255,126,126" +minetest.register_node("default:wall_cobble", { + description = "Cobblestone Wall", + drawtype = "fencelike", + tiles = {"default_cobble.png"}, + inventory_image = wall_cobble_texture, + wield_image = wall_cobble_texture, + paramtype = "light", + is_ground_content = false, + selection_box = { + type = "fixed", + fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, + }, + node_box = { + type = "fixed", + fixed = { + {-0.2, -0.5, -0.2, 0.2, 1.0, 0.2}, + }, + }, + groups = {cracky=2,oddly_breakable_by_hand=2,flammable=2}, + sounds = default.node_sound_stone_defaults(), +}) +local wall_mossycobble_texture = "default_fence_overlay.png^default_mossycobble.png^default_fence_overlay.png^[makealpha:255,126,126" +minetest.register_node("default:wall_mossycobble", { + description = "Mossy Cobblestone Wall", + drawtype = "fencelike", + tiles = {"default_mossycobble.png"}, + inventory_image = wall_mossycobble_texture, + wield_image = wall_mossycobble_texture, + paramtype = "light", + is_ground_content = false, + selection_box = { + type = "fixed", + fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, + }, + node_box = { + type = "fixed", + fixed = { + {-0.2, -0.5, -0.2, 0.2, 1.0, 0.2}, + }, + }, + groups = {cracky=2,oddly_breakable_by_hand=2,flammable=2}, + sounds = default.node_sound_stone_defaults(), +}) minetest.register_node("default:glass", { description = "Glass", diff --git a/mods/gate/init.lua b/mods/gate/init.lua index ff0e9ed..3a6887e 100644 --- a/mods/gate/init.lua +++ b/mods/gate/init.lua @@ -123,15 +123,6 @@ minetest.register_node("gate:fencegate", { }}, }) -minetest.override_item("default:fence_wood", {node_box = { - type = "fixed", - fixed = { - {-0.2, -0.5, -0.2, 0.2, 1.0, 0.2}, - }, - }}) - - -- minetest.register_on_placenode(can_place) - minetest.register_craft({ output = 'gate:fencegate', recipe = { diff --git a/tools/tomtweschem.py b/tools/tomtweschem.py index 0474b7b..b2274c0 100644 --- a/tools/tomtweschem.py +++ b/tools/tomtweschem.py @@ -158,7 +158,8 @@ conversionTable = [ (134, -4, "stairs:stair_wood"), (135, -4, "stairs:stair_wood"), (136, -4, "stairs:stair_junglewood"), - (139, -1, "default:cobble"), + (139, 0, "default:wall_cobble"), + (139, 1, "default:wall_mossycobble"), (140 , -1, "flowers:dandelion_yellow"), (145 , -1, "itemframes:pedestal"), (146 , -3, "default:chest"),