diff --git a/api.lua b/api.lua index d17b255..e615100 100644 --- a/api.lua +++ b/api.lua @@ -2,7 +2,7 @@ local utils = ... --- function (spawn_pos, itemstack, owner, spawner_pos, spawner_dir) +-- function (spawn_pos, itemstack, owner, spawner_pos, spawner_dir, force) function lwcomponents.register_spawner (itemname, spawn_func) return utils.register_spawner (itemname, spawn_func) end diff --git a/change.log b/change.log index 3689777..0a972a4 100644 --- a/change.log +++ b/change.log @@ -43,3 +43,14 @@ v0.1.7 * Fixed fan description. * Breakers can break nodes up to 5 forward with digilines message. * Added deployers. + + +v0.1.8 +* Changed detector digilines message to single message with list of + detected items. +* Added conduits. +* Fixed fans not blowing upward. +* Made changes to lwcomponents.register_spawner api - called function + must now set velocity, can use force parameter. +* Removed spawning from this mod. Created lwcomponents_spawners to + register spawers. diff --git a/conduit.lua b/conduit.lua new file mode 100644 index 0000000..9a0c810 --- /dev/null +++ b/conduit.lua @@ -0,0 +1,748 @@ +local utils, mod_storage = ... +local S = utils.S + + + +if utils.digilines_supported or utils.mesecon_supported then + + + +local transfer_rate = 0.1 +local conduit_interval = 1.0 +local conduit_connections = utils.connections:new (mod_storage, "conduit_connections") + + + +local function get_target_list (pos) + local tlist = conduit_connections:get_connected_ids (pos) + local list = { } + + for i = 1, #tlist do + if tlist[i].pos.x ~= pos.x or + tlist[i].pos.y ~= pos.y or + tlist[i].pos.y ~= pos.y then + + list[#list + 1] = tlist[i].id + end + end + + return list +end + + + +local function send_targets_message (pos) + if utils.digilines_supported then + local meta = minetest.get_meta (pos) + + if meta then + local channel = meta:get_string ("channel") + + if channel:len () > 0 then + utils.digilines_receptor_send (pos, + utils.digilines_default_rules, + channel, + { action = "targets", + targets = get_target_list (pos) }) + end + end + end +end + + + +local function deliver_slot (pos, slot) + local meta = minetest.get_meta (pos) + + if meta then + local inv = meta:get_inventory () + local transfer_data = minetest.deserialize (meta:get_string ("transfer_data")) + + if inv then + local item = inv:get_stack ("transfer", slot) + + if transfer_data[slot] and item and not item:is_empty () then + local tmeta = minetest.get_meta (transfer_data[slot].pos) + + if tmeta then + local tinv = tmeta:get_inventory () + + if tinv then + tinv:add_item ("main", item) + + --send_conduit_message (pos, target, slot) + end + end + end + + transfer_data[slot] = nil + meta:set_string ("transfer_data", minetest.serialize (transfer_data)) + inv:set_stack ("transfer", slot, nil) + end + end +end + + + +local function run_deliveries (pos) + local meta = minetest.get_meta (pos) + + if meta then + local inv = meta:get_inventory () + local transfer_data = minetest.deserialize (meta:get_string ("transfer_data")) or { } + + if inv then + local slots = inv:get_size ("transfer") + local tm = minetest.get_us_time () + + for i = 1, slots do + if transfer_data[i] and + (transfer_data[i].due <= tm or + tm < (transfer_data[i].due - 1000000000)) then + + deliver_slot (pos, i) + end + end + end + + return not inv:is_empty ("transfer") + end + + return false +end + + + +local function deliver_all (pos) + local meta = minetest.get_meta (pos) + + if meta then + local inv = meta:get_inventory () + + if inv then + local slots = inv:get_size ("transfer") + + for i = 1, slots do + local item = inv:get_stack ("transfer", i) + + if item and not item:is_empty () then + deliver_slot (pos, i) + end + end + end + + meta:set_string ("transfer_data", minetest.serialize({ })) + inv:set_list ("transfer", { }) + end +end + + + +local function delivered_earliest (pos) + local meta = minetest.get_meta (pos) + + if meta then + local inv = meta:get_inventory () + local transfer_data = minetest.deserialize (meta:get_string ("transfer_data")) or { } + + if inv then + local slots = inv:get_size ("transfer") + local slot = 0 + local tm = 0 + + for i = 1, slots do + if transfer_data[i] and transfer_data[i].due < tm then + slot = i + tm = transfer_data[i].due + end + end + + if slot > 0 then + deliver_slot (pos, slot) + end + end + end +end + + + +local function get_transfer_free_slot (pos) + local meta = minetest.get_meta (pos) + + if meta then + local inv = meta:get_inventory () + + if inv then + local slots = inv:get_size ("transfer") + + for i = 1, slots do + local item = inv:get_stack ("transfer", i) + + if not item or item:is_empty () then + return i + end + end + end + end + + return 0 +end + + + +local function add_to_send_list (pos, item, destpos, distance) + local slot = get_transfer_free_slot (pos) + + while slot < 1 do + delivered_earliest (pos) + end + + local meta = minetest.get_meta (pos) + + if meta then + local inv = meta:get_inventory () + local transfer_data = minetest.deserialize (meta:get_string ("transfer_data")) or { } + + if inv then + transfer_data[slot] = + { + pos = destpos, + due = minetest.get_us_time () + (transfer_rate * 1000000 * distance) + } + + inv:add_item ("transfer", item) + + meta:set_string ("transfer_data", minetest.serialize (transfer_data)) + + local timer = minetest.get_node_timer (pos) + + if not timer:is_started () then + timer:start (conduit_interval) + end + end + end +end + + + +local function send_to_target (pos, target, slot) + local meta = minetest.get_meta (pos) + + if meta then + local inv = meta:get_inventory () + + target = (target and tostring (target)) or meta:get_string ("target") + + if inv and target:len () > 0 then + if not slot then + local slots = inv:get_size ("main") + + for i = 1, slots do + local stack = inv:get_stack ("main", i) + + if not stack:is_empty () and stack:get_count () > 0 then + slot = i + break + end + end + + elseif type (slot) == "string" then + local name = slot + slot = nil + + local slots = inv:get_size ("main") + + for i = 1, slots do + local stack = inv:get_stack ("main", i) + + if not stack:is_empty () and stack:get_count () > 0 then + if name == stack:get_name () then + slot = i + break + end + end + end + + else + slot = tonumber (slot) + + end + + if slot then + local stack = inv:get_stack ("main", slot) + + if not stack:is_empty () and stack:get_count () > 0 then + local name = stack:get_name () + local item = ItemStack (stack) + + if item then + item:set_count (1) + + local tpos, distance = conduit_connections:is_connected (pos, target) + + if tpos then + local tmeta = minetest.get_meta (tpos) + + if tmeta then + local tinv = tmeta:get_inventory () + + if tinv and tinv:room_for_item ("main", item) then + add_to_send_list (pos, item, tpos, distance) + + stack:set_count (stack:get_count () - 1) + inv:set_stack ("main", slot, stack) + + --send_conduit_message (pos, target, slot) + + return true, target, slot + end + end + end + end + end + end + end + end + + return false +end + + + +local function run_conduit (pos) + local meta = minetest.get_meta (pos) + local automatic = false + + if meta then + automatic = meta:get_string ("automatic") == "true" + end + + if automatic then + send_to_target (pos) + end + + return run_deliveries (pos) or automatic +end + + + +local function get_formspec (pos) + local meta = minetest.get_meta (pos) + local automatic = "false" + + if meta then + automatic = meta:get_string ("automatic") + end + + return + "formspec_version[3]\n".. + "size[11.75,12.25;true]\n".. + "field[1.0,1.5;3.0,0.8;channel;Channel;${channel}]\n".. + "button[4.2,1.5;1.5,0.8;setchannel;Set]\n".. + "field[1.0,3.0;3.0,0.8;target;Target;${target}]\n".. + "button[4.2,3.0;1.5,0.8;settarget;Set]\n".. + "checkbox[1.0,4.5;automatic;Automatic;"..automatic.."]\n".. + "list[context;main;6.0,1.0;4,4;]\n".. + "list[current_player;main;1.0,6.5;8,4;]\n".. + "listring[]" +end + + + +local function on_construct (pos) + conduit_connections:add_node (pos) +end + + + +local function on_destruct (pos) + deliver_all (pos) + conduit_connections:remove_node (pos) +end + + + +local function after_place_node (pos, placer, itemstack, pointed_thing) + local meta = minetest.get_meta (pos) + local spec = + "formspec_version[3]".. + "size[7.0,3.8]".. + "field[0.5,1.0;6.0,0.8;channel;Channel;${channel}]".. + "button[2.0,2.3;3.0,0.8;setchannel;Set]" + + meta:set_string ("inventory", "{ main = { }, transfer = { } }") + meta:set_string ("formspec", spec) + meta:set_string ("transfer_data", minetest.serialize({ })) + meta:set_string ("automatic", "false") + + local inv = meta:get_inventory () + + inv:set_size ("main", 16) + inv:set_width ("main", 4) + + inv:set_size ("transfer", 32) + inv:set_width ("transfer", 8) + + -- If return true no item is taken from itemstack + return false +end + + + +local function after_place_node_locked (pos, placer, itemstack, pointed_thing) + after_place_node (pos, placer, itemstack, pointed_thing) + + if placer and placer:is_player () then + local meta = minetest.get_meta (pos) + + meta:set_string ("owner", placer:get_player_name ()) + meta:set_string ("infotext", "Dropper (owned by "..placer:get_player_name ()..")") + end + + -- If return true no item is taken from itemstack + return false +end + + + +local function can_dig (pos, player) + if not utils.can_interact_with_node (pos, player) then + return false + end + + local meta = minetest.get_meta (pos) + + if meta then + local inv = meta:get_inventory () + + if inv then + if not inv:is_empty ("main") then + return false + end + end + end + + return true +end + + + +local function on_receive_fields (pos, formname, fields, sender) + if not utils.can_interact_with_node (pos, sender) then + return + end + + if fields.setchannel then + local meta = minetest.get_meta (pos) + + if meta then + if tostring (fields.channel):len () > 0 then + if meta:get_string ("channel"):len () < 1 then + meta:set_string ("formspec", get_formspec (pos)) + end + + meta:set_string ("channel", fields.channel) + + conduit_connections:set_id (pos, tostring (fields.channel)) + + elseif meta:get_string ("channel"):len () > 0 then + if can_dig (pos, sender) ~= false then + local spec = + "formspec_version[3]".. + "size[7.0,3.8]".. + "field[0.5,1.0;6.0,0.8;channel;Channel;${channel}]".. + "button[2.0,2.3;3.0,0.8;setchannel;Set]" + + meta:set_string ("channel", fields.channel) + + meta:set_string ("formspec", spec) + + conduit_connections:set_id (pos, nil) + + elseif sender and sender:is_player () then + fields.channel = meta:get_string ("channel") + + local spec = + "formspec_version[3]".. + "size[8.0,4.0,false]".. + "label[2.5,1.0;Conduit not empty]".. + "button_exit[3.0,2.0;2.0,1.0;close;Close]" + + minetest.show_formspec (sender:get_player_name (), + "lwcomponents:conduit_not_empty", + spec) + + end + end + end + end + + if fields.settarget then + local meta = minetest.get_meta (pos) + + if meta then + meta:set_string ("target", fields.target) + end + end + + if fields.automatic then + local meta = minetest.get_meta (pos) + + if meta then + meta:set_string ("automatic", fields.automatic) + meta:set_string ("formspec", get_formspec (pos)) + + local timer = minetest.get_node_timer (pos) + + if not timer:is_started () then + timer:start (conduit_interval) + end + end + end +end + + + +local function on_blast (pos, intensity) + local meta = minetest.get_meta (pos) + + if meta then + if intensity >= 1.0 then + local inv = meta:get_inventory () + + if inv then + local slots = inv:get_size ("main") + + for slot = 1, slots do + local stack = inv:get_stack ("main", slot) + + if stack and not stack:is_empty () then + if math.floor (math.random (0, 5)) == 3 then + utils.item_drop (stack, nil, pos) + else + utils.on_destroy (stack) + end + end + end + end + + on_destruct (pos) + minetest.remove_node (pos) + + else -- intensity < 1.0 + local inv = meta:get_inventory () + + if inv then + local slots = inv:get_size ("main") + + for slot = 1, slots do + local stack = inv:get_stack ("main", slot) + + if stack and not stack:is_empty () then + utils.item_drop (stack, nil, pos) + end + end + end + + local node = minetest.get_node_or_nil (pos) + if node then + local items = minetest.get_node_drops (node, nil) + + if items and #items > 0 then + local stack = ItemStack (items[1]) + + if stack then + preserve_metadata (pos, node, meta, { stack }) + utils.item_drop (stack, nil, pos) + on_destruct (pos) + minetest.remove_node (pos) + end + end + end + end + end +end + + + +local function on_rightclick (pos, node, clicker, itemstack, pointed_thing) + if not utils.can_interact_with_node (pos, clicker) then + if clicker and clicker:is_player () then + local owner = "" + local meta = minetest.get_meta (pos) + + if meta then + owner = meta:get_string ("owner") + end + + local spec = + "formspec_version[3]".. + "size[8.0,4.0,false]".. + "label[1.0,1.0;Owned by "..minetest.formspec_escape (owner).."]".. + "button_exit[3.0,2.0;2.0,1.0;close;Close]" + + minetest.show_formspec (clicker:get_player_name (), + "lwcomponents:component_privately_owned", + spec) + end + end + + return itemstack +end + + + +local function on_timer (pos, elapsed) + return run_conduit (pos) +end + + + +local function digilines_support () + if utils.digilines_supported then + return + { + wire = + { + rules = utils.digilines_default_rules, + }, + + effector = + { + action = function (pos, node, channel, msg) + local meta = minetest.get_meta(pos) + + if meta then + local this_channel = meta:get_string ("channel") + + if this_channel ~= "" and this_channel == channel then + if type (msg) == "string" then + local m = { } + for w in string.gmatch(msg, "[^%s]+") do + m[#m + 1] = w + end + + if m[1] == "target" then + meta:set_string ("target", (m[2] and tostring (m[2])) or "") + + elseif m[1] == "targets" then + send_targets_message (pos) + + elseif m[1] == "transfer" then + send_to_target (pos) + + end + + elseif type (msg) == "table" then + if msg.action and tostring (msg.action) == "transfer" then + send_to_target (pos, msg.target, msg.slot or msg.item) + end + + end + end + end + end, + } + } + end + + return nil +end + + + +local function mesecon_support () + if utils.mesecon_supported then + return + { + effector = + { + rules = utils.mesecon_flat_rules, + + action_on = function (pos, node) + send_to_target (pos) + end + } + } + end + + return nil +end + + + +minetest.register_node("lwcomponents:conduit", { + description = S("Conduit"), + drawtype = "glasslike_framed", + tiles = { "lwconduit_edge.png", "lwconduit.png" }, + is_ground_content = false, + groups = { cracky = 3 }, + sounds = default.node_sound_stone_defaults (), + paramtype = "none", + param1 = 0, + paramtype2 = "none", + param2 = 0, + floodable = false, + _digistuff_channelcopier_fieldname = "channel", + + mesecons = mesecon_support (), + digiline = digilines_support (), + + on_construct = on_construct, + on_destruct = on_destruct, + on_receive_fields = on_receive_fields, + after_place_node = after_place_node, + can_dig = can_dig, + on_blast = on_blast, + on_timer = on_timer, + on_rightclick = on_rightclick +}) + + + +minetest.register_node("lwcomponents:conduit_locked", { + description = S("Conduit (locked)"), + drawtype = "glasslike_framed", + tiles = { "lwconduit_edge.png", "lwconduit.png" }, + is_ground_content = false, + groups = { cracky = 3 }, + sounds = default.node_sound_stone_defaults (), + paramtype = "none", + param1 = 0, + paramtype2 = "none", + param2 = 0, + floodable = false, + _digistuff_channelcopier_fieldname = "channel", + + mesecons = mesecon_support (), + digiline = digilines_support (), + + on_construct = on_construct, + on_destruct = on_destruct, + on_receive_fields = on_receive_fields, + after_place_node = after_place_node_locked, + can_dig = can_dig, + on_blast = on_blast, + on_timer = on_timer, + on_rightclick = on_rightclick +}) + + + +utils.hopper_add_container({ + {"top", "lwcomponents:conduit", "main"}, -- take items from above into hopper below + {"bottom", "lwcomponents:conduit", "main"}, -- insert items below from hopper above + {"side", "lwcomponents:conduit", "main"}, -- insert items from hopper at side +}) + + + +utils.hopper_add_container({ + {"top", "lwcomponents:conduit_locked", "main"}, -- take items from above into hopper below + {"bottom", "lwcomponents:conduit_locked", "main"}, -- insert items below from hopper above + {"side", "lwcomponents:conduit_locked", "main"}, -- insert items from hopper at side +}) + + + +end -- utils.digilines_supported or utils.mesecon_supported diff --git a/connections.lua b/connections.lua new file mode 100644 index 0000000..6e2f7ca --- /dev/null +++ b/connections.lua @@ -0,0 +1,300 @@ + + + +local connections = { } + + + +function connections:new (mod_storage, name) + local obj = { } + + setmetatable (obj, self) + self.__index = self + + obj.connector_list = { } + obj.name = tostring (name) + obj.storage = mod_storage + + if mod_storage then + local stored = mod_storage:get_string (obj.name) + + if stored == "" then + stored = "{ }" + end + + obj.connector_list = minetest.deserialize (stored) + + if not obj.connector_list then + obj.connector_list = { } + end + end + + return obj +end + + + +function connections:load () + if self.storage then + local stored = self.storage:get_string (self.name) + + if stored == "" then + stored = "{ }" + end + + self.connector_list = minetest.deserialize (stored) + end +end + + + +function connections:store () + if self.storage then + self.storage:set_string (self.name, minetest.serialize (self.connector_list)) + end +end + + + + +function connections:add_node (pos, id) + self.connector_list[minetest.pos_to_string (pos, 0)] = + { + id = (id and tostring (id)) or nil, + checked = false + } + + self:store () +end + + + +function connections:remove_node (pos) + self.connector_list[minetest.pos_to_string (pos, 0)] = nil + + self:store () +end + + + +function connections:set_id (pos, id) + local con = self.connector_list[minetest.pos_to_string (pos, 0)] + + if con then + con.id = (id and tostring (id)) or nil + + self:store () + + return true + end + + return false +end + + + +local function is_connected (self, pos, id, tally, test_coords) + if not id then + return nil + end + + local con = self.connector_list[minetest.pos_to_string (pos, 0)] + + if con and not con.checked then + con.checked = true + + if con.id == id then + con.checked = false + + return pos, tally + end + + for i = 1, #test_coords do + local result, agg = is_connected (self, + { + x = pos.x + test_coords[i].x, + y = pos.y + test_coords[i].y, + z = pos.z + test_coords[i].z + }, + id, + tally, + test_coords) + + if result then + con.checked = false + + return result, (tally + agg + 1) + end + end + + con.checked = false + end + + return nil, 0 +end + + + +function connections:is_connected (pos, id) + return is_connected (self, + pos, + tostring (id), + 0, + { + { x = 1, y = 0, z = 0 }, + { x = -1, y = 0, z = 0 }, + { x = 0, y = 0, z = 1 }, + { x = 0, y = 0, z = -1 }, + { x = 0, y = 1, z = 0 }, + { x = 0, y = -1, z = 0 } + }) +end + + + +function connections:is_connected_horizontal (pos, id) + return is_connected (self, + pos, + tostring (id), + 0, + { + { x = 1, y = 0, z = 0 }, + { x = -1, y = 0, z = 0 }, + { x = 0, y = 0, z = 1 }, + { x = 0, y = 0, z = -1 } + }) +end + + + +function connections:is_connected_vertical (pos, id) + return is_connected (self, + pos, + tostring (id), + 0, + { + { x = 0, y = 1, z = 0 }, + { x = 0, y = -1, z = 0 } + }) +end + + + +local function get_connected_ids (self, pos, test_coords, list) + local con = self.connector_list[minetest.pos_to_string (pos, 0)] + + if con and not con.checked then + con.checked = true + + if con.id then + list[#list + 1] = + { + pos = { x = pos.x, y = pos.y, z = pos.z }, + id = con.id + } + end + + for i = 1, #test_coords do + get_connected_ids (self, + { + x = pos.x + test_coords[i].x, + y = pos.y + test_coords[i].y, + z = pos.z + test_coords[i].z + }, + test_coords, + list) + end + + con.checked = false + end + + return list +end + + + +function connections:get_connected_ids (pos) + local list = get_connected_ids (self, + pos, + { + { x = 1, y = 0, z = 0 }, + { x = -1, y = 0, z = 0 }, + { x = 0, y = 0, z = 1 }, + { x = 0, y = 0, z = -1 }, + { x = 0, y = 1, z = 0 }, + { x = 0, y = -1, z = 0 } + }, + { }) + + for i = #list, 1, -1 do + for j = 1, i - 1, 1 do + if list[i].pos.x == list[j].pos.x and + list[i].pos.y == list[j].pos.y and + list[i].pos.z == list[j].pos.z then + + list[i] = nil + break + end + end + end + + return list +end + + + +function connections:get_connected_ids_horizontal (pos) + return get_connected_ids (self, + pos, + { + { x = 1, y = 0, z = 0 }, + { x = -1, y = 0, z = 0 }, + { x = 0, y = 0, z = 1 }, + { x = 0, y = 0, z = -1 } + }, + { }) +end + + + +function connections:get_connected_ids_vertical (pos) + return get_connected_ids (self, + pos, + { + { x = 0, y = 1, z = 0 }, + { x = 0, y = -1, z = 0 } + }, + { }) +end + + + +function connections:get_connected_ids_north_south (pos) + return get_connected_ids (self, + pos, + { + { x = 0, y = 0, z = 1 }, + { x = 0, y = 0, z = -1 } + }, + { }) +end + + + +function connections:get_connected_ids_east_west (pos) + return get_connected_ids (self, + pos, + { + { x = 1, y = 0, z = 0 }, + { x = -1, y = 0, z = 0 } + }, + { }) +end + + + +return connections + + + +-- diff --git a/crafting.lua b/crafting.lua index d9e3cff..ef1a9d9 100644 --- a/crafting.lua +++ b/crafting.lua @@ -113,6 +113,24 @@ minetest.register_craft( { }) +minetest.register_craft( { + output = "lwcomponents:deployer", + recipe = { + { "default:chest", "group:wood" }, + { "default:copper_ingot", "default:steel_ingot" }, + }, +}) + + +minetest.register_craft( { + output = "lwcomponents:deployer_locked", + recipe = { + { "default:chest_locked", "group:wood" }, + { "default:copper_ingot", "default:steel_ingot" }, + }, +}) + + minetest.register_craft( { output = "lwcomponents:fan", recipe = { @@ -130,6 +148,26 @@ minetest.register_craft( { }, }) + +minetest.register_craft( { + output = "lwcomponents:conduit 5", + recipe = { + { "default:stone", "", "default:stone" }, + { "", "default:chest", "" }, + { "default:stone", "default:steel_ingot", "default:stone" }, + }, +}) + + +minetest.register_craft( { + output = "lwcomponents:conduit_locked 5", + recipe = { + { "default:stone", "", "default:stone" }, + { "", "default:chest_locked", "" }, + { "default:stone", "default:steel_ingot", "default:stone" }, + }, +}) + end -- utils.digilines_supported or utils.mesecon_supported diff --git a/depends.txt b/depends.txt index aac988c..f9b2b62 100644 --- a/depends.txt +++ b/depends.txt @@ -5,5 +5,4 @@ digilines? unifieddyes? intllib? hopper? -mobs? digistuff? diff --git a/detector.lua b/detector.lua index 9b88128..71bbbe7 100644 --- a/detector.lua +++ b/detector.lua @@ -60,7 +60,7 @@ end -local function send_detect_message (pos, item_type, name, label, item_pos, count, hp, height) +local function send_detect_message (pos, detected_list) if utils.digilines_supported then local meta = minetest.get_meta (pos) @@ -72,13 +72,7 @@ local function send_detect_message (pos, item_type, name, label, item_pos, count utils.digilines_default_rules, channel, { action = "detect", - type = item_type, - name = name, - label = label, - pos = to_relative_coords (pos, item_pos), - count = count, - hp = hp, - height = height }) + detected = detected_list }) end end end @@ -169,6 +163,7 @@ local function detect (pos) local radius = meta:get_int ("radius") local mode = meta:get_int ("mode") local object = minetest.get_objects_inside_radius (pos, radius + 0.5) + local detected_list = { } for i = 1, #object do if object[i]:is_player () then @@ -177,14 +172,16 @@ local function detect (pos) if meta:get_string ("players") == "true" and filter_item (pos, mode, object[i]:get_pos ()) then - send_detect_message (pos, - "player", - object[i]:get_player_name (), - object[i]:get_player_name (), - object[i]:get_pos (), - 1, - object[i]:get_hp (), - get_entity_height (object[i])) + detected_list[#detected_list + 1] = + { + type = "player", + name = object[i]:get_player_name (), + label = object[i]:get_player_name (), + pos = to_relative_coords (pos, object[i]:get_pos ()), + count = 1, + hp = object[i]:get_hp (), + height = get_entity_height (object[i]) + } detected = true end @@ -200,14 +197,17 @@ local function detect (pos) local stack = ItemStack (object[i]:get_luaentity ().itemstring or "") if stack and not stack:is_empty () then - send_detect_message (pos, - "drop", - stack:get_name (), - stack:get_name (), - object[i]:get_pos (), - stack:get_count (), - 0, - 0) + + detected_list[#detected_list + 1] = + { + type = "drop", + name = stack:get_name (), + label = stack:get_name (), + pos = to_relative_coords (pos, object[i]:get_pos ()), + count = stack:get_count (), + hp = 0, + height = 0 + } detected = true end @@ -231,14 +231,16 @@ local function detect (pos) object[i]:get_luaentity () and object[i]:get_luaentity ().name) or "" - send_detect_message (pos, - "entity", - name, - label, - object[i]:get_pos (), - 1, - object[i]:get_hp (), - get_entity_height (object[i])) + detected_list[#detected_list + 1] = + { + type = "entity", + name = name, + label = label, + pos = to_relative_coords (pos, object[i]:get_pos ()), + count = 1, + hp = object[i]:get_hp (), + height = get_entity_height (object[i]) + } detected = true @@ -258,14 +260,16 @@ local function detect (pos) if node and node.name ~= "air" and node.name ~= "ignore" and filter_item (pos, mode, testpos) then - send_detect_message (pos, - "node", - node.name, - node.name, - testpos, - 1, - 0, - 0) + detected_list[#detected_list + 1] = + { + type = "node", + name = node.name, + label = node.name, + pos = testpos, + count = 1, + hp = 0, + height = 0 + } detected = true end @@ -276,6 +280,8 @@ local function detect (pos) if detected then mesecons_on (pos) + + send_detect_message (pos, detected_list) else mesecons_off (pos) end diff --git a/dispenser.lua b/dispenser.lua index 9429c4f..02adf56 100644 --- a/dispenser.lua +++ b/dispenser.lua @@ -7,6 +7,10 @@ if utils.digilines_supported or utils.mesecon_supported then +local dispenser_force = 25 + + + local function dispense_dir (node) if node.param2 == 0 then return { x = 0, y = 0, z = -1 } @@ -40,18 +44,17 @@ end local function dispense_velocity (node) - local force = 25 --math.random (30 , 35) local tilt = (math.random (1 , 2001) - 1001) / 1000 local sway = (math.random (1 , 4001) - 2001) / 1000 if node.param2 == 0 then - return { x = sway, y = tilt, z = -force } + return { x = sway, y = tilt, z = -dispenser_force } elseif node.param2 == 1 then - return { x = -force, y = tilt, z = sway } + return { x = -dispenser_force, y = tilt, z = sway } elseif node.param2 == 2 then - return { x = sway, y = tilt, z = force } + return { x = sway, y = tilt, z = dispenser_force } elseif node.param2 == 3 then - return { x = force, y = tilt, z = sway } + return { x = dispenser_force, y = tilt, z = sway } else return { x = 0, y = 0, z = 0 } end @@ -80,73 +83,6 @@ end -local function try_spawn (pos, node, item, owner) - if utils.mobs_supported and utils.settings.spawn_mobs then - local mob = item:get_name () - local item_def = minetest.registered_craftitems[mob] - local spawn_pos = dispense_pos (pos, node) - - if item_def and item_def.groups and item_def.groups.spawn_egg then - if mob:sub (mob:len () - 3) == "_set" then - mob = mob:sub (1, mob:len () - 4) - - if minetest.registered_entities[mob] then - local data = item:get_metadata () - local smob = minetest.add_entity (spawn_pos, mob, data) - local ent = smob and smob:get_luaentity () - - if ent then - -- set owner if not a monster - if owner:len () > 0 and ent.type ~= "monster" then - ent.owner = owner - ent.tamed = true - end - end - - return smob - end - - else - if minetest.registered_entities[mob] then - local smob = minetest.add_entity (spawn_pos, mob) - local ent = smob and smob:get_luaentity () - - if ent then - -- set owner if not a monster - if owner:len () > 0 and ent.type ~= "monster" then - ent.owner = owner - ent.tamed = true - end - end - - return smob - end - - end - - elseif mob == "mobs:egg" then - if math.random (1, 10) == 1 then - local smob = minetest.add_entity (spawn_pos, "mobs_animal:chicken") - local ent = smob and smob:get_luaentity () - - if ent then - -- set owner if not a monster - if owner:len () > 0 and ent.type ~= "monster" then - ent.owner = owner - ent.tamed = true - end - end - - return smob - end - end - end - - return nil -end - - - -- slot: -- nil - next item, no dispense if empty -- number - 1 item from slot, no dispense if empty @@ -203,28 +139,29 @@ local function dispense_item (pos, node, slot) item:set_count (1) local spawn_pos = dispense_pos (pos, node) local owner = meta:get_string ("owner") + local obj, cancel = nil, false - local obj, cancel = utils.spawn_registered (name, - spawn_pos, - item, - owner, - pos, - dispense_dir (node)) + if utils.settings.spawn_mobs then + obj, cancel = utils.spawn_registered (name, + spawn_pos, + item, + owner, + pos, + dispense_dir (node), + dispenser_force) - if obj == nil and cancel then - return false - end - - if not obj then - obj = try_spawn (pos, node, item, owner) + if obj == nil and cancel then + return false + end end if not obj then obj = minetest.add_item (spawn_pos, item) + + obj:set_velocity (dispense_velocity (node)) end if obj then - obj:set_velocity (dispense_velocity (node)) stack:set_count (stack:get_count () - 1) inv:set_stack ("main", slot, stack) diff --git a/fan.lua b/fan.lua index c7f8460..dc8ee7c 100644 --- a/fan.lua +++ b/fan.lua @@ -13,17 +13,33 @@ local fan_force = 15.0 local function direction_vector (node) - if node.param2 == 0 then - return { x = 0, y = 0, z = -1 } - elseif node.param2 == 1 then - return { x = -1, y = 0, z = 0 } - elseif node.param2 == 2 then - return { x = 0, y = 0, z = 1 } - elseif node.param2 == 3 then - return { x = 1, y = 0, z = 0 } - else - return { x = 0, y = 0, z = 0 } + local axis = math.floor (node.param2 / 4) + local rotate = node.param2 % 4 + local vec = { x = 0, y = 0, z = 0 } + + if rotate == 0 then + vec = { x = 0, y = 0, z = -1 } + elseif rotate == 1 then + vec = { x = -1, y = 0, z = 0 } + elseif rotate == 2 then + vec = { x = 0, y = 0, z = 1 } + elseif rotate == 3 then + vec = { x = 1, y = 0, z = 0 } end + + if axis == 1 then + vec = vector.rotate (vec, { x = math.pi / -2, y = 0, z = 0 }) + elseif axis == 2 then + vec = vector.rotate (vec, { x = math.pi / 2, y = 0, z = 0 }) + elseif axis == 3 then + vec = vector.rotate (vec, { x = 0, y = 0, z = math.pi / 2 }) + elseif axis == 4 then + vec = vector.rotate (vec, { x = 0, y = 0, z = math.pi / -2 }) + elseif axis == 5 then + vec = vector.rotate (vec, { x = math.pi, y = 0, z = 0 }) + end + + return vec end @@ -39,11 +55,15 @@ local function blow (pos) local tnode = minetest.get_node_or_nil (tpos) if tnode and tnode.name ~= "air" then - return + local def = utils.find_item_def (tnode.name) + + if def and def.walkable then + return + end end local object = minetest.get_objects_inside_radius (tpos, 1.5) - local vel = vector.multiply (dir, fan_force) + local vel = vector.multiply (dir, (dir.y > 0 and fan_force / 2) or fan_force) for i = 1, #object do if object[i].add_velocity then @@ -113,6 +133,20 @@ end +local function on_place (itemstack, placer, pointed_thing) + local param2 = 0 + + if placer and placer:is_player () then + param2 = minetest.dir_to_facedir (placer:get_look_dir (), true) + elseif pointed_thing and pointed_thing.type == "node" then + param2 = minetest.dir_to_facedir (vector.subtract (pointed_thing.under, pointed_thing.above), true) + end + + return minetest.item_place (itemstack, placer, pointed_thing, param2) +end + + + local function after_place_node (pos, placer, itemstack, pointed_thing) local meta = minetest.get_meta (pos) @@ -318,7 +352,7 @@ minetest.register_node("lwcomponents:fan", { paramtype = "none", param1 = 0, paramtype2 = "facedir", - param2 = 1, + param2 = 0, floodable = false, drop = "lwcomponents:fan", _digistuff_channelcopier_fieldname = "channel", @@ -326,6 +360,7 @@ minetest.register_node("lwcomponents:fan", { mesecons = mesecon_support (), digiline = digilines_support (), + on_place = on_place, on_receive_fields = on_receive_fields, can_dig = can_dig, after_place_node = after_place_node, @@ -345,7 +380,7 @@ minetest.register_node("lwcomponents:fan_locked", { paramtype = "none", param1 = 0, paramtype2 = "facedir", - param2 = 1, + param2 = 0, floodable = false, drop = "lwcomponents:fan_locked", _digistuff_channelcopier_fieldname = "channel", @@ -353,6 +388,7 @@ minetest.register_node("lwcomponents:fan_locked", { mesecons = mesecon_support (), digiline = digilines_support (), + on_place = on_place, on_receive_fields = on_receive_fields, can_dig = can_dig, after_place_node = after_place_node_locked, @@ -372,7 +408,7 @@ minetest.register_node("lwcomponents:fan_on", { paramtype = "none", param1 = 0, paramtype2 = "facedir", - param2 = 1, + param2 = 0, floodable = false, drop = "lwcomponents:fan", _digistuff_channelcopier_fieldname = "channel", @@ -380,6 +416,7 @@ minetest.register_node("lwcomponents:fan_on", { mesecons = mesecon_support (), digiline = digilines_support (), + on_place = on_place, on_receive_fields = on_receive_fields, can_dig = can_dig, after_place_node = after_place_node, @@ -400,7 +437,7 @@ minetest.register_node("lwcomponents:fan_locked_on", { paramtype = "none", param1 = 0, paramtype2 = "facedir", - param2 = 1, + param2 = 0, floodable = false, drop = "lwcomponents:fan_locked", _digistuff_channelcopier_fieldname = "channel", @@ -408,6 +445,7 @@ minetest.register_node("lwcomponents:fan_locked_on", { mesecons = mesecon_support (), digiline = digilines_support (), + on_place = on_place, on_receive_fields = on_receive_fields, can_dig = can_dig, after_place_node = after_place_node_locked, diff --git a/init.lua b/init.lua index 5859046..1d2d32b 100644 --- a/init.lua +++ b/init.lua @@ -1,4 +1,4 @@ -local version = "0.1.7" +local version = "0.1.8" local mod_storage = minetest.get_mod_storage () @@ -18,6 +18,7 @@ local modpath = minetest.get_modpath ("lwcomponents") loadfile (modpath.."/utils.lua") (utils, mod_storage) loadfile (modpath.."/settings.lua") (utils) loadfile (modpath.."/api.lua") (utils) +utils.connections = loadfile (modpath.."/connections.lua") () loadfile (modpath.."/dropper.lua") (utils) loadfile (modpath.."/collector.lua") (utils) loadfile (modpath.."/dispenser.lua") (utils) @@ -29,6 +30,7 @@ loadfile (modpath.."/hologram.lua") (utils) loadfile (modpath.."/breaker.lua") (utils) loadfile (modpath.."/deployer.lua") (utils) loadfile (modpath.."/fan.lua") (utils) +loadfile (modpath.."/conduit.lua") (utils, mod_storage) loadfile (modpath.."/extras.lua") (utils) loadfile (modpath.."/digiswitch.lua") (utils) loadfile (modpath.."/movefloor.lua") (utils) diff --git a/mod.conf b/mod.conf index e5748c6..3cfa78f 100644 --- a/mod.conf +++ b/mod.conf @@ -3,4 +3,4 @@ description = Various components for mesecons and digilines. title = LWComponents name = lwcomponents depends = default -optional_depends = lwdrops, mesecons, digilines, unifieddyes, intllib, hopper, mobs, digistuff +optional_depends = lwdrops, mesecons, digilines, unifieddyes, intllib, hopper, digistuff diff --git a/readme.txt b/readme.txt index d382cf7..97a7834 100644 --- a/readme.txt +++ b/readme.txt @@ -13,7 +13,7 @@ CC BY-SA 3.0 Version ======= -0.1.7 +0.1.8 Minetest Version @@ -34,7 +34,6 @@ digilines unifieddyes intllib hopper -mobs digistuff @@ -63,9 +62,13 @@ Various components for mesecons and digilines. * Deployers, places the nodes directly in front. * Hologram, projects a hologram above the hologram node. * Fan, blows any entity, player or drop in front of the fan. +* Conduit, connected in a circuit to move items. * Digiswitch, digilines controlled mesecons power. * Movefloor, similar to vertical mesecons movestone. -* Solid color conductor blocks, same as Solid Color Block but also mesecons and digilines conductor. +* Solid color conductor blocks, same as Solid Color Block but also mesecons + and digilines conductor. + +To spawn entities from dispensers include the lwcomponents_spawners mod. See the docs folder for details on each item. @@ -77,6 +80,7 @@ the relevant mod is loaded. * Panel, full node variant of digistuff:panel. + The mod supports the following settings: Spawn mobs diff --git a/utils.lua b/utils.lua index c80f3c3..0b72373 100644 --- a/utils.lua +++ b/utils.lua @@ -129,15 +129,6 @@ end --- check for mobs -if minetest.global_exists ("mobs") then - utils.mobs_supported = true -else - utils.mobs_supported = false -end - - - -- check for digistuff if minetest.global_exists ("digistuff") then utils.digistuff_supported = true @@ -259,17 +250,18 @@ end -function utils.spawn_registered (itemname, spawn_pos, itemstack, owner, spawner_pos, spawner_dir) +function utils.spawn_registered (itemname, spawn_pos, itemstack, owner, spawner_pos, spawner_dir, force) local func = utils.registered_spawners[itemname] if func then - local result, obj, cancel = pcall (func, spawn_pos, itemstack, owner, spawner_pos, spawner_dir) + local result, obj, cancel = pcall (func, spawn_pos, itemstack, owner, spawner_pos, spawner_dir, force) - if result and (obj == nil or type (obj) == "userdata") then + if result and (obj == nil or type (obj) == "userdata" or type (obj) == "table") then return obj, cancel end - minetest.log ("error", "lwcomponents.register_spawner spawner function for "..itemname.." failed") + minetest.log ("error", "lwcomponents.register_spawner spawner function for "..itemname.." failed ".. + ((type (obj) == "string" and obj) or "")) return nil, true end