made storage tanks connect from top/bottom, made storage tank and pipe

textures use the ^ combine operator so they can show the actual liquid going
through the pipes/tanks.
This commit is contained in:
Vanessa Ezekowitz 2013-01-05 21:14:09 -05:00
parent 0a1f90c391
commit 14102d7c3a
21 changed files with 27 additions and 16 deletions

@ -171,14 +171,23 @@ function pipes_scansurroundings(pos)
pzp=1 pzp=1
end end
-- ...pumps, grates, and storage tanks -- ...pumps, grates...
if (string.find(nym.name, "pipeworks:storage_tank_") ~= nil) or if (string.find(nym.name, "pipeworks:grating") ~= nil) or
(string.find(nym.name, "pipeworks:grating") ~= nil) or
(string.find(nym.name, "pipeworks:pump") ~= nil) then (string.find(nym.name, "pipeworks:pump") ~= nil) then
pym=1 pym=1
end end
-- ... and storage tanks.
if (string.find(nym.name, "pipeworks:storage_tank_") ~= nil) then
pym=1
end
if (string.find(nyp.name, "pipeworks:storage_tank_") ~= nil) then
pyp=1
end
-- ...extra devices specified via the function's parameters -- ...extra devices specified via the function's parameters
-- ...except that this part is not implemented yet -- ...except that this part is not implemented yet
-- --

@ -291,7 +291,7 @@ for fill = 0, 10 do
"pipeworks_storage_tank_back.png", "pipeworks_storage_tank_back.png",
"pipeworks_storage_tank_back.png", "pipeworks_storage_tank_back.png",
"pipeworks_storage_tank_back.png", "pipeworks_storage_tank_back.png",
"pipeworks_storage_tank_front_"..fill..".png" pipeworks_liquid_texture.."^pipeworks_storage_tank_front_"..fill..".png"
}, },
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
@ -316,12 +316,12 @@ for fill = 0, 10 do
minetest.register_node("pipeworks:storage_tank_"..fill, { minetest.register_node("pipeworks:storage_tank_"..fill, {
description = "Fluid Storage Tank ("..filldesc..")", description = "Fluid Storage Tank ("..filldesc..")",
tiles = { tiles = {
"pipeworks_storage_tank_fittings.png",
"pipeworks_storage_tank_fittings.png", "pipeworks_storage_tank_fittings.png",
"pipeworks_storage_tank_back.png", "pipeworks_storage_tank_back.png",
"pipeworks_storage_tank_back.png", "pipeworks_storage_tank_back.png",
"pipeworks_storage_tank_back.png", "pipeworks_storage_tank_back.png",
"pipeworks_storage_tank_back.png", pipeworks_liquid_texture.."^pipeworks_storage_tank_front_"..fill..".png"
"pipeworks_storage_tank_front_"..fill..".png"
}, },
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",

@ -15,6 +15,8 @@
minetest.register_alias("pipeworks:pipe", "pipeworks:pipe_110000_empty") minetest.register_alias("pipeworks:pipe", "pipeworks:pipe_110000_empty")
local DEBUG = true local DEBUG = true
pipeworks_liquid_texture = "default_water.png"
pipe_leftstub = { pipe_leftstub = {
{ -32/64, -2/64, -6/64, 1/64, 2/64, 6/64 }, -- pipe segment against -X face { -32/64, -2/64, -6/64, 1/64, 2/64, 6/64 }, -- pipe segment against -X face
{ -32/64, -4/64, -5/64, 1/64, 4/64, 5/64 }, { -32/64, -4/64, -5/64, 1/64, 4/64, 5/64 },
@ -198,27 +200,27 @@ for zp = 0, 1 do
if (jx+jy+jz) == 1 then if (jx+jy+jz) == 1 then
if xm == 1 then if xm == 1 then
table.remove(outimgs, 3) table.remove(outimgs, 3)
table.insert(outimgs, 3, "pipeworks_pipe_end_XXXXX.png") table.insert(outimgs, 3, "^pipeworks_plain.png")
end end
if xp == 1 then if xp == 1 then
table.remove(outimgs, 4) table.remove(outimgs, 4)
table.insert(outimgs, 4, "pipeworks_pipe_end_XXXXX.png") table.insert(outimgs, 4, "^pipeworks_plain.png")
end end
if ym == 1 then if ym == 1 then
table.remove(outimgs, 1) table.remove(outimgs, 1)
table.insert(outimgs, 1, "pipeworks_pipe_end_XXXXX.png") table.insert(outimgs, 1, "^pipeworks_plain.png")
end end
if xp == 1 then if xp == 1 then
table.remove(outimgs, 2) table.remove(outimgs, 2)
table.insert(outimgs, 2, "pipeworks_pipe_end_XXXXX.png") table.insert(outimgs, 2, "^pipeworks_plain.png")
end end
if zm == 1 then if zm == 1 then
table.remove(outimgs, 5) table.remove(outimgs, 5)
table.insert(outimgs, 5, "pipeworks_pipe_end_XXXXX.png") table.insert(outimgs, 5, "^pipeworks_plain.png")
end end
if zp == 1 then if zp == 1 then
table.remove(outimgs, 6) table.remove(outimgs, 6)
table.insert(outimgs, 6, "pipeworks_pipe_end_XXXXX.png") table.insert(outimgs, 6, "^pipeworks_plain.png")
end end
end end
@ -229,15 +231,15 @@ for zp = 0, 1 do
if (jx==2 and jy~=2 and jz~=2) then if (jx==2 and jy~=2 and jz~=2) then
table.remove(outimgs, 5) table.remove(outimgs, 5)
table.remove(outimgs, 5) table.remove(outimgs, 5)
table.insert(outimgs, 5, "pipeworks_windowed_XXXXX.png") table.insert(outimgs, 5, pipeworks_liquid_texture.."^pipeworks_windowed_XXXXX.png")
table.insert(outimgs, 5, "pipeworks_windowed_XXXXX.png") table.insert(outimgs, 5, pipeworks_liquid_texture.."^pipeworks_windowed_XXXXX.png")
end end
if (jx~=2 and jy~=2 and jz==2) or (jx~=2 and jy==2 and jz~=2) then if (jx~=2 and jy~=2 and jz==2) or (jx~=2 and jy==2 and jz~=2) then
table.remove(outimgs, 3) table.remove(outimgs, 3)
table.remove(outimgs, 3) table.remove(outimgs, 3)
table.insert(outimgs, 3, "pipeworks_windowed_XXXXX.png") table.insert(outimgs, 3, pipeworks_liquid_texture.."^pipeworks_windowed_XXXXX.png")
table.insert(outimgs, 3, "pipeworks_windowed_XXXXX.png") table.insert(outimgs, 3, pipeworks_liquid_texture.."^pipeworks_windowed_XXXXX.png")
end end
local pname = xm..xp..ym..yp..zm..zp local pname = xm..xp..ym..yp..zm..zp

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 338 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 331 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 347 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 274 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 483 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 631 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 586 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 541 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 581 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 579 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 582 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 577 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 576 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 581 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 581 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 579 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 366 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 347 B