diff --git a/blends/Column_toppers.blend b/blends/Column_toppers.blend index 84d4a88..e21e1f1 100644 Binary files a/blends/Column_toppers.blend and b/blends/Column_toppers.blend differ diff --git a/blends/Column_toppers.blend1 b/blends/Column_toppers.blend1 index 3347dfc..84d4a88 100644 Binary files a/blends/Column_toppers.blend1 and b/blends/Column_toppers.blend1 differ diff --git a/machine.lua b/machine.lua index 83a1a11..9c04a83 100644 --- a/machine.lua +++ b/machine.lua @@ -311,24 +311,24 @@ then end if fields["column_sphere"] then make_ok = false - anzahl = 4 - deco = "mylandscaping:column_t_sphere_" + anzahl = 2 + block = "mylandscaping:column_t_sphere_" if inv:is_empty("input") then return end end if fields["column_dragon"] then make_ok = false - anzahl = 4 - deco = "mylandscaping:column_t_dragon_" + anzahl = 1 + block = "mylandscaping:column_t_dragon_" if inv:is_empty("input") then return end end if fields["column_suzanne"] then make_ok = false - anzahl = 4 - deco = "mylandscaping:column_t_suzanne_" + anzahl = 2 + block = "mylandscaping:column_t_suzanne_" if inv:is_empty("input") then return end diff --git a/mixer.lua b/mixer.lua index 067401e..37b18e0 100644 --- a/mixer.lua +++ b/mixer.lua @@ -84,8 +84,10 @@ on_timer = function(pos) local cobble = inv:get_stack("cobble", 1) local gravel = inv:get_stack("gravel", 1) local sand = inv:get_stack("sand", 1) + local cobble_inv= cobble:get_name() ---------------------------------------------------------------------- - if cobble:get_name() == "default:cobble" then + if cobble:get_name() == "default:cobble" or + minetest.get_node_group(cobble_inv, 'ml') > 0 then inv:add_item("gravel","default:gravel") cobble:take_item() inv:set_stack("cobble",1,cobble) diff --git a/stones.lua b/stones.lua index 93b0694..77c6741 100644 --- a/stones.lua +++ b/stones.lua @@ -264,7 +264,7 @@ minetest.register_node("mylandscaping:stone_"..style..col,{ "mylandscaping_"..img1..".png"..alpha, }, paramtype = "light", - groups = {cracky = 2, not_in_creative_inventory=1}, + groups = {cracky = 2, not_in_creative_inventory=1, ml=1,}, node_box = cbox, selection_box = stone_cbox, collision_box = stone_cbox, diff --git a/toppers.lua b/toppers.lua index 3bed199..acf8795 100644 --- a/toppers.lua +++ b/toppers.lua @@ -36,7 +36,7 @@ minetest.register_node('mylandscaping:column_t_'..obj.."_"..col, { drawtype = 'mesh', mesh = 'mylandscaping_column_t_'..obj..'.obj', tiles = {name='mylandscaping_'..tex..'.png'..alpha}, - groups = {cracky=2, not_in_creative_inventory=visible}, + groups = {cracky=2, not_in_creative_inventory=visible, ml=1}, paramtype = 'light', paramtype2 = 'facedir', sounds = default.node_sound_stone_defaults(), diff --git a/walls_adaridge.lua b/walls_adaridge.lua index a9cead0..e2250d3 100644 --- a/walls_adaridge.lua +++ b/walls_adaridge.lua @@ -30,19 +30,19 @@ local colbox_type7 = { --outside corner } local block_type1 = { -- desc2, typ, obj, colbox, drops, grup -{"Retaining Wall Left", "left", "blocka_l_t", colbox_type1, "left", {cracky=2,not_in_creative_inventory=visible}}, -{"Retaining Wall Middle", "middle", "blocka_m_t", colbox_type1, "middle", {cracky=2,not_in_creative_inventory=visible}}, -{"Retaining Wall Right", "right", "blocka_r_t", colbox_type1, "right", {cracky=2,not_in_creative_inventory=visible}}, -{"Retaining Wall Inside Corner", "icorner", "blocka_ic_t", colbox_type4, "icorner", {cracky=2,not_in_creative_inventory=visible}}, -{"Retaining Wall Outside Corner", "ocorner", "blocka_oc_t", colbox_type2, "ocorner", {cracky=2,not_in_creative_inventory=visible}}, +{"Retaining Wall Left", "left", "blocka_l_t", colbox_type1, "left", {ml=1,cracky=2,not_in_creative_inventory=visible}}, +{"Retaining Wall Middle", "middle", "blocka_m_t", colbox_type1, "middle", {ml=1,cracky=2,not_in_creative_inventory=visible}}, +{"Retaining Wall Right", "right", "blocka_r_t", colbox_type1, "right", {ml=1,cracky=2,not_in_creative_inventory=visible}}, +{"Retaining Wall Inside Corner", "icorner", "blocka_ic_t", colbox_type4, "icorner", {ml=1,cracky=2,not_in_creative_inventory=visible}}, +{"Retaining Wall Outside Corner", "ocorner", "blocka_oc_t", colbox_type2, "ocorner", {ml=1,cracky=2,not_in_creative_inventory=visible}}, {"Retaining Wall Left Bot", "bleft", "blocka_l_b", colbox_type3, "left", {not_in_creative_inventory=visible}}, {"Retaining Wall Middle Bot", "bmiddle", "blocka_m_b", colbox_type3, "middle", {not_in_creative_inventory=visible}}, {"Retaining Wall Right Bot", "bright", "blocka_r_b", colbox_type3, "right", {not_in_creative_inventory=visible}}, {"Retaining Wall Inside Corner Bot", "bicorner", "blocka_ic_b", colbox_type4, "icorner", {not_in_creative_inventory=visible}}, {"Retaining Wall Outside Corner Bot", "bocorner", "blocka_oc_b", colbox_type2, "ocorner", {not_in_creative_inventory=visible}}, -{"Column Inside Corner", "column_ic_t", "columna_ic_t", colbox_type5, "column_ic_t", {cracky=2,not_in_creative_inventory=visible}}, -{"Column Outside Corner", "column_oc_t", "columna_oc_t", colbox_type2, "column_oc_t", {cracky=2,not_in_creative_inventory=visible}}, -{"Column Middle", "column_m_t", "columna_m_t", colbox_type6, "column_m_t", {cracky=2,not_in_creative_inventory=visible}}, +{"Column Inside Corner", "column_ic_t", "columna_ic_t", colbox_type5, "column_ic_t", {ml=1,cracky=2,not_in_creative_inventory=visible}}, +{"Column Outside Corner", "column_oc_t", "columna_oc_t", colbox_type2, "column_oc_t", {ml=1,cracky=2,not_in_creative_inventory=visible}}, +{"Column Middle", "column_m_t", "columna_m_t", colbox_type6, "column_m_t", {ml=1,cracky=2,not_in_creative_inventory=visible}}, {"Column Inside Corner Bot", "bcolumn_ic_t", "columna_ic_b", colbox_type5, "column_ic_b", {not_in_creative_inventory=visible}}, {"Column Outside Corner Bot", "bcolumn_oc_t", "columna_oc_b", colbox_type2, "column_oc_b", {not_in_creative_inventory=visible}}, {"Column Middle Bot", "bcolumn_m_t", "columna_m_b", colbox_type6, "column_m_b", {not_in_creative_inventory=visible}},zz diff --git a/walls_deco.lua b/walls_deco.lua index d1e3765..becccac 100644 --- a/walls_deco.lua +++ b/walls_deco.lua @@ -8,11 +8,11 @@ local colbox_type2 = { --wall } local block_type1 = { -- desc2, obj, colbox, grup, -{"Deco Wall Round Top", "wall_r", colbox_type2, {cracky=2,not_in_creative_inventory=visible}}, -{"Deco Wall Flat Top", "wall_f", colbox_type2, {cracky=2,not_in_creative_inventory=visible}}, -{'Deco Wall Peaked Top', 'wall_p', colbox_type2, {cracky=2,not_in_creative_inventory=visible}}, -{'Deco Wall Random Top', 'wall_ra', colbox_type2, {cracky=2,not_in_creative_inventory=visible}}, -{"Deco Wall Column", "column", colbox_type1, {cracky=2,not_in_creative_inventory=visible}}, +{"Deco Wall Round Top", "wall_r", colbox_type2, {ml=1,cracky=2,not_in_creative_inventory=visible}}, +{"Deco Wall Flat Top", "wall_f", colbox_type2, {ml=1,cracky=2,not_in_creative_inventory=visible}}, +{'Deco Wall Peaked Top', 'wall_p', colbox_type2, {ml=1,cracky=2,not_in_creative_inventory=visible}}, +{'Deco Wall Random Top', 'wall_ra', colbox_type2, {ml=1,cracky=2,not_in_creative_inventory=visible}}, +{"Deco Wall Column", "column", colbox_type1, {ml=1,cracky=2,not_in_creative_inventory=visible}}, } for i in ipairs (block_type1) do local desc2 = block_type1[i][1] diff --git a/walls_freeport.lua b/walls_freeport.lua index 7d7ed1c..9f5875b 100644 --- a/walls_freeport.lua +++ b/walls_freeport.lua @@ -25,17 +25,17 @@ local colbox_type6 = { --corner } local block_type1 = { -- desc2, typ, obj, colbox, drops, grup -{"Retaining Wall Left", "left", "blockf_l_t", colbox_type1, "left", {cracky=2,not_in_creative_inventory=visible}}, -{"Retaining Wall Middle", "middle", "blockf_m_t", colbox_type1, "middle", {cracky=2,not_in_creative_inventory=visible}}, -{"Retaining Wall Right", "right", "blockf_r_t", colbox_type1, "right", {cracky=2,not_in_creative_inventory=visible}}, -{"Retaining Wall Corner", "corner", "blockf_c_t", colbox_type4, "corner", {cracky=2,not_in_creative_inventory=visible}}, +{"Retaining Wall Left", "left", "blockf_l_t", colbox_type1, "left", {ml=1,cracky=2,not_in_creative_inventory=visible}}, +{"Retaining Wall Middle", "middle", "blockf_m_t", colbox_type1, "middle", {ml=1,cracky=2,not_in_creative_inventory=visible}}, +{"Retaining Wall Right", "right", "blockf_r_t", colbox_type1, "right", {ml=1,cracky=2,not_in_creative_inventory=visible}}, +{"Retaining Wall Corner", "corner", "blockf_c_t", colbox_type4, "corner", {ml=1,cracky=2,not_in_creative_inventory=visible}}, {"Retaining Wall Left Bot", "bleft", "blockf_l_b", colbox_type3, "left", {not_in_creative_inventory=visible}}, {"Retaining Wall Middle Bot", "bmiddle", "blockf_m_b", colbox_type3, "middle", {not_in_creative_inventory=visible}}, {"Retaining Wall Right Bot", "bright", "blockf_r_b", colbox_type3, "right", {not_in_creative_inventory=visible}}, {"Retaining Wall Corner Bot", "bcorner", "blockf_c_b", colbox_type4, "corner", {not_in_creative_inventory=visible}}, -{"Column Inside Corner", "column_ic_t", "columnf_ic_t", colbox_type5, "column_ic_t", {cracky=2,not_in_creative_inventory=visible}}, -{"Column Outside Corner", "column_oc_t", "columnf_oc_t", colbox_type2, "column_oc_t", {cracky=2,not_in_creative_inventory=visible}}, -{"Column Middle", "column_m_t", "columnf_m_t", colbox_type6, "column_m_t", {cracky=2,not_in_creative_inventory=visible}}, +{"Column Inside Corner", "column_ic_t", "columnf_ic_t", colbox_type5, "column_ic_t", {ml=1,cracky=2,not_in_creative_inventory=visible}}, +{"Column Outside Corner", "column_oc_t", "columnf_oc_t", colbox_type2, "column_oc_t", {ml=1,cracky=2,not_in_creative_inventory=visible}}, +{"Column Middle", "column_m_t", "columnf_m_t", colbox_type6, "column_m_t", {ml=1,cracky=2,not_in_creative_inventory=visible}}, {"Column Inside Corner Bot", "bcolumn_ic_t", "columnf_ic_b", colbox_type5, "column_ic_b", {not_in_creative_inventory=visible}}, {"Column Outside Corner Bot", "bcolumn_oc_t", "columnf_oc_b", colbox_type2, "column_oc_b", {not_in_creative_inventory=visible}}, {"Column Middle Bot", "bcolumn_m_t", "columnf_m_b", colbox_type6, "column_m_b", {not_in_creative_inventory=visible}},