From 10307f23a78b33af50dc4a5f3d1baafb4ee4b0d9 Mon Sep 17 00:00:00 2001
From: Maciej 'agaran' Pijanka <agaran@pld-linux.org>
Date: Thu, 16 Mar 2017 00:00:22 +0100
Subject: [PATCH] Do not run converters twice.
---
technic/tools/sonic_screwdriver.lua | 131 ++++++++++++++++++++++++++-----------------
1 files changed, 78 insertions(+), 53 deletions(-)
diff --git a/technic/tools/sonic_screwdriver.lua b/technic/tools/sonic_screwdriver.lua
index 0a9b3a9..300d363 100644
--- a/technic/tools/sonic_screwdriver.lua
+++ b/technic/tools/sonic_screwdriver.lua
@@ -4,70 +4,95 @@
technic.register_power_tool("technic:sonic_screwdriver", sonic_screwdriver_max_charge)
+-- screwdriver handler code reused from minetest/minetest_game screwdriver @a9ac480
+local ROTATE_FACE = 1
+local ROTATE_AXIS = 2
+
+local function nextrange(x, max)
+ x = x + 1
+ if x > max then
+ x = 0
+ end
+ return x
+end
+
+-- Handles rotation
+local function screwdriver_handler(itemstack, user, pointed_thing, mode)
+ if pointed_thing.type ~= "node" then
+ return
+ end
+
+ local pos = pointed_thing.under
+
+ if minetest.is_protected(pos, user:get_player_name()) then
+ minetest.record_protection_violation(pos, user:get_player_name())
+ return
+ end
+
+ local node = minetest.get_node(pos)
+ local ndef = minetest.registered_nodes[node.name]
+ if not ndef or not ndef.paramtype2 == "facedir" or
+ (ndef.drawtype == "nodebox" and
+ not ndef.node_box.type == "fixed") or
+ node.param2 == nil then
+ return
+ end
+
+ -- contrary to the default screwdriver, do not check for can_dig, to allow rotating machines with CLU's in them
+ -- this is consistent with the previous sonic screwdriver
+
+ local meta1 = minetest.deserialize(itemstack:get_metadata())
+ if not meta1 or not meta1.charge or meta1.charge < 100 then
+ return
+ end
+
+ minetest.sound_play("technic_sonic_screwdriver", {pos = pos, gain = 0.3, max_hear_distance = 10})
+
+ -- Set param2
+ local rotationPart = node.param2 % 32 -- get first 4 bits
+ local preservePart = node.param2 - rotationPart
+
+ local axisdir = math.floor(rotationPart / 4)
+ local rotation = rotationPart - axisdir * 4
+ if mode == ROTATE_FACE then
+ rotationPart = axisdir * 4 + nextrange(rotation, 3)
+ elseif mode == ROTATE_AXIS then
+ rotationPart = nextrange(axisdir, 5) * 4
+ end
+
+ node.param2 = preservePart + rotationPart
+ minetest.swap_node(pos, node)
+
+ if not technic.creative_mode then
+ meta1.charge = meta1.charge - 100
+ itemstack:set_metadata(minetest.serialize(meta1))
+ technic.set_RE_wear(itemstack, meta1.charge, sonic_screwdriver_max_charge)
+ end
+
+ return itemstack
+end
+
minetest.register_tool("technic:sonic_screwdriver", {
- description = S("Sonic Screwdriver"),
+ description = S("Sonic Screwdriver (left-click rotates face, right-click rotates axis)"),
inventory_image = "technic_sonic_screwdriver.png",
wear_represents = "technic_RE_charge",
on_refill = technic.refill_RE_charge,
on_use = function(itemstack, user, pointed_thing)
- -- Must be pointing to facedir applicable node
- if pointed_thing.type ~= "node" then
- return
- end
- local pos = pointed_thing.under
- if minetest.is_protected(pos, user:get_player_name()) then
- minetest.record_protection_violation(pos, user:get_player_name())
- return
- end
- local node = minetest.get_node(pos)
- local node_name = node.name
- if minetest.registered_nodes[node_name].paramtype2 ~= "facedir" and
- minetest.registered_nodes[node_name].paramtype2 ~= "wallmounted" then
- return
- end
- if node.param2 == nil then
- return
- end
- local meta1 = minetest.deserialize(itemstack:get_metadata())
- if not meta1 or not meta1.charge then
- return
- end
- if meta1.charge >= 100 then
- minetest.sound_play("technic_sonic_screwdriver",
- {pos = pos, gain = 0.3, max_hear_distance = 10})
- local p = node.param2
- if minetest.registered_nodes[node_name].paramtype2 == "facedir" then
- p = p + 1
- if p == 4 then
- p = 0
- end
- else
- p = p + 1
- if p == 6 then
- p = 0
- end
- end
- if minetest.is_protected(pos, user:get_player_name()) then
- minetest.record_protection_violation(pos, user:get_player_name())
- else
- node.param2 = p
- minetest.swap_node(pos, node)
-
- meta1.charge = meta1.charge - 100
- itemstack:set_metadata(minetest.serialize(meta1))
- technic.set_RE_wear(itemstack, meta1.charge, sonic_screwdriver_max_charge)
- end
- end
+ screwdriver_handler(itemstack, user, pointed_thing, ROTATE_FACE)
return itemstack
- end,
+ end,
+ on_place = function(itemstack, user, pointed_thing)
+ screwdriver_handler(itemstack, user, pointed_thing, ROTATE_AXIS)
+ return itemstack
+ end,
})
minetest.register_craft({
output = "technic:sonic_screwdriver",
recipe = {
- {"default:diamond"},
- {"technic:battery"},
- {"technic:stainless_steel_ingot"}
+ {"", "default:diamond", ""},
+ {"mesecons_materials:fiber", "technic:battery", "mesecons_materials:fiber"},
+ {"mesecons_materials:fiber", "moreores:mithril_ingot", "mesecons_materials:fiber"}
}
})
--
Gitblit v1.8.0