diff --git a/aliases.lua b/aliases.lua index de425f9..a57c409 100644 --- a/aliases.lua +++ b/aliases.lua @@ -61,6 +61,8 @@ minetest.register_alias("moreblocks:wood_tile_down","moreblocks:wood_tile_up") minetest.register_alias("moreblocks:wood_tile_left","moreblocks:wood_up") minetest.register_alias("moreblocks:wood_tile_right","moreblocks:wood_up") minetest.register_alias("moreblocks:empty_bookshelf","moreblocks:empty_shelf") +minetest.register_alias("moreblocks:split_stone_tile_alt","moreblocks:checker_stone_tile") +minetest.register_alias("moreblocks:tar","default:gravel") -- ABM for horizontal trees (fix facedir): local horizontal_tree_convert_facedir = {7, 12, 9, 18} diff --git a/crafting.lua b/crafting.lua index f76532f..e71aad2 100644 --- a/crafting.lua +++ b/crafting.lua @@ -401,12 +401,36 @@ minetest.register_craft({ recipe = {"default:mese_crystal_fragment", "default:stone"}, }) +minetest.register_craft({ + output = "moreblocks:trap_desert_stone", + type = "shapeless", + recipe = {"default:mese_crystal_fragment", "default:desert_stone"}, +}) + minetest.register_craft({ output = "moreblocks:trap_glass", type = "shapeless", recipe = {"default:mese_crystal_fragment", "default:glass"}, }) +minetest.register_craft({ + output = "moreblocks:trap_obsidian_glass", + type = "shapeless", + recipe = {"default:mese_crystal_fragment", "default:obsidian_glass"}, +}) + +minetest.register_craft({ + output = "moreblocks:trap_obsidian", + type = "shapeless", + recipe = {"default:mese_crystal_fragment", "default:obsidian"}, +}) + +minetest.register_craft({ + output = "moreblocks:trap_sandstone", + type = "shapeless", + recipe = {"default:mese_crystal_fragment", "default:sandstone"}, +}) + minetest.register_craft({ output = "moreblocks:cactus_brick", type = "shapeless", diff --git a/nodes.lua b/nodes.lua index e7b7c7b..2778e54 100644 --- a/nodes.lua +++ b/nodes.lua @@ -25,7 +25,7 @@ end local nodes = { ["wood_tile"] = { description = S("Wooden Tile"), - groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 3}, + groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3}, is_ground_content = false, paramtype2 = "facedir", place_param2 = 0, @@ -107,8 +107,8 @@ local nodes = { is_ground_content = false, sounds = sound_stone, }, - ["split_stone_tile_alt"] = { - description = S("Checkered Stone Tile"), + ["checker_stone_tile"] = { + description = S("Checker Stone Tile"), groups = {stone = 1, cracky = 3}, is_ground_content = false, sounds = sound_stone, @@ -236,6 +236,16 @@ local nodes = { }, ["trap_stone"] = { description = S("Trap Stone"), + tiles = {"default_stone.png^moreblocks_trap_box.png"}, + walkable = false, + groups = {cracky = 3}, + is_ground_content = false, + sounds = sound_stone, + no_stairs = true, + }, + ["trap_desert_stone"] = { + description = S("Trap Desert Stone"), + tiles = {"default_desert_stone.png^moreblocks_trap_box.png"}, walkable = false, groups = {cracky = 3}, is_ground_content = false, @@ -246,7 +256,7 @@ local nodes = { description = S("Trap Glass"), drawtype = "glasslike_framed_optional", --tiles = {"moreblocks_trap_glass.png", "default_glass_detail.png"}, - tiles = {"moreblocks_trap_glass.png"}, + tiles = {"default_glass.png^moreblocks_trap_box_glass.png"}, paramtype = "light", sunlight_propagates = true, is_ground_content = false, @@ -255,6 +265,37 @@ local nodes = { sounds = sound_glass, no_stairs = true, }, + ["trap_obsidian_glass"] = { + description = S("Trap Obsidian Glass"), + drawtype = "glasslike_framed_optional", + --tiles = {"moreblocks_trap_glass.png", "default_glass_detail.png"}, + tiles = {"default_obsidian_glass.png^moreblocks_trap_box_glass.png"}, + paramtype = "light", + sunlight_propagates = true, + is_ground_content = false, + walkable = false, + groups = {cracky = 3, oddly_breakable_by_hand = 3}, + sounds = sound_glass, + no_stairs = true, + }, + ["trap_obsidian"] = { + description = S("Trap Obsidian"), + tiles = {"default_obsidian.png^moreblocks_trap_box.png"}, + walkable = false, + groups = {cracky = 1, level = 2}, + is_ground_content = false, + sounds = sound_stone, + no_stairs = true, + }, + ["trap_sandstone"] = { + description = S("Trap Sandstone"), + tiles = {"default_sandstone.png^moreblocks_trap_box.png"}, + walkable = false, + groups = {crumbly = 1, cracky = 3}, + is_ground_content = false, + sounds = sound_stone, + no_stairs = true, + }, ["all_faces_tree"] = { description = S("All-faces Tree"), tiles = {"default_tree_top.png"}, @@ -306,7 +347,7 @@ local nodes = { description = S("Trap Glow Glass"), drawtype = "glasslike_framed_optional", --tiles = {"moreblocks_trap_glass.png", "moreblocks_glow_glass_detail.png"}, - tiles = {"moreblocks_trap_glass.png"}, + tiles = {"moreblocks_glow_glass.png^moreblocks_trap_box_glass.png"}, paramtype = "light", sunlight_propagates = true, is_ground_content = false, @@ -332,7 +373,7 @@ local nodes = { description = S("Trap Super Glow Glass"), drawtype = "glasslike_framed_optional", --tiles = {"moreblocks_trap_super_glow_glass.png", "moreblocks_super_glow_glass_detail.png"}, - tiles = {"moreblocks_trap_super_glow_glass.png"}, + tiles = {"moreblocks_super_glow_glass.png^moreblocks_trap_box_glass.png"}, paramtype = "light", sunlight_propagates = true, is_ground_content = false, @@ -384,15 +425,9 @@ for name, def in pairs(nodes) do end end - -- Items minetest.register_craftitem("moreblocks:sweeper", { description = S("Sweeper"), inventory_image = "moreblocks_sweeper.png", }) - -minetest.register_craftitem("moreblocks:nothing", { - inventory_image = "invisible.png", - on_use = function() end, -}) diff --git a/textures/default_brick.png b/textures/default_brick.png deleted file mode 100644 index 9c76033..0000000 Binary files a/textures/default_brick.png and /dev/null differ diff --git a/textures/default_fence_overlay.png b/textures/default_fence_overlay.png deleted file mode 100644 index 780e736..0000000 Binary files a/textures/default_fence_overlay.png and /dev/null differ diff --git a/textures/invisible.png b/textures/invisible.png deleted file mode 100644 index 4b5b302..0000000 Binary files a/textures/invisible.png and /dev/null differ diff --git a/textures/moreblocks_split_stone_tile_alt.png b/textures/moreblocks_checker_stone_tile.png similarity index 100% rename from textures/moreblocks_split_stone_tile_alt.png rename to textures/moreblocks_checker_stone_tile.png diff --git a/textures/moreblocks_fence_jungle_wood.png b/textures/moreblocks_fence_jungle_wood.png deleted file mode 100644 index b59db10..0000000 Binary files a/textures/moreblocks_fence_jungle_wood.png and /dev/null differ diff --git a/textures/moreblocks_fence_wood.png b/textures/moreblocks_fence_wood.png deleted file mode 100644 index e3510c5..0000000 Binary files a/textures/moreblocks_fence_wood.png and /dev/null differ diff --git a/textures/moreblocks_glass.png b/textures/moreblocks_glass.png deleted file mode 100644 index 912b029..0000000 Binary files a/textures/moreblocks_glass.png and /dev/null differ diff --git a/textures/moreblocks_trap_box.png b/textures/moreblocks_trap_box.png new file mode 100644 index 0000000..292ae88 Binary files /dev/null and b/textures/moreblocks_trap_box.png differ diff --git a/textures/moreblocks_trap_box_glass.png b/textures/moreblocks_trap_box_glass.png new file mode 100644 index 0000000..fbb25ca Binary files /dev/null and b/textures/moreblocks_trap_box_glass.png differ diff --git a/textures/moreblocks_trap_glass.png b/textures/moreblocks_trap_glass.png deleted file mode 100644 index 25c3387..0000000 Binary files a/textures/moreblocks_trap_glass.png and /dev/null differ diff --git a/textures/moreblocks_trap_glow_glass.png b/textures/moreblocks_trap_glow_glass.png deleted file mode 100644 index 1096dd7..0000000 Binary files a/textures/moreblocks_trap_glow_glass.png and /dev/null differ diff --git a/textures/moreblocks_trap_stone.png b/textures/moreblocks_trap_stone.png deleted file mode 100644 index 764aa81..0000000 Binary files a/textures/moreblocks_trap_stone.png and /dev/null differ diff --git a/textures/moreblocks_trap_super_glow_glass.png b/textures/moreblocks_trap_super_glow_glass.png deleted file mode 100644 index fef974b..0000000 Binary files a/textures/moreblocks_trap_super_glow_glass.png and /dev/null differ