update boost_cart, currency, mesecons, pipeworks, and technic

This commit is contained in:
Vanessa Ezekowitz 2017-11-03 23:05:36 -04:00
parent 159a50b8ce
commit fadb973205
21 changed files with 5835 additions and 2766 deletions

View File

@ -307,6 +307,7 @@ function cart_entity:on_step(dtime)
self.object:set_acceleration(new_acc)
self.old_pos = vector.round(pos)
local old_y_dir = self.old_dir.y
if not vector.equals(dir, {x=0, y=0, z=0}) and not stop_wiggle then
self.old_dir = dir
end
@ -351,6 +352,25 @@ function cart_entity:on_step(dtime)
anim = {x=2, y=2}
end
self.object:set_animation(anim, 1, 0)
if player and dir.y ~= old_y_dir then
local feet = {x=0, y=0, z=0}
local eye = {x=0, y=-4, z=0}
feet.y = boost_cart.old_player_model and 6 or -4.2
if dir.y ~= 0 then
-- TODO: Find a better way to calculate this
if boost_cart.old_player_model then
feet.y = 6 + 1.5
feet.z = -dir.y * 7
else
feet.y = -4.2 + 3
feet.z = -dir.y
end
eye.z = -dir.y * 10
end
player:set_attach(self.object, "", feet,
{x=dir.y * -45, y=0, z=0})
player:set_eye_offset(eye, eye)
end
self.object:set_velocity(vel)
if update.pos then

View File

@ -18,8 +18,7 @@ function boost_cart:manage_attachment(player, obj)
default.player_attached[player_name] = status
if status then
-- player_api came after the new model. Check for it.
local y_pos = player_api and -4.5 or 6
local y_pos = self.old_player_model and 6 or -4.2
player:set_attach(obj, "", {x=0, y=y_pos, z=0}, {x=0, y=0, z=0})
player:set_eye_offset({x=0, y=-4, z=0},{x=0, y=-4, z=0})
else

View File

@ -25,6 +25,10 @@ if not default.player_attached then
default.player_attached = {}
end
minetest.after(1, function()
boost_cart.old_player_model = type(player_api) ~= "table"
end)
dofile(boost_cart.modpath.."/functions.lua")
dofile(boost_cart.modpath.."/rails.lua")

179
currency/locale/ms.po Normal file
View File

@ -0,0 +1,179 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-20 13:58-0700\n"
"PO-Revision-Date: 2017-10-17 02:03+0800\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.0.4\n"
"Last-Translator: \n"
"Plural-Forms: nplurals=1; plural=0;\n"
"Language: ms\n"
#: barter.lua:14 barter.lua:22
msgid "Start"
msgstr "Mula"
#: barter.lua:16 barter.lua:24
msgid "Confirm"
msgstr "Sah"
#: barter.lua:17 barter.lua:19 barter.lua:25 barter.lua:27
msgid "Cancel"
msgstr "Batal"
#: barter.lua:18 barter.lua:26 shop.lua:20
msgid "Exchange"
msgstr "Tukar"
#: barter.lua:97 barter.lua:118
msgid "Barter Table"
msgstr "Meja Barter"
#: craftitems.lua:6
msgid "1 MineGeld Note"
msgstr "Wang 1 MineGeld"
#: craftitems.lua:13
msgid "5 MineGeld Note"
msgstr "Wang 5 MineGeld"
#: craftitems.lua:20
msgid "10 MineGeld Note"
msgstr "Wang 10 MineGeld"
#: craftitems.lua:27
msgid "Bundle of random Minegeld notes"
msgstr "Seberkas wang Minegeld rawak"
#: income.lua:18
msgid "basic income for @1"
msgstr "pendapatan asas untuk @1"
#: income.lua:34
msgid "added basic income for @1 to inventory"
msgstr "pendapatan asas untuk @1 ditambah masuk ke dalam inventori"
#: init.lua:6
msgid "Currency mod loading..."
msgstr "Memuatkan mods Currency..."
#: init.lua:9
msgid "Craft_items Loaded!"
msgstr "Item pertukangan dimuatkan!"
#: init.lua:11
msgid "Shop Loaded!"
msgstr "Kedai dimuatkan!"
#: init.lua:13
msgid "Barter Loaded!"
msgstr "Meja barter dimuatkan!"
#: init.lua:15
msgid "Safe Loaded!"
msgstr "Peti besi dimuatkan!"
#: init.lua:17
msgid "Crafting Loaded!"
msgstr "Pertukangan dimuatkan!"
#: init.lua:20
msgid "Creative mode in use, skipping basic income."
msgstr "Dalam mod kreatif, pendapatan asas diabaikan."
#: init.lua:23
msgid "Income Loaded!"
msgstr "Pendapatan dimuatkan!"
#: safe.lua:29
msgid "Safe"
msgstr "Peti besi"
#: safe.lua:44
msgid "Safe (owned by @1)"
msgstr "Peti besi (pemilik: @1)"
#: safe.lua:61 safe.lua:70 safe.lua:79
msgid "@1 tried to access a safe belonging to @2 at @3"
msgstr "@1 cuba untuk mengakses peti besi milik @2 di @3"
#: safe.lua:86
msgid "@1 moves stuff in safe at @2"
msgstr "@1 pindahkan barang dalam peti besi di @2"
#: safe.lua:89
msgid "@1 moves stuff to safe at @2"
msgstr "@1 masukkan barang dalam peti besi di @2"
#: safe.lua:92
msgid "@1 takes stuff from safe at @2"
msgstr "@1 keluarkan barang dari peti besi di @2"
#: shop.lua:11
msgid "Customer gives (pay here!)"
msgstr "Pelanggan beri (bayar sini!)"
#: shop.lua:13
msgid "Customer gets:"
msgstr "Pelanggan dapat:"
#: shop.lua:15
msgid "Owner wants:"
msgstr "Penjual inginkan:"
#: shop.lua:17
msgid "Owner gives:"
msgstr "Penjual berikan:"
#: shop.lua:26
msgid "Customers gave:"
msgstr "Pelanggan berikan:"
#: shop.lua:28
msgid "Your stock:"
msgstr "Stok anda:"
#: shop.lua:30
msgid "You want:"
msgstr "Anda mahukan:"
#: shop.lua:32
msgid "In exchange, you give:"
msgstr "Anda berikan:"
#: shop.lua:34
msgid "Owner, Use (E)+Place (right mouse button) for customer interface"
msgstr "Penjual, Gunakan (E) + Letak (butang tetikus kanan) untuk antaramuka pelanggan"
#: shop.lua:88
msgid "Shop"
msgstr "Kedai"
#: shop.lua:102
msgid "Exchange shop (owned by @1)"
msgstr "Kedai (pemilik: @1)"
#: shop.lua:151
msgid "This is your own shop, you can't exchange to yourself!"
msgstr "Ini kedai anda, anda tidak boleh menjual kepada diri sendiri!"
#: shop.lua:188
msgid "Exchanged!"
msgstr "Jual!"
#: shop.lua:191
msgid "Exchange can not be done, contact the shop owner."
msgstr "Tak boleh jual, hubungi penjual."
#: shop.lua:193
msgid "Exchange can not be done, check if you put all items!"
msgstr "Tak boleh jual, pastikan anda ada apa yang penjual mahukan!"

View File

@ -72,7 +72,7 @@ plg.register_nodes({
sunlight_propagates = true,
paramtype = "light",
walkable = true,
groups = {dig_immediate = 2, mesecon = 3},
groups = {dig_immediate = 2, mesecon = 3, overheat = 1},
drop = "mesecons_fpga:fpga0000",
selection_box = {
type = "fixed",
@ -309,6 +309,11 @@ plg.update = function(pos)
local meta = minetest.get_meta(pos)
if meta:get_int("valid") ~= 1 then
return
elseif mesecon.do_overheat(pos) then
plg.setports(pos, false, false, false, false)
meta:set_int("valid", 0)
meta:set_string("infotext", "FPGA (overheated)")
return
end
local is = lcore.deserialize(meta:get_string("instr"))

View File

@ -159,6 +159,18 @@ function pipeworks.scan_pipe_surroundings(pos)
pzp = f or pzp
end
-- ...straight-only pipe...
local match,a,b,c,d,e,f = pipeworks.get_axis_dir(nodetable, "pipeworks:straight_pipe")
if match then
pxm = a or pxm
pxp = b or pxp
pym = c or pym
pyp = d or pyp
pzm = e or pzm
pzp = f or pzp
end
-- ... other nodes
local def_left = minetest.registered_nodes[nxp.name] -- the node that {pos} is to the left of (not the

View File

@ -682,7 +682,58 @@ local fountain_neighbours={{x=0, y=1, z=0}}
new_flow_logic_register.output_simple(nodename_fountain_empty, fountain_upper, fountain_lower, fountain_neighbours)
new_flow_logic_register.output_simple(nodename_fountain_loaded, fountain_upper, fountain_lower, fountain_neighbours)
local sp_cbox = {
type = "fixed",
fixed = {
{ -2/16, -2/16, -8/16, 2/16, 2/16, 8/16 }
}
}
local nodename_sp_empty = "pipeworks:straight_pipe_empty"
minetest.register_node(nodename_sp_empty, {
description = "Straight-only Pipe",
drawtype = "mesh",
mesh = "pipeworks_straight_pipe"..polys..".obj",
tiles = { "pipeworks_straight_pipe_empty.png" },
paramtype = "light",
paramtype2 = "facedir",
groups = {snappy=3, pipe=1},
sounds = default.node_sound_wood_defaults(),
walkable = true,
on_place = pipeworks.rotate_on_place,
after_dig_node = function(pos)
pipeworks.scan_for_pipe_objects(pos)
end,
selection_box = sp_cbox,
collision_box = sp_cbox,
on_rotate = pipeworks.fix_after_rotation
})
local nodename_sp_loaded = "pipeworks:straight_pipe_loaded"
minetest.register_node(nodename_sp_loaded, {
description = "Straight-only Pipe",
drawtype = "mesh",
mesh = "pipeworks_straight_pipe"..polys..".obj",
tiles = { "pipeworks_straight_pipe_loaded.png" },
paramtype = "light",
paramtype2 = "facedir",
groups = {snappy=3, pipe=1, not_in_creative_inventory=1},
sounds = default.node_sound_wood_defaults(),
walkable = true,
on_place = pipeworks.rotate_on_place,
after_dig_node = function(pos)
pipeworks.scan_for_pipe_objects(pos)
end,
selection_box = sp_cbox,
collision_box = sp_cbox,
drop = "pipeworks:straight_pipe_empty",
on_rotate = pipeworks.fix_after_rotation
})
new_flow_logic_register.directional_horizonal_rotate(nodename_sp_empty, true)
new_flow_logic_register.directional_horizonal_rotate(nodename_sp_loaded, true)
-- Other misc stuff
minetest.register_alias("pipeworks:valve_off_loaded", "pipeworks:valve_off_empty")
minetest.register_alias("pipeworks:entry_panel", "pipeworks:entry_panel_empty")

View File

@ -44,7 +44,8 @@ pipeworks.check_for_inflows = function(pos,node)
source = minetest.get_meta(coords[i]):get_string("source")
if source == minetest.pos_to_string(pos) then break end
end
if string.find(name, "valve") or string.find(name, "sensor") then
if string.find(name, "valve") or string.find(name, "sensor")
or string.find(name, "straight_pipe") or string.find(name, "panel") then
if ((i == 3 or i == 4) and minetest.facedir_to_dir(testnode.param2).x ~= 0)
or ((i == 5 or i == 6) and minetest.facedir_to_dir(testnode.param2).z ~= 0)

View File

@ -1026,92 +1026,92 @@ vt 0.5938 0.5898
vt 0.5938 0.5664
vt 0.5625 0.5898
vt 0.5625 0.5664
vt 0.6340 0.5124
vt 0.6340 0.4980
vt 0.6649 0.4980
vt 0.6649 0.5123
vt 0.6959 0.5124
vt 0.6959 0.4980
vt 0.7268 0.5123
vt 0.7268 0.4980
vt 0.7577 0.5123
vt 0.7578 0.4980
vt 0.7886 0.5124
vt 0.7887 0.4980
vt 0.8196 0.5125
vt 0.8196 0.4980
vt 0.8506 0.4981
vt 0.8505 0.5124
vt 0.8814 0.5125
vt 0.8815 0.4981
vt 0.9123 0.5126
vt 0.9125 0.4982
vt 0.9434 0.5128
vt 0.9436 0.4983
vt 0.9747 0.4983
vt 0.9745 0.5128
vt 1.0057 0.4984
vt 1.0055 0.5128
vt 1.0366 0.5128
vt 1.0367 0.4984
vt 1.0677 0.4984
vt 1.0677 0.5129
vt 1.0988 0.4984
vt 1.0988 0.5128
vt 1.1301 0.5129
vt 1.1297 0.4983
vt 1.1607 0.4982
vt 1.1617 0.5126
vt 1.1934 0.5121
vt 1.1912 0.4978
vt 0.1983 0.5120
vt 0.2004 0.4977
vt 0.2310 0.4981
vt 0.2300 0.5126
vt 0.2617 0.5129
vt 0.2621 0.4982
vt 0.2933 0.4983
vt 0.2932 0.5129
vt 0.3244 0.4982
vt 0.3245 0.5127
vt 0.3553 0.4982
vt 0.3554 0.5126
vt 0.3863 0.4982
vt 0.3864 0.5126
vt 0.4172 0.4981
vt 0.4173 0.5125
vt 0.4481 0.4981
vt 0.4482 0.5124
vt 0.5101 0.5125
vt 0.4791 0.5124
vt 0.4790 0.4981
vt 0.5100 0.4980
vt 0.5720 0.5124
vt 0.5410 0.5124
vt 0.5410 0.4980
vt 0.5719 0.4980
vt 0.6030 0.5125
vt 0.6030 0.4980
vt 0.4516 0.0324
vt 0.4827 0.0325
vt 0.9459 0.0196
vt 0.9458 0.0339
vt 0.9151 0.0339
vt 0.9151 0.0196
vt 0.9767 0.0195
vt 0.9767 0.0339
vt 1.0076 0.0195
vt 1.0075 0.0339
vt 0.8843 0.0339
vt 0.8536 0.0338
vt 0.8844 0.0196
vt 1.0385 0.0195
vt 1.0383 0.0339
vt 0.8537 0.0195
vt 1.0694 0.0196
vt 1.0691 0.0339
vt 0.8229 0.0194
vt 0.8228 0.0338
vt 0.6719 0.5156
vt 0.6719 0.5000
vt 0.7031 0.5000
vt 0.7031 0.5156
vt 0.7344 0.5156
vt 0.7344 0.5000
vt 0.7656 0.5156
vt 0.7656 0.5000
vt 0.7969 0.5156
vt 0.7969 0.5000
vt 0.8281 0.5156
vt 0.8281 0.5000
vt 0.8594 0.5156
vt 0.8594 0.5000
vt 0.8906 0.5000
vt 0.8906 0.5156
vt 0.9219 0.5156
vt 0.9219 0.5000
vt 0.9531 0.5156
vt 0.9531 0.5000
vt 0.9844 0.5156
vt 0.9844 0.5000
vt 1.0156 0.5000
vt 1.0156 0.5156
vt 0.0156 0.5156
vt 0.0156 0.5000
vt 0.0469 0.5000
vt 0.0469 0.5156
vt 0.0781 0.5156
vt 0.0781 0.5000
vt 0.1094 0.5000
vt 0.1094 0.5156
vt 0.1406 0.5000
vt 0.1406 0.5156
vt 0.1719 0.5156
vt 0.1719 0.5000
vt 0.2031 0.5000
vt 0.2031 0.5156
vt 0.2344 0.5156
vt 0.2344 0.5000
vt 0.2656 0.5000
vt 0.2656 0.5156
vt 0.2969 0.5156
vt 0.2969 0.5000
vt 0.3281 0.5000
vt 0.3281 0.5156
vt 0.3594 0.5000
vt 0.3594 0.5156
vt 0.3906 0.5000
vt 0.3906 0.5156
vt 0.4219 0.5000
vt 0.4219 0.5156
vt 0.4531 0.5000
vt 0.4531 0.5156
vt 0.4844 0.5000
vt 0.4844 0.5156
vt 0.5469 0.5156
vt 0.5156 0.5156
vt 0.5156 0.5000
vt 0.5469 0.5000
vt 0.6094 0.5156
vt 0.5781 0.5156
vt 0.5781 0.5000
vt 0.6094 0.5000
vt 0.6406 0.5156
vt 0.6406 0.5000
vt 1.0156 0.0312
vt 0.9844 0.0312
vt 0.9844 0.0156
vt 0.9531 0.0312
vt 0.9531 0.0156
vt 1.0156 0.0156
vt 0.0469 0.0156
vt 0.0469 0.0312
vt 0.0156 0.0312
vt 0.0156 0.0156
vt 0.9219 0.0312
vt 0.8906 0.0312
vt 0.9219 0.0156
vt 0.0781 0.0156
vt 0.0781 0.0312
vt 0.8906 0.0156
vt 0.1094 0.0156
vt 0.1094 0.0312
vt 0.8594 0.0156
vt 0.8594 0.0312
vt 0.6875 0.5898
vt 0.6875 0.5664
vt 0.7188 0.5664
@ -1120,105 +1120,105 @@ vt 0.7812 0.5898
vt 0.7812 0.5664
vt 0.8125 0.5664
vt 0.8125 0.5898
vt 1.1004 0.0197
vt 1.0999 0.0340
vt 0.1406 0.0156
vt 0.1406 0.0312
vt 0.6562 0.5898
vt 0.6562 0.5664
vt 0.7921 0.0194
vt 0.7920 0.0337
vt 0.8281 0.0156
vt 0.8281 0.0312
vt 0.8438 0.5664
vt 0.8438 0.5898
vt 1.1314 0.0198
vt 1.1306 0.0342
vt 0.1719 0.0156
vt 0.1719 0.0312
vt 0.6250 0.5898
vt 0.6250 0.5664
vt 0.7613 0.0193
vt 0.7611 0.0336
vt 0.7969 0.0156
vt 0.7969 0.0312
vt 0.5938 0.5898
vt 0.5938 0.5664
vt 1.1624 0.0202
vt 1.1610 0.0344
vt 0.2031 0.0156
vt 0.2031 0.0312
vt 0.5312 0.5898
vt 0.5312 0.5664
vt 0.5625 0.5664
vt 0.5625 0.5898
vt 0.7304 0.0192
vt 0.7302 0.0335
vt 0.7656 0.0156
vt 0.7656 0.0312
vt 0.8750 0.5664
vt 0.8750 0.5898
vt 1.1934 0.0209
vt 1.1908 0.0349
vt 0.2344 0.0156
vt 0.2344 0.0312
vt 0.5000 0.5898
vt 0.5000 0.5664
vt 0.6995 0.0191
vt 0.6994 0.0334
vt 0.7344 0.0156
vt 0.7344 0.0312
vt 0.9062 0.5664
vt 0.9062 0.5898
vt 0.2320 0.0171
vt 0.2327 0.0318
vt 0.2015 0.0321
vt 0.1997 0.0175
vt 0.2656 0.0156
vt 0.2656 0.0312
vt 0.5312 0.5664
vt 0.5312 0.5898
vt 0.4688 0.5898
vt 0.4688 0.5664
vt 0.3892 0.0320
vt 0.3580 0.0320
vt 0.6686 0.0189
vt 0.6685 0.0333
vt 0.4219 0.0312
vt 0.3906 0.0312
vt 0.7031 0.0156
vt 0.7031 0.0312
vt 0.9375 0.5664
vt 0.9375 0.5898
vt 0.2641 0.0170
vt 0.2642 0.0317
vt 0.2969 0.0156
vt 0.2969 0.0312
vt 0.4375 0.5898
vt 0.4375 0.5664
vt 0.6377 0.0188
vt 0.6375 0.0332
vt 0.6719 0.0156
vt 0.6719 0.0312
vt 0.9688 0.5664
vt 0.9688 0.5898
vt 0.2958 0.0171
vt 0.2956 0.0317
vt 0.3281 0.0156
vt 0.3281 0.0312
vt 0.4062 0.5898
vt 0.4062 0.5664
vt 0.6068 0.0187
vt 0.6066 0.0331
vt 0.6406 0.0156
vt 0.6406 0.0312
vt 0.0000 0.5898
vt 0.0000 0.5664
vt 0.0312 0.5664
vt 0.0312 0.5898
vt 0.3271 0.0173
vt 0.3268 0.0318
vt 0.3594 0.0156
vt 0.3594 0.0312
vt 1.0000 0.5664
vt 1.0000 0.5898
vt 0.5759 0.0186
vt 0.5757 0.0330
vt 0.6094 0.0156
vt 0.6094 0.0312
vt 0.0625 0.5664
vt 0.0625 0.5898
vt 0.7500 0.5664
vt 0.7500 0.5898
vt 0.3583 0.0174
vt 0.3906 0.0156
vt 0.3750 0.5898
vt 0.3750 0.5664
vt 0.5137 0.0327
vt 0.5447 0.0328
vt 0.5450 0.0184
vt 0.5469 0.0312
vt 0.5781 0.0312
vt 0.5781 0.0156
vt 0.0937 0.5664
vt 0.0938 0.5898
vt 0.3895 0.0175
vt 0.4219 0.0156
vt 0.3438 0.5898
vt 0.3438 0.5664
vt 0.5140 0.0183
vt 0.5469 0.0156
vt 0.0938 0.5664
vt 0.1250 0.5664
vt 0.1250 0.5898
vt 0.4208 0.0177
vt 0.4204 0.0322
vt 0.4531 0.0156
vt 0.4531 0.0312
vt 0.3125 0.5898
vt 0.3125 0.5664
vt 0.4830 0.0181
vt 0.5156 0.0156
vt 0.5156 0.0312
vt 0.1562 0.5664
vt 0.1562 0.5898
vt 0.4519 0.0179
vt 0.4844 0.0156
vt 0.4844 0.0312
vt 0.2812 0.5898
vt 0.2812 0.5664
vt 0.2500 0.5898
@ -1803,14 +1803,12 @@ vn 0.1087 0.4686 0.8767
vn 0.1087 0.6306 0.7684
vn 0.2147 0.7550 0.6196
vn 0.1087 0.7684 0.6306
vn -0.1087 -0.0974 0.9893
vn -0.1087 0.0974 0.9893
vn -0.2147 0.0957 -0.9720
vn -0.1087 -0.0974 -0.9893
vn -0.1087 0.0974 -0.9893
vn -0.2147 0.0957 -0.9720
vn -0.1087 0.2886 -0.9513
vn -0.2147 0.2835 -0.9346
vn -0.2147 -0.0957 -0.9720
vn -0.1087 -0.0974 -0.9893
vn -0.2147 -0.2835 -0.9346
vn -0.1087 -0.2886 -0.9513
vn -0.1087 0.4686 -0.8767
@ -1868,7 +1866,9 @@ vn -0.2147 0.2835 0.9346
vn -0.2147 -0.2835 0.9346
vn -0.1087 -0.2886 0.9513
vn -0.2147 0.0957 0.9720
vn -0.1087 0.0974 0.9893
vn -0.2147 -0.0957 0.9720
vn -0.1087 -0.0974 0.9893
vn -0.6100 -0.3032 0.7321
vn 0.0000 -0.3827 0.9239
vn 0.0000 0.6088 0.7933
@ -2093,13 +2093,13 @@ f 8/402/81 7/401/80 40/400/79 41/403/82
f 9/404/83 8/402/81 41/403/82 42/405/84
f 10/406/85 9/404/83 42/405/84 43/407/86
f 10/406/85 43/407/86 44/408/87 11/409/88
f 11/409/88 44/408/87 45/410/89 31/411/90
f 12/412/91 46/413/92 47/414/93 13/415/94
f 31/411/90 45/410/89 46/413/92 12/412/91
f 13/415/94 47/414/93 48/416/95 14/417/96
f 15/418/97 14/417/96 48/416/95 49/419/98
f 15/418/97 49/419/98 50/420/99 16/421/100
f 17/422/101 16/421/100 50/420/99 51/423/102
f 11/410/88 44/411/87 45/412/89 31/413/90
f 12/414/91 46/415/92 47/416/93 13/417/94
f 31/413/90 45/412/89 46/415/92 12/414/91
f 13/417/94 47/416/93 48/418/95 14/419/96
f 15/420/97 14/419/96 48/418/95 49/421/98
f 15/420/97 49/421/98 50/422/99 16/423/100
f 17/424/101 16/423/100 50/422/99 51/425/102
f 17/424/101 51/425/102 52/426/103 18/427/104
f 19/428/105 18/427/104 52/426/103 53/429/106
f 19/428/105 53/429/106 54/430/107 20/431/108
@ -2114,74 +2114,74 @@ f 28/446/123 26/447/124 62/448/125 63/449/126
f 27/442/119 61/445/122 62/448/125 26/447/124
f 29/450/127 28/446/123 63/449/126 64/451/128
f 29/450/127 64/451/128 33/387/66 30/386/65
f 60/444/121 59/440/117 125/452/129 123/453/130
f 70/454/131 66/455/132 65/456/133 71/457/134
f 72/458/135 67/459/136 66/455/132 70/454/131
f 74/460/137 68/461/138 67/459/136 72/458/135
f 69/462/139 41/403/82 40/400/79 75/463/140
f 71/457/134 65/456/133 69/462/139 76/464/141
f 78/465/142 73/466/143 68/461/138 74/460/137
f 80/467/144 76/464/141 69/462/139 75/463/140
f 82/468/145 77/469/146 73/466/143 78/465/142
f 84/470/147 80/467/144 75/463/140 79/471/148
f 67/452/129 44/408/87 43/407/86 66/453/130
f 70/454/131 66/453/130 65/455/132 71/456/133
f 72/457/134 67/452/129 66/453/130 70/454/131
f 74/458/135 68/459/136 67/460/129 72/461/134
f 69/462/137 41/403/82 40/400/79 75/463/138
f 71/456/133 65/455/132 69/462/137 76/464/139
f 78/465/140 73/466/141 68/459/136 74/458/135
f 80/467/142 76/464/139 69/462/137 75/463/138
f 82/468/143 77/469/144 73/466/141 78/465/140
f 84/470/145 80/467/142 75/463/138 79/471/146
f 388/472/18 392/473/17 393/474/19 385/475/20
f 387/476/24 395/477/23 396/478/25 389/479/26
f 86/480/149 81/481/150 77/469/146 82/468/145
f 86/480/147 81/481/148 77/469/144 82/468/143
f 391/482/16 398/483/15 392/473/17 388/472/18
f 88/484/151 84/470/147 79/471/148 83/485/152
f 88/484/149 84/470/145 79/471/146 83/485/150
f 389/479/26 396/478/25 400/486/27 399/487/28
f 90/488/153 85/489/154 81/481/150 86/480/149
f 90/488/151 85/489/152 81/481/148 86/480/147
f 390/490/14 403/491/13 398/483/15 391/482/16
f 92/492/155 88/484/151 83/485/152 87/493/156
f 92/492/153 88/484/149 83/485/150 87/493/154
f 397/494/12 402/495/11 403/491/13 390/490/14
f 94/496/157 89/497/158 85/489/154 90/488/153
f 94/496/155 89/497/156 85/489/152 90/488/151
f 406/498/8 411/499/7 407/500/9 401/501/10
f 96/502/159 92/492/155 87/493/156 91/503/160
f 96/502/157 92/492/153 87/493/154 91/503/158
f 399/487/28 400/486/27 405/504/29 404/505/30
f 98/506/161 93/507/162 89/497/158 94/496/157
f 98/506/159 93/507/160 89/497/156 94/496/155
f 410/508/4 415/509/3 411/499/7 406/498/8
f 100/510/163 96/502/159 91/503/160 95/511/164
f 100/510/161 96/502/157 91/503/158 95/511/162
f 404/505/30 405/504/29 409/512/31 408/513/32
f 102/514/165 97/515/166 93/516/162 98/517/161
f 355/324/6 322/323/5 321/518/167 353/519/168
f 414/520/5 420/521/6 415/509/3 410/508/4
f 36/393/72 91/503/160 87/493/156 37/395/74
f 117/522/169 57/436/113 56/434/111 113/523/170
f 104/524/171 100/510/163 95/511/164 99/525/172
f 408/513/32 409/512/31 413/526/33 412/527/34
f 106/528/173 101/529/174 97/515/166 102/514/165
f 419/530/167 424/531/168 420/521/6 414/520/5
f 108/532/175 104/524/171 99/525/172 103/533/176
f 412/527/34 413/526/33 418/534/35 417/535/36
f 110/536/177 105/537/178 101/529/174 106/528/173
f 423/538/64 428/539/63 424/531/168 419/530/167
f 112/540/179 108/532/175 103/533/176 107/541/180
f 416/542/38 422/543/37 426/544/39 421/545/40
f 110/536/177 114/546/181 109/547/182 105/537/178
f 417/535/36 418/534/35 422/548/37 416/549/38
f 116/550/183 112/540/179 107/541/180 111/551/184
f 421/545/40 426/544/39 430/552/41 425/553/42
f 385/475/20 393/474/19 394/554/21 386/555/22
f 118/556/185 113/523/170 109/547/182 114/546/181
f 427/557/62 432/558/61 428/539/63 423/538/64
f 61/445/122 119/559/186 115/560/187 62/448/125
f 120/561/188 116/550/183 111/551/184 115/560/187
f 425/553/42 430/552/41 434/562/43 429/563/44
f 118/556/185 122/564/189 117/522/169 113/523/170
f 431/565/58 436/566/57 432/558/61 427/557/62
f 124/567/190 120/561/188 115/560/187 119/559/186
f 429/563/44 434/568/43 439/569/48 433/570/47
f 122/564/189 126/571/191 121/572/192 117/522/169
f 435/573/59 441/574/60 436/566/57 431/565/58
f 102/514/163 97/515/164 93/507/160 98/506/159
f 355/324/6 322/323/5 321/516/165 353/517/166
f 414/518/5 420/519/6 415/509/3 410/508/4
f 36/393/72 91/503/158 87/493/154 37/395/74
f 117/520/167 57/436/113 56/434/111 113/521/168
f 104/522/169 100/510/161 95/511/162 99/523/170
f 408/513/32 409/512/31 413/524/33 412/525/34
f 106/526/171 101/527/172 97/515/164 102/514/163
f 419/528/165 424/529/166 420/519/6 414/518/5
f 108/530/173 104/522/169 99/523/170 103/531/174
f 412/525/34 413/524/33 418/532/35 417/533/36
f 110/534/175 105/535/176 101/527/172 106/526/171
f 423/536/64 428/537/63 424/529/166 419/528/165
f 112/538/177 108/530/173 103/531/174 107/539/178
f 416/540/38 422/541/37 426/542/39 421/543/40
f 110/534/175 114/544/179 109/545/180 105/535/176
f 417/533/36 418/532/35 422/546/37 416/547/38
f 116/548/181 112/538/177 107/539/178 111/549/182
f 421/543/40 426/542/39 430/550/41 425/551/42
f 385/475/20 393/474/19 394/552/21 386/553/22
f 118/554/183 113/521/168 109/545/180 114/544/179
f 427/555/62 432/556/61 428/537/63 423/536/64
f 61/445/122 119/557/184 115/558/185 62/448/125
f 120/559/186 116/548/181 111/549/182 115/558/185
f 425/551/42 430/550/41 434/560/43 429/561/44
f 118/554/183 122/562/187 117/520/167 113/521/168
f 431/563/58 436/564/57 432/556/61 427/555/62
f 124/565/188 120/559/186 115/558/185 119/557/184
f 429/561/44 434/566/43 439/567/48 433/568/47
f 122/562/187 126/569/189 121/570/190 117/520/167
f 435/571/59 441/572/60 436/564/57 431/563/58
f 401/501/10 407/500/9 402/495/11 397/494/12
f 127/575/193 124/567/190 119/559/186 123/453/130
f 433/570/47 439/569/48 445/576/45 438/577/46
f 126/571/191 128/578/194 125/452/129 121/572/192
f 440/579/56 437/580/55 441/574/60 435/573/59
f 128/578/194 127/575/193 123/453/130 125/452/129
f 386/555/22 394/554/21 395/477/23 387/476/24
f 127/573/191 124/565/188 119/557/184 123/574/192
f 433/568/47 439/567/48 445/575/45 438/576/46
f 126/569/189 128/577/193 125/578/194 121/570/190
f 440/579/56 437/580/55 441/572/60 435/571/59
f 128/577/193 127/573/191 123/574/192 125/578/194
f 386/553/22 394/552/21 395/477/23 387/476/24
f 446/581/54 443/582/53 437/580/55 440/579/56
f 438/577/46 445/576/45 444/583/49 447/584/50
f 438/576/46 445/575/45 444/583/49 447/584/50
f 448/585/52 442/586/51 443/582/53 446/581/54
f 447/584/50 444/583/49 442/586/51 448/585/52
f 129/587/195 130/588/196 131/589/197 132/590/198
@ -2280,32 +2280,31 @@ f 312/800/266 311/799/254 318/803/259 313/804/263
f 313/804/263 318/803/259 319/805/257 314/806/261
f 314/807/261 319/808/257 320/809/255 315/810/262
f 315/810/262 320/809/255 317/802/251 316/801/264
f 54/430/107 53/429/106 101/529/174 105/537/178
f 64/451/128 107/541/180 103/533/176 33/387/66
f 125/452/129 59/440/117 58/438/115 121/572/192
f 65/456/133 42/405/84 41/403/82 69/462/139
f 62/448/125 115/560/187 111/551/184 63/449/126
f 89/497/158 93/507/162 51/423/102 50/420/99
f 38/397/76 37/395/74 87/493/156 83/485/152
f 121/572/192 58/438/115 57/436/113 117/522/169
f 61/445/122 60/444/121 123/453/130 119/559/186
f 64/451/128 63/449/126 111/551/184 107/541/180
f 39/399/78 79/471/148 75/463/140 40/400/79
f 35/391/70 34/388/67 99/525/172 95/511/164
f 55/432/109 109/547/182 113/523/170 56/434/111
f 36/393/72 35/391/70 95/511/164 91/503/160
f 55/432/109 54/430/107 105/537/178 109/547/182
f 49/419/98 48/416/95 81/481/150 85/489/154
f 353/519/168 321/518/167 346/385/64 354/384/63
f 67/459/136 44/408/87 43/407/86 66/455/132
f 43/407/86 42/405/84 65/456/133 66/455/132
f 52/426/103 51/425/102 93/516/162 97/515/166
f 45/410/89 68/461/138 73/466/143 46/413/92
f 46/413/92 73/466/143 77/469/146 47/414/93
f 44/408/87 67/459/136 68/461/138 45/410/89
f 52/426/103 97/515/166 101/529/174 53/429/106
f 34/388/67 33/387/66 103/533/176 99/525/172
f 89/497/158 50/420/99 49/419/98 85/489/154
f 54/430/107 53/429/106 101/527/172 105/535/176
f 64/451/128 107/539/178 103/531/174 33/387/66
f 125/578/194 59/440/117 58/438/115 121/570/190
f 65/455/132 42/405/84 41/403/82 69/462/137
f 62/448/125 115/558/185 111/549/182 63/449/126
f 89/497/156 93/507/160 51/425/102 50/422/99
f 38/397/76 37/395/74 87/493/154 83/485/150
f 121/570/190 58/438/115 57/436/113 117/520/167
f 61/445/122 60/444/121 123/574/192 119/557/184
f 64/451/128 63/449/126 111/549/182 107/539/178
f 125/578/194 123/574/192 60/444/121 59/440/117
f 39/399/78 79/471/146 75/463/138 40/400/79
f 35/391/70 34/388/67 99/523/170 95/511/162
f 55/432/109 109/545/180 113/521/168 56/434/111
f 55/432/109 54/430/107 105/535/176 109/545/180
f 49/421/98 48/418/95 81/481/148 85/489/152
f 353/517/166 321/516/165 346/385/64 354/384/63
f 36/393/72 35/391/70 95/511/162 91/503/158
f 43/407/86 42/405/84 65/455/132 66/453/130
f 45/412/89 68/459/136 73/466/141 46/415/92
f 46/415/92 73/466/141 77/469/144 47/416/93
f 44/411/87 67/460/129 68/459/136 45/412/89
f 52/426/103 97/515/164 101/527/172 53/429/106
f 34/388/67 33/387/66 103/531/174 99/523/170
f 89/497/156 50/422/99 49/421/98 85/489/152
f 449/811/267 450/812/268 451/813/269 452/814/270
f 456/815/271 457/816/272 450/812/268 449/811/267
f 452/814/270 451/813/269 458/817/273 453/818/274
@ -2402,5 +2401,6 @@ f 632/1024/338 631/1023/326 638/1027/331 633/1028/335
f 633/1028/335 638/1027/331 639/1029/329 634/1030/333
f 634/1031/333 639/1032/329 640/1033/327 635/1034/334
f 635/1034/334 640/1033/327 637/1026/323 636/1025/336
f 38/397/76 83/485/152 79/471/148 39/399/78
f 81/481/150 48/416/95 47/414/93 77/469/146
f 38/397/76 83/485/150 79/471/146 39/399/78
f 81/481/148 48/418/95 47/416/93 77/469/144
f 51/425/102 93/507/160 97/515/164 52/426/103

View File

@ -1,54 +1,54 @@
# Blender v2.78 (sub 0) OBJ File: 'pipe-master-lowpoly.blend'
# www.blender.org
o Cylinder.000_Cylinder.000_None
v -0.468750 -0.156250 -0.064721
v -0.468750 -0.064721 -0.156250
v -0.468750 0.064721 -0.156250
v -0.468750 0.156250 -0.064721
v -0.468750 0.156250 0.064721
v -0.468750 0.064721 0.156250
v -0.468750 -0.064721 0.156250
v -0.468750 -0.156250 0.064721
v -0.500000 -0.064721 -0.156250
v -0.500000 -0.156250 -0.064721
v -0.500000 -0.156250 0.064721
v -0.500000 -0.064721 0.156250
v -0.500000 0.064721 0.156250
v -0.500000 0.156250 0.064721
v -0.500000 0.156250 -0.064721
v -0.500000 0.064721 -0.156250
v 0.500000 -0.156250 -0.064721
v 0.500000 -0.064721 -0.156250
v 0.500000 0.064721 -0.156250
v 0.500000 0.156250 -0.064721
v 0.500000 0.156250 0.064721
v 0.500000 0.064721 0.156250
o Cylinder.000
v 0.500000 -0.064721 0.156250
v 0.500000 -0.156250 0.064721
v 0.468750 -0.064721 -0.156250
v 0.468750 -0.156250 -0.064721
v 0.468750 -0.156250 0.064721
v 0.468750 -0.064721 0.156250
v 0.468750 0.064721 0.156250
v 0.468750 0.156250 0.064721
v 0.468750 0.156250 -0.064721
v 0.500000 -0.156250 0.064721
v 0.468750 -0.156250 0.064721
v 0.500000 -0.156250 -0.064721
v 0.468750 -0.156250 -0.064721
v 0.500000 -0.064721 -0.156250
v 0.468750 -0.064721 -0.156250
v 0.500000 0.064721 -0.156250
v 0.468750 0.064721 -0.156250
v 0.468750 0.125000 -0.051777
v 0.468750 0.051777 -0.125000
v -0.468750 0.051777 -0.125000
v -0.468750 0.125000 -0.051777
v 0.468750 0.051777 0.125000
v 0.468750 0.125000 0.051777
v -0.468750 0.125000 0.051777
v -0.468750 0.051777 0.125000
v 0.500000 0.156250 -0.064721
v 0.468750 0.156250 -0.064721
v 0.500000 0.156250 0.064721
v 0.468750 0.156250 0.064721
v 0.500000 0.064721 0.156250
v 0.468750 0.064721 0.156250
v 0.468750 -0.051777 0.125000
v -0.468750 -0.051777 0.125000
v -0.468750 -0.125000 0.051777
v 0.468750 -0.125000 0.051777
v -0.468750 -0.125000 -0.051777
v -0.468750 -0.051777 -0.125000
v 0.468750 -0.051777 -0.125000
v -0.468750 -0.125000 0.051777
v 0.468750 -0.125000 -0.051777
v -0.468750 -0.125000 -0.051777
v 0.468750 -0.051777 -0.125000
v -0.468750 -0.051777 -0.125000
v 0.468750 0.051777 -0.125000
v -0.468750 0.051777 -0.125000
v 0.468750 0.125000 -0.051777
v -0.468750 0.125000 -0.051777
v 0.468750 0.125000 0.051777
v -0.468750 0.125000 0.051777
v 0.468750 0.051777 0.125000
v -0.468750 0.051777 0.125000
v -0.468750 -0.064721 0.156250
v -0.500000 -0.064721 0.156250
v -0.468750 -0.156250 0.064721
v -0.500000 -0.156250 0.064721
v -0.468750 -0.156250 -0.064721
v -0.500000 -0.156250 -0.064721
v -0.468750 -0.064721 -0.156250
v -0.500000 -0.064721 -0.156250
v -0.468750 0.064721 -0.156250
v -0.500000 0.064721 -0.156250
v -0.468750 0.156250 -0.064721
v -0.500000 0.156250 -0.064721
v -0.468750 0.156250 0.064721
v -0.500000 0.156250 0.064721
v -0.468750 0.064721 0.156250
v -0.500000 0.064721 0.156250
vt 0.7188 0.8906
vt 0.6250 0.9844
vt 0.5000 0.9844
@ -117,80 +117,78 @@ vt 0.1875 0.5625
vt 0.1875 0.5938
vt 0.2500 0.5625
vt 0.2500 0.5938
vt 0.6507 0.5135
vt 0.5253 0.5135
vt 0.5253 0.0130
vt 0.6507 0.0130
vt 0.9015 0.5135
vt 0.7761 0.5135
vt 0.7761 0.0130
vt 0.9015 0.0130
vt 0.0269 0.5135
vt 0.0269 0.0130
vt 0.1523 0.0130
vt 0.1523 0.5135
vt 0.2743 0.0130
vt 0.3999 0.0130
vt 0.3999 0.5135
vt 0.2743 0.5135
vt 0.1489 0.0130
vt 0.1489 0.5135
vt 1.0269 0.5135
vt 1.0269 0.0130
vn 1.0000 0.0000 0.0000
vn -1.0000 -0.0000 0.0000
vn -0.6302 -0.2971 -0.7173
vn 0.6302 -0.2971 -0.7173
vn 0.6302 -0.7173 -0.2971
vn -0.6302 -0.7173 -0.2971
vn 0.6302 -0.7173 0.2971
vn -0.6302 -0.7173 0.2971
vt 1.0625 0.5156
vt 0.9375 0.5156
vt 0.9375 0.0156
vt 1.0625 0.0156
vt 0.6875 0.5156
vt 0.5625 0.5156
vt 0.5625 0.0156
vt 0.6875 0.0156
vt 0.8125 0.5156
vt 0.8125 0.0156
vt 0.0625 0.5156
vt 0.0625 0.0156
vt 0.1875 0.0156
vt 0.1875 0.5156
vt 0.3125 0.0156
vt 0.4375 0.0156
vt 0.4375 0.5156
vt 0.3125 0.5156
vn -1.0000 0.0000 0.0000
vn 1.0000 0.0000 -0.0000
vn 0.6302 -0.2971 0.7173
vn -0.6302 -0.2971 0.7173
vn 0.6302 0.2971 0.7173
vn -0.6302 0.2971 0.7173
vn 0.6302 0.7173 0.2971
vn -0.6302 0.7173 0.2971
vn 0.6302 0.7173 -0.2971
vn -0.6302 0.7173 -0.2971
vn 0.6302 0.2971 -0.7173
vn -0.6302 -0.7173 0.2971
vn 0.6302 -0.7173 0.2971
vn -0.6302 -0.7173 -0.2971
vn 0.6302 -0.7173 -0.2971
vn -0.6302 -0.2971 -0.7173
vn 0.6302 -0.2971 -0.7173
vn -0.6302 0.2971 -0.7173
vn 0.0000 0.9239 -0.3827
vn 0.0000 0.3827 -0.9239
vn 0.0000 0.3827 0.9239
vn 0.0000 0.9239 0.3827
vn 0.0000 -0.3827 0.9239
vn 0.0000 -0.9239 0.3827
vn 0.0000 -0.9239 -0.3827
vn 0.6302 0.2971 -0.7173
vn -0.6302 0.7173 -0.2971
vn 0.6302 0.7173 -0.2971
vn -0.6302 0.7173 0.2971
vn 0.6302 0.7173 0.2971
vn -0.6302 0.2971 0.7173
vn 0.6302 0.2971 0.7173
vn 0.0000 -0.3827 -0.9239
g Cylinder.000_Cylinder.000_None_Cylinder.000_Cylinder.000_None_None
vn 0.0000 0.3827 -0.9239
vn 0.0000 0.9239 0.3827
vn 0.0000 0.3827 0.9239
vn 0.0000 0.9239 -0.3827
vn 0.0000 -0.9239 -0.3827
vn 0.0000 -0.9239 0.3827
vn 0.0000 -0.3827 0.9239
g Cylinder.000_Cylinder.000_None
s off
f 1/1/1 2/2/1 3/3/1 4/4/1 5/5/1 6/6/1 7/7/1 8/8/1
f 9/9/2 10/10/2 11/11/2 12/12/2 13/13/2 14/14/2 15/15/2 16/16/2
f 17/17/1 18/18/1 19/19/1 20/20/1 21/21/1 22/22/1 23/23/1 24/24/1
f 25/25/2 26/26/2 27/27/2 28/28/2 29/29/2 30/30/2 31/31/2 32/32/2
f 4/1/1 2/2/1 16/3/1 14/4/1 12/5/1 10/6/1 8/7/1 6/8/1
f 1/9/2 3/10/2 5/11/2 7/12/2 9/13/2 11/14/2 13/15/2 15/16/2
f 36/17/1 34/18/1 48/19/1 46/20/1 44/21/1 42/22/1 40/23/1 38/24/1
f 33/25/2 35/26/2 37/27/2 39/28/2 41/29/2 43/30/2 45/31/2 47/32/2
s 1
f 9/33/3 2/34/4 1/35/5 10/36/6
f 10/36/6 1/35/5 8/37/7 11/38/8
f 11/38/8 8/37/7 7/39/9 12/40/10
f 12/41/10 7/42/9 6/43/11 13/44/12
f 13/44/12 6/43/11 5/45/13 14/46/14
f 14/46/14 5/45/13 4/47/15 15/48/16
f 15/48/16 4/47/15 3/49/17 16/50/18
f 16/50/18 3/49/17 2/34/4 9/33/3
f 26/51/6 17/52/5 24/53/7 27/54/8
f 25/55/3 18/56/4 17/52/5 26/51/6
f 27/54/8 24/53/7 23/57/9 28/58/10
f 28/59/10 23/60/9 22/61/11 29/62/12
f 29/62/12 22/61/11 21/63/13 30/64/14
f 30/64/14 21/63/13 20/65/15 31/66/16
f 31/66/16 20/65/15 19/67/17 32/68/18
f 32/68/18 19/67/17 18/56/4 25/55/3
f 33/69/19 34/70/20 35/71/20 36/72/19
f 37/73/21 38/74/22 39/75/22 40/76/21
f 41/77/23 42/78/23 43/79/24 44/80/24
f 33/69/19 36/72/19 39/75/22 38/74/22
f 45/81/25 46/82/26 47/83/26 48/84/25
f 43/85/24 45/81/25 48/84/25 44/86/24
f 41/87/23 37/73/21 40/76/21 42/88/23
f 46/82/26 35/71/20 34/70/20 47/83/26
f 1/33/3 2/34/4 4/35/5 3/36/6
f 3/36/6 4/35/5 6/37/7 5/38/8
f 5/38/8 6/37/7 8/39/9 7/40/10
f 7/41/10 8/42/9 10/43/11 9/44/12
f 9/44/12 10/43/11 12/45/13 11/46/14
f 11/46/14 12/45/13 14/47/15 13/48/16
f 13/48/16 14/47/15 16/49/17 15/50/18
f 15/50/18 16/49/17 2/34/4 1/33/3
f 35/51/6 36/52/5 38/53/7 37/54/8
f 33/55/3 34/56/4 36/52/5 35/51/6
f 37/54/8 38/53/7 40/57/9 39/58/10
f 39/59/10 40/60/9 42/61/11 41/62/12
f 41/62/12 42/61/11 44/63/13 43/64/14
f 43/64/14 44/63/13 46/65/15 45/66/16
f 45/66/16 46/65/15 48/67/17 47/68/18
f 47/68/18 48/67/17 34/56/4 33/55/3
f 24/69/19 26/70/20 25/71/20 23/72/19
f 30/73/21 32/74/22 31/75/22 29/76/21
f 26/70/20 28/77/23 27/78/23 25/71/20
f 24/79/19 23/80/19 21/81/24 22/82/24
f 19/83/25 17/84/26 18/85/26 20/86/25
f 21/81/24 19/83/25 20/86/25 22/82/24
f 30/73/21 29/76/21 27/78/23 28/77/23
f 17/84/26 31/75/22 32/74/22 18/85/26

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,194 @@
# Blender v2.78 (sub 0) OBJ File: ''
# www.blender.org
o Cylinder.000_Cylinder.000_None
v 0.064721 -0.156250 -0.468750
v 0.156250 -0.064721 -0.468750
v 0.156250 0.064721 -0.468750
v 0.064721 0.156250 -0.468750
v -0.064721 0.156250 -0.468750
v -0.156250 0.064721 -0.468750
v -0.156250 -0.064721 -0.468750
v -0.064721 -0.156250 -0.468750
v 0.156250 -0.064721 -0.500000
v 0.064721 -0.156250 -0.500000
v -0.064721 -0.156250 -0.500000
v -0.156250 -0.064721 -0.500000
v -0.156250 0.064721 -0.500000
v -0.064721 0.156250 -0.500000
v 0.064721 0.156250 -0.500000
v 0.156250 0.064721 -0.500000
v 0.064721 -0.156250 0.500000
v 0.156250 -0.064721 0.500000
v 0.156250 0.064721 0.500000
v 0.064721 0.156250 0.500000
v -0.064721 0.156250 0.500000
v -0.156250 0.064721 0.500000
v -0.156250 -0.064721 0.500000
v -0.064721 -0.156250 0.500000
v 0.156250 -0.064721 0.468750
v 0.064721 -0.156250 0.468750
v -0.064721 -0.156250 0.468750
v -0.156250 -0.064721 0.468750
v -0.156250 0.064721 0.468750
v -0.064721 0.156250 0.468750
v 0.064721 0.156250 0.468750
v 0.156250 0.064721 0.468750
v -0.125000 -0.051777 0.468750
v -0.125000 0.051777 0.468750
v -0.125000 0.051777 -0.468750
v -0.125000 -0.051777 -0.468750
v 0.051777 0.125000 0.468750
v 0.125000 0.051777 0.468750
v 0.125000 0.051777 -0.468750
v 0.051777 0.125000 -0.468750
v -0.051777 0.125000 0.468750
v -0.051777 0.125000 -0.468750
v -0.051777 -0.125000 -0.468750
v -0.051777 -0.125000 0.468750
v 0.051777 -0.125000 -0.468750
v 0.125000 -0.051777 -0.468750
v 0.125000 -0.051777 0.468750
v 0.051777 -0.125000 0.468750
vt 0.7188 0.8906
vt 0.6250 0.9844
vt 0.5000 0.9844
vt 0.4062 0.8906
vt 0.4062 0.7656
vt 0.5000 0.6719
vt 0.6250 0.6719
vt 0.7188 0.7656
vt 0.2500 0.9844
vt 0.3438 0.8906
vt 0.3438 0.7656
vt 0.2500 0.6719
vt 0.1250 0.6719
vt 0.0312 0.7656
vt 0.0312 0.8906
vt 0.1250 0.9844
vt 0.3438 0.8906
vt 0.2500 0.9844
vt 0.1250 0.9844
vt 0.0312 0.8906
vt 0.0312 0.7656
vt 0.1250 0.6719
vt 0.2500 0.6719
vt 0.3438 0.7656
vt 0.6250 0.9844
vt 0.7188 0.8906
vt 0.7188 0.7656
vt 0.6250 0.6719
vt 0.5000 0.6719
vt 0.4062 0.7656
vt 0.4062 0.8906
vt 0.5000 0.9844
vt 0.8125 0.5938
vt 0.8125 0.5625
vt 0.8750 0.5625
vt 0.8750 0.5938
vt 0.9375 0.5625
vt 0.9375 0.5938
vt 1.0000 0.5625
vt 1.0000 0.5938
vt 0.5000 0.5938
vt 0.5000 0.5625
vt 0.5625 0.5625
vt 0.5625 0.5938
vt 0.6250 0.5625
vt 0.6250 0.5938
vt 0.6875 0.5625
vt 0.6875 0.5938
vt 0.7500 0.5625
vt 0.7500 0.5938
vt 0.3750 0.5938
vt 0.3750 0.5625
vt 0.4375 0.5625
vt 0.4375 0.5938
vt 0.3125 0.5938
vt 0.3125 0.5625
vt 0.5000 0.5625
vt 0.5000 0.5938
vt 0.0000 0.5938
vt 0.0000 0.5625
vt 0.0625 0.5625
vt 0.0625 0.5938
vt 0.1250 0.5625
vt 0.1250 0.5938
vt 0.1875 0.5625
vt 0.1875 0.5938
vt 0.2500 0.5625
vt 0.2500 0.5938
vt 1.0624 0.5135
vt 0.9370 0.5135
vt 0.9370 0.0130
vt 1.0624 0.0130
vt 0.6862 0.5135
vt 0.5608 0.5135
vt 0.5608 0.0130
vt 0.6862 0.0130
vt 0.8116 0.5135
vt 0.8116 0.0130
vt 1.1878 0.0130
vt 1.1878 0.5135
vt 0.3100 0.0130
vt 0.4354 0.0130
vt 0.4354 0.5135
vt 0.3100 0.5135
vt 0.1846 0.0130
vt 0.1846 0.5135
vn -0.0000 0.0000 1.0000
vn 0.0000 0.0000 -1.0000
vn 0.7173 -0.2971 -0.6302
vn 0.7173 -0.2971 0.6302
vn 0.2971 -0.7173 0.6302
vn 0.2971 -0.7173 -0.6302
vn -0.2971 -0.7173 0.6302
vn -0.2971 -0.7173 -0.6302
vn -0.7173 -0.2971 0.6302
vn -0.7173 -0.2971 -0.6302
vn -0.7173 0.2971 0.6302
vn -0.7173 0.2971 -0.6302
vn -0.2971 0.7173 0.6302
vn -0.2971 0.7173 -0.6302
vn 0.2971 0.7173 0.6302
vn 0.2971 0.7173 -0.6302
vn 0.7173 0.2971 0.6302
vn 0.7173 0.2971 -0.6302
vn -0.9239 -0.3827 -0.0000
vn -0.9239 0.3827 -0.0000
vn 0.3827 0.9239 0.0000
vn 0.9239 0.3827 0.0000
vn -0.3827 0.9239 -0.0000
vn -0.3827 -0.9239 -0.0000
vn 0.3827 -0.9239 0.0000
vn 0.9239 -0.3827 0.0000
g Cylinder.000_Cylinder.000_None_Cylinder.000_Cylinder.000_None_None
s off
f 1/1/1 2/2/1 3/3/1 4/4/1 5/5/1 6/6/1 7/7/1 8/8/1
f 9/9/2 10/10/2 11/11/2 12/12/2 13/13/2 14/14/2 15/15/2 16/16/2
f 17/17/1 18/18/1 19/19/1 20/20/1 21/21/1 22/22/1 23/23/1 24/24/1
f 25/25/2 26/26/2 27/27/2 28/28/2 29/29/2 30/30/2 31/31/2 32/32/2
s 1
f 9/33/3 2/34/4 1/35/5 10/36/6
f 10/36/6 1/35/5 8/37/7 11/38/8
f 11/38/8 8/37/7 7/39/9 12/40/10
f 12/41/10 7/42/9 6/43/11 13/44/12
f 13/44/12 6/43/11 5/45/13 14/46/14
f 14/46/14 5/45/13 4/47/15 15/48/16
f 15/48/16 4/47/15 3/49/17 16/50/18
f 16/50/18 3/49/17 2/34/4 9/33/3
f 26/51/6 17/52/5 24/53/7 27/54/8
f 25/55/3 18/56/4 17/52/5 26/51/6
f 27/54/8 24/53/7 23/57/9 28/58/10
f 28/59/10 23/60/9 22/61/11 29/62/12
f 29/62/12 22/61/11 21/63/13 30/64/14
f 30/64/14 21/63/13 20/65/15 31/66/16
f 31/66/16 20/65/15 19/67/17 32/68/18
f 32/68/18 19/67/17 18/56/4 25/55/3
f 33/69/19 34/70/20 35/71/20 36/72/19
f 37/73/21 38/74/22 39/75/22 40/76/21
f 34/70/20 41/77/23 42/78/23 35/71/20
f 33/69/19 36/72/19 43/79/24 44/80/24
f 45/81/25 46/82/26 47/83/26 48/84/25
f 43/85/24 45/81/25 48/84/25 44/86/24
f 37/73/21 40/76/21 42/78/23 41/77/23
f 46/82/26 39/75/22 38/74/22 47/83/26

View File

@ -191,35 +191,32 @@ if REGISTER_COMPATIBILITY then
})
end
local valve_on = "pipeworks:valve_on_empty"
local valve_off = "pipeworks:valve_off_empty"
local entry_panel_empty = "pipeworks:entry_panel_empty"
local flow_sensor_empty = "pipeworks:flow_sensor_empty"
local sp_empty = "pipeworks:straight_pipe_empty"
-- XXX: why aren't these in devices.lua!?
table.insert(pipes_empty_nodenames, valve_on)
table.insert(pipes_empty_nodenames, valve_off)
table.insert(pipes_empty_nodenames, entry_panel_empty)
table.insert(pipes_empty_nodenames, flow_sensor_empty)
table.insert(pipes_empty_nodenames, sp_empty)
local valve_on_loaded = "pipeworks:valve_on_loaded"
local entry_panel_loaded = "pipeworks:entry_panel_loaded"
local flow_sensor_loaded = "pipeworks:flow_sensor_loaded"
local sp_loaded = "pipeworks:straight_pipe_loaded"
table.insert(pipes_full_nodenames, valve_on_loaded)
table.insert(pipes_full_nodenames, entry_panel_loaded)
table.insert(pipes_full_nodenames, flow_sensor_loaded)
table.insert(pipes_full_nodenames, sp_loaded)
pipeworks.pipes_full_nodenames = pipes_full_nodenames
pipeworks.pipes_empty_nodenames = pipes_empty_nodenames
if pipeworks.toggles.pipe_mode == "classic" then
minetest.register_abm({
nodenames = pipes_empty_nodenames,
interval = 1,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

@ -72,6 +72,9 @@ local digiline_def = {
receptor = {action = function() end},
effector = {
action = function(pos, node, channel, msg)
if type(msg) ~= "string" then
return
end
local meta = minetest.get_meta(pos)
if channel ~= meta:get_string("channel") then
return
@ -90,7 +93,7 @@ local digiline_def = {
meta:set_int("enabled", 1)
elseif msg == "toggle" then
local onn = meta:get_int("enabled")
onn = -(onn-1) -- Mirror onn with pivot 0.5, so switch between 1 and 0.
onn = 1-onn -- Mirror onn with pivot 0.5, so switch between 1 and 0.
meta:set_int("enabled", onn)
elseif msg:sub(1, 5) == "power" then
local power = tonumber(msg:sub(7))
@ -103,6 +106,8 @@ local digiline_def = {
meta:set_int("power", power)
elseif msg:sub(1, 12) == "mesecon_mode" then
meta:set_int("mesecon_mode", tonumber(msg:sub(14)))
else
return
end
set_supply_converter_formspec(meta)
end