From 1f24693a60adf6c3f512d1f3cef7081dfc03880b Mon Sep 17 00:00:00 2001 From: agaran Date: Sun, 20 Nov 2016 14:25:06 +0100 Subject: [PATCH 1/9] Add dyes to depends and few first recipes --- depends.txt | 3 +- init.lua | 92 ++++++++++++++++++++++++++++------------------------- 2 files changed, 51 insertions(+), 44 deletions(-) diff --git a/depends.txt b/depends.txt index 331d858..2717bef 100644 --- a/depends.txt +++ b/depends.txt @@ -1 +1,2 @@ -default \ No newline at end of file +default +dye diff --git a/init.lua b/init.lua index 2b94b69..4459335 100644 --- a/init.lua +++ b/init.lua @@ -6,6 +6,9 @@ Who did it: Shara RedCat. ]] +local is_darklands = true + + --boring glass because why not? minetest.register_node("abriglass:clear_glass", { @@ -19,52 +22,55 @@ minetest.register_node("abriglass:clear_glass", { sounds = default.node_sound_glass_defaults(), }) +minetest.register_craft({ + output = 'abriglass:clear_glass 4', -- intentional lower yield + recipe = { + {'default:glass', '', 'default:glass' }, + {'', 'default:glass', '' }, + {'default:glass', '', 'default:glass' }, + } +}) + +local plain_colors = { + "green", "blue", "red", "yellow", +} --glass lights -minetest.register_node("abriglass:glass_light_green", { - description = "Green Glass Light", - tiles = {"abriglass_lightgreen.png"}, - groups = {cracky = 3}, - use_texture_alpha = true, - sunlight_propagates = true, - light_source = 14, - drawtype = "glasslike", - sounds = default.node_sound_glass_defaults(), -}) +local i +for i in ipairs(plain_colors) do + local name = plain_colors[i] + local description = name:sub(1,1):upper()..name:sub(2).." Glass Light" -minetest.register_node("abriglass:glass_light_blue", { - description = "Blue Glass Light", - tiles = {"abriglass_lightblue.png"}, - groups = {cracky = 3}, - use_texture_alpha = true, - sunlight_propagates = true, - light_source = 14, - drawtype = "glasslike", - sounds = default.node_sound_glass_defaults(), -}) + local nodesuffix = 'glass_light_'..name -minetest.register_node("abriglass:glass_light_red", { - description = "Red Glass Light", - tiles = {"abriglass_lightred.png"}, - groups = {cracky = 3}, - use_texture_alpha = true, - sunlight_propagates = true, - light_source = 14, - drawtype = "glasslike", - sounds = default.node_sound_glass_defaults(), -}) + minetest.debug("i="..i..", name="..name..", desc="..description); -minetest.register_node("abriglass:glass_light_yellow", { - description = "Yellow Glass Light", - tiles = {"abriglass_lightyellow.png"}, - groups = {cracky = 3}, - use_texture_alpha = true, - sunlight_propagates = true, - light_source = 14, - drawtype = "glasslike", - sounds = default.node_sound_glass_defaults(), -}) + minetest.register_node("abriglass:"..nodesuffix, { + description = "Green Glass Light", + tiles = { "abriglass_light"..name..".png"}, + groups = {cracky = 3}, + use_texture_alpha = true, + sunlight_propagates = true, + light_source = (is_darklands and 14 or 4), + drawtype = "glasslike", + sounds = default.node_sound_glass_defaults(), + }) + + minetest.register_craft({ + output = 'abriglass:'..nodesuffix..' 4', + recipe = { + {'abriglass:clear_glass', 'default:torch', 'abriglass:clear_glass' }, + {'abriglass:clear_glass', 'dye:'..name, 'abriglass:clear_glass' }, + } + }) + + minetest.register_craft({ + type = "cooking", + recipe = "abriglass:"..nodesuffix, + output = "abriglass:clear_glass", + }) +end --crystal, for later use in crafting recipes @@ -75,7 +81,7 @@ minetest.register_node("abriglass:ghost_crystal", { groups = {cracky = 3}, use_texture_alpha = true, sunlight_propagates = true, - light_source = 14, + light_source = (is_darklands and 14 or 4), drawtype = "glasslike", sounds = default.node_sound_glass_defaults(), }) @@ -103,7 +109,7 @@ for i in ipairs(pattern_list) do groups = {cracky = 3}, use_texture_alpha = true, sunlight_propagates = true, - light_source = 5, + light_source = (is_darklands and 5 or 4), drawtype = "glasslike", paramtype2 = "facedir", sounds = default.node_sound_glass_defaults(), @@ -185,7 +191,7 @@ minetest.register_node("abriglass:hidden_light", { use_texture_alpha = true, sunlight_propagates = true, walkable = false, - light_source = 7, + light_source = (is_darklands and 7 or 4), -- not sure about this one drawtype = "glasslike", }) From 610be6a09bff16f7e3148a6e2f0f77367dcef2c0 Mon Sep 17 00:00:00 2001 From: agaran Date: Sun, 20 Nov 2016 15:01:55 +0100 Subject: [PATCH 2/9] Move recipes into separate file --- crafting.lua | 36 ++++++++++++++++++++++++++++++++++++ init.lua | 27 ++------------------------- 2 files changed, 38 insertions(+), 25 deletions(-) create mode 100644 crafting.lua diff --git a/crafting.lua b/crafting.lua new file mode 100644 index 0000000..01c5f7e --- /dev/null +++ b/crafting.lua @@ -0,0 +1,36 @@ + +minetest.register_craft({ + output = 'abriglass:clear_glass 4', -- intentional lower yield + recipe = { + {'default:glass', '', 'default:glass' }, + {'', 'default:glass', '' }, + {'default:glass', '', 'default:glass' }, + } +}) + + +local plain_colors = { + "green", "blue", "red", "yellow", +} +--glass lights + +local i +for i in ipairs(plain_colors) do + local name = plain_colors[i] + local nodesuffix = 'glass_light_'..name + + minetest.register_craft({ + output = 'abriglass:'..nodesuffix..' 4', + recipe = { + {'abriglass:clear_glass', 'default:torch', 'abriglass:clear_glass' }, + {'abriglass:clear_glass', 'dye:'..name, 'abriglass:clear_glass' }, + } + }) + + minetest.register_craft({ + type = "cooking", + recipe = "abriglass:"..nodesuffix, + output = "abriglass:clear_glass", + }) +end + diff --git a/init.lua b/init.lua index 4459335..717244b 100644 --- a/init.lua +++ b/init.lua @@ -8,7 +8,6 @@ Who did it: Shara RedCat. local is_darklands = true - --boring glass because why not? minetest.register_node("abriglass:clear_glass", { @@ -22,16 +21,6 @@ minetest.register_node("abriglass:clear_glass", { sounds = default.node_sound_glass_defaults(), }) -minetest.register_craft({ - output = 'abriglass:clear_glass 4', -- intentional lower yield - recipe = { - {'default:glass', '', 'default:glass' }, - {'', 'default:glass', '' }, - {'default:glass', '', 'default:glass' }, - } -}) - - local plain_colors = { "green", "blue", "red", "yellow", } @@ -56,20 +45,6 @@ for i in ipairs(plain_colors) do drawtype = "glasslike", sounds = default.node_sound_glass_defaults(), }) - - minetest.register_craft({ - output = 'abriglass:'..nodesuffix..' 4', - recipe = { - {'abriglass:clear_glass', 'default:torch', 'abriglass:clear_glass' }, - {'abriglass:clear_glass', 'dye:'..name, 'abriglass:clear_glass' }, - } - }) - - minetest.register_craft({ - type = "cooking", - recipe = "abriglass:"..nodesuffix, - output = "abriglass:clear_glass", - }) end --crystal, for later use in crafting recipes @@ -234,4 +209,6 @@ minetest.register_node("abriglass:stained_glass_frosted", { sounds = default.node_sound_glass_defaults(), }) +local modpath = minetest.get_modpath(minetest.get_current_modname()) +dofile(modpath.."/crafting.lua") From 671cf84f81acd971dc0c0a7d1d75aaad31bacfc1 Mon Sep 17 00:00:00 2001 From: agaran Date: Sun, 20 Nov 2016 16:19:39 +0100 Subject: [PATCH 3/9] Three stained glass recipes added --- crafting.lua | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/crafting.lua b/crafting.lua index 01c5f7e..3cdd745 100644 --- a/crafting.lua +++ b/crafting.lua @@ -34,3 +34,74 @@ for i in ipairs(plain_colors) do }) end +minetest.register_craft({ + output = 'abriglass:stainedglass_pattern01 9', + recipe = { + {'abriglass:glass_light_yellow', 'abriglass:glass_light_yellow', 'abriglass:glass_light_yellow' }, + {'abriglass:glass_light_yellow', 'abriglass:glass_light_blue', 'abriglass:glass_light_yellow' }, + {'abriglass:glass_light_yellow', 'abriglass:glass_light_yellow', 'abriglass:glass_light_yellow' }, + } +}) + + +minetest.register_craft({ + output = 'abriglass:stainedglass_pattern04 9', + recipe = { + {'abriglass:glass_light_green', 'abriglass:glass_light_red', 'abriglass:glass_light_green' }, + {'abriglass:glass_light_red', 'abriglass:glass_light_blue', 'abriglass:glass_light_red' }, + {'abriglass:glass_light_green', 'abriglass:glass_light_red', 'abriglass:glass_light_green' }, + } +}) + +minetest.register_craft({ + output = 'abriglass:stainedglass_pattern05 9', + recipe = { + {'abriglass:glass_light_blue', 'abriglass:glass_light_blue', 'abriglass:glass_light_blue' }, + {'abriglass:glass_light_blue', 'abriglass:glass_light_green', 'abriglass:glass_light_blue' }, + {'abriglass:glass_light_blue', 'abriglass:glass_light_blue', 'abriglass:glass_light_blue' }, + } +}) + +minetest.register_craft({ + type = "cooking", + recipe = "abriglass:stainedglass_pattern01", + output = "abriglass:clear_glass", +}) + +minetest.register_craft({ + type = "cooking", + recipe = "abriglass:stainedglass_pattern02", + output = "abriglass:clear_glass", +}) + +minetest.register_craft({ + type = "cooking", + recipe = "abriglass:stainedglass_pattern03", + output = "abriglass:clear_glass", +}) + +minetest.register_craft({ + type = "cooking", + recipe = "abriglass:stainedglass_pattern04", + output = "abriglass:clear_glass", +}) + +minetest.register_craft({ + type = "cooking", + recipe = "abriglass:stainedglass_pattern05", + output = "abriglass:clear_glass", +}) + +-- missing crafts for: +-- ghost_crystal +-- stainedglass_tiles_dark, stainedglass_tiles_pale, +-- stainedglass_pattern02, +-- stainedglass_pattern03, +-- oneway_glass_dark +-- oneway_glass_pale +-- oneway_wall_dark +-- oneway_wall_pale +-- hidden_light + +-- and missing also recipes for undecorated glass.. +-- likelly ones without torches in recipe, just glass and dye From 17d17c4080e8afb46dd8a531869fbe819dd907f5 Mon Sep 17 00:00:00 2001 From: agaran Date: Sun, 20 Nov 2016 16:19:49 +0100 Subject: [PATCH 4/9] Fixed buggy fixed description in registration --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 717244b..1f662d2 100644 --- a/init.lua +++ b/init.lua @@ -36,7 +36,7 @@ for i in ipairs(plain_colors) do minetest.debug("i="..i..", name="..name..", desc="..description); minetest.register_node("abriglass:"..nodesuffix, { - description = "Green Glass Light", + description = description, tiles = { "abriglass_light"..name..".png"}, groups = {cracky = 3}, use_texture_alpha = true, From 69e9b6ff3a0284e74fa4a7128df7ad07c789b85f Mon Sep 17 00:00:00 2001 From: agaran Date: Sat, 3 Dec 2016 23:26:12 +0100 Subject: [PATCH 5/9] Reverted to origin --- crafting.lua | 107 --------------------------------------------------- depends.txt | 3 +- init.lua | 71 +++++++++++++++++++++------------- 3 files changed, 45 insertions(+), 136 deletions(-) delete mode 100644 crafting.lua diff --git a/crafting.lua b/crafting.lua deleted file mode 100644 index 3cdd745..0000000 --- a/crafting.lua +++ /dev/null @@ -1,107 +0,0 @@ - -minetest.register_craft({ - output = 'abriglass:clear_glass 4', -- intentional lower yield - recipe = { - {'default:glass', '', 'default:glass' }, - {'', 'default:glass', '' }, - {'default:glass', '', 'default:glass' }, - } -}) - - -local plain_colors = { - "green", "blue", "red", "yellow", -} ---glass lights - -local i -for i in ipairs(plain_colors) do - local name = plain_colors[i] - local nodesuffix = 'glass_light_'..name - - minetest.register_craft({ - output = 'abriglass:'..nodesuffix..' 4', - recipe = { - {'abriglass:clear_glass', 'default:torch', 'abriglass:clear_glass' }, - {'abriglass:clear_glass', 'dye:'..name, 'abriglass:clear_glass' }, - } - }) - - minetest.register_craft({ - type = "cooking", - recipe = "abriglass:"..nodesuffix, - output = "abriglass:clear_glass", - }) -end - -minetest.register_craft({ - output = 'abriglass:stainedglass_pattern01 9', - recipe = { - {'abriglass:glass_light_yellow', 'abriglass:glass_light_yellow', 'abriglass:glass_light_yellow' }, - {'abriglass:glass_light_yellow', 'abriglass:glass_light_blue', 'abriglass:glass_light_yellow' }, - {'abriglass:glass_light_yellow', 'abriglass:glass_light_yellow', 'abriglass:glass_light_yellow' }, - } -}) - - -minetest.register_craft({ - output = 'abriglass:stainedglass_pattern04 9', - recipe = { - {'abriglass:glass_light_green', 'abriglass:glass_light_red', 'abriglass:glass_light_green' }, - {'abriglass:glass_light_red', 'abriglass:glass_light_blue', 'abriglass:glass_light_red' }, - {'abriglass:glass_light_green', 'abriglass:glass_light_red', 'abriglass:glass_light_green' }, - } -}) - -minetest.register_craft({ - output = 'abriglass:stainedglass_pattern05 9', - recipe = { - {'abriglass:glass_light_blue', 'abriglass:glass_light_blue', 'abriglass:glass_light_blue' }, - {'abriglass:glass_light_blue', 'abriglass:glass_light_green', 'abriglass:glass_light_blue' }, - {'abriglass:glass_light_blue', 'abriglass:glass_light_blue', 'abriglass:glass_light_blue' }, - } -}) - -minetest.register_craft({ - type = "cooking", - recipe = "abriglass:stainedglass_pattern01", - output = "abriglass:clear_glass", -}) - -minetest.register_craft({ - type = "cooking", - recipe = "abriglass:stainedglass_pattern02", - output = "abriglass:clear_glass", -}) - -minetest.register_craft({ - type = "cooking", - recipe = "abriglass:stainedglass_pattern03", - output = "abriglass:clear_glass", -}) - -minetest.register_craft({ - type = "cooking", - recipe = "abriglass:stainedglass_pattern04", - output = "abriglass:clear_glass", -}) - -minetest.register_craft({ - type = "cooking", - recipe = "abriglass:stainedglass_pattern05", - output = "abriglass:clear_glass", -}) - --- missing crafts for: --- ghost_crystal --- stainedglass_tiles_dark, stainedglass_tiles_pale, --- stainedglass_pattern02, --- stainedglass_pattern03, --- oneway_glass_dark --- oneway_glass_pale --- oneway_wall_dark --- oneway_wall_pale --- hidden_light - --- and missing also recipes for undecorated glass.. --- likelly ones without torches in recipe, just glass and dye diff --git a/depends.txt b/depends.txt index 2717bef..331d858 100644 --- a/depends.txt +++ b/depends.txt @@ -1,2 +1 @@ -default -dye +default \ No newline at end of file diff --git a/init.lua b/init.lua index 1f662d2..2b94b69 100644 --- a/init.lua +++ b/init.lua @@ -6,8 +6,6 @@ Who did it: Shara RedCat. ]] -local is_darklands = true - --boring glass because why not? minetest.register_node("abriglass:clear_glass", { @@ -21,31 +19,52 @@ minetest.register_node("abriglass:clear_glass", { sounds = default.node_sound_glass_defaults(), }) -local plain_colors = { - "green", "blue", "red", "yellow", -} + --glass lights -local i -for i in ipairs(plain_colors) do - local name = plain_colors[i] - local description = name:sub(1,1):upper()..name:sub(2).." Glass Light" +minetest.register_node("abriglass:glass_light_green", { + description = "Green Glass Light", + tiles = {"abriglass_lightgreen.png"}, + groups = {cracky = 3}, + use_texture_alpha = true, + sunlight_propagates = true, + light_source = 14, + drawtype = "glasslike", + sounds = default.node_sound_glass_defaults(), +}) - local nodesuffix = 'glass_light_'..name +minetest.register_node("abriglass:glass_light_blue", { + description = "Blue Glass Light", + tiles = {"abriglass_lightblue.png"}, + groups = {cracky = 3}, + use_texture_alpha = true, + sunlight_propagates = true, + light_source = 14, + drawtype = "glasslike", + sounds = default.node_sound_glass_defaults(), +}) - minetest.debug("i="..i..", name="..name..", desc="..description); +minetest.register_node("abriglass:glass_light_red", { + description = "Red Glass Light", + tiles = {"abriglass_lightred.png"}, + groups = {cracky = 3}, + use_texture_alpha = true, + sunlight_propagates = true, + light_source = 14, + drawtype = "glasslike", + sounds = default.node_sound_glass_defaults(), +}) - minetest.register_node("abriglass:"..nodesuffix, { - description = description, - tiles = { "abriglass_light"..name..".png"}, - groups = {cracky = 3}, - use_texture_alpha = true, - sunlight_propagates = true, - light_source = (is_darklands and 14 or 4), - drawtype = "glasslike", - sounds = default.node_sound_glass_defaults(), - }) -end +minetest.register_node("abriglass:glass_light_yellow", { + description = "Yellow Glass Light", + tiles = {"abriglass_lightyellow.png"}, + groups = {cracky = 3}, + use_texture_alpha = true, + sunlight_propagates = true, + light_source = 14, + drawtype = "glasslike", + sounds = default.node_sound_glass_defaults(), +}) --crystal, for later use in crafting recipes @@ -56,7 +75,7 @@ minetest.register_node("abriglass:ghost_crystal", { groups = {cracky = 3}, use_texture_alpha = true, sunlight_propagates = true, - light_source = (is_darklands and 14 or 4), + light_source = 14, drawtype = "glasslike", sounds = default.node_sound_glass_defaults(), }) @@ -84,7 +103,7 @@ for i in ipairs(pattern_list) do groups = {cracky = 3}, use_texture_alpha = true, sunlight_propagates = true, - light_source = (is_darklands and 5 or 4), + light_source = 5, drawtype = "glasslike", paramtype2 = "facedir", sounds = default.node_sound_glass_defaults(), @@ -166,7 +185,7 @@ minetest.register_node("abriglass:hidden_light", { use_texture_alpha = true, sunlight_propagates = true, walkable = false, - light_source = (is_darklands and 7 or 4), -- not sure about this one + light_source = 7, drawtype = "glasslike", }) @@ -209,6 +228,4 @@ minetest.register_node("abriglass:stained_glass_frosted", { sounds = default.node_sound_glass_defaults(), }) -local modpath = minetest.get_modpath(minetest.get_current_modname()) -dofile(modpath.."/crafting.lua") From cb9a286bfd50a99e5e99b1d82ea90e8b5320011c Mon Sep 17 00:00:00 2001 From: agaran Date: Sat, 3 Dec 2016 23:39:07 +0100 Subject: [PATCH 6/9] Recipes and deps for them --- crafting.lua | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++ depends.txt | 3 +- 2 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 crafting.lua diff --git a/crafting.lua b/crafting.lua new file mode 100644 index 0000000..3cdd745 --- /dev/null +++ b/crafting.lua @@ -0,0 +1,107 @@ + +minetest.register_craft({ + output = 'abriglass:clear_glass 4', -- intentional lower yield + recipe = { + {'default:glass', '', 'default:glass' }, + {'', 'default:glass', '' }, + {'default:glass', '', 'default:glass' }, + } +}) + + +local plain_colors = { + "green", "blue", "red", "yellow", +} +--glass lights + +local i +for i in ipairs(plain_colors) do + local name = plain_colors[i] + local nodesuffix = 'glass_light_'..name + + minetest.register_craft({ + output = 'abriglass:'..nodesuffix..' 4', + recipe = { + {'abriglass:clear_glass', 'default:torch', 'abriglass:clear_glass' }, + {'abriglass:clear_glass', 'dye:'..name, 'abriglass:clear_glass' }, + } + }) + + minetest.register_craft({ + type = "cooking", + recipe = "abriglass:"..nodesuffix, + output = "abriglass:clear_glass", + }) +end + +minetest.register_craft({ + output = 'abriglass:stainedglass_pattern01 9', + recipe = { + {'abriglass:glass_light_yellow', 'abriglass:glass_light_yellow', 'abriglass:glass_light_yellow' }, + {'abriglass:glass_light_yellow', 'abriglass:glass_light_blue', 'abriglass:glass_light_yellow' }, + {'abriglass:glass_light_yellow', 'abriglass:glass_light_yellow', 'abriglass:glass_light_yellow' }, + } +}) + + +minetest.register_craft({ + output = 'abriglass:stainedglass_pattern04 9', + recipe = { + {'abriglass:glass_light_green', 'abriglass:glass_light_red', 'abriglass:glass_light_green' }, + {'abriglass:glass_light_red', 'abriglass:glass_light_blue', 'abriglass:glass_light_red' }, + {'abriglass:glass_light_green', 'abriglass:glass_light_red', 'abriglass:glass_light_green' }, + } +}) + +minetest.register_craft({ + output = 'abriglass:stainedglass_pattern05 9', + recipe = { + {'abriglass:glass_light_blue', 'abriglass:glass_light_blue', 'abriglass:glass_light_blue' }, + {'abriglass:glass_light_blue', 'abriglass:glass_light_green', 'abriglass:glass_light_blue' }, + {'abriglass:glass_light_blue', 'abriglass:glass_light_blue', 'abriglass:glass_light_blue' }, + } +}) + +minetest.register_craft({ + type = "cooking", + recipe = "abriglass:stainedglass_pattern01", + output = "abriglass:clear_glass", +}) + +minetest.register_craft({ + type = "cooking", + recipe = "abriglass:stainedglass_pattern02", + output = "abriglass:clear_glass", +}) + +minetest.register_craft({ + type = "cooking", + recipe = "abriglass:stainedglass_pattern03", + output = "abriglass:clear_glass", +}) + +minetest.register_craft({ + type = "cooking", + recipe = "abriglass:stainedglass_pattern04", + output = "abriglass:clear_glass", +}) + +minetest.register_craft({ + type = "cooking", + recipe = "abriglass:stainedglass_pattern05", + output = "abriglass:clear_glass", +}) + +-- missing crafts for: +-- ghost_crystal +-- stainedglass_tiles_dark, stainedglass_tiles_pale, +-- stainedglass_pattern02, +-- stainedglass_pattern03, +-- oneway_glass_dark +-- oneway_glass_pale +-- oneway_wall_dark +-- oneway_wall_pale +-- hidden_light + +-- and missing also recipes for undecorated glass.. +-- likelly ones without torches in recipe, just glass and dye diff --git a/depends.txt b/depends.txt index 331d858..2717bef 100644 --- a/depends.txt +++ b/depends.txt @@ -1 +1,2 @@ -default \ No newline at end of file +default +dye From a2097b588ac577895f82ecbaebc378df73d43140 Mon Sep 17 00:00:00 2001 From: agaran Date: Sat, 3 Dec 2016 23:49:24 +0100 Subject: [PATCH 7/9] Call crafting recipes --- init.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/init.lua b/init.lua index f2df44b..6738684 100644 --- a/init.lua +++ b/init.lua @@ -188,3 +188,8 @@ minetest.register_node("abriglass:hidden_light", { light_source = 7, drawtype = "glasslike", }) + + +local modpath = minetest.get_modpath(minetest.get_current_modname()) +dofile(modpath.."/crafting.lua") + From 249640b70cbbb5d27e26db1f99a5666808bda044 Mon Sep 17 00:00:00 2001 From: agaran Date: Sun, 4 Dec 2016 00:41:40 +0100 Subject: [PATCH 8/9] Few more recipes added --- crafting.lua | 61 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 55 insertions(+), 6 deletions(-) diff --git a/crafting.lua b/crafting.lua index 3cdd745..0bbda76 100644 --- a/crafting.lua +++ b/crafting.lua @@ -34,6 +34,37 @@ for i in ipairs(plain_colors) do }) end +-- this has to be kept in sync with init.lua one +local glass_list = { + "black", "blue", "cyan", "green", "magenta", + "orange", "purple", "red", "yellow", +} + +for i in ipairs(glass_list) do + local name = glass_list[i] + minetest.register_craft({ + output = 'abriglass:stained_glass_'..name..' 2', + recipe = { + {'abriglass:clear_glass', 'dye:'..name, 'abriglass:clear_glass' }, + } + }) + + minetest.register_craft({ + type = "cooking", + recipe = "abriglass:stained_glass_"..name, + output = "abriglass:clear_glass", + }) +end + +minetest.register_craft({ + output = 'abriglass:stained_glass_frosted 6', + recipe = { + {'abriglass:clear_glass', '', 'abriglass:clear_glass' }, + {'abriglass:clear_glass', 'dye:white', 'abriglass:clear_glass' }, + {'abriglass:clear_glass', '', 'abriglass:clear_glass' }, + } +}) + minetest.register_craft({ output = 'abriglass:stainedglass_pattern01 9', recipe = { @@ -43,6 +74,23 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'abriglass:stainedglass_pattern02 9', + recipe = { + {'abriglass:clear_glass', 'abriglass:clear_glass', 'abriglass:clear_glass' }, + {'abriglass:clear_glass', 'abriglass:clear_glass', 'abriglass:clear_glass' }, + {'abriglass:clear_glass', 'abriglass:clear_glass', 'abriglass:clear_glass' }, + } +}) + +minetest.register_craft({ + output = 'abriglass:stainedglass_pattern03 9', + recipe = { + {'abriglass:glass_light_red', 'abriglass:clear_glass', 'abriglass:glass_light_red' }, + {'abriglass:clear_glass', 'abriglass:clear_glass', 'abriglass:clear_glass' }, + {'abriglass:glass_light_red', 'abriglass:clear_glass', 'abriglass:glass_light_red' }, + } +}) minetest.register_craft({ output = 'abriglass:stainedglass_pattern04 9', @@ -92,16 +140,17 @@ minetest.register_craft({ output = "abriglass:clear_glass", }) +minetest.register_craft({ + type = "cooking", + recipe = "abriglass:stained_glass_frosted", + output = "abriglass:clear_glass", +}) + -- missing crafts for: -- ghost_crystal -- stainedglass_tiles_dark, stainedglass_tiles_pale, --- stainedglass_pattern02, --- stainedglass_pattern03, -- oneway_glass_dark -- oneway_glass_pale -- oneway_wall_dark -- oneway_wall_pale --- hidden_light - --- and missing also recipes for undecorated glass.. --- likelly ones without torches in recipe, just glass and dye +-- 2 more oneways From 4de776ffb7b1c97dd8ee87b19de279a58310318c Mon Sep 17 00:00:00 2001 From: agaran Date: Sun, 4 Dec 2016 01:06:27 +0100 Subject: [PATCH 9/9] Added recipe for oneway stone/desertstone glass --- crafting.lua | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/crafting.lua b/crafting.lua index 0bbda76..e9fee8e 100644 --- a/crafting.lua +++ b/crafting.lua @@ -110,6 +110,25 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'abriglass:stainedglass_tiles_dark 7', + recipe = { + {'abriglass:stained_glass_red', 'abriglass:stained_glass_green', 'abriglass:stained_glass_blue' }, + {'abriglass:stained_glass_yellow', 'abriglass:stained_glass_magenta', 'abriglass:stained_glass_cyan' }, + {'', 'abriglass:stained_glass_black', '' }, + } +}) + +minetest.register_craft({ + output = 'abriglass:stainedglass_tiles_pale 7', + recipe = { + {'abriglass:stained_glass_red', 'abriglass:stained_glass_green', 'abriglass:stained_glass_blue' }, + {'abriglass:stained_glass_yellow', 'abriglass:stained_glass_magenta', 'abriglass:stained_glass_cyan' }, + {'', 'abriglass:stained_glass_frosted', '' }, + } +}) + + minetest.register_craft({ type = "cooking", recipe = "abriglass:stainedglass_pattern01", @@ -146,11 +165,35 @@ minetest.register_craft({ output = "abriglass:clear_glass", }) +minetest.register_craft({ + type = "cooking", + recipe = "abriglass:stainedglass_tiles_dark", + output = "abriglass:clear_glass", +}) + +minetest.register_craft({ + type = "cooking", + recipe = "abriglass:stainedglass_tiles_pale", + output = "abriglass:clear_glass", +}) + +minetest.register_craft({ + output = 'abriglass:oneway_glass_desert_brick 2', + recipe = { + {'abriglass:clear_glass', 'default:mese_crystal_fragment', 'default:desert_stonebrick' }, + } +}) + +minetest.register_craft({ + output = 'abriglass:oneway_glass_stone_brick 2', + recipe = { + {'abriglass:clear_glass', 'default:mese_crystal_fragment', 'default:stonebrick' }, + } +}) + -- missing crafts for: -- ghost_crystal --- stainedglass_tiles_dark, stainedglass_tiles_pale, -- oneway_glass_dark -- oneway_glass_pale -- oneway_wall_dark -- oneway_wall_pale --- 2 more oneways