From a8daa417c485ee20716ec050d4c676b5c91af773 Mon Sep 17 00:00:00 2001
From: David Leal <halfpacho@gmail.com>
Date: Fri, 12 Jun 2020 20:39:00 +0200
Subject: [PATCH] Add GitHub workflow and luacheck (#545)
---
technic/tools/mining_drill.lua | 61 +++++++++++++++---------------
1 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/technic/tools/mining_drill.lua b/technic/tools/mining_drill.lua
index fee7c4e..e54e73d 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'},
}
})
@@ -62,7 +62,7 @@
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 +71,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 +78,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 +94,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 +101,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 +154,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 +186,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 +204,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 +227,7 @@
drill_dig_it4(pos,player)
end
end
-
+
minetest.sound_play("mining_drill", {pos = pos, gain = 1.0, max_hear_distance = 10,})
end
@@ -238,6 +240,7 @@
local function mining_drill_mk2_setmode(user,itemstack)
local player_name=user:get_player_name()
local item=itemstack:to_table()
+ local mode = nil
local meta=minetest.deserialize(item["metadata"])
if meta==nil then
meta={}
@@ -252,7 +255,7 @@
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
itemstack:set_metadata(minetest.serialize(meta))
return itemstack
@@ -275,7 +278,7 @@
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
itemstack:set_metadata(minetest.serialize(meta))
return itemstack
@@ -284,7 +287,6 @@
local function mining_drill_mk2_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_mk2_setmode(user, itemstack)
@@ -294,7 +296,7 @@
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)
+ local pos = minetest.get_pointed_thing_position(pointed_thing, false)
drill_dig_it(pos, user, meta.mode)
if not technic.creative_mode then
meta.charge = meta.charge - charge_to_take
@@ -307,7 +309,6 @@
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)
@@ -317,7 +318,7 @@
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)
+ local pos = minetest.get_pointed_thing_position(pointed_thing, false)
drill_dig_it(pos, user, meta.mode)
if not technic.creative_mode then
meta.charge = meta.charge - charge_to_take
@@ -346,7 +347,7 @@
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)
+ local pos = minetest.get_pointed_thing_position(pointed_thing, false)
drill_dig_it(pos, user, 1)
if not technic.creative_mode then
meta.charge = meta.charge - charge_to_take
--
Gitblit v1.8.0