From d0efa15b983f7a0a96e1a7abcdad713715dfeeeb Mon Sep 17 00:00:00 2001
From: Zefram <zefram@fysh.org>
Date: Mon, 18 Aug 2014 16:14:15 +0200
Subject: [PATCH] In quarry, skip past undiggable nodes
---
technic/tools/mining_drill.lua | 94 ++++++++++++++++++++++++++--------------------
1 files changed, 53 insertions(+), 41 deletions(-)
diff --git a/technic/tools/mining_drill.lua b/technic/tools/mining_drill.lua
index e3a01de..cd8d551 100644
--- a/technic/tools/mining_drill.lua
+++ b/technic/tools/mining_drill.lua
@@ -1,18 +1,14 @@
-local mining_drill_max_charge = 50000
-local mining_drill_mk2_max_charge = 200000
-local mining_drill_mk3_max_charge = 650000
-local mining_drill_power_usage = 200
-local mining_drill_mk2_power_usage = 500
-local mining_drill_mk3_power_usage = 800
+local max_charge = {50000, 200000, 650000}
+local power_usage_per_node = {200, 500, 800}
local S = technic.getter
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({
@@ -140,9 +136,19 @@
drill_dig_it0 (pos,player)
end
+local function cost_to_use(drill_type, mode)
+ local mult
+ if mode == 1 then
+ mult = 1
+ elseif mode <= 4 then
+ mult = 3
+ else
+ mult = 9
+ end
+ return power_usage_per_node[drill_type] * mult
+end
-local function drill_dig_it(pos, player, drill_type, mode)
- local charge
+local function drill_dig_it(pos, player, mode)
if mode == 1 then
drill_dig_it0(pos, player)
end
@@ -220,18 +226,13 @@
end
end
- if drill_type==1 then charge=mining_drill_power_usage end
- if drill_type==2 then
- if mode==1 then charge=mining_drill_mk2_power_usage end
- if (mode==2 or mode==3 or mode==4) then charge=mining_drill_mk2_power_usage*3 end
- end
- if drill_type==3 then
- if mode==1 then charge=mining_drill_mk3_power_usage end
- if (mode==2 or mode==3 or mode==4) then charge=mining_drill_mk3_power_usage*6 end
- if mode==5 then charge=mining_drill_mk3_power_usage*9 end
- end
minetest.sound_play("mining_drill", {pos = pos, gain = 1.0, max_hear_distance = 10,})
- return charge
+end
+
+local function pos_is_pointable(pos)
+ local node = minetest.env:get_node(pos)
+ local nodedef = minetest.registered_nodes[node.name]
+ return nodedef and nodedef.pointable
end
local function mining_drill_mk2_setmode(user,itemstack)
@@ -290,16 +291,16 @@
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
- if meta.charge - mining_drill_power_usage > 0 then
+ 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)
- local charge_to_take = drill_dig_it(pos, user, 2, meta.mode)
+ drill_dig_it(pos, user, meta.mode)
meta.charge = meta.charge - charge_to_take
- meta.charge = math.max(meta.charge, 0)
itemstack:set_metadata(minetest.serialize(meta))
- technic.set_RE_wear(itemstack, meta.charge, mining_drill_mk2_max_charge)
+ technic.set_RE_wear(itemstack, meta.charge, max_charge[2])
end
return itemstack
end
@@ -311,40 +312,43 @@
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
- if meta.charge - mining_drill_power_usage > 0 then
+ 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)
- local charge_to_take = drill_dig_it(pos, user, 3, meta.mode)
+ drill_dig_it(pos, user, meta.mode)
meta.charge = meta.charge - charge_to_take
- meta.charge = math.max(meta.charge, 0)
itemstack:set_metadata(minetest.serialize(meta))
- technic.set_RE_wear(itemstack, meta.charge, mining_drill_mk3_max_charge)
+ technic.set_RE_wear(itemstack, meta.charge, max_charge[3])
end
return itemstack
end
-technic.register_power_tool("technic:mining_drill", mining_drill_max_charge)
+technic.register_power_tool("technic:mining_drill", max_charge[1])
minetest.register_tool("technic:mining_drill", {
description = S("Mining Drill Mk%d"):format(1),
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())
if not meta or not meta.charge then
return
end
- if meta.charge - mining_drill_power_usage > 0 then
+ local charge_to_take = cost_to_use(1, 1)
+ if meta.charge >= charge_to_take then
local pos = minetest.get_pointed_thing_position(pointed_thing, above)
- charge_to_take = drill_dig_it(pos, user, 1, 1)
- meta.charge = meta.charge - mining_drill_power_usage
+ 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, mining_drill_max_charge)
+ technic.set_RE_wear(itemstack, meta.charge, max_charge[1])
end
return itemstack
end,
@@ -353,20 +357,24 @@
minetest.register_tool("technic:mining_drill_mk2", {
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
end,
})
-technic.register_power_tool("technic:mining_drill_mk2", mining_drill_mk2_max_charge)
+technic.register_power_tool("technic:mining_drill_mk2", max_charge[2])
for i = 1, 4 do
- technic.register_power_tool("technic:mining_drill_mk2_"..i, mining_drill_mk2_max_charge)
+ technic.register_power_tool("technic:mining_drill_mk2_"..i, max_charge[2])
minetest.register_tool("technic:mining_drill_mk2_"..i, {
description = S("Mining Drill Mk%d Mode %d"):format(2, i),
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,20 +386,24 @@
minetest.register_tool("technic:mining_drill_mk3", {
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
end,
})
-technic.register_power_tool("technic:mining_drill_mk3", mining_drill_mk3_max_charge)
+technic.register_power_tool("technic:mining_drill_mk3", max_charge[3])
for i=1,5,1 do
- technic.register_power_tool("technic:mining_drill_mk3_"..i, mining_drill_mk3_max_charge)
+ technic.register_power_tool("technic:mining_drill_mk3_"..i, max_charge[3])
minetest.register_tool("technic:mining_drill_mk3_"..i, {
description = S("Mining Drill Mk%d Mode %d"):format(3, i),
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)
--
Gitblit v1.8.0