pot changes, textures removed, not in creative inv

master
D00Med 2017-02-09 07:22:03 +10:00
parent a0e97338e8
commit 080d6665fe
3 changed files with 142 additions and 86 deletions

View File

@ -1,69 +1,74 @@
# Blender v2.78 (sub 0) OBJ File: ''
# Blender v2.72 (sub 0) OBJ File: 'flowerpot.blend'
# www.blender.org
mtllib flowerpot.mtl
o Cube_Cube.001
v -0.376017 -1.015283 0.376017
v -0.376017 -0.263249 0.376017
v -0.376017 -0.263249 -0.376017
v -0.376017 -1.015283 -0.376017
v 0.376017 -0.263249 -0.376017
v 0.376017 -1.015283 -0.376017
v 0.376017 -0.263249 0.376017
v 0.376017 -1.015283 0.376017
v -0.250565 -0.558776 0.250565
v -0.250565 -0.558776 -0.250565
v -0.250565 -0.263350 -0.250565
v -0.250565 -0.263350 0.250565
v 0.250565 -0.558776 -0.250565
v 0.250565 -0.263350 -0.250565
v 0.250565 -0.558776 0.250565
v 0.250565 -0.263350 0.250565
vt 0.5625 0.6250
vt 0.5625 0.8125
vt 0.3750 0.8125
vt 0.3750 0.6250
vt 0.1875 0.8125
vt 0.1875 0.6250
vt -0.0000 0.8125
vt 0.0000 0.6250
vt 0.7500 0.6250
vt 0.7500 0.8125
vt 0.3750 0.8125
vt 0.5625 0.8125
vt 0.5625 1.0000
vt 0.3750 1.0000
vt 0.3750 1.0000
vt 0.1875 1.0000
vt 0.3750 0.4375
vt 0.2500 0.4375
vt 0.2500 0.5000
vt 0.3750 0.5000
vt 0.1250 0.4375
vt 0.1250 0.5000
vt -0.0000 0.4375
vt -0.0000 0.5000
vt 0.5000 0.4375
vt 0.5000 0.5000
vt 0.1250 0.5000
vt 0.1250 0.6250
vt 0.2500 0.6250
vt 0.2500 0.5000
vn -1.0000 0.0000 0.0000
vn 0.0000 0.0000 -1.0000
vn 1.0000 -0.0000 0.0000
vn 0.0000 -0.0000 1.0000
vn 0.0000 -1.0000 -0.0000
vn 0.0000 1.0000 0.0000
v -0.376261 -1.015969 0.376261
v -0.376261 -0.263447 0.376261
v -0.376261 -1.015969 -0.376261
v -0.376261 -0.263447 -0.376261
v 0.376261 -1.015969 0.376261
v 0.376261 -0.263447 0.376261
v 0.376261 -1.015969 -0.376261
v 0.376261 -0.263447 -0.376261
v -0.250727 -0.559166 0.250727
v -0.250727 -0.263549 0.250727
v -0.250727 -0.559166 -0.250727
v -0.250727 -0.263549 -0.250727
v 0.250727 -0.559166 0.250727
v 0.250727 -0.263549 0.250727
v 0.250727 -0.559166 -0.250727
v 0.250727 -0.263549 -0.250727
v 0.678334 1.490754 0.678334
v 0.678334 -0.569152 0.678334
v -0.678334 1.490754 -0.678334
v -0.678334 -0.569152 -0.678334
v -0.678334 1.490754 0.678334
v -0.678334 -0.569152 0.678334
v 0.678334 1.490754 -0.678334
v 0.678334 -0.569152 -0.678334
vt 0.562500 0.187500
vt 0.562500 0.375000
vt 0.375000 0.375000
vt 0.375000 0.187500
vt 0.187500 0.375000
vt 0.187500 0.187500
vt 0.000000 0.375000
vt 0.000000 0.187500
vt 0.750000 0.187500
vt 0.750000 0.375000
vt 0.687500 0.000000
vt 0.875000 0.000000
vt 0.875000 0.187500
vt 0.687500 0.187500
vt 0.500000 0.000000
vt 0.500000 0.187500
vt 0.375000 0.000000
vt 0.250000 0.000000
vt 0.250000 0.062500
vt 0.375000 0.062500
vt 0.125000 0.000000
vt 0.125000 0.062500
vt 0.000000 0.000000
vt 0.000000 0.062500
vt 0.500000 0.062500
vt 0.125000 0.187500
vt 0.250000 0.187500
vt 0.000000 1.000000
vt 0.500000 1.000000
vt 0.500000 0.500000
vt 0.000000 0.500000
usemtl None
s 1
f 1/1/1 2/2/1 3/3/1 4/4/1
f 4/4/2 3/3/2 5/5/2 6/6/2
f 6/6/3 5/5/3 7/7/3 8/8/3
f 8/9/4 7/10/4 2/2/4 1/1/4
f 4/11/5 6/12/5 8/13/5 1/14/5
f 5/5/6 3/3/6 2/15/6 7/16/6
f 9/17/3 10/18/3 11/19/3 12/20/3
f 10/18/4 13/21/4 14/22/4 11/19/4
f 13/21/1 15/23/1 16/24/1 14/22/1
f 15/25/2 9/17/2 12/20/2 16/26/2
f 10/27/6 9/28/6 15/29/6 13/30/6
s off
f 1/1 2/2 4/3 3/4
f 3/4 4/3 8/5 7/6
f 7/6 8/5 6/7 5/8
f 5/9 6/10 2/2 1/1
f 3/11 7/12 5/13 1/14
f 8/15 4/11 2/14 6/16
f 9/17 11/18 12/19 10/20
f 11/18 15/21 16/22 12/19
f 15/21 13/23 14/24 16/22
f 13/15 9/17 10/20 14/25
f 11/22 9/26 13/27 15/19
f 17/28 19/29 20/30 18/31
f 21/28 23/29 24/30 22/31

View File

@ -1,23 +1,32 @@
local flowers = {
{"rose", "flowers:rose", "flowerpot_with_Xflower.obj"},
{"tulip", "flowers:tulip", "flowerpot_with_Xflower.obj"},
{"geranium", "flowers:geranium", "flowerpot_with_Xflower.obj"},
{"viola", "flowers:viola", "flowerpot_with_Xflower.obj"},
{"dandelion_yellow", "flowers:dandelion_yellow", "flowerpot_with_Xflower.obj"},
{"dandelion_white", "flowers:dandelion_white", "flowerpot_with_Xflower.obj"},
{"mushroom_brown", "flowers:mushroom_brown", "flowerpot_with_Xflower.obj"},
{"mushroom_red", "flowers:mushroom_red", "flowerpot_with_Xflower.obj"},
{"cactus", "default:cactus", "flowerpot_with_long_cube.obj"},
{"grass", "default:grass_1", "flowerpot_with_Xflower.obj"},
{"dry_grass", "default:dry_grass_1", "flowerpot_with_Xflower.obj"},
{"dry_shrub", "default:dry_shrub", "flowerpot_with_Xflower.obj"},
{"papyrus", "default:papyrus", "flowerpot_with_Xflower.obj"},
{"leaves", "default:leaves", "flowerpot_with_long_cube.obj"},
{"aspen_leaves", "default:aspen_leaves", "flowerpot_with_long_cube.obj"},
{"pine_needles", "default:pine_needles", "flowerpot_with_long_cube.obj"},
{"jungleleaves", "default:jungleleaves", "flowerpot_with_long_cube.obj"},
{"acacia_leaves", "default:acacia_leaves", "flowerpot_with_long_cube.obj"},
{"rose", "flowers:rose", "Rose"},
{"tulip", "flowers:tulip", "Tulip"},
{"geranium", "flowers:geranium", "Geranium"},
{"viola", "flowers:viola", "Viola"},
{"dandelion_yellow", "flowers:dandelion_yellow", "Yellow Dandelion"},
{"dandelion_white", "flowers:dandelion_white", "White Dandelion"},
{"mushroom_brown", "flowers:mushroom_brown", "Brown Mushroom"},
{"mushroom_red", "flowers:mushroom_red", "Red Mushroom"},
{"grass", "default:grass_1", "Grass"},
{"dry_grass", "default:dry_grass_1", "Dry Grass"},
{"dry_shrub", "default:dry_shrub", "Dry Shrub"},
{"papyrus", "default:papyrus", "Papyrus"},
{"sapling", "default:sapling", "Sapling"},
{"acacia_sapling", "default:acacia_sapling", "Acacia Sapling"},
{"aspen_sapling", "default:aspen_sapling", "Aspen Sapling"},
{"junglesapling", "default:junglesapling", "Jungle Sapling"},
{"pine_sapling", "default:pine_sapling", "Pine Sapling"},
}
local cubes = {
{"cactus", "default:cactus", "Cactus"},
{"leaves", "default:leaves", "Leaves"},
{"aspen_leaves", "default:aspen_leaves", "Aspen Leaves"},
{"pine_needles", "default:pine_needles", "Pine Needles"},
{"jungleleaves", "default:jungleleaves", "Jungle Leaves"},
{"acacia_leaves", "default:acacia_leaves", "Acacia Leaves"},
}
@ -53,6 +62,14 @@ minetest.register_node("flowerpots:flower_pot", {
itemstack:take_item()
end
end
for _, row in ipairs(cubes) do
local flower = row[1]
local flower_node = row[2]
if item == flower_node then
minetest.env:set_node(pos, {name="flowerpots:flower_pot_"..flower})
itemstack:take_item()
end
end
end,
})
@ -67,11 +84,45 @@ minetest.register_craft({
for _, row in ipairs(flowers) do
local flower = row[1]
local flower_node = row[2]
local desc = row[3]
local texture = minetest.registered_nodes[flower_node]["tiles"]
minetest.register_node("flowerpots:flower_pot_"..flower, {
description = "Flower Pot With "..flower.."",
drawtype = "mesh",
mesh = "flowerpot.obj",
tiles = {
"[combine:32x32:0,0=flowerpot.png:0,0="..texture[1],
},
visual_scale = 0.5,
wield_image = "flowerpot_item.png",
wield_scale = {x=1.0, y=1.0, z=1.0},
paramtype = "light",
selection_box = {
type = "fixed",
fixed = {-0.2, -0.5, -0.2, 0.2, -0.1, 0.2}
},
collision_box = {
type = "fixed",
fixed = {-0.2, -0.5, -0.2, 0.2, -0.1, 0.2}
},
inventory_image = "flowerpot_item.png",
groups = {cracky = 2, stone = 1, not_in_creative_inventory=1},
sounds = default.node_sound_stone_defaults(),
on_rightclick = function(pos, item, clicker)
minetest.env:add_item({x=pos.x, y=pos.y+0.5, z=pos.z}, flower_node)
minetest.env:set_node(pos, {name="flowerpots:flower_pot"})
end,
})
end
for _, row in ipairs(cubes) do
local flower = row[1]
local flower_node = row[2]
local model = row[3]
minetest.register_node("flowerpots:flower_pot_"..flower, {
description = "Flower Pot With "..flower.." Flower",
description = "Flower Pot With "..flower.."",
drawtype = "mesh",
mesh = model,
mesh = "flowerpot_with_long_cube.obj",
tiles = {
"flowerpot_"..flower..".png",
},
@ -88,7 +139,7 @@ minetest.register_node("flowerpots:flower_pot_"..flower, {
fixed = {-0.2, -0.5, -0.2, 0.2, -0.1, 0.2}
},
inventory_image = "flowerpot_item.png",
groups = {cracky = 2, stone = 1},
groups = {cracky = 2, stone = 1, not_in_creative_inventory=1},
sounds = default.node_sound_stone_defaults(),
on_rightclick = function(pos, item, clicker)
minetest.env:add_item({x=pos.x, y=pos.y+0.5, z=pos.z}, flower_node)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 975 B

After

Width:  |  Height:  |  Size: 828 B