From cd91942e21fb225f494c44a3a8be43b6bcd6e632 Mon Sep 17 00:00:00 2001 From: Calinou Date: Wed, 30 Apr 2014 19:50:59 +0200 Subject: [PATCH] Lots of crafting tweaks, slight code cleanup. --- crafting.lua | 121 ++++++++++++++++++++++++++++++++++----------------- nodes.lua | 14 +++--- 2 files changed, 89 insertions(+), 46 deletions(-) diff --git a/crafting.lua b/crafting.lua index 8e02ef7..5d6e1a5 100644 --- a/crafting.lua +++ b/crafting.lua @@ -2,41 +2,31 @@ minetest.register_craft({ output = "default:stick 1", - recipe = { - {"default:dry_shrub"}, - } + recipe = {{"default:dry_shrub"},} }) minetest.register_craft({ output = "default:dirt_with_grass 1", - recipe = { - {"default:junglegrass"}, - {"default:dirt"}, - } + type = "shapeless", + recipe = {"default:junglegrass", "default:dirt"}, }) minetest.register_craft({ output = "default:dirt_with_grass 1", - recipe = { - {"default:mese"}, - {"default:dirt"}, - } + type = "shapeless", + recipe = {"default:mese", "default:dirt"}, }) minetest.register_craft({ output = "default:mossycobble 1", - recipe = { - {"default:junglegrass"}, - {"default:cobble"}, - } + type = "shapeless", + recipe = {"default:junglegrass", "default:cobble"}, }) minetest.register_craft({ output = "default:mossycobble 1", - recipe = { - {"default:mese"}, - {"default:cobble"}, - } + type = "shapeless", + recipe = {"default:mese_crystal_fragment", "default:cobble"}, }) minetest.register_craft({ @@ -50,9 +40,7 @@ minetest.register_craft({ minetest.register_craft({ output = "moreblocks:wood_tile_flipped 1", - recipe = { - {"moreblocks:wood_tile"}, - } + recipe = {{"moreblocks:wood_tile"},} }) minetest.register_craft({ @@ -104,9 +92,7 @@ minetest.register_craft({ minetest.register_craft({ output = "moreblocks:junglestick 4", - recipe = { - {"default:junglewood"}, - } + recipe = {{"default:junglewood"},} }) minetest.register_craft({ @@ -169,10 +155,8 @@ minetest.register_craft({ minetest.register_craft({ output = "moreblocks:empty_bookshelf 1", - recipe = { - {"moreblocks:sweeper"}, - {"default:bookshelf"}, - } + type = "shapeless", + recipe = {"moreblocks:sweeper", "default:bookshelf"}, }) minetest.register_craft({ @@ -244,6 +228,23 @@ minetest.register_craft({ type = "shapeless", recipe = {"default:steel_ingot", "default:chest"}, }) +minetest.register_craft({ + output = "default:chest_locked 1", + type = "shapeless", + recipe = {"default:copper_ingot", "default:chest"}, +}) + +minetest.register_craft({ + output = "default:chest_locked 1", + type = "shapeless", + recipe = {"default:bronze_ingot", "default:chest"}, +}) + +minetest.register_craft({ + output = "default:chest_locked 1", + type = "shapeless", + recipe = {"default:gold_ingot", "default:chest"}, +}) minetest.register_craft({ output = "moreblocks:iron_glass 1", @@ -251,12 +252,25 @@ minetest.register_craft({ recipe = {"default:steel_ingot", "default:glass"}, }) +minetest.register_craft({ + output = "default:glass 1", + type = "shapeless", + recipe = {"default:coal_lump", "moreblocks:iron_glass"}, +}) + + minetest.register_craft({ output = "moreblocks:coal_glass 1", type = "shapeless", recipe = {"default:coal_lump", "default:glass"}, }) +minetest.register_craft({ + output = "default:glass 1", + type = "shapeless", + recipe = {"default:steel_ingot", "moreblocks:coal_glass"}, +}) + minetest.register_craft({ output = "moreblocks:clean_glass 1", type = "shapeless", @@ -272,8 +286,13 @@ minetest.register_craft({ minetest.register_craft({ output = "moreblocks:trap_glow_glass 1", type = "shapeless", - walkable = false, - recipe = {"default:mese_crystal", "default:glass", "default:torch"}, + recipe = {"default:mese_crystal_fragment", "default:glass", "default:torch"}, +}) + +minetest.register_craft({ + output = "moreblocks:trap_glow_glass 1", + type = "shapeless", + recipe = {"default:mese_crystal_fragment", "moreblocks:glow_glass"}, }) minetest.register_craft({ @@ -282,11 +301,23 @@ minetest.register_craft({ recipe = {"default:torch", "default:torch", "default:glass"}, }) +minetest.register_craft({ + output = "moreblocks:super_glow_glass 1", + type = "shapeless", + recipe = {"default:torch", "moreblocks:glow_glass"}, +}) + + minetest.register_craft({ output = "moreblocks:trap_super_glow_glass 1", type = "shapeless", - walkable = false, - recipe = {"default:mese_crystal", "default:glass", "default:torch", "default:torch"}, + recipe = {"default:mese_crystal_fragment", "default:glass", "default:torch", "default:torch"}, +}) + +minetest.register_craft({ + output = "moreblocks:trap_super_glow_glass 1", + type = "shapeless", + recipe = {"default:mese_crystal_fragment", "moreblocks:super_glow_glass"}, }) minetest.register_craft({ @@ -295,22 +326,34 @@ minetest.register_craft({ recipe = {"default:coal_lump", "default:stone"}, }) +minetest.register_craft({ + output = "default:stone 1", + type = "shapeless", + recipe = {"default:steel_ingot", "moreblocks:coal_stone"}, +}) + minetest.register_craft({ output = "moreblocks:iron_stone 1", type = "shapeless", - recipe = {"default:iron_lump", "default:stone"}, + recipe = {"default:steel_ingot", "default:stone"}, }) minetest.register_craft({ - output = "moreblocks:trap_stone 12", + output = "default:stone 1", type = "shapeless", - recipe = {"default:mese", "default:stone"}, + recipe = {"default:coal_lump", "moreblocks:iron_stone"}, }) minetest.register_craft({ - output = "moreblocks:trap_glass 12", + output = "moreblocks:trap_stone 1", type = "shapeless", - recipe = {"default:mese", "default:glass"}, + recipe = {"default:mese_crystal_fragment", "default:stone"}, +}) + +minetest.register_craft({ + output = "moreblocks:trap_glass 1", + type = "shapeless", + recipe = {"default:mese_crystal_fragment", "default:glass"}, }) minetest.register_craft({ @@ -336,7 +379,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "moreblocks:rope 2", + output = "moreblocks:rope 3", recipe = { {"default:junglegrass"}, {"default:junglegrass"}, diff --git a/nodes.lua b/nodes.lua index ab2de32..deae474 100644 --- a/nodes.lua +++ b/nodes.lua @@ -107,7 +107,7 @@ local nodes = { }, ["iron_glass"] = { description = S("Iron Glass"), - drawtype = "glasslike", + drawtype = "glasslike_framed", paramtype = "light", sunlight_propagates = true, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, @@ -115,7 +115,7 @@ local nodes = { }, ["coal_glass"] = { description = S("Coal Glass"), - drawtype = "glasslike", + drawtype = "glasslike_framed", paramtype = "light", sunlight_propagates = true, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, @@ -123,7 +123,7 @@ local nodes = { }, ["clean_glass"] = { description = S("Clean Glass"), - drawtype = "glasslike", + drawtype = "glasslike_framed", paramtype = "light", sunlight_propagates = true, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, @@ -182,7 +182,7 @@ local nodes = { }, ["trap_glass"] = { description = S("Trap Glass"), - drawtype = "glasslike", + drawtype = "glasslike_framed", paramtype = "light", sunlight_propagates = true, walkable = false, @@ -194,8 +194,8 @@ local nodes = { description = S("Jungle Wood Fence"), drawtype = "fencelike", tiles = {"moreblocks_jungle_wood.png"}, - inventory_image = "moreblocks_fence_jungle_wood.png", - wield_image = "moreblocks_fence_jungle_wood.png", + inventory_image = "default_fence_overlay.png^moreblocks_jungle_wood.png^default_fence_overlay.png^[makealpha:255,126,126", + wield_image = "default_fence_overlay.png^moreblocks_jungle_wood.png^default_fence_overlay.png^[makealpha:255,126,126", paramtype = "light", selection_box = { type = "fixed", @@ -213,7 +213,7 @@ local nodes = { furnace_burntime = 30, }, ["all_faces_jungle_tree"] = { - description = S("All-faces Tree"), + description = S("All-faces Jungle Tree"), tiles = {"default_jungletree_top.png"}, groups = {tree=1,snappy=1,choppy=2,oddly_breakable_by_hand=1,flammable=2}, sounds = sound_wood,