fixing conflicts.

master
NathanSalapat 2015-05-01 21:08:04 -05:00
commit 5aa287ef02
19 changed files with 231 additions and 33 deletions

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -1,3 +1,15 @@
This mod adds a variety of landscaping related nodes, starting with walls, though we may add more things in the future.
# Mod Contributors
Natan
Don
Begin by crafting a cement making machine and then build a cement mixer to create the wall parts.
# mylandscaping
This is a Minetest mod that adds retaining walls and column nodes.
## Forum Topic
- soon
## Licensing
- WTFPL
## Dependencies
- default

BIN
screenshot.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 335 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 218 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 217 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 163 B

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 172 B

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 167 B

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 195 B

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 173 B

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 218 B

View File

@ -31,30 +31,21 @@ local colbox_type5 = { --corner
}
local block_type1 = { -- desc2, typ, obj, colbox, drops, grup
--Upper walls
{"Left", "left", "block1_l_t", colbox_type1, "left", {cracky=2,not_in_creative_inventory=1}},
{"Middle", "middle", "block1_m_t", colbox_type1, "middle", {cracky=2,not_in_creative_inventory=1}},
{"Full", "full", "block1_f_t", colbox_type1, "full", {cracky=2,not_in_creative_inventory=1}},
{"Right", "right", "block1_r_t", colbox_type1, "right", {cracky=2,not_in_creative_inventory=1}},
{"Corner", "corner", "block1_c_t", colbox_type4, "corner", {cracky=2,not_in_creative_inventory=1}},
--Lower Walls
{"Left Bot", "bleft", "block1_l_b", colbox_type3, "left", {not_in_creative_inventory=1}},
{"Middle Bot", "bmiddle", "block1_m_b", colbox_type3, "middle", {not_in_creative_inventory=1}},
{"Full Bot", "bfull", "block1_f_b", colbox_type1, "full", {not_in_creative_inventory=1}},
{"Right Bot", "bright", "block1_r_b", colbox_type3, "right", {not_in_creative_inventory=1}},
{"Corner Bot", "bcorner", "block1_c_b", colbox_type4, "corner", {not_in_creative_inventory=1}},
--Columns
{"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}},
{"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}},
{"Left", "left", "block1_l_t", colbox_type1, "left", {cracky=2,not_in_creative_inventory=1}},
{"Middle", "middle", "block1_m_t", colbox_type1, "middle", {cracky=2,not_in_creative_inventory=1}},
{"Right", "right", "block1_r_t", colbox_type1, "right", {cracky=2,not_in_creative_inventory=1}},
{"Corner", "corner", "block1_c_t", 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}},
{"Column Inside Corner", "column_ic_t", "column_ic_t", colbox_type2, "column_ic_t", {cracky=2,not_in_creative_inventory=1}},
{"Column Outside Corner", "column_oc_t", "column_oc_t", colbox_type2, "column_oc_t", {cracky=2,not_in_creative_inventory=1}},
{"Column Middle", "column_m_t", "column_m_t", colbox_type2, "column_m_t", {cracky=2,not_in_creative_inventory=1}},
{"Column Inside Corner Bot", "column_ic_b", "column_ic_b", colbox_type2, "column_ic_b", {not_in_creative_inventory=1}},
{"Column Outside Corner Bot","column_oc_b", "column_oc_b", colbox_type2, "column_oc_b", {not_in_creative_inventory=1}},
{"Column Middle Bot", "column_m_b", "column_m_b", colbox_type2, "column_m_b", {not_in_creative_inventory=1}},
{"Left Bot", "bleft", "block1_l_b", colbox_type3, "left", {not_in_creative_inventory=1}},
{"Middle Bot", "bmiddle", "block1_m_b", colbox_type3, "middle", {not_in_creative_inventory=1}},
{"Right Bot", "bright", "block1_r_b", colbox_type3, "right", {not_in_creative_inventory=1}},
{"Corner Bot", "bcorner", "block1_c_b", 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]