diff --git a/machine.lua b/machine.lua index 26180c6..900bb04 100644 --- a/machine.lua +++ b/machine.lua @@ -54,18 +54,23 @@ on_construct = function(pos) "background[-0.15,-0.25;10.40,10.75;mylandscaping_background.png]".. "label[1.5,0.5;Retaining Wall]".. --Styles of blocks + "label[1,1;Wall Blocks]".. "image_button[1,1.5;1,1;mylandscaping_wall1.png;wall1; ]".. "image_button[2,1.5;1,1;mylandscaping_wall2.png;wall2; ]".. "image_button[3,1.5;1,1;mylandscaping_wall3.png;wall3; ]".. - "image_button[1,2.5;1,1;mylandscaping_wall4.png;wall4; ]".. - "image_button[2,2.5;1,1;mylandscaping_wall5.png;column; ]".. - "image_button[3,2.5;1,1;mylandscaping_wall5.png;column2; ]".. + "image_button[4,1.5;1,1;mylandscaping_wall4.png;wall4; ]".. + + --Styles of columns + "label[1,2.5;Columns]".. + "image_button[1,3;1,1;mylandscaping_wall5.png;column; ]".. + "image_button[2,3;1,1;mylandscaping_wall5.png;column2; ]".. + "image_button[3,3;1,1;mylandscaping_wall5.png;column3; ]".. "label[6.5,0.5;Patio Stones]".. --Styles of blocks - "image_button[6,1.5;1,1;mylandscaping_square.png;patio1; ]".. - "image_button[7,1.5;1,1;mylandscaping_square_sm.png;patio2; ]".. - "image_button[8,1.5;1,1;mylandscaping_pavers.png;patio3; ]".. + "image_button[6,1.5;1,1;mylandscaping_patio1.png;patio1; ]".. + "image_button[7,1.5;1,1;mylandscaping_patio2.png;patio2; ]".. + "image_button[8,1.5;1,1;mylandscaping_patio3.png;patio3; ]".. --Input "label[3,4; Input]".. @@ -94,6 +99,7 @@ or fields["wall3"] or fields["wall4"] or fields["column"] or fields["column2"] +or fields["column3"] then if fields["wall1"] then @@ -130,7 +136,7 @@ then end if fields["column"] then make_ok = "0" - anzahl = "2" + anzahl = "1" block = "mylandscaping:rwall_column" if inv:is_empty("input") then return @@ -138,12 +144,20 @@ then end if fields["column2"] then make_ok = "0" - anzahl = "2" + anzahl = "1" block = "mylandscaping:rwall_column_m" if inv:is_empty("input") then return end end + if fields["column3"] then + make_ok = "0" + anzahl = "1" + block = "mylandscaping:rwall_column_i" + if inv:is_empty("input") then + return + end + end local instack = inv:get_stack("input", 1) local outstack = inv:get_stack("output", 1) diff --git a/models/mylandscaping_column_i_lower.obj b/models/mylandscaping_column_i_lower.obj new file mode 100644 index 0000000..929780e --- /dev/null +++ b/models/mylandscaping_column_i_lower.obj @@ -0,0 +1,37 @@ +# Blender v2.74 (sub 5) OBJ File: 'Walls.blend' +# www.blender.org +o Brick1_Inside_Column_Bottom_Cube.001 +v -0.500000 -0.500000 0.500000 +v -0.500000 0.500000 0.500000 +v -0.500000 -0.500000 -0.500000 +v -0.500000 0.500000 -0.500000 +v 0.500000 -0.500000 0.500000 +v 0.500000 0.500000 0.500000 +v 0.500000 -0.500000 -0.500000 +v 0.500000 0.500000 -0.500000 +vt 0.333333 0.666667 +vt 0.333333 0.333333 +vt 0.666667 0.333333 +vt 0.666667 0.666667 +vt 0.000000 0.666667 +vt 0.000000 0.333333 +vt 0.000000 0.000000 +vt 0.333333 0.000000 +vt 0.666667 0.000000 +vt 1.000000 0.000000 +vt 1.000000 0.333333 +vt 0.333333 1.000000 +vt 0.000000 1.000000 +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 +s off +f 2/1/1 4/2/1 3/3/1 1/4/1 +f 4/5/2 8/6/2 7/2/2 3/1/2 +f 8/6/3 6/7/3 5/8/3 7/2/3 +f 6/8/4 2/9/4 1/3/4 5/2/4 +f 1/10/5 3/11/5 7/3/5 5/9/5 +f 6/5/6 8/1/6 4/12/6 2/13/6 diff --git a/models/mylandscaping_column_i_upper.obj b/models/mylandscaping_column_i_upper.obj new file mode 100644 index 0000000..7990a6e --- /dev/null +++ b/models/mylandscaping_column_i_upper.obj @@ -0,0 +1,144 @@ +# Blender v2.74 (sub 5) OBJ File: 'Walls.blend' +# www.blender.org +o Block_InsideCorner_Top.001_Cube.008 +v 0.492196 0.499740 0.049996 +v 0.492196 0.499740 0.515505 +v -0.038606 0.499740 0.515505 +v 0.492196 0.600283 0.049996 +v 0.492196 0.600283 0.515505 +v -0.038606 0.600283 0.515505 +v -0.038606 0.709599 0.049996 +v -0.503953 0.499740 0.515505 +v -0.503953 0.499740 -0.497344 +v -0.038606 0.499740 -0.497344 +v -0.503953 0.600283 0.515505 +v -0.503953 0.600283 -0.497344 +v -0.038606 0.600283 -0.497344 +v -0.503953 0.600283 0.049996 +v -0.503953 0.499740 0.049996 +v -0.501194 -0.500000 0.504531 +v -0.501194 0.500000 0.504531 +v -0.501194 -0.500000 -0.495469 +v -0.501194 0.500000 -0.495469 +v 0.498806 -0.500000 0.504531 +v 0.498806 0.500000 0.504531 +v 0.498806 -0.500000 -0.495469 +v 0.498806 0.500000 -0.495469 +v 0.561394 0.499740 -0.497344 +v 0.561394 0.600283 -0.497344 +v 0.561394 0.499740 0.050237 +v 0.561394 0.600283 0.050237 +v 0.561394 0.600283 -0.572807 +v 0.561394 0.499740 -0.572807 +v -0.038606 0.600283 -0.572807 +v -0.038606 0.499740 -0.572807 +v 0.492716 0.499740 -0.497344 +v 0.492716 0.600283 -0.497344 +v 0.492716 0.499740 -0.572807 +v 0.492716 0.600283 -0.572807 +vt 0.000000 0.847049 +vt 0.000000 0.694694 +vt 0.032556 0.694694 +vt 0.032556 0.847049 +vt 0.708753 0.540271 +vt 0.708753 0.718810 +vt 0.676197 0.718810 +vt 0.676197 0.540271 +vt 0.708753 0.875332 +vt 0.676197 0.875332 +vt 0.323803 0.391244 +vt 0.323803 0.358337 +vt 0.348238 0.358337 +vt 0.348238 0.391244 +vt 0.150906 0.201670 +vt 0.000000 0.201810 +vt 0.000000 0.023272 +vt 0.150731 0.023275 +vt 0.708753 0.719407 +vt 0.741309 0.540271 +vt 0.741309 0.719407 +vt 0.806422 0.696794 +vt 0.806422 0.540271 +vt 0.838978 0.540271 +vt 0.838978 0.696794 +vt 0.708753 0.871762 +vt 0.741309 0.871762 +vt 0.150732 0.358334 +vt 0.000000 0.358331 +vt 0.327959 0.201816 +vt 0.327959 0.358337 +vt 0.741309 0.564969 +vt 0.773866 0.564969 +vt 0.773866 0.744185 +vt 0.741309 0.744185 +vt 0.352394 1.000000 +vt 0.352394 0.672714 +vt 0.676197 0.672714 +vt 0.676197 1.000000 +vt 0.352394 0.336357 +vt 0.676197 0.336357 +vt 1.000000 0.327286 +vt 0.676197 0.327286 +vt 0.676197 0.000000 +vt 1.000000 0.000000 +vt 0.323803 0.694694 +vt 0.352394 0.000000 +vt 0.806422 0.563371 +vt 0.773866 0.563371 +vt 0.773866 0.540271 +vt 0.806422 0.742085 +vt 0.773866 0.742085 +vt 0.853009 0.361055 +vt 0.875863 0.361055 +vt 0.875863 0.540271 +vt 0.852836 0.540192 +vt 0.346830 0.391244 +vt 0.346830 0.424150 +vt 0.323803 0.424150 +vt 0.676197 0.361055 +vt 0.853009 0.336357 +vt 0.327959 0.023104 +vt 0.327959 0.000003 +vt 0.352394 0.023104 +vt 0.352394 0.201816 +vt 0.875863 0.336357 +vt 0.150653 0.000000 +vn 1.000000 0.000000 0.000000 +vn -0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn 0.101700 0.988000 0.116000 +vn 0.000000 0.000000 -1.000000 +vn -0.115900 0.986500 0.115800 +vn -0.116100 0.988300 -0.098700 +vn 0.000000 -1.000000 0.000000 +vn -0.003500 0.000000 1.000000 +vn 0.000000 1.000000 0.000000 +vn 0.101900 0.989900 -0.098800 +s off +f 4/1/1 5/2/1 2/3/1 1/4/1 +f 5/5/2 6/6/2 3/7/2 2/8/2 +f 6/6/2 11/9/2 8/10/2 3/7/2 +f 10/11/3 13/12/3 30/13/3 31/14/3 +f 7/15/4 6/16/4 5/17/4 4/18/4 +f 14/19/3 12/5/3 9/20/3 15/21/3 +f 12/22/5 13/23/5 10/24/5 9/25/5 +f 11/26/3 14/19/3 15/21/3 8/27/3 +f 7/15/6 14/28/6 11/29/6 6/16/6 +f 13/30/7 12/31/7 14/28/7 7/15/7 +f 24/32/1 25/33/1 27/34/1 26/35/1 +f 17/36/3 19/37/3 18/38/3 16/39/3 +f 19/37/5 23/40/5 22/41/5 18/38/5 +f 23/42/1 21/43/1 20/44/1 22/45/1 +f 21/2/2 17/29/2 16/12/2 20/46/2 +f 16/47/8 18/44/8 22/41/8 20/40/8 +f 34/48/5 35/49/5 28/50/5 29/23/5 +f 25/33/1 24/32/1 29/20/1 28/50/1 +f 31/51/5 30/52/5 35/49/5 34/48/5 +f 32/53/8 24/54/8 26/55/8 1/56/8 +f 1/11/9 26/57/9 27/58/9 4/59/9 +f 32/53/8 10/60/8 31/41/8 34/61/8 +f 33/62/10 25/63/10 28/47/10 35/64/10 +f 13/30/10 33/62/10 35/64/10 30/65/10 +f 24/54/8 32/53/8 34/61/8 29/66/8 +f 4/18/11 33/62/11 13/30/11 7/15/11 +f 25/63/10 33/62/10 4/18/10 27/67/10 diff --git a/readme.md b/readme.md index e69de29..99734cd 100644 --- a/readme.md +++ b/readme.md @@ -0,0 +1,15 @@ +# Mod Contributors +Natan +Don + +# mylandscaping +This is a Minetest mod that adds retaining walls and column nodes. + +## Forum Topic +- soon + +## Licensing +- WTFPL + +## Dependencies +- default diff --git a/screenshot.png b/screenshot.png new file mode 100644 index 0000000..ced77fd Binary files /dev/null and b/screenshot.png differ diff --git a/textures/mylandscaping_orange.png b/textures/mylandscaping_orange.png new file mode 100644 index 0000000..67d58ba Binary files /dev/null and b/textures/mylandscaping_orange.png differ diff --git a/textures/mylandscaping_patio1.png b/textures/mylandscaping_patio1.png new file mode 100644 index 0000000..f13a6bb Binary files /dev/null and b/textures/mylandscaping_patio1.png differ diff --git a/textures/mylandscaping_patio2.png b/textures/mylandscaping_patio2.png new file mode 100644 index 0000000..672aa42 Binary files /dev/null and b/textures/mylandscaping_patio2.png differ diff --git a/textures/mylandscaping_patio3.png b/textures/mylandscaping_patio3.png new file mode 100644 index 0000000..18ba059 Binary files /dev/null and b/textures/mylandscaping_patio3.png differ diff --git a/textures/mylandscaping_red.png b/textures/mylandscaping_red.png new file mode 100644 index 0000000..dcc0b84 Binary files /dev/null and b/textures/mylandscaping_red.png differ diff --git a/textures/mylandscaping_wall1.png b/textures/mylandscaping_wall1.png index 1659f4e..f351e97 100644 Binary files a/textures/mylandscaping_wall1.png and b/textures/mylandscaping_wall1.png differ diff --git a/textures/mylandscaping_wall2.png b/textures/mylandscaping_wall2.png index eb00de0..65f0ebb 100644 Binary files a/textures/mylandscaping_wall2.png and b/textures/mylandscaping_wall2.png differ diff --git a/textures/mylandscaping_wall3.png b/textures/mylandscaping_wall3.png index 1c905eb..78fba0d 100644 Binary files a/textures/mylandscaping_wall3.png and b/textures/mylandscaping_wall3.png differ diff --git a/textures/mylandscaping_wall4.png b/textures/mylandscaping_wall4.png index 6712f13..7569593 100644 Binary files a/textures/mylandscaping_wall4.png and b/textures/mylandscaping_wall4.png differ diff --git a/textures/mylandscaping_wall5.png b/textures/mylandscaping_wall5.png index 86885bc..192cc3c 100644 Binary files a/textures/mylandscaping_wall5.png and b/textures/mylandscaping_wall5.png differ diff --git a/textures/mylandscaping_wall6.png b/textures/mylandscaping_wall6.png index 6486d10..d778bf6 100644 Binary files a/textures/mylandscaping_wall6.png and b/textures/mylandscaping_wall6.png differ diff --git a/textures/mylandscaping_wall7.png b/textures/mylandscaping_wall7.png new file mode 100644 index 0000000..3a8f475 Binary files /dev/null and b/textures/mylandscaping_wall7.png differ diff --git a/textures/mylandscaping_yellow.png b/textures/mylandscaping_yellow.png new file mode 100644 index 0000000..e4cf543 Binary files /dev/null and b/textures/mylandscaping_yellow.png differ diff --git a/walls.lua b/walls.lua index 305695a..3e9df7a 100644 --- a/walls.lua +++ b/walls.lua @@ -37,6 +37,7 @@ local block_type1 = { -- desc2, typ, obj, colbox, drops, grup {"Corner", "corner", "block1_top_c", colbox_type4, "corner", {cracky=2,not_in_creative_inventory=1}}, {"Column Top", "column", "column_upper", colbox_type2, "column", {cracky=2,not_in_creative_inventory=1}}, {"Big Column Top", "column_m", "column_m_upper", colbox_type5, "column_m", {cracky=2,not_in_creative_inventory=1}}, +{"Inside Corner Column Top", "column_i","column_i_upper", colbox_type5, "column_i", {cracky=2,not_in_creative_inventory=1}}, {"Left Bot", "bleft", "block1_bot_l", colbox_type3, "left", {not_in_creative_inventory=1}}, {"Middle Bot", "bmiddle", "block1_bot_m", colbox_type3, "middle", {not_in_creative_inventory=1}}, @@ -44,6 +45,7 @@ local block_type1 = { -- desc2, typ, obj, colbox, drops, grup {"Corner Bot", "bcorner", "block1_bot_c", colbox_type4, "corner", {not_in_creative_inventory=1}}, {"Column Bot", "bcolumn", "column_lower", colbox_type2, "column", {not_in_creative_inventory=1}}, {"Big Column Bot", "bcolumn_m", "column_m_lower", colbox_type5, "column_m", {not_in_creative_inventory=1}}, +{"Inside Corner Column Bot", "bcolumn_i","column_i_lower", colbox_type5, "column_i", {not_in_creative_inventory=1}}, } for i in ipairs (block_type1) do local desc2 = block_type1[i][1]