Fixed set mode for mining drill mk2 and mk3

Thomas

2017-03-05 1765c31eaa758b0a522a51ae0c1748f0fbb05f23

 technic/tools/mining_drill.lua

@@ -6,9 +6,9 @@
minetest.register_craft({
   output = 'technic:mining_drill',
   recipe = {
      {'technic:stainless_steel_ingot', 'technic:diamond_drill_head', 'technic:stainless_steel_ingot'},
      {'moreores:tin_ingot',            'technic:diamond_drill_head', 'moreores:tin_ingot'},
      {'technic:stainless_steel_ingot', 'technic:motor',              'technic:stainless_steel_ingot'},
      {'',                              'technic:red_energy_crystal', 'moreores:copper_ingot'},
      {'',                              'technic:red_energy_crystal', 'default:copper_ingot'},
   }
})
minetest.register_craft({
@@ -51,12 +51,12 @@
      minetest.record_protection_violation(pos, player:get_player_name())
      return
   end
   local node=minetest.env:get_node(pos)
   local node=minetest.get_node(pos)
   if node.name == "air" or node.name == "ignore" then return end
   if node.name == "default:lava_source" then return end
   if node.name == "default:lava_flowing" then return end
   if node.name == "default:water_source" then minetest.env:remove_node(pos) return end
   if node.name == "default:water_flowing" then minetest.env:remove_node(pos) return end
   if node.name == "default:water_source" then minetest.remove_node(pos) return end
   if node.name == "default:water_flowing" then minetest.remove_node(pos) return end
   minetest.node_dig(pos,node,player)
end

@@ -229,6 +229,12 @@
   minetest.sound_play("mining_drill", {pos = pos, gain = 1.0, max_hear_distance = 10,})
end

local function pos_is_pointable(pos)
   local node = minetest.get_node(pos)
   local nodedef = minetest.registered_nodes[node.name]
   return nodedef and nodedef.pointable
end

local function mining_drill_mk2_setmode(user,itemstack)
   local player_name=user:get_player_name()
   local item=itemstack:to_table()
@@ -246,10 +252,9 @@
   mode=mode+1
   if mode>=5 then mode=1 end
   minetest.chat_send_player(player_name, S("Mining Drill Mk%d Mode %d"):format(2, mode)..": "..mining_drill_mode_text[mode][1])
   item["name"]="technic:mining_drill_mk2_"..mode
    itemstack:set_name("technic:mining_drill_mk2_"..mode);
   meta["mode"]=mode
   item["metadata"]=minetest.serialize(meta)
   itemstack:replace(item)
    itemstack:set_metadata(minetest.serialize(meta))
   return itemstack
end

@@ -270,10 +275,9 @@
   mode=mode+1
   if mode>=6 then mode=1 end
   minetest.chat_send_player(player_name, S("Mining Drill Mk%d Mode %d"):format(3, mode)..": "..mining_drill_mode_text[mode][1])
   item["name"]="technic:mining_drill_mk3_"..mode
    itemstack:set_name("technic:mining_drill_mk3_"..mode);
   meta["mode"]=mode
   item["metadata"]=minetest.serialize(meta)
   itemstack:replace(item)
    itemstack:set_metadata(minetest.serialize(meta))
   return itemstack
end

@@ -285,16 +289,18 @@
   if not meta or not meta.mode or keys.sneak then
      return mining_drill_mk2_setmode(user, itemstack)
   end
   if pointed_thing.type ~= "node" or not meta.charge then
   if pointed_thing.type ~= "node" or not pos_is_pointable(pointed_thing.under) or not meta.charge then
      return
   end
   local charge_to_take = cost_to_use(2, meta.mode)
   if meta.charge >= charge_to_take then
      local pos = minetest.get_pointed_thing_position(pointed_thing, above)
      drill_dig_it(pos, user, meta.mode)
      meta.charge = meta.charge - charge_to_take
      itemstack:set_metadata(minetest.serialize(meta))
      technic.set_RE_wear(itemstack, meta.charge, max_charge[2])
      if not technic.creative_mode then
         meta.charge = meta.charge - charge_to_take
         itemstack:set_metadata(minetest.serialize(meta))
         technic.set_RE_wear(itemstack, meta.charge, max_charge[2])
      end
   end
   return itemstack
end
@@ -306,16 +312,18 @@
   if not meta or not meta.mode or keys.sneak then
      return mining_drill_mk3_setmode(user, itemstack)
   end
   if pointed_thing.type ~= "node" or not meta.charge then
   if pointed_thing.type ~= "node" or not pos_is_pointable(pointed_thing.under) or not meta.charge then
      return
   end
   local charge_to_take = cost_to_use(3, meta.mode)
   if meta.charge >= charge_to_take then
      local pos = minetest.get_pointed_thing_position(pointed_thing, above)
      drill_dig_it(pos, user, meta.mode)
      meta.charge = meta.charge - charge_to_take
      itemstack:set_metadata(minetest.serialize(meta))
      technic.set_RE_wear(itemstack, meta.charge, max_charge[3])
      if not technic.creative_mode then
         meta.charge = meta.charge - charge_to_take
         itemstack:set_metadata(minetest.serialize(meta))
         technic.set_RE_wear(itemstack, meta.charge, max_charge[3])
      end
   end
   return itemstack
end
@@ -327,8 +335,9 @@
   inventory_image = "technic_mining_drill.png",
   stack_max = 1,
   wear_represents = "technic_RE_charge",
   on_refill = technic.refill_RE_charge,
   on_use = function(itemstack, user, pointed_thing)
      if pointed_thing.type ~= "node" then
      if pointed_thing.type ~= "node" or not pos_is_pointable(pointed_thing.under) then
         return itemstack
      end
      local meta = minetest.deserialize(itemstack:get_metadata())
@@ -339,9 +348,11 @@
      if meta.charge >= charge_to_take then
         local pos = minetest.get_pointed_thing_position(pointed_thing, above)
         drill_dig_it(pos, user, 1)
         meta.charge = meta.charge - charge_to_take
         itemstack:set_metadata(minetest.serialize(meta))
         technic.set_RE_wear(itemstack, meta.charge, max_charge[1])
         if not technic.creative_mode then
            meta.charge = meta.charge - charge_to_take
            itemstack:set_metadata(minetest.serialize(meta))
            technic.set_RE_wear(itemstack, meta.charge, max_charge[1])
         end
      end
      return itemstack
   end,
@@ -351,6 +362,7 @@
   description = S("Mining Drill Mk%d"):format(2),
   inventory_image = "technic_mining_drill_mk2.png",
   wear_represents = "technic_RE_charge",
   on_refill = technic.refill_RE_charge,
   on_use = function(itemstack, user, pointed_thing)
      mining_drill_mk2_handler(itemstack, user, pointed_thing)
      return itemstack
@@ -366,6 +378,7 @@
      inventory_image = "technic_mining_drill_mk2.png^technic_tool_mode"..i..".png",
      wield_image = "technic_mining_drill_mk2.png",
      wear_represents = "technic_RE_charge",
      on_refill = technic.refill_RE_charge,
      groups = {not_in_creative_inventory=1},
      on_use = function(itemstack, user, pointed_thing)
         mining_drill_mk2_handler(itemstack, user, pointed_thing)
@@ -378,6 +391,7 @@
   description = S("Mining Drill Mk%d"):format(3),
   inventory_image = "technic_mining_drill_mk3.png",
   wear_represents = "technic_RE_charge",
   on_refill = technic.refill_RE_charge,
   on_use = function(itemstack, user, pointed_thing)
   mining_drill_mk3_handler(itemstack,user,pointed_thing)
   return itemstack
@@ -393,6 +407,7 @@
      inventory_image = "technic_mining_drill_mk3.png^technic_tool_mode"..i..".png",
      wield_image = "technic_mining_drill_mk3.png",
      wear_represents = "technic_RE_charge",
      on_refill = technic.refill_RE_charge,
      groups = {not_in_creative_inventory=1},
      on_use = function(itemstack, user, pointed_thing)
      mining_drill_mk3_handler(itemstack,user,pointed_thing)