Fix some global errors

ShadowNinja

2014-12-15 5382a88aefbd503c00500236510412e6f2b42f4e

 technic/machines/register/battery_box.lua

@@ -29,6 +29,33 @@
   }
})

local tube = {
   insert_object = function(pos, node, stack, direction)
      if direction.y == 0 then
         return stack
      end
      local meta = minetest.get_meta(pos)
      local inv = meta:get_inventory()
      if direction.y > 0 then
         return inv:add_item("src", stack)
      else
         return inv:add_item("dst", stack)
      end
   end,
   can_insert = function(pos, node, stack, direction)
      if direction.y == 0 then
         return false
      end
      local meta = minetest.get_meta(pos)
      local inv = meta:get_inventory()
      if direction.y > 0 then
         return inv:room_for_item("src", stack)
      else
         return inv:room_for_item("dst", stack)
      end
   end,
   connect_sides = {left=1, right=1, back=1, top=1, bottom=1},
}

function technic.register_battery_box(data)
   local tier = data.tier
@@ -45,12 +72,95 @@
      "label[5,0;"..S("Discharge").."]"..
      "label[1,3;"..S("Power level").."]"..
      "list[current_player;main;0,5;8,4;]"
	
   if data.upgrade then
      formspec = formspec..
         "list[current_name;upgrade1;3.5,3;1,1;]"..
         "list[current_name;upgrade2;4.5,3;1,1;]"..
         "label[3.5,4;"..S("Upgrade Slots").."]"
   end

   local run = function(pos, node)
      local meta           = minetest.get_meta(pos)
      local eu_input       = meta:get_int(tier.."_EU_input")
      local current_charge = meta:get_int("internal_EU_charge")

      local EU_upgrade, tube_upgrade = 0, 0
      if data.upgrade then
         EU_upgrade, tube_upgrade = technic.handle_machine_upgrades(meta)
      end
      local max_charge = data.max_charge * (1 + EU_upgrade / 10)
			
      -- Charge/discharge the battery with the input EUs
      if eu_input >= 0 then
         current_charge = math.min(current_charge + eu_input, max_charge)
      else
         current_charge = math.max(current_charge + eu_input, 0)
      end

      -- Charging/discharging tools here
      local tool_full, tool_empty
      current_charge, tool_full = technic.charge_tools(meta,
            current_charge, data.charge_step)
      current_charge, tool_empty = technic.discharge_tools(meta,
            current_charge, data.discharge_step,
            max_charge)
			
      if data.tube then
         local inv = meta:get_inventory()
         technic.handle_machine_pipeworks(pos, tube_upgrade,
         function(pos, x_velocity, z_velocity)
            if tool_full and not inv:is_empty("src") then
               technic.send_items(pos, x_velocity, z_velocity, "src")
            elseif tool_empty and not inv:is_empty("dst") then
               technic.send_items(pos, x_velocity, z_velocity, "dst")
            end
         end)
      end

      -- We allow batteries to charge on less than the demand
      meta:set_int(tier.."_EU_demand",
            math.min(data.charge_rate, max_charge - current_charge))
      meta:set_int(tier.."_EU_supply",
            math.min(data.discharge_rate, current_charge))
         meta:set_int("internal_EU_charge", current_charge)

      -- Select node textures
      local charge_count = math.ceil((current_charge / max_charge) * 8)
      charge_count = math.min(charge_count, 8)
      charge_count = math.max(charge_count, 0)
      local last_count = meta:get_float("last_side_shown")
      if charge_count ~= last_count then
         technic.swap_node(pos,"technic:"..ltier.."_battery_box"..charge_count)
         meta:set_float("last_side_shown", charge_count)
      end

      local charge_percent = math.floor(current_charge / max_charge * 100)
      meta:set_string("formspec",
         formspec..
         "image[1,1;1,2;technic_power_meter_bg.png"
         .."^[lowpart:"..charge_percent
         ..":technic_power_meter_fg.png]")

      local infotext = S("%s Battery Box: %d/%d"):format(tier,
            current_charge, max_charge)
      if eu_input == 0 then
         infotext = S("%s Idle"):format(infotext)
      end
      meta:set_string("infotext", infotext)
   end
	
   for i = 0, 8 do
      local groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2}
      local groups = {snappy=2, choppy=2, oddly_breakable_by_hand=2, technic_machine=1}
      if i ~= 0 then
         groups.not_in_creative_inventory = 1
      end
		
      if data.tube then
         groups.tubedevice = 1
         groups.tubedevice_receiver = 1
      end
		
      minetest.register_node("technic:"..ltier.."_battery_box"..i, {
         description = S("%s Battery Box"):format(tier),
         tiles = {"technic_"..ltier.."_battery_box_top.png",
@@ -60,6 +170,8 @@
             "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png",
             "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png"},
         groups = groups,
         tube = data.tube and tube or nil,
         paramtype2 = "facedir",
         sounds = default.node_sound_wood_defaults(),
         drop = "technic:"..ltier.."_battery_box0",
         on_construct = function(pos)
@@ -75,78 +187,16 @@
            meta:set_float("internal_EU_charge", 0)
            inv:set_size("src", 1)
            inv:set_size("dst", 1)
            inv:set_size("upgrade1", 1)
            inv:set_size("upgrade2", 1)
         end,
         can_dig = technic.machine_can_dig,
         allow_metadata_inventory_put = technic.machine_inventory_put,
         allow_metadata_inventory_take = technic.machine_inventory_take,
         allow_metadata_inventory_move = technic.machine_inventory_move,
         technic_run = run,
      })
   end


   minetest.register_abm({
      nodenames = {"technic:"..ltier.."_battery_box0", "technic:"..ltier.."_battery_box1",
                   "technic:"..ltier.."_battery_box2", "technic:"..ltier.."_battery_box3",
                   "technic:"..ltier.."_battery_box4", "technic:"..ltier.."_battery_box5",
                   "technic:"..ltier.."_battery_box6", "technic:"..ltier.."_battery_box7",
                   "technic:"..ltier.."_battery_box8"},
      interval = 1,
      chance   = 1,
      action = function(pos, node, active_object_count, active_object_count_wider)
         local meta           = minetest.get_meta(pos)
         local eu_input       = meta:get_int(tier.."_EU_input")
         local current_charge = meta:get_int("internal_EU_charge")

         -- Power off automatically if no longer connected to a switching station
         technic.switching_station_timeout_count(pos, tier)

         -- Charge/discharge the battery with the input EUs
         if eu_input >= 0 then
            current_charge = math.min(current_charge + eu_input, data.max_charge)
         else
            current_charge = math.max(current_charge + eu_input, 0)
         end

         -- Charging/discharging tools here
         current_charge = technic.charge_tools(meta,
               current_charge, data.charge_step)
         current_charge = technic.discharge_tools(meta,
               current_charge, data.discharge_step,
               data.max_charge)

         -- We allow batteries to charge on less than the demand
         meta:set_int(tier.."_EU_demand",
               math.min(data.charge_rate, data.max_charge - current_charge))
         meta:set_int(tier.."_EU_supply",
               math.min(data.discharge_rate, current_charge))

         meta:set_int("internal_EU_charge", current_charge)

         -- Select node textures
         local charge_count = math.ceil((current_charge / data.max_charge) * 8)
         charge_count = math.min(charge_count, 8)
         charge_count = math.max(charge_count, 0)
         local last_count = meta:get_float("last_side_shown")
         if charge_count ~= last_count then
            technic.swap_node(pos,"technic:"..ltier.."_battery_box"..charge_count)
            meta:set_float("last_side_shown", charge_count)
         end

         local charge_percent = math.floor(current_charge / data.max_charge * 100)
         meta:set_string("formspec",
            formspec..
            "image[1,1;1,2;technic_power_meter_bg.png"
            .."^[lowpart:"..charge_percent
            ..":technic_power_meter_fg.png]")

         local infotext = S("%s Battery Box: %d/%d"):format(tier,
               current_charge, data.max_charge)
         if eu_input == 0 then
            infotext = S("%s Idle"):format(infotext)
         end
         meta:set_string("infotext", infotext)
      end
   })

   -- Register as a battery type
   -- Battery type machines function as power reservoirs and can both receive and give back power
@@ -160,48 +210,48 @@
function technic.charge_tools(meta, batt_charge, charge_step)
   local inv = meta:get_inventory()
   if inv:is_empty("src") then
      return batt_charge
      return batt_charge, false
   end
   local srcstack = inv:get_stack("src", 1)
   local src_meta = minetest.deserialize(srcstack:get_metadata())
   local src_stack = inv:get_stack("src", 1)

   local toolname = srcstack:get_name()
   if not technic.power_tools[toolname] then
      return batt_charge
   local tool_name = src_stack:get_name()
   if not technic.power_tools[tool_name] then
      return batt_charge, false
   end
   -- Set meta data for the tool if it didn't do it itself
   src_meta = minetest.deserialize(srcstack:get_metadata())
   src_meta = src_meta or {}
   local src_meta = minetest.deserialize(src_stack:get_metadata()) or {}
   if not src_meta.charge then
      src_meta.charge = 0
   end
   -- Do the charging
   local item_max_charge = technic.power_tools[toolname]
   local item_max_charge = technic.power_tools[tool_name]
   local tool_charge     = src_meta.charge
   if tool_charge >= item_max_charge or batt_charge <= 0 then
      return batt_charge
   if tool_charge >= item_max_charge then
      return batt_charge, true
   elseif batt_charge <= 0 then
      return batt_charge, false
   end
   charge_step = math.min(charge_step, batt_charge)
   charge_step = math.min(charge_step, item_max_charge - tool_charge)
   tool_charge = tool_charge + charge_step
   batt_charge = batt_charge - charge_step
   technic.set_RE_wear(srcstack, tool_charge, item_max_charge)
   technic.set_RE_wear(src_stack, tool_charge, item_max_charge)
   src_meta.charge = tool_charge
   srcstack:set_metadata(minetest.serialize(src_meta))
   inv:set_stack("src", 1, srcstack)
   return batt_charge
   src_stack:set_metadata(minetest.serialize(src_meta))
   inv:set_stack("src", 1, src_stack)
   return batt_charge, (tool_charge == item_max_charge)
end


function technic.discharge_tools(meta, batt_charge, charge_step, max_charge)
   local inv = meta:get_inventory()
   if inv:is_empty("dst") then
      return batt_charge
      return batt_charge, false
   end
   srcstack = inv:get_stack("dst", 1)
   local toolname = srcstack:get_name()
   if technic.power_tools[toolname] == nil then
      return batt_charge
      return batt_charge, false
   end
   -- Set meta data for the tool if it didn't do it itself :-(
   local src_meta = minetest.deserialize(srcstack:get_metadata())
@@ -213,8 +263,10 @@
   -- Do the discharging
   local item_max_charge = technic.power_tools[toolname]
   local tool_charge     = src_meta.charge
   if tool_charge <= 0 or batt_charge >= max_charge then
      return batt_charge
   if tool_charge <= 0 then
      return batt_charge, true
   elseif batt_charge >= max_charge then
      return batt_charge, false
   end
   charge_step = math.min(charge_step, max_charge - batt_charge)
   charge_step = math.min(charge_step, tool_charge)
@@ -224,6 +276,6 @@
   src_meta.charge = tool_charge
   srcstack:set_metadata(minetest.serialize(src_meta))
   inv:set_stack("dst", 1, srcstack)
   return batt_charge
   return batt_charge, (tool_charge == 0)
end