diff --git a/blends/Deco_wall.blend b/blends/Deco_wall.blend new file mode 100644 index 0000000..7c03cde Binary files /dev/null and b/blends/Deco_wall.blend differ diff --git a/blends/Retaining_wall.blend b/blends/Retaining_wall.blend new file mode 100644 index 0000000..9e3f8ca Binary files /dev/null and b/blends/Retaining_wall.blend differ diff --git a/formspec.lua b/formspec.lua index 87a0b7a..8fca74a 100644 --- a/formspec.lua +++ b/formspec.lua @@ -21,20 +21,29 @@ retaining_walls = 'label[0,1.75;Freeport]'.. 'label[0,2.75;Madison]'.. 'label[0,3.75;Adaridge]'.. + --Freeport walls 'label[1.5,1;Wall Blocks]'.. - 'item_image_button[2,1.5;1,1;mylandscaping:rwall_left_cement;wall1; ]'.. - 'item_image_button[3,1.5;1,1;mylandscaping:rwall_middle_cement;wall2; ]'.. - 'item_image_button[4,1.5;1,1;mylandscaping:rwall_right_cement;wall3; ]'.. - 'item_image_button[5,1.5;1,1;mylandscaping:rwall_corner_cement;wall4; ]'.. - --Styles of columns + 'item_image_button[2,1.5;1,1;mylandscaping:fwall_left_cement;fwall1; ]'.. + 'item_image_button[3,1.5;1,1;mylandscaping:fwall_middle_cement;fwall2; ]'.. + 'item_image_button[4,1.5;1,1;mylandscaping:fwall_right_cement;fwall3; ]'.. + 'item_image_button[5,1.5;1,1;mylandscaping:fwall_corner_cement;fwall4; ]'.. + --Freeport columns 'label[6,1;Columns]'.. - 'item_image_button[6.5,1.5;1,1;mylandscaping:rwall_column_m_t_cement;column2; ]'.. - 'item_image_button[7.5,1.5;1,1;mylandscaping:rwall_column_ic_t_cement;column3; ]'.. - 'item_image_button[8.5,1.5;1,1;mylandscaping:rwall_column_oc_t_cement;column4; ]'.. + 'item_image_button[6.5,1.5;1,1;mylandscaping:fwall_column_m_t_cement;fcolumn2; ]'.. + 'item_image_button[7.5,1.5;1,1;mylandscaping:fwall_column_ic_t_cement;fcolumn3; ]'.. + 'item_image_button[8.5,1.5;1,1;mylandscaping:fwall_column_oc_t_cement;fcolumn4; ]'.. + --Madison walls + --Madison columns + --Adaridge walls + 'item_image_button[3,3.5;1,1;mylandscaping:awall_middle_cement;awall2; ]'.. + --Adaridge colums input patio_pavers = form.. + 'label[1,1.5;Place pavers on top of sand]'.. + 'label[1,2;to achieve best fit, and to be]'.. + 'label[1,2.5;able to place patio decorations.]'.. 'item_image_button[5.5,1.5;1,1;mylandscaping:stone_squarecement;patio1; ]'.. 'item_image_button[6.5,1.5;1,1;mylandscaping:stone_square_smcement;patio2; ]'.. 'item_image_button[7.5,1.5;1,1;mylandscaping:stone_square_xsmcement;patio7; ]'.. @@ -47,13 +56,13 @@ patio_pavers = deco_walls = form.. 'image_button[2,1.5;1,1;mylandscaping_deco_scallop.png;deco1;]'.. - 'tooltip[deco1;'..('Scalloped decorative wall')..']'.. + 'tooltip[deco1;Scalloped decorative wall]'.. 'image_button[3,1.5;1,1;mylandscaping_deco_flat.png;deco2;]'.. - 'tooltip[deco2;'..('Flat decorative wall')..']'.. + 'tooltip[deco2;Flat decorative wall]'.. 'image_button[4,1.5;1,1;mylandscaping_deco_peak.png;deco3;]'.. - 'tooltip[deco3;'..('Peaked decorative wall')..']'.. + 'tooltip[deco3;Peaked decorative wall]'.. 'image_button[5,1.5;1,1;mylandscaping_deco_random.png;deco4;]'.. - 'tooltip[deco4;'..('Random decorative wall')..']'.. + 'tooltip[deco4;Random decorative wall]'.. 'image_button[6,1.5;1,1;mylandscaping_deco_column.png;deco5;]'.. - 'tooltip[deco5;'..('Decorative column')..']'.. + 'tooltip[deco5;Decorative column]'.. input diff --git a/init.lua b/init.lua index 888b204..1d032ac 100644 --- a/init.lua +++ b/init.lua @@ -1,9 +1,11 @@ --configs -- change this to make blocks show in creative inventory. 0 will show, 1 is invisible -visible = 1 +visible = 0 --Load File -dofile(minetest.get_modpath('mylandscaping')..'/walls.lua') +dofile(minetest.get_modpath('mylandscaping')..'/walls_freeport.lua') +dofile(minetest.get_modpath('mylandscaping')..'/walls_madison.lua') +dofile(minetest.get_modpath('mylandscaping')..'/walls_adaridge.lua') dofile(minetest.get_modpath('mylandscaping')..'/stones.lua') dofile(minetest.get_modpath('mylandscaping')..'/recipes.lua') dofile(minetest.get_modpath("mylandscaping").."/machine.lua") diff --git a/machine.lua b/machine.lua index 671b046..0c17015 100644 --- a/machine.lua +++ b/machine.lua @@ -73,7 +73,7 @@ after_place_node = function(pos, placer, itemstack) on_construct = function(pos) local meta = minetest.env:get_meta(pos) - meta:set_string("formspec", retaining_wall) + meta:set_string("formspec", retaining_walls) meta:set_string("infotext", "Concrete Mixer") local inv = meta:get_inventory() inv:set_size("input", 1) @@ -99,68 +99,68 @@ local col = color_tab[i][1] local coldesc = color_tab[i][2] local dyecol = color_tab[i][3] -if fields["wall1"] -or fields["wall2"] -or fields["wall3"] -or fields["wall4"] -or fields["column"] -or fields["column2"] -or fields["column3"] -or fields["column4"] +if fields["fwall1"] +or fields["fwall2"] +or fields["fwall3"] +or fields["fwall4"] +or fields["fcolumn"] +or fields["fcolumn2"] +or fields["fcolumn3"] +or fields["fcolumn4"] then - if fields["wall1"] then + if fields["fwall1"] then make_ok = false anzahl = 2 - block = "mylandscaping:rwall_left_" + block = "mylandscaping:fwall_left_" if inv:is_empty("input") then return end end - if fields["wall2"] then + if fields["fwall2"] then make_ok = false anzahl = 2 - block = "mylandscaping:rwall_middle_" + block = "mylandscaping:fwall_middle_" if inv:is_empty("input") then return end end - if fields["wall3"] then + if fields["fwall3"] then make_ok = false anzahl = 2 - block = "mylandscaping:rwall_right_" + block = "mylandscaping:fwall_right_" if inv:is_empty("input") then return end end - if fields["wall4"] then + if fields["fwall4"] then make_ok = false anzahl = 2 - block = "mylandscaping:rwall_corner_" + block = "mylandscaping:fwall_corner_" if inv:is_empty("input") then return end end - if fields["column2"] then + if fields["fcolumn2"] then make_ok = false anzahl = 1 - block = "mylandscaping:rwall_column_m_t_" + block = "mylandscaping:fwall_column_m_t_" if inv:is_empty("input") then return end end - if fields["column3"] then + if fields["fcolumn3"] then make_ok = false anzahl = 1 - block = "mylandscaping:rwall_column_ic_t_" + block = "mylandscaping:fwall_column_ic_t_" if inv:is_empty("input") then return end end - if fields["column4"] then + if fields["fcolumn4"] then make_ok = false anzahl = 1 - block = "mylandscaping:rwall_column_oc_t_" + block = "mylandscaping:fwall_column_oc_t_" if inv:is_empty("input") then return end diff --git a/models/mylandscaping_blocka_m_b.obj b/models/mylandscaping_blocka_m_b.obj new file mode 100644 index 0000000..936dd99 --- /dev/null +++ b/models/mylandscaping_blocka_m_b.obj @@ -0,0 +1,164 @@ +# Blender v2.75 (sub 4) OBJ File: 'Retaining_wall.blend' +# www.blender.org +o Adaridge_M_B_Cube.004 +v 0.300000 -0.300000 -0.248631 +v 0.700000 -0.500000 -0.248631 +v 0.300000 -0.500000 -0.248631 +v 0.700000 -0.100000 -0.248631 +v 0.700000 -0.300000 -0.248631 +v -0.100000 -0.500000 -0.248631 +v 0.300000 -0.100000 -0.248631 +v -0.300000 -0.500000 -0.248631 +v -0.300000 -0.100000 -0.248631 +v -0.100000 -0.100000 -0.248631 +v -0.100000 0.300000 -0.048631 +v 0.300000 0.500000 -0.148631 +v -0.100000 0.500000 -0.148631 +v 0.300000 0.300000 -0.148631 +v -0.100000 0.300000 -0.148631 +v -0.700000 0.300000 -0.148631 +v -0.700000 -0.100000 -0.148631 +v -0.500000 -0.100000 -0.148631 +v -0.500000 0.500000 -0.048631 +v -0.500000 0.100000 -0.048631 +v -0.100000 0.500000 -0.048631 +v -0.100000 0.100000 -0.148631 +v -0.500000 0.100000 -0.148631 +v -0.100000 -0.100000 -0.148631 +v -0.500000 0.500000 -0.148631 +v -0.700000 0.500000 -0.148631 +v -0.500000 0.300000 -0.148631 +v 0.700000 -0.100000 -0.048631 +v 0.300000 -0.100000 -0.048631 +v -0.300000 -0.100000 -0.048631 +v -0.500000 -0.100000 -0.048631 +v -0.100000 0.100000 -0.048631 +v -0.100000 -0.100000 -0.048631 +v -0.700000 -0.100000 -0.048631 +v -0.500000 0.300000 -0.048631 +v 0.300000 0.300000 -0.048631 +v -0.700000 0.500000 -0.048631 +v -0.300000 -0.500000 -0.048631 +v 0.700000 -0.500000 -0.048631 +v 0.700000 -0.300000 -0.048631 +v 0.300000 0.500000 -0.048631 +v -0.700000 0.300000 -0.048631 +v -0.500000 0.500000 0.251369 +v -0.100000 0.500000 0.251369 +v 0.700000 -0.100000 0.251369 +v 0.300000 -0.100000 0.251369 +v -0.700000 -0.100000 0.251369 +v -0.700000 0.500000 0.251369 +v -0.300000 -0.500000 0.251369 +v -0.300000 -0.100000 0.251369 +v -0.500000 -0.100000 0.251369 +v -0.100000 -0.100000 0.251369 +v 0.700000 -0.500000 0.251369 +v 0.700000 -0.300000 0.251369 +v 0.300000 0.500000 0.251369 +v 0.300000 0.300000 0.251369 +v -0.700000 0.300000 0.251369 +vt 0.606510 0.714982 +vt 0.606510 0.428339 +vt 0.534849 0.428339 +vt 0.534849 0.714982 +vt 0.606510 0.571661 +vt 0.534849 0.571661 +vt 0.606510 0.858304 +vt 0.534849 0.858304 +vt 0.428339 0.606510 +vt 0.714982 0.606510 +vt 0.714982 0.534849 +vt 0.428339 0.534849 +vt 0.141696 0.606510 +vt -0.001625 0.606510 +vt -0.001625 0.534849 +vt 0.141696 0.534849 +vt -0.001625 0.319867 +vt 0.141696 0.319867 +vt 0.428339 0.319867 +vt 0.714982 0.319867 +vt 0.319867 0.428339 +vt 0.319867 0.714982 +vt 0.428339 0.678171 +vt 0.285018 0.678171 +vt 0.285018 0.534849 +vt 0.714982 0.678171 +vt 1.001625 0.678171 +vt 1.001625 0.534849 +vt 0.678171 0.428339 +vt 0.678171 0.141696 +vt 0.534849 0.141696 +vt 0.678171 0.285018 +vt 0.534849 0.285018 +vt 0.319867 0.285018 +vt 0.319867 0.141696 +vt 0.319867 0.858304 +vt 1.001625 0.319867 +vt 0.666667 -0.000000 +vt 0.666667 0.250000 +vt 0.333333 0.250000 +vt 0.333333 0.000000 +vt 0.000000 0.500000 +vt 0.000000 0.250000 +vt 0.333333 0.500000 +vt 1.000000 1.000000 +vt 0.666667 1.000000 +vt 0.666667 0.500000 +vt 1.000000 0.500000 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 0.333333 1.000000 +vt 0.166667 0.750000 +vt 0.166667 0.500000 +vt 0.333333 0.750000 +vn -1.000000 0.000000 0.000000 +vn 1.000000 -0.000000 0.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +g Adaridge_M_B_Cube.004_Top +s off +f 16/1/1 17/2/1 34/3/1 42/4/1 +f 24/2/2 22/5/2 32/6/2 33/3/2 +f 13/7/1 15/1/1 11/4/1 21/8/1 +f 15/9/3 14/10/3 36/11/3 11/12/3 +f 27/1/2 25/7/2 19/8/2 35/4/2 +f 12/10/4 13/9/4 21/12/4 41/11/4 +f 25/13/4 26/14/4 37/15/4 19/16/4 +f 19/16/4 37/15/4 48/17/4 43/18/4 +f 21/12/4 19/16/4 43/18/4 44/19/4 +f 41/11/4 21/12/4 44/19/4 55/20/4 +f 42/4/1 34/3/1 47/21/1 57/22/1 +f 10/23/4 9/24/4 30/25/4 33/12/4 +f 7/26/4 10/23/4 33/12/4 29/11/4 +f 4/27/4 7/26/4 29/11/4 28/28/4 +f 18/2/2 27/1/2 35/4/2 31/3/2 +f 22/9/4 23/13/4 20/16/4 32/12/4 +f 9/29/1 8/30/1 38/31/1 30/3/1 +f 18/13/3 24/9/3 33/12/3 31/16/3 +f 17/14/3 18/13/3 31/16/3 34/15/3 +f 5/32/2 4/29/2 28/3/2 40/33/2 +f 2/30/2 5/32/2 40/33/2 39/31/2 +f 14/1/2 12/7/2 41/8/2 36/4/2 +f 26/7/1 16/1/1 42/4/1 37/8/1 +f 39/31/2 40/33/2 54/34/2 53/35/2 +f 40/33/2 28/3/2 45/21/2 54/34/2 +f 34/15/3 31/16/3 51/18/3 47/17/3 +f 31/16/3 33/12/3 52/19/3 51/18/3 +f 37/8/1 42/4/1 57/22/1 48/36/1 +f 29/3/2 36/4/2 56/22/2 46/21/2 +f 28/28/4 29/11/4 46/20/4 45/37/4 +f 30/3/1 38/31/1 49/35/1 50/21/1 +f 36/4/2 41/8/2 55/36/2 56/22/2 +g Adaridge_M_B_Cube.004_Face1 +f 12/38/5 14/39/5 15/40/5 13/41/5 +f 5/42/5 2/43/5 3/40/5 1/44/5 +f 4/40/5 5/41/5 1/38/5 7/39/5 +f 10/45/5 7/46/5 3/47/5 6/48/5 +f 9/41/5 10/40/5 6/43/5 8/49/5 +f 11/48/5 36/47/5 29/38/5 33/50/5 +f 16/40/5 27/44/5 18/42/5 17/43/5 +f 19/46/5 21/51/5 32/44/5 20/47/5 +f 22/44/5 24/40/5 18/39/5 23/47/5 +f 25/52/5 27/53/5 16/44/5 26/54/5 diff --git a/models/mylandscaping_blocka_m_t.obj b/models/mylandscaping_blocka_m_t.obj new file mode 100644 index 0000000..6987f58 --- /dev/null +++ b/models/mylandscaping_blocka_m_t.obj @@ -0,0 +1,163 @@ +# Blender v2.75 (sub 4) OBJ File: 'Retaining_wall.blend' +# www.blender.org +o Adaridge_M_T_Cube.001 +v -0.500000 0.500000 0.513086 +v -0.500000 0.600000 0.513086 +v -0.500000 0.500000 0.015393 +v -0.500000 0.600000 0.015393 +v 0.493328 0.500000 0.513086 +v 0.493328 0.600000 0.513086 +v 0.493328 0.500000 0.015393 +v 0.493328 0.600000 0.015393 +v -0.700000 0.500000 0.051369 +v 0.300000 -0.500000 -0.048631 +v 0.700000 -0.500000 -0.048631 +v 0.300000 -0.100000 -0.048631 +v 0.700000 -0.100000 -0.048631 +v -0.300000 -0.100000 0.151369 +v -0.300000 0.300000 0.151369 +v 0.100000 0.300000 0.151369 +v -0.300000 -0.500000 -0.048631 +v 0.100000 -0.500000 -0.048631 +v -0.300000 -0.100000 -0.048631 +v 0.100000 -0.100000 -0.048631 +v -0.300000 0.300000 0.051369 +v 0.100000 0.300000 0.051369 +v -0.300000 0.500000 0.051369 +v -0.700000 -0.100000 0.051369 +v -0.300000 -0.100000 0.051369 +v -0.700000 0.100000 0.051369 +v -0.300000 0.100000 0.051369 +v 0.100000 0.500000 0.051369 +v 0.300000 0.500000 0.051369 +v 0.300000 0.100000 0.051369 +v 0.100000 0.100000 0.051369 +v 0.100000 -0.100000 0.151369 +v 0.300000 -0.100000 0.051369 +v 0.100000 -0.100000 0.051369 +v 0.300000 -0.100000 0.451369 +v 0.700000 -0.100000 0.451369 +v 0.100000 0.500000 0.151369 +v 0.100000 0.100000 0.151369 +v -0.300000 0.500000 0.151369 +v -0.300000 0.100000 0.151369 +v 0.700000 -0.500000 0.451369 +v -0.300000 -0.500000 0.451369 +v -0.300000 -0.100000 0.451369 +v -0.700000 0.500000 0.451369 +v -0.700000 -0.100000 0.451369 +v -0.700000 0.100000 0.451369 +v 0.300000 0.500000 0.451369 +v 0.300000 0.100000 0.451369 +v -0.300000 0.500000 0.451369 +vt 2.141286 -0.754266 +vt 2.141286 -1.127505 +vt 2.060771 -1.127505 +vt 2.060771 -0.754266 +vt 1.255584 -0.670972 +vt 2.060739 -0.670972 +vt 2.060739 -0.751488 +vt 1.255584 -0.751488 +vt 1.256272 -1.124704 +vt 1.256272 -0.751466 +vt 1.175757 -0.751466 +vt 1.175757 -1.124704 +vt 2.060739 -1.124682 +vt 1.255584 -1.124682 +vt 1.255584 -1.205197 +vt 2.060739 -1.205197 +vt 1.266786 -1.385136 +vt 1.266786 -1.011898 +vt 2.071942 -1.011898 +vt 2.071942 -1.385136 +vt 2.060739 -0.751435 +vt 1.255584 -0.751435 +vt 1.910911 -0.932866 +vt 1.910911 -1.335444 +vt 2.232973 -1.335444 +vt 2.232973 -0.932866 +vt 1.708520 -1.374600 +vt 1.305942 -1.374600 +vt 1.305942 -1.052537 +vt 1.708520 -1.052537 +vt 1.628004 -1.052537 +vt 1.305942 -0.891506 +vt 1.628004 -0.891506 +vt 1.427817 -0.932866 +vt 1.427817 -1.093898 +vt 1.749880 -1.093898 +vt 1.749880 -0.932866 +vt 1.749880 -1.013382 +vt 1.910911 -1.013382 +vt 1.547489 -1.052537 +vt 1.547489 -0.891506 +vt 1.547489 -0.569444 +vt 1.628004 -0.569444 +vt 1.305942 -0.569444 +vt 1.427817 -1.013382 +vt 1.427817 -1.335444 +vt 1.105755 -1.335444 +vt 1.105755 -1.013382 +vt 0.666667 0.500000 +vt 0.666667 1.000000 +vt 0.333333 1.000000 +vt 0.333333 0.500000 +vt 1.000000 0.009760 +vt 1.000000 0.500000 +vt 0.666667 0.000000 +vt 0.333333 0.250000 +vt 0.666667 0.250000 +vt 1.000000 1.000000 +vt 0.000000 0.250000 +vt 0.000000 0.000000 +vt 0.333333 0.000000 +vt 0.000000 0.500000 +vt 0.000000 1.000000 +vt 0.000000 0.750000 +vt 0.166667 0.750000 +vt 0.166667 1.000000 +vt 1.849833 -1.058187 +vt 1.849833 -1.238656 +vt 1.127958 -1.238656 +vt 1.127958 -1.058187 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +g Adaridge_M_T_Cube.001_Top +s off +f 2/1/1 4/2/1 3/3/1 1/4/1 +f 4/5/2 8/6/2 7/7/2 3/8/2 +f 8/9/3 6/10/3 5/11/3 7/12/3 +f 6/13/4 2/14/4 1/15/4 5/16/4 +f 1/17/5 3/18/5 7/19/5 5/20/5 +f 6/13/6 8/21/6 4/22/6 2/14/6 +f 12/23/6 35/24/6 36/25/6 13/26/6 +f 17/27/1 42/28/1 43/29/1 19/30/1 +f 24/31/1 45/29/1 46/32/1 26/33/1 +f 19/34/6 14/35/6 32/36/6 20/37/6 +f 20/37/6 34/38/6 33/39/6 12/23/6 +f 34/31/1 32/40/1 38/41/1 31/33/1 +f 31/33/1 38/41/1 37/42/1 28/43/1 +f 27/33/3 40/41/3 14/40/3 25/31/3 +f 23/43/3 39/42/3 40/41/3 27/33/3 +f 13/30/3 36/29/3 41/28/3 11/27/3 +f 29/43/3 47/44/3 48/32/3 30/33/3 +f 30/33/3 48/32/3 35/29/3 33/31/3 +f 26/33/1 46/32/1 44/44/1 9/43/1 +f 25/45/5 43/46/5 45/47/5 24/48/5 +f 9/48/6 44/47/6 49/46/6 23/45/6 +g Adaridge_M_T_Cube.001_Face1 +f 10/49/2 12/50/2 13/51/2 11/52/2 +f 17/53/2 19/54/2 20/49/2 18/55/2 +f 24/52/2 26/56/2 27/57/2 25/49/2 +f 26/50/2 9/49/2 23/54/2 27/58/2 +f 14/52/2 15/49/2 16/50/2 32/51/2 +f 28/59/2 22/60/2 21/61/2 23/56/2 +f 10/56/2 18/61/2 20/55/2 12/57/2 +f 28/56/2 29/52/2 30/62/2 31/59/2 +f 30/63/2 33/64/2 34/65/2 31/66/2 +g Adaridge_M_T_Cube.001_Face1_mylandscaping_block_split.png +f 22/67/5 16/68/5 15/69/5 21/70/5 diff --git a/models/mylandscaping_block1_c_b.obj b/models/mylandscaping_blockf_c_b.obj similarity index 100% rename from models/mylandscaping_block1_c_b.obj rename to models/mylandscaping_blockf_c_b.obj diff --git a/models/mylandscaping_block1_c_t.obj b/models/mylandscaping_blockf_c_t.obj similarity index 100% rename from models/mylandscaping_block1_c_t.obj rename to models/mylandscaping_blockf_c_t.obj diff --git a/models/mylandscaping_block1_f_b.obj b/models/mylandscaping_blockf_f_b.obj similarity index 100% rename from models/mylandscaping_block1_f_b.obj rename to models/mylandscaping_blockf_f_b.obj diff --git a/models/mylandscaping_block1_f_t.obj b/models/mylandscaping_blockf_f_t.obj similarity index 100% rename from models/mylandscaping_block1_f_t.obj rename to models/mylandscaping_blockf_f_t.obj diff --git a/models/mylandscaping_block1_l_b.obj b/models/mylandscaping_blockf_l_b.obj similarity index 100% rename from models/mylandscaping_block1_l_b.obj rename to models/mylandscaping_blockf_l_b.obj diff --git a/models/mylandscaping_block1_l_t.obj b/models/mylandscaping_blockf_l_t.obj similarity index 100% rename from models/mylandscaping_block1_l_t.obj rename to models/mylandscaping_blockf_l_t.obj diff --git a/models/mylandscaping_block1_m_b.obj b/models/mylandscaping_blockf_m_b.obj similarity index 100% rename from models/mylandscaping_block1_m_b.obj rename to models/mylandscaping_blockf_m_b.obj diff --git a/models/mylandscaping_block1_m_t.obj b/models/mylandscaping_blockf_m_t.obj similarity index 100% rename from models/mylandscaping_block1_m_t.obj rename to models/mylandscaping_blockf_m_t.obj diff --git a/models/mylandscaping_block1_r_b.obj b/models/mylandscaping_blockf_r_b.obj similarity index 100% rename from models/mylandscaping_block1_r_b.obj rename to models/mylandscaping_blockf_r_b.obj diff --git a/models/mylandscaping_block1_r_t.obj b/models/mylandscaping_blockf_r_t.obj similarity index 100% rename from models/mylandscaping_block1_r_t.obj rename to models/mylandscaping_blockf_r_t.obj diff --git a/models/mylandscaping_block1_top_m.obj b/models/mylandscaping_blockf_top_m.obj similarity index 100% rename from models/mylandscaping_block1_top_m.obj rename to models/mylandscaping_blockf_top_m.obj diff --git a/models/mylandscaping_block1_top_r.obj b/models/mylandscaping_blockf_top_r.obj similarity index 100% rename from models/mylandscaping_block1_top_r.obj rename to models/mylandscaping_blockf_top_r.obj diff --git a/models/mylandscaping_column_ic_b.obj b/models/mylandscaping_columnf_ic_b.obj similarity index 100% rename from models/mylandscaping_column_ic_b.obj rename to models/mylandscaping_columnf_ic_b.obj diff --git a/models/mylandscaping_column_ic_t.obj b/models/mylandscaping_columnf_ic_t.obj similarity index 100% rename from models/mylandscaping_column_ic_t.obj rename to models/mylandscaping_columnf_ic_t.obj diff --git a/models/mylandscaping_column_m_b.obj b/models/mylandscaping_columnf_m_b.obj similarity index 100% rename from models/mylandscaping_column_m_b.obj rename to models/mylandscaping_columnf_m_b.obj diff --git a/models/mylandscaping_column_m_t.obj b/models/mylandscaping_columnf_m_t.obj similarity index 100% rename from models/mylandscaping_column_m_t.obj rename to models/mylandscaping_columnf_m_t.obj diff --git a/models/mylandscaping_column_oc_b.obj b/models/mylandscaping_columnf_oc_b.obj similarity index 100% rename from models/mylandscaping_column_oc_b.obj rename to models/mylandscaping_columnf_oc_b.obj diff --git a/models/mylandscaping_column_oc_t.obj b/models/mylandscaping_columnf_oc_t.obj similarity index 100% rename from models/mylandscaping_column_oc_t.obj rename to models/mylandscaping_columnf_oc_t.obj diff --git a/textures/mylandscaping_adaridge_tex.png b/textures/mylandscaping_adaridge_tex.png new file mode 100644 index 0000000..eae22ba Binary files /dev/null and b/textures/mylandscaping_adaridge_tex.png differ diff --git a/walls_adaridge.lua b/walls_adaridge.lua new file mode 100644 index 0000000..84e9f38 --- /dev/null +++ b/walls_adaridge.lua @@ -0,0 +1,116 @@ +local colbox_type1 = { --top blocks + type = "fixed", + fixed = {{-.49, -.5, 0.05, .5, .6, .52}} +} +local colbox_type2 = { --columns + type = "fixed", + fixed = {{-.2, -.5, -.2, .5, .5, .5}} +} +local colbox_type3 = { --bottom blocks + type = "fixed", + fixed = {{-.5, -.5, -.16, .5, .5, .25}} +} +local colbox_type4 = { --corner + type = "fixed", + fixed = {{-.5, -.5, 0, .5, .5, .5}, + {0, -.5, -.5, .5, .5, .5}} +} +local colbox_type5 = { --corner + type = "fixed", + fixed = {{-.5, -.5, -.5, .5, .5, .5},} +} +local colbox_type6 = { --corner + type = "fixed", + fixed = {{-.5, -.5, -.3, .5, .5, .5},} +} + +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 Corner", "corner", "blocka_c_t", colbox_type4, "corner", {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 Corner Bot", "bcorner", "blocka_c_b", colbox_type4, "corner", {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 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}}, +} +for i in ipairs (block_type1) do + local desc2 = block_type1[i][1] + local typ = block_type1[i][2] + local obj = block_type1[i][3] + local colbox = block_type1[i][4] + local drops = block_type1[i][5] + local grup = block_type1[i][6] + +local color_tab = { +{"black", "Black", "^[colorize:black:150"}, +{"blue", "Blue", "^[colorize:#0404B4:100"}, +{"brown", "Brown", "^[colorize:#190B07:100"}, +{"cyan", "Cyan", "^[colorize:cyan:100"}, +{"dark_green", "Dark Green", "^[colorize:#071907:150"}, +{"dark_grey", "Dark Grey", "^[colorize:black:150"}, +{"green", "Green", "^[colorize:green:100"}, +{"grey", "Grey", "^[colorize:black:100"}, +{"magenta", "Magenta", "^[colorize:magenta:100"}, +{"orange", "Orange", "^[colorize:orange:100"}, +{"pink", "Pink", "^[colorize:#FE2E9A:100"}, +{"red", "Red", "^[colorize:#B40404:100"}, +{"violet", "Violet", "^[colorize:#2F0B3A:100"}, +{"white", "White", "^[colorize:white:100"}, +{"yellow", "Yellow", "^[colorize:yellow:100"}, +{"cement", "Concrete", ""}, +} +for i in ipairs (color_tab) do +local col = color_tab[i][1] +local coldesc = color_tab[i][2] +local alpha = color_tab[i][3] + +minetest.register_node('mylandscaping:awall_'..typ.."_"..col, { + description = desc2.." "..coldesc, + drawtype = 'mesh', + mesh = 'mylandscaping_'..obj..'.obj', + tiles = {{name='mylandscaping_block_smooth.png'..alpha}, {name='mylandscaping_adaridge_tex.png'..alpha}}, + groups = grup, + paramtype = 'light', + paramtype2 = 'facedir', + drop = 'mylandscaping:awall_'..drops.."_"..col, + selection_box = colbox, + collision_box = colbox, + sounds = default.node_sound_stone_defaults(), + +after_place_node = function(pos, placer, itemstack, pointed_thing) + local nodeu = minetest.get_node({x=pos.x,y=pos.y-1,z=pos.z}) + local nodea = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z}) + local node = minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}) + if nodeu.name == "mylandscaping:awall_"..typ.."_"..col then + minetest.set_node(pos,{name="mylandscaping:awall_"..typ.."_"..col,param2=nodeu.param2}) + minetest.set_node({x=pos.x,y=pos.y-1,z=pos.z},{name="mylandscaping:awall_b"..typ.."_"..col,param2=nodeu.param2}) + end + if nodea.name == "mylandscaping:awall_"..typ..col then + minetest.set_node(pos,{name="mylandscaping:awall_b"..typ.."_"..col,param2=node.param2}) + end +end, + +after_destruct = function(pos, oldnode) + local node = minetest.get_node(pos).name + local nodeu = minetest.get_node({x=pos.x,y=pos.y-1,z=pos.z}) + local nodea = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z}) + + if nodeu.name == "mylandscaping:awall_b"..typ.."_"..col and + nodea.name == "air" then + minetest.set_node({x=pos.x,y=pos.y-1,z=pos.z},{name="mylandscaping:awall_"..typ.."_"..col,param2=nodeu.param2}) + end + +end, + +}) + +end +end + diff --git a/walls.lua b/walls_freeport.lua similarity index 55% rename from walls.lua rename to walls_freeport.lua index a6d2521..bdb8a58 100644 --- a/walls.lua +++ b/walls_freeport.lua @@ -25,20 +25,20 @@ local colbox_type6 = { --corner } local block_type1 = { -- desc2, typ, obj, colbox, drops, grup -{"Retaining Wall Left", "left", "block1_l_t", colbox_type1, "left", {cracky=2,not_in_creative_inventory=visible}}, -{"Retaining Wall Middle", "middle", "block1_m_t", colbox_type1, "middle", {cracky=2,not_in_creative_inventory=visible}}, -{"Retaining Wall Right", "right", "block1_r_t", colbox_type1, "right", {cracky=2,not_in_creative_inventory=visible}}, -{"Retaining Wall Corner", "corner", "block1_c_t", colbox_type4, "corner", {cracky=2,not_in_creative_inventory=visible}}, -{"Retaining Wall Left Bot", "bleft", "block1_l_b", colbox_type3, "left", {not_in_creative_inventory=visible}}, -{"Retaining Wall Middle Bot", "bmiddle", "block1_m_b", colbox_type3, "middle", {not_in_creative_inventory=visible}}, -{"Retaining Wall Right Bot", "bright", "block1_r_b", colbox_type3, "right", {not_in_creative_inventory=visible}}, -{"Retaining Wall Corner Bot", "bcorner", "block1_c_b", colbox_type4, "corner", {not_in_creative_inventory=visible}}, -{"Column Inside Corner", "column_ic_t", "column_ic_t", colbox_type5, "column_ic_t", {cracky=2,not_in_creative_inventory=visible}}, -{"Column Outside Corner", "column_oc_t", "column_oc_t", colbox_type2, "column_oc_t", {cracky=2,not_in_creative_inventory=visible}}, -{"Column Middle", "column_m_t", "column_m_t", colbox_type6, "column_m_t", {cracky=2,not_in_creative_inventory=visible}}, -{"Column Inside Corner Bot", "bcolumn_ic_t", "column_ic_b", colbox_type5, "column_ic_b", {not_in_creative_inventory=visible}}, -{"Column Outside Corner Bot", "bcolumn_oc_t", "column_oc_b", colbox_type2, "column_oc_b", {not_in_creative_inventory=visible}}, -{"Column Middle Bot", "bcolumn_m_t", "column_m_b", colbox_type6, "column_m_b", {not_in_creative_inventory=visible}}, +{"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 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 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}}, } for i in ipairs (block_type1) do local desc2 = block_type1[i][1] @@ -71,7 +71,7 @@ local col = color_tab[i][1] local coldesc = color_tab[i][2] local alpha = color_tab[i][3] -minetest.register_node('mylandscaping:rwall_'..typ.."_"..col, { +minetest.register_node('mylandscaping:fwall_'..typ.."_"..col, { description = desc2.." "..coldesc, drawtype = 'mesh', mesh = 'mylandscaping_'..obj..'.obj', @@ -79,7 +79,7 @@ minetest.register_node('mylandscaping:rwall_'..typ.."_"..col, { groups = grup, paramtype = 'light', paramtype2 = 'facedir', - drop = 'mylandscaping:rwall_'..drops.."_"..col, + drop = 'mylandscaping:fwall_'..drops.."_"..col, selection_box = colbox, collision_box = colbox, sounds = default.node_sound_stone_defaults(), @@ -88,12 +88,12 @@ after_place_node = function(pos, placer, itemstack, pointed_thing) local nodeu = minetest.get_node({x=pos.x,y=pos.y-1,z=pos.z}) local nodea = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z}) local node = minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}) - if nodeu.name == "mylandscaping:rwall_"..typ.."_"..col then - minetest.set_node(pos,{name="mylandscaping:rwall_"..typ.."_"..col,param2=nodeu.param2}) - minetest.set_node({x=pos.x,y=pos.y-1,z=pos.z},{name="mylandscaping:rwall_b"..typ.."_"..col,param2=nodeu.param2}) + if nodeu.name == "mylandscaping:fwall_"..typ.."_"..col then + minetest.set_node(pos,{name="mylandscaping:fwall_"..typ.."_"..col,param2=nodeu.param2}) + minetest.set_node({x=pos.x,y=pos.y-1,z=pos.z},{name="mylandscaping:fwall_b"..typ.."_"..col,param2=nodeu.param2}) end - if nodea.name == "mylandscaping:rwall_"..typ..col then - minetest.set_node(pos,{name="mylandscaping:rwall_b"..typ.."_"..col,param2=node.param2}) + if nodea.name == "mylandscaping:fwall_"..typ..col then + minetest.set_node(pos,{name="mylandscaping:fwall_b"..typ.."_"..col,param2=node.param2}) end end, @@ -102,9 +102,9 @@ after_destruct = function(pos, oldnode) local nodeu = minetest.get_node({x=pos.x,y=pos.y-1,z=pos.z}) local nodea = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z}) - if nodeu.name == "mylandscaping:rwall_b"..typ.."_"..col and + if nodeu.name == "mylandscaping:fwall_b"..typ.."_"..col and nodea.name == "air" then - minetest.set_node({x=pos.x,y=pos.y-1,z=pos.z},{name="mylandscaping:rwall_"..typ.."_"..col,param2=nodeu.param2}) + minetest.set_node({x=pos.x,y=pos.y-1,z=pos.z},{name="mylandscaping:fwall_"..typ.."_"..col,param2=nodeu.param2}) end end, diff --git a/walls_madison.lua b/walls_madison.lua new file mode 100644 index 0000000..e69de29