support every paramtype2 #662
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,14 +8,6 @@ technic.register_power_tool("technic:sonic_screwdriver", sonic_screwdriver_max_c | |
| local ROTATE_FACE = 1 | ||
| local ROTATE_AXIS = 2 | ||
|
|
||
| -- Handles rotation | ||
| local function screwdriver_handler(itemstack, user, pointed_thing, mode) | ||
| if pointed_thing.type ~= "node" then | ||
|
|
@@ -31,16 +23,80 @@ local function screwdriver_handler(itemstack, user, pointed_thing, mode) | |
|
|
||
| local node = minetest.get_node(pos) | ||
| local ndef = minetest.registered_nodes[node.name] | ||
|
|
||
| if not ndef then return end | ||
|
|
||
| local paramtype2 = ndef.paramtype2 | ||
|
|
||
| -- 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 | ||
|
|
||
| -- Set param2 | ||
| local new_param2 | ||
| local param2 = node.param2 | ||
|
|
||
| local dirs_per_axis = 4 | ||
|
|
||
| local dir_components = { | ||
| -- 2^5, 5 bits | ||
| facedir = 32, | ||
| colorfacedir = 32, | ||
| colordegrotate = 32, | ||
|
|
||
| -- 2^2, 2 bits | ||
| ["4dir"] = 4, -- lua doesn't like it when vars start with a digit | ||
| color4dir = 4, | ||
| } | ||
|
|
||
| local dir_component = dir_components[paramtype2] | ||
|
|
||
| local floor = math.floor | ||
| -- non-direction data is preserved whether it be color or otherwise | ||
| if (paramtype2 == "facedir") or (paramtype2 == "colorfacedir") then | ||
| local aux = floor(param2 / dir_component) | ||
| local dir = param2 % dir_component | ||
|
|
||
| if mode == ROTATE_FACE then | ||
| dir = (floor(param2 / dirs_per_axis)) * dirs_per_axis + ((dir + 1) % dirs_per_axis) | ||
| elseif mode == ROTATE_AXIS then | ||
| dir = ((floor(param2 / dirs_per_axis) + 1) * dirs_per_axis) % 24 | ||
| end | ||
|
|
||
| new_param2 = aux * dir_component + dir | ||
| elseif (paramtype2 == "4dir") or (paramtype2 == "color4dir") then | ||
| local aux = floor(param2 / dir_component) | ||
| local dir = param2 % dir_component | ||
|
|
||
| if mode == ROTATE_FACE then | ||
| dir = (dir + 1) % dirs_per_axis | ||
| elseif mode == ROTATE_AXIS then | ||
| dir = 0 | ||
| end | ||
|
|
||
| new_param2 = aux * dir_component + dir | ||
| elseif (paramtype2 == "degrotate") then | ||
| if mode == ROTATE_FACE then | ||
| new_param2 = param2 + 1 | ||
| elseif mode == ROTATE_AXIS then | ||
| new_param2 = param2 + 20 | ||
| end | ||
| new_param2 = new_param2 % 240 | ||
| elseif (paramtype2 == "colordegrotate") then | ||
| local aux = floor(param2 / dir_component) | ||
| local rotation = param2 % dir_component | ||
|
|
||
| if mode == ROTATE_FACE then | ||
| rotation = rotation + 1 | ||
| elseif mode == ROTATE_AXIS then | ||
| rotation = rotation + 4 | ||
| end | ||
| rotation = rotation % 24 | ||
|
|
||
| new_param2 = aux * dir_component + rotation | ||
| else | ||
| return | ||
| end | ||
|
There was a problem hiding this comment. Idea: You could move this code up such that a final Admittedly this code does not look great (magic numbers and many different cases) but I don't see much that could be done to improve it. There was a problem hiding this comment. should be done |
||
|
|
||
| local meta = technic.get_stack_meta(itemstack) | ||
| local charge = meta:get_int("technic:charge") | ||
| if charge < 100 then | ||
|
|
@@ -49,19 +105,7 @@ local function screwdriver_handler(itemstack, user, pointed_thing, mode) | |
|
|
||
| minetest.sound_play("technic_sonic_screwdriver", {pos = pos, gain = 0.3, max_hear_distance = 10}) | ||
|
|
||
|
There was a problem hiding this comment. luacheck is yet unhappy -- luacheck: push ignore 211
local function foobar()
end
-- luacheck: popThere was a problem hiding this comment.
done: 150e738 |
||
| node.param2 = new_param2 | ||
| minetest.swap_node(pos, node) | ||
|
|
||
| if not technic.creative_mode then | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When I use
paramtype2 = "degrotate",in the nodedef of"default:aspen_sapling"(nodes.lua), the rotation oddly jumps in this case. There is no such anomaly withparamtype2 = "degrotate",.Is it because you're using modulo 32 in L94, but modulo 24 in L101?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
describe the jump
(%32 is bitwise extraction, %24 is rotation modulo)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry. I meant that
colordegoratejumps oddly whereasdegrotateworks well.It turns out this code is not flawed but my perception. It simply turned too far to notice at a stationary viewing position. When following the node around in its rotation, there is no such "glitch" or "jump".
Resolved.