diff options
21 files changed, 27 insertions, 16 deletions
diff --git a/autoplace.lua b/autoplace.lua index 54df02a..6ff5b90 100644 --- a/autoplace.lua +++ b/autoplace.lua @@ -171,14 +171,23 @@ function pipes_scansurroundings(pos) pzp=1 end --- ...pumps, grates, and storage tanks +-- ...pumps, grates... - if (string.find(nym.name, "pipeworks:storage_tank_") ~= nil) or - (string.find(nym.name, "pipeworks:grating") ~= nil) or + if (string.find(nym.name, "pipeworks:grating") ~= nil) or (string.find(nym.name, "pipeworks:pump") ~= nil) then pym=1 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 -- ...except that this part is not implemented yet -- diff --git a/devices.lua b/devices.lua index 577979e..9d6a6d8 100644 --- a/devices.lua +++ b/devices.lua @@ -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_front_"..fill..".png" + pipeworks_liquid_texture.."^pipeworks_storage_tank_front_"..fill..".png" }, paramtype = "light", paramtype2 = "facedir", @@ -317,11 +317,11 @@ for fill = 0, 10 do description = "Fluid Storage Tank ("..filldesc..")", tiles = { "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_front_"..fill..".png" + pipeworks_liquid_texture.."^pipeworks_storage_tank_front_"..fill..".png" }, paramtype = "light", paramtype2 = "facedir", @@ -15,6 +15,8 @@ minetest.register_alias("pipeworks:pipe", "pipeworks:pipe_110000_empty") local DEBUG = true +pipeworks_liquid_texture = "default_water.png" + pipe_leftstub = { { -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 }, @@ -198,27 +200,27 @@ for zp = 0, 1 do if (jx+jy+jz) == 1 then if xm == 1 then table.remove(outimgs, 3) - table.insert(outimgs, 3, "pipeworks_pipe_end_XXXXX.png") + table.insert(outimgs, 3, "^pipeworks_plain.png") end if xp == 1 then table.remove(outimgs, 4) - table.insert(outimgs, 4, "pipeworks_pipe_end_XXXXX.png") + table.insert(outimgs, 4, "^pipeworks_plain.png") end if ym == 1 then table.remove(outimgs, 1) - table.insert(outimgs, 1, "pipeworks_pipe_end_XXXXX.png") + table.insert(outimgs, 1, "^pipeworks_plain.png") end if xp == 1 then table.remove(outimgs, 2) - table.insert(outimgs, 2, "pipeworks_pipe_end_XXXXX.png") + table.insert(outimgs, 2, "^pipeworks_plain.png") end if zm == 1 then table.remove(outimgs, 5) - table.insert(outimgs, 5, "pipeworks_pipe_end_XXXXX.png") + table.insert(outimgs, 5, "^pipeworks_plain.png") end if zp == 1 then table.remove(outimgs, 6) - table.insert(outimgs, 6, "pipeworks_pipe_end_XXXXX.png") + table.insert(outimgs, 6, "^pipeworks_plain.png") end end @@ -229,15 +231,15 @@ for zp = 0, 1 do if (jx==2 and jy~=2 and jz~=2) then table.remove(outimgs, 5) table.remove(outimgs, 5) - table.insert(outimgs, 5, "pipeworks_windowed_XXXXX.png") - table.insert(outimgs, 5, "pipeworks_windowed_XXXXX.png") + table.insert(outimgs, 5, pipeworks_liquid_texture.."^pipeworks_windowed_XXXXX.png") + table.insert(outimgs, 5, pipeworks_liquid_texture.."^pipeworks_windowed_XXXXX.png") end 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.insert(outimgs, 3, "pipeworks_windowed_XXXXX.png") - table.insert(outimgs, 3, "pipeworks_windowed_XXXXX.png") + table.insert(outimgs, 3, pipeworks_liquid_texture.."^pipeworks_windowed_XXXXX.png") + table.insert(outimgs, 3, pipeworks_liquid_texture.."^pipeworks_windowed_XXXXX.png") end local pname = xm..xp..ym..yp..zm..zp diff --git a/textures/pipeworks_pipe_end.png b/textures/pipeworks_pipe_end.png Binary files differindex cb0e4b9..4b0f348 100644 --- a/textures/pipeworks_pipe_end.png +++ b/textures/pipeworks_pipe_end.png diff --git a/textures/pipeworks_pipe_end_empty.png b/textures/pipeworks_pipe_end_empty.png Binary files differindex 400a85b..d09697b 100644 --- a/textures/pipeworks_pipe_end_empty.png +++ b/textures/pipeworks_pipe_end_empty.png diff --git a/textures/pipeworks_pipe_end_loaded.png b/textures/pipeworks_pipe_end_loaded.png Binary files differindex 5624b83..4951484 100644 --- a/textures/pipeworks_pipe_end_loaded.png +++ b/textures/pipeworks_pipe_end_loaded.png diff --git a/textures/pipeworks_plain.png b/textures/pipeworks_plain.png Binary files differindex 3bd1b6a..736e5a0 100644 --- a/textures/pipeworks_plain.png +++ b/textures/pipeworks_plain.png diff --git a/textures/pipeworks_storage_tank_back.png b/textures/pipeworks_storage_tank_back.png Binary files differindex aeecdf9..81f6ffb 100644 --- a/textures/pipeworks_storage_tank_back.png +++ b/textures/pipeworks_storage_tank_back.png diff --git a/textures/pipeworks_storage_tank_fittings.png b/textures/pipeworks_storage_tank_fittings.png Binary files differindex 2460b86..5d54de5 100644 --- a/textures/pipeworks_storage_tank_fittings.png +++ b/textures/pipeworks_storage_tank_fittings.png diff --git a/textures/pipeworks_storage_tank_front_1.png b/textures/pipeworks_storage_tank_front_1.png Binary files differindex cebd8ef..606efb5 100644 --- a/textures/pipeworks_storage_tank_front_1.png +++ b/textures/pipeworks_storage_tank_front_1.png diff --git a/textures/pipeworks_storage_tank_front_10.png b/textures/pipeworks_storage_tank_front_10.png Binary files differindex 7d1e54e..a628d5b 100644 --- a/textures/pipeworks_storage_tank_front_10.png +++ b/textures/pipeworks_storage_tank_front_10.png diff --git a/textures/pipeworks_storage_tank_front_2.png b/textures/pipeworks_storage_tank_front_2.png Binary files differindex 14babe7..20bb918 100644 --- a/textures/pipeworks_storage_tank_front_2.png +++ b/textures/pipeworks_storage_tank_front_2.png diff --git a/textures/pipeworks_storage_tank_front_3.png b/textures/pipeworks_storage_tank_front_3.png Binary files differindex f479797..038fcbd 100644 --- a/textures/pipeworks_storage_tank_front_3.png +++ b/textures/pipeworks_storage_tank_front_3.png diff --git a/textures/pipeworks_storage_tank_front_4.png b/textures/pipeworks_storage_tank_front_4.png Binary files differindex 08e1092..cf0e254 100644 --- a/textures/pipeworks_storage_tank_front_4.png +++ b/textures/pipeworks_storage_tank_front_4.png diff --git a/textures/pipeworks_storage_tank_front_5.png b/textures/pipeworks_storage_tank_front_5.png Binary files differindex 8ba4374..ad5c1e4 100644 --- a/textures/pipeworks_storage_tank_front_5.png +++ b/textures/pipeworks_storage_tank_front_5.png diff --git a/textures/pipeworks_storage_tank_front_6.png b/textures/pipeworks_storage_tank_front_6.png Binary files differindex 1647011..280bdf6 100644 --- a/textures/pipeworks_storage_tank_front_6.png +++ b/textures/pipeworks_storage_tank_front_6.png diff --git a/textures/pipeworks_storage_tank_front_7.png b/textures/pipeworks_storage_tank_front_7.png Binary files differindex 3ec4f4a..e3d7522 100644 --- a/textures/pipeworks_storage_tank_front_7.png +++ b/textures/pipeworks_storage_tank_front_7.png diff --git a/textures/pipeworks_storage_tank_front_8.png b/textures/pipeworks_storage_tank_front_8.png Binary files differindex 0bd0f3f..80c858a 100644 --- a/textures/pipeworks_storage_tank_front_8.png +++ b/textures/pipeworks_storage_tank_front_8.png diff --git a/textures/pipeworks_storage_tank_front_9.png b/textures/pipeworks_storage_tank_front_9.png Binary files differindex d24c425..cbb9993 100644 --- a/textures/pipeworks_storage_tank_front_9.png +++ b/textures/pipeworks_storage_tank_front_9.png diff --git a/textures/pipeworks_windowed_empty.png b/textures/pipeworks_windowed_empty.png Binary files differindex ebd4486..0d5a3dd 100644 --- a/textures/pipeworks_windowed_empty.png +++ b/textures/pipeworks_windowed_empty.png diff --git a/textures/pipeworks_windowed_loaded.png b/textures/pipeworks_windowed_loaded.png Binary files differindex 91c4829..fceb731 100644 --- a/textures/pipeworks_windowed_loaded.png +++ b/textures/pipeworks_windowed_loaded.png |
