Mirrorlandia_minetest/technic
1
0
Fork 0
mirror of https://github.com/minetest-mods/technic.git synced 2024-12-22 05:42:33 +01:00
Code Issues Projects Releases Wiki Activity

clean up upgrade handling a bit and only allow setting known upgrades

Browse Source
This commit is contained in:
Tim 2015-02-05 16:56:32 +01:00
parent 6ef3438832
commit 96788677bb
1 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
technic/machines/register/common.lua
View File

@ -1,41 +1,48 @@
local S = technic.getter local S = technic.getter
-- handles the machine upgrades every tick
function technic.handle_machine_upgrades(meta) function technic.handle_machine_upgrades(meta)
-- Get the names of the upgrades -- Get the names of the upgrades
local inv = meta:get_inventory() local inv = meta:get_inventory()
local upg_item1
local upg_item2
local srcstack = inv:get_stack("upgrade1", 1) local srcstack = inv:get_stack("upgrade1", 1)
if srcstack then local upg_item1 = srcstack and srcstack:get_name()
upg_item1 = srcstack:to_table()
end
srcstack = inv:get_stack("upgrade2", 1) srcstack = inv:get_stack("upgrade2", 1)
if srcstack then local upg_item2 = srcstack and srcstack:get_name()
upg_item2 = srcstack:to_table()
end
-- Save some power by installing battery upgrades. -- Save some power by installing battery upgrades.
-- Tube loading speed can be upgraded using control logic units. -- Tube loading speed can be upgraded using control logic units.
local EU_upgrade = 0 local EU_upgrade = 0
local tube_upgrade = 0 local tube_upgrade = 0
if upg_item1 then
if upg_item1.name == "technic:battery" then if upg_item1 == "technic:control_logic_unit" then
EU_upgrade = EU_upgrade + 1 tube_upgrade = tube_upgrade + 1
elseif upg_item1.name == "technic:control_logic_unit" then elseif upg_item1 == "technic:battery" then
tube_upgrade = tube_upgrade + 1 EU_upgrade = EU_upgrade + 1
end
end end
if upg_item2 then
if upg_item2.name == "technic:battery" then if upg_item2 == "technic:control_logic_unit" then
EU_upgrade = EU_upgrade + 1 tube_upgrade = tube_upgrade + 1
elseif upg_item2.name == "technic:control_logic_unit" then elseif upg_item2 == "technic:battery" then
tube_upgrade = tube_upgrade + 1 EU_upgrade = EU_upgrade + 1
end
end end
return EU_upgrade, tube_upgrade return EU_upgrade, tube_upgrade
end end
-- handles the machine upgrades when set or removed
local function on_machine_upgrade(meta, stack)
local stack_name = stack and stack:get_name()
if stack_name ~= "technic:control_logic_unit"
and stack_name ~= "technic:battery" then
return 0
end
return 1
end
function technic.send_items(pos, x_velocity, z_velocity, output_name) function technic.send_items(pos, x_velocity, z_velocity, output_name)
-- Send items on their way in the pipe system. -- Send items on their way in the pipe system.
@ -131,30 +138,37 @@ function technic.machine_can_dig(pos, player)
end end
end end
local function inv_change(pos, player, count, from_list, to_list) local function inv_change(pos, player, count, from_list, to_list, stack)
if minetest.is_protected(pos, player:get_player_name()) then local playername = player:get_player_name()
minetest.chat_send_player(player:get_player_name(), if minetest.is_protected(pos, playername) then
S("Inventory move disallowed due to protection")) minetest.chat_send_player(playername, S("Inventory move disallowed due to protection"))
return 0 return 0
end end
if to_list == "upgrade1" or to_list == "upgrade2" then if to_list == "upgrade1" or to_list == "upgrade2" then
-- only place a single item into it, if it's empty -- only place a single item into it, if it's empty
local empty = minetest.get_meta(pos):get_inventory():is_empty(to_list) local meta = minetest.get_meta(pos);
return empty and 1 or 0 local empty = meta:get_inventory():is_empty(to_list)
if empty then
return on_machine_upgrade(meta, stack)
end
return 0
elseif from_list == "upgrade1" or from_list == "upgrade2" then
on_machine_upgrade(meta, nil)
end end
return count return count
end end
function technic.machine_inventory_put(pos, listname, index, stack, player) function technic.machine_inventory_put(pos, listname, index, stack, player)
return inv_change(pos, player, stack:get_count(), nil, listname) return inv_change(pos, player, stack:get_count(), nil, listname, stack)
end end
function technic.machine_inventory_take(pos, listname, index, stack, player) function technic.machine_inventory_take(pos, listname, index, stack, player)
return inv_change(pos, player, stack:get_count(), listname, nil) return inv_change(pos, player, stack:get_count(), listname, nil, stack)
end end
function technic.machine_inventory_move(pos, from_list, from_index, function technic.machine_inventory_move(pos, from_list, from_index,
to_list, to_index, count, player) to_list, to_index, count, player)
return inv_change(pos, player, count, from_list, to_list) local stack = minetest.get_meta(pos):get_inventory():get_stack(from_list, from_index)
return inv_change(pos, player, count, from_list, to_list, stack)
end end