diff --git a/mods/default/README.txt b/mods/default/README.txt index e51b8747..e33bf633 100644 --- a/mods/default/README.txt +++ b/mods/default/README.txt @@ -177,6 +177,7 @@ Gambit (WTFPL): default_grass_*.png default_paper.png default_diamond_block.png + default_ladder_steel.png asl97 (WTFPL): default_ice.png diff --git a/mods/default/aliases.lua b/mods/default/aliases.lua index 64e6ebba..487d20d5 100644 --- a/mods/default/aliases.lua +++ b/mods/default/aliases.lua @@ -23,7 +23,7 @@ minetest.register_alias("bookshelf", "default:bookshelf") minetest.register_alias("glass", "default:glass") minetest.register_alias("wooden_fence", "default:fence_wood") minetest.register_alias("rail", "default:rail") -minetest.register_alias("ladder", "default:ladder") +minetest.register_alias("ladder", "default:ladder_wood") minetest.register_alias("wood", "default:wood") minetest.register_alias("mese", "default:mese") minetest.register_alias("cloud", "default:cloud") @@ -74,3 +74,6 @@ minetest.register_alias("default:mese_block", "default:mese") -- Aliases for corrected pine node names minetest.register_alias("default:pinetree", "default:pine_tree") minetest.register_alias("default:pinewood", "default:pine_wood") + +minetest.register_alias("default:ladder", "default:ladder_wood") + diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua index 27f69035..92864b1d 100644 --- a/mods/default/crafting.lua +++ b/mods/default/crafting.lua @@ -539,7 +539,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = 'default:ladder', + output = 'default:ladder_wood 3', recipe = { {'group:stick', '', 'group:stick'}, {'group:stick', 'group:stick', 'group:stick'}, @@ -547,6 +547,15 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'default:ladder_steel 15', + recipe = { + {'default:steel_ingot', '', 'default:steel_ingot'}, + {'default:steel_ingot', 'default:steel_ingot', 'default:steel_ingot'}, + {'default:steel_ingot', '', 'default:steel_ingot'}, + } +}) + minetest.register_craft({ output = 'default:mese', recipe = { diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index e4239d3b..61feec26 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -148,7 +148,8 @@ default:bookshelf default:sign_wall -default:ladder +default:ladder_wood +default:ladder_steel default:fence_wood default:fence_acacia_wood @@ -1653,12 +1654,12 @@ minetest.register_node("default:sign_wall", { }) -minetest.register_node("default:ladder", { - description = "Ladder", +minetest.register_node("default:ladder_wood", { + description = "Wooden Ladder", drawtype = "signlike", - tiles = {"default_ladder.png"}, - inventory_image = "default_ladder.png", - wield_image = "default_ladder.png", + tiles = {"default_ladder_wood.png"}, + inventory_image = "default_ladder_wood.png", + wield_image = "default_ladder_wood.png", paramtype = "light", paramtype2 = "wallmounted", sunlight_propagates = true, @@ -1676,6 +1677,28 @@ minetest.register_node("default:ladder", { sounds = default.node_sound_wood_defaults(), }) +minetest.register_node("default:ladder_steel", { + description = "Steel Ladder", + drawtype = "signlike", + tiles = {"default_ladder_steel.png"}, + inventory_image = "default_ladder_steel.png", + wield_image = "default_ladder_steel.png", + paramtype = "light", + paramtype2 = "wallmounted", + sunlight_propagates = true, + walkable = false, + climbable = true, + is_ground_content = false, + selection_box = { + type = "wallmounted", + --wall_top = = + --wall_bottom = = + --wall_side = = + }, + groups = {cracky = 2}, + sounds = default.node_sound_defaults(), +}) + default.register_fence("default:fence_wood", { description = "Wooden Fence", texture = "default_wood.png", diff --git a/mods/default/textures/default_ladder_steel.png b/mods/default/textures/default_ladder_steel.png new file mode 100644 index 00000000..1cc6dfde Binary files /dev/null and b/mods/default/textures/default_ladder_steel.png differ diff --git a/mods/default/textures/default_ladder.png b/mods/default/textures/default_ladder_wood.png similarity index 100% rename from mods/default/textures/default_ladder.png rename to mods/default/textures/default_ladder_wood.png diff --git a/mods/xpanes/init.lua b/mods/xpanes/init.lua index ebd1566f..9189912e 100644 --- a/mods/xpanes/init.lua +++ b/mods/xpanes/init.lua @@ -173,7 +173,7 @@ xpanes.register_pane("bar", { textures = {"xpanes_bar.png","xpanes_bar.png","xpanes_space.png"}, inventory_image = "xpanes_bar.png", wield_image = "xpanes_bar.png", - groups = {snappy=2, cracky=3, oddly_breakable_by_hand=3, pane=1}, + groups = {cracky=2, pane=1}, sounds = default.node_sound_stone_defaults(), recipe = { {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},