diff --git a/aliases.lua b/aliases.lua index e55c101..93751ff 100644 --- a/aliases.lua +++ b/aliases.lua @@ -1,52 +1,72 @@ - --- The following function where taken out of moreblocks, and is licenced under zlib license --- Modified to fit into darkage purpose --- Thats the realy old conversation of stairsplus. some of them may be never used in darkage. comment them out. -local function register_stairsplus_alias(origin, new) +--[[ + This function registers alias for all micro, panel, stair nodes that get registered by moreblocks + Converts all nodes from origin to new + * origin: nodename in form of "modname:oldnode" + * new: nodename in form of "modname:newnode" +]] +local function register_moreblocks_alias(origin, new) local originmod = origin:split(":")[1] local originnode = origin:split(":")[2] local newmod = new:split(":")[1] local newnode = new:split(":")[2] local ra = minetest.register_alias - ra(originmod.. ":slab_" ..originnode, newmod..":slab_" ..newnode) - --ra(originmod.. ":slab_" ..originnode.. "_inverted", newmod..":slab_" ..newnode.. "_inverted") - --ra(originmod.. ":slab_" ..originnode.. "_wall", newmod..":slab_" ..newnode.. "_wall") - ra(originmod.. ":slab_" ..originnode.. "_quarter", newmod..":slab_" ..newnode.. "_quarter") - --ra(originmod.. ":slab_" ..originnode.. "_quarter_inverted", newmod..":slab_" ..newnode.. "_quarter_inverted") - --ra(originmod.. ":slab_" ..originnode.. "_quarter_wall", newmod..":slab_" ..newnode.. "_quarter_wall") - ra(originmod.. ":slab_" ..originnode.. "_three_quarter", newmod..":slab_" ..newnode.. "_three_quarter") - --ra(originmod.. ":slab_" ..originnode.. "_three_quarter_inverted", newmod..":slab_" ..newnode.. "_three_quarter_inverted") - --ra(originmod.. ":slab_" ..originnode.. "_three_quarter_wall", newmod..":slab_" ..newnode.. "_three_quarter_wall") - ra(originmod.. ":stair_" ..originnode, newmod..":stair_" ..newnode) - ra(originmod.. ":stair_" ..originnode.. "_inverted", newmod..":stair_" ..newnode) - ra(originmod.. ":stair_" ..originnode.. "_wall", newmod..":stair_" ..newnode.. "_wall") - ra(originmod.. ":stair_" ..originnode.. "_wall_half", newmod..":stair_" ..newnode.. "_wall_half") - --ra(originmod.. ":stair_" ..originnode.. "_wall_half_inverted", newmod..":stair_" ..newnode.. "_wall_half_inverted") - ra(originmod.. ":stair_" ..originnode.. "_half", newmod..":stair_" ..newnode.. "_half") - --ra(originmod.. ":stair_" ..originnode.. "_half_inverted", newmod..":stair_" ..newnode.. "_half_inverted") - ra(originmod.. ":stair_" ..originnode.. "_right_half", newmod..":stair_" ..newnode.. "_right_half") - --ra(originmod.. ":stair_" ..originnode.. "_right_half_inverted", newmod..":stair_" ..newnode.. "_right_half_inverted") - --ra(originmod.. ":stair_" ..originnode.. "_wall_half", newmod..":stair_" ..newnode.. "_wall_half") - --ra(originmod.. ":stair_" ..originnode.. "_wall_half_inverted", newmod..":stair_" ..newnode.. "_wall_half_inverted") - ra(originmod.. ":stair_" ..originnode.. "_inner", newmod..":stair_" ..newnode.. "_inner") - --ra(originmod.. ":stair_" ..originnode.. "_inner_inverted", newmod..":stair_" ..newnode.. "_inner_inverted") - ra(originmod.. ":stair_" ..originnode.. "_outer", newmod..":stair_" ..newnode.. "_outer") - --ra(originmod.. ":stair_" ..originnode.. "_outer_inverted", newmod..":stair_" ..newnode.. "_outer_inverted") - --ra(originmod.. ":panel_" ..originnode.. "_bottom", newmod..":panel_" ..newnode.. "_bottom") - --ra(originmod.. ":panel_" ..originnode.. "_top", newmod..":panel_" ..newnode.. "_top") - --ra(originmod.. ":panel_" ..originnode.. "_vertical", newmod..":panel_" ..newnode.. "_vertical") - --ra(originmod.. ":micro_" ..originnode.. "_bottom", newmod..":micro_" ..newnode.. "_bottom") - --ra(originmod.. ":micro_" ..originnode.. "_top", newmod..":micro_" ..newnode.. "_top") + ra(originmod.. ":micro_" ..originnode.."_1", newmod..":micro_" ..newnode.."_1") + ra(originmod.. ":panel_" ..originnode.."_1", newmod..":panel_" ..newnode.."_1") + ra(originmod.. ":micro_" ..originnode.."_2", newmod..":micro_" ..newnode.."_2") + ra(originmod.. ":panel_" ..originnode.."_2", newmod..":panel_" ..newnode.."_2") + ra(originmod.. ":micro_" ..originnode.."_4", newmod..":micro_" ..newnode.."_4") + ra(originmod.. ":panel_" ..originnode.."_4", newmod..":panel_" ..newnode.."_4") + ra(originmod.. ":micro_" ..originnode, newmod..":micro_" ..newnode) + ra(originmod.. ":panel_" ..originnode, newmod..":panel_" ..newnode) + ra(originmod.. ":micro_" ..originnode.."_12", newmod..":micro_" ..newnode.."_12") + ra(originmod.. ":panel_" ..originnode.."_12", newmod..":panel_" ..newnode.."_12") + ra(originmod.. ":micro_" ..originnode.."_14", newmod..":micro_" ..newnode.."_14") + ra(originmod.. ":panel_" ..originnode.."_14", newmod..":panel_" ..newnode.."_14") + ra(originmod.. ":micro_" ..originnode.."_15", newmod..":micro_" ..newnode.."_15") + ra(originmod.. ":panel_" ..originnode.."_15", newmod..":panel_" ..newnode.."_15") + + ra(originmod.. ":stair_" ..originnode.."_outer", newmod..":stair_" ..newnode.."_outer") + ra(originmod.. ":stair_" ..originnode, newmod..":stair_" ..newnode) + ra(originmod.. ":stair_" ..originnode.."_inner", newmod..":stair_" ..newnode.."_inner") + + ra(originmod.. ":slab_" ..originnode.."_1", newmod..":slab_" ..newnode.."_1") + ra(originmod.. ":slab_" ..originnode.."_2", newmod..":slab_" ..newnode.."_2") + ra(originmod.. ":slab_" ..originnode.."_quarter", newmod..":slab_" ..newnode.."_quarter") + ra(originmod.. ":slab_" ..originnode, newmod..":slab_" ..newnode) + ra(originmod.. ":slab_" ..originnode.."_three_quarter", newmod..":slab_" ..newnode.."_three_quarter") + ra(originmod.. ":slab_" ..originnode.."_14", newmod..":slab_" ..newnode.."_14") + ra(originmod.. ":slab_" ..originnode.."_15", newmod..":slab_" ..newnode.."_15") + + ra(originmod.. ":stair_" ..originnode.."_half", newmod..":stair_" ..newnode.."_half") + + ra(originmod.. ":stair_" ..originnode.."_alt_1", newmod..":stair_" ..newnode.."_alt_1") + ra(originmod.. ":stair_" ..originnode.."_alt_2", newmod..":stair_" ..newnode.."_alt_2") + ra(originmod.. ":stair_" ..originnode.."_alt_4", newmod..":stair_" ..newnode.."_alt_4") + ra(originmod.. ":stair_" ..originnode.."_alt", newmod..":stair_" ..newnode.."_alt") + ra(originmod.. ":slope_" ..originnode, newmod..":slope_" ..newnode) + ra(originmod.. ":slope_" ..originnode.."_half", newmod..":slope_" ..newnode.."_half") + ra(originmod.. ":slope_" ..originnode.."_half_raised", newmod..":slope_" ..newnode.."_half_raised") + + ra(originmod.. ":slope_" ..originnode.."_inner", newmod..":slope_" ..newnode.."_inner") + ra(originmod.. ":slope_" ..originnode.."_inner_half", newmod..":slope_" ..newnode.."_inner_half") + ra(originmod.. ":slope_" ..originnode.."_inner_half_raised", newmod..":slope_" ..newnode.."_inner_half_raised") + ra(originmod.. ":slope_" ..originnode.."_inner_cut", newmod..":slope_" ..newnode.."_inner_cut") + ra(originmod.. ":slope_" ..originnode.."_inner_cut_half", newmod..":slope_" ..newnode.."_inner_cut_half") + ra(originmod.. ":slope_" ..originnode.."_inner_cut_half_raised", newmod..":slope_" ..newnode.."_inner_cut_half_raised") + + ra(originmod.. ":slope_" ..originnode.."_outer", newmod..":slope_" ..newnode.."_outer") + ra(originmod.. ":slope_" ..originnode.."_outer_half", newmod..":slope_" ..newnode.."_outer_half") + ra(originmod.. ":slope_" ..originnode.."_outer_half_raised", newmod..":slope_" ..newnode.."_outer_half_raised") + ra(originmod.. ":slope_" ..originnode.."_outer_cut", newmod..":slope_" ..newnode.."_outer_cut") + ra(originmod.. ":slope_" ..originnode.."_outer_cut_half", newmod..":slope_" ..newnode.."_outer_cut_half") + ra(originmod.. ":slope_" ..originnode.."_outer_cut_half_raised", newmod..":slope_" ..newnode.."_outer_cut_half_raised") + ra(originmod.. ":slope_" ..originnode.."_cut", newmod..":slope_" ..newnode.."_cut") end --- Sandstone cobble -minetest.register_alias( "darkage:sandstone_cobble","default:sandstonebrick") -register_stairsplus_alias("darkage:sandstone_cobble","default:sandstonebrick") - --- Desert Stone cobble -minetest.register_alias( "darkage:desert_stone_cobble","default:desert_stonebrick") -register_stairsplus_alias("darkage:desert_stone_cobble","default:desert_stonebrick") +-- Ors Brick +minetest.register_alias( "darkage:ors_cobble", "darkage:ors_brick") +register_moreblocks_alias("darkage:ors_cobble", "darkage:ors_brick") -- Slate Tile -minetest.register_alias( "darkage:slate_tale","darkage:slate_tile") -register_stairsplus_alias("darkage:slate_tale","darkage:slate_tile") +minetest.register_alias( "darkage:slate_tale", "darkage:slate_tile") +register_moreblocks_alias("darkage:slate_tale", "darkage:slate_tile") diff --git a/nodes.lua b/nodes.lua index 45dd43f..eec0d5f 100644 --- a/nodes.lua +++ b/nodes.lua @@ -130,9 +130,9 @@ minetest.register_node("darkage:ors", { sounds = default.node_sound_stone_defaults() }) -minetest.register_node("darkage:ors_cobble", { - description = "Old Red Sandstone Cobble", - tiles = {"darkage_ors_cobble.png"}, +minetest.register_node("darkage:ors_brick", { + description = "Old Red Sandstone Brick", + tiles = {"darkage_ors_brick.png"}, is_ground_content = false, groups = {crumbly=2,cracky=2}, sounds = default.node_sound_stone_defaults() diff --git a/stairs.lua b/stairs.lua index 2abf3ab..99395c1 100644 --- a/stairs.lua +++ b/stairs.lua @@ -8,7 +8,7 @@ darkage.register_stairs("darkage:marble") darkage.register_stairs("darkage:marble_tile") darkage.register_stairs("darkage:old_tuff_bricks") darkage.register_stairs("darkage:ors") -darkage.register_stairs("darkage:ors_cobble") +darkage.register_stairs("darkage:ors_brick") darkage.register_stairs("darkage:rhyolitic_tuff") darkage.register_stairs("darkage:rhyolitic_tuff_bricks") darkage.register_stairs("darkage:schist") diff --git a/textures/darkage_ors_cobble.png b/textures/darkage_ors_brick.png similarity index 100% rename from textures/darkage_ors_cobble.png rename to textures/darkage_ors_brick.png