From c40189eabf663eb142e5da8107a570c4a0018642 Mon Sep 17 00:00:00 2001
From: SmallJoker <mk939@ymail.com>
Date: Tue, 25 Oct 2022 18:17:45 +0200
Subject: [PATCH] Export technic_music_player_top.png to PNG, run optipng
---
technic/tools/mining_drill.lua | 230 ++++++++++++++++++++++++---------------------------------
1 files changed, 98 insertions(+), 132 deletions(-)
diff --git a/technic/tools/mining_drill.lua b/technic/tools/mining_drill.lua
index 0612059..dfef394 100644
--- a/technic/tools/mining_drill.lua
+++ b/technic/tools/mining_drill.lua
@@ -6,8 +6,8 @@
minetest.register_craft({
output = 'technic:mining_drill',
recipe = {
- {'moreores:tin_ingot', 'technic:diamond_drill_head', 'moreores:tin_ingot'},
- {'technic:stainless_steel_ingot', 'technic:motor', 'technic:stainless_steel_ingot'},
+ {'default:tin_ingot', 'technic:diamond_drill_head', 'default:tin_ingot'},
+ {'technic:stainless_steel_ingot', 'basic_materials:motor', 'technic:stainless_steel_ingot'},
{'', 'technic:red_energy_crystal', 'default:copper_ingot'},
}
})
@@ -46,23 +46,32 @@
{S("3x3 nodes.")},
}
-local function drill_dig_it0 (pos,player)
+local function drill_dig_it0(pos, player)
if minetest.is_protected(pos, player:get_player_name()) then
minetest.record_protection_violation(pos, player:get_player_name())
return
end
- 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.remove_node(pos) return end
- if node.name == "default:water_flowing" then minetest.remove_node(pos) return end
- minetest.node_dig(pos,node,player)
+ local node = minetest.get_node(pos)
+ local ndef = minetest.registered_nodes[node.name]
+ if not ndef or ndef.drawtype == "airlike" then
+ -- Covers "air", "ignore", unknown nodes and more.
+ return
+ end
+ local groups = ndef and ndef.groups or {}
+
+ if groups.lava then
+ return
+ end
+ if groups.water then
+ minetest.remove_node(pos)
+ return
+ end
+ ndef.on_dig(pos, node, player)
end
local function drill_dig_it1 (player)
local dir=player:get_look_dir()
- if math.abs(dir.x)>math.abs(dir.z) then
+ if math.abs(dir.x)>math.abs(dir.z) then
if dir.x>0 then return 0 end
return 1
end
@@ -71,12 +80,6 @@
end
local function drill_dig_it2 (pos,player)
- drill_dig_it0 (pos,player)
- pos.z=pos.z+1
- drill_dig_it0 (pos,player)
- pos.z=pos.z-2
- drill_dig_it0 (pos,player)
- pos.z=pos.z+1
pos.y=pos.y+1
drill_dig_it0 (pos,player)
pos.z=pos.z+1
@@ -84,7 +87,14 @@
pos.z=pos.z-2
drill_dig_it0 (pos,player)
pos.z=pos.z+1
- pos.y=pos.y-2
+ pos.y=pos.y-1
+ drill_dig_it0 (pos,player)
+ pos.z=pos.z+1
+ drill_dig_it0 (pos,player)
+ pos.z=pos.z-2
+ drill_dig_it0 (pos,player)
+ pos.z=pos.z+1
+ pos.y=pos.y-1
drill_dig_it0 (pos,player)
pos.z=pos.z+1
drill_dig_it0 (pos,player)
@@ -93,12 +103,6 @@
end
local function drill_dig_it3 (pos,player)
- drill_dig_it0 (pos,player)
- pos.x=pos.x+1
- drill_dig_it0 (pos,player)
- pos.x=pos.x-2
- drill_dig_it0 (pos,player)
- pos.x=pos.x+1
pos.y=pos.y+1
drill_dig_it0 (pos,player)
pos.x=pos.x+1
@@ -106,7 +110,14 @@
pos.x=pos.x-2
drill_dig_it0 (pos,player)
pos.x=pos.x+1
- pos.y=pos.y-2
+ pos.y=pos.y-1
+ drill_dig_it0 (pos,player)
+ pos.x=pos.x+1
+ drill_dig_it0 (pos,player)
+ pos.x=pos.x-2
+ drill_dig_it0 (pos,player)
+ pos.x=pos.x+1
+ pos.y=pos.y-1
drill_dig_it0 (pos,player)
pos.x=pos.x+1
drill_dig_it0 (pos,player)
@@ -152,9 +163,9 @@
if mode == 1 then
drill_dig_it0(pos, player)
end
-
+
if mode == 2 then -- 3 deep
- dir = drill_dig_it1(player)
+ local dir = drill_dig_it1(player)
if dir == 0 then -- x+
drill_dig_it0(pos, player)
pos.x = pos.x + 1
@@ -184,9 +195,9 @@
drill_dig_it0 (pos,player)
end
end
-
+
if mode==3 then -- 3 wide
- dir=drill_dig_it1(player)
+ local dir = drill_dig_it1(player)
if dir==0 or dir==1 then -- x
drill_dig_it0 (pos,player)
pos.z=pos.z+1
@@ -202,7 +213,7 @@
drill_dig_it0 (pos,player)
end
end
-
+
if mode==4 then -- 3 tall, selected in the middle
drill_dig_it0 (pos,player)
pos.y=pos.y-1
@@ -225,7 +236,7 @@
drill_dig_it4(pos,player)
end
end
-
+
minetest.sound_play("mining_drill", {pos = pos, gain = 1.0, max_hear_distance = 10,})
end
@@ -235,96 +246,61 @@
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()
- local meta=minetest.deserialize(item["metadata"])
- if meta==nil then
- meta={}
- mode=0
- end
- if meta["mode"]==nil then
- minetest.chat_send_player(player_name, S("Use while sneaking to change Mining Drill Mk%d modes."):format(2))
- meta["mode"]=0
- mode=0
- end
- mode=(meta["mode"])
- 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
- meta["mode"]=mode
- item["metadata"]=minetest.serialize(meta)
- itemstack:replace(item)
- return itemstack
-end
-
-local function mining_drill_mk3_setmode(user,itemstack)
- local player_name=user:get_player_name()
- local item=itemstack:to_table()
- local meta=minetest.deserialize(item["metadata"])
- if meta==nil then
- meta={}
- mode=0
- end
- if meta["mode"]==nil then
- minetest.chat_send_player(player_name, S("Use while sneaking to change Mining Drill Mk%d modes."):format(3))
- meta["mode"]=0
- mode=0
- end
- mode=(meta["mode"])
- 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
- meta["mode"]=mode
- item["metadata"]=minetest.serialize(meta)
- itemstack:replace(item)
- return itemstack
-end
-
-
-local function mining_drill_mk2_handler(itemstack, user, pointed_thing)
- local keys = user:get_player_control()
+local function mining_drill_mkX_setmode(user, itemstack, drill_type, max_modes)
local player_name = user:get_player_name()
- local meta = minetest.deserialize(itemstack:get_metadata())
- if not meta or not meta.mode or keys.sneak then
- return mining_drill_mk2_setmode(user, itemstack)
+ local meta = minetest.deserialize(itemstack:get_metadata()) or {}
+
+ if not meta["mode"] then
+ minetest.chat_send_player(player_name,
+ S("Use while sneaking to change Mining Drill Mk%d modes."):format(drill_type))
end
- if pointed_thing.type ~= "node" or not pos_is_pointable(pointed_thing.under) or not meta.charge then
+ local mode = (meta["mode"] or 0) + 1
+ if mode > max_modes 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])
+ itemstack:set_name(("technic:mining_drill_mk%d_%s"):format(drill_type, mode))
+ meta["mode"] = mode
+ itemstack:set_metadata(minetest.serialize(meta))
+ return itemstack
+end
+
+local function mining_drill_mkX_handler(itemstack, user, pointed_thing, drill_type, max_modes)
+ local keys = user:get_player_control()
+ local meta = minetest.deserialize(itemstack:get_metadata()) or {}
+
+ -- Mode switching (if possible)
+ if max_modes > 1 then
+ if not meta.mode or keys.sneak then
+ return mining_drill_mkX_setmode(user, itemstack, drill_type, max_modes)
+ end
+ end
+ if pointed_thing.type ~= "node" or not pos_is_pointable(pointed_thing.under) 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)
+ if not meta.charge then
+ return
+ end
+
+ -- Check whether the tool has enough charge
+ local charge_to_take = cost_to_use(drill_type, meta.mode or 1)
+ if meta.charge < charge_to_take then
+ return
+ end
+
+ -- Do the actual shoorting action
+ local pos = minetest.get_pointed_thing_position(pointed_thing, false)
+ drill_dig_it(pos, user, meta.mode or 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[2])
+ technic.set_RE_wear(itemstack, meta.charge, max_charge[drill_type])
end
return itemstack
end
-local function mining_drill_mk3_handler(itemstack, user, pointed_thing)
- local keys = user:get_player_control()
- local player_name = user:get_player_name()
- local meta = minetest.deserialize(itemstack:get_metadata())
- 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 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])
- end
- return itemstack
-end
+-- Simple mining drill registration
technic.register_power_tool("technic:mining_drill", max_charge[1])
@@ -335,24 +311,12 @@
wear_represents = "technic_RE_charge",
on_refill = technic.refill_RE_charge,
on_use = function(itemstack, user, pointed_thing)
- 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
- 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)
- 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])
- end
+ mining_drill_mkX_handler(itemstack, user, pointed_thing, 1, 1)
return itemstack
end,
})
+
+-- Mk2 registration
minetest.register_tool("technic:mining_drill_mk2", {
description = S("Mining Drill Mk%d"):format(2),
@@ -360,7 +324,7 @@
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)
+ mining_drill_mkX_handler(itemstack, user, pointed_thing, 2, 4)
return itemstack
end,
})
@@ -377,11 +341,13 @@
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)
+ mining_drill_mkX_handler(itemstack, user, pointed_thing, 2, 4)
return itemstack
end,
})
end
+
+-- Mk3 registration
minetest.register_tool("technic:mining_drill_mk3", {
description = S("Mining Drill Mk%d"):format(3),
@@ -389,8 +355,8 @@
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
+ mining_drill_mkX_handler(itemstack, user, pointed_thing, 3, 5)
+ return itemstack
end,
})
@@ -406,8 +372,8 @@
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)
- return itemstack
+ mining_drill_mkX_handler(itemstack, user, pointed_thing, 3, 5)
+ return itemstack
end,
})
end
--
Gitblit v1.8.0