mirror of
https://github.com/minetest/minetest_game.git
synced 2024-12-23 07:10:19 +01:00
Cleanup
* Remove unused variables * Fix wearing out of screwdriver * Move magic numbers into constants * Scale down texture
This commit is contained in:
parent
bd24c15db4
commit
2b7ca68805
@ -6,6 +6,10 @@ local function nextrange(x, max)
|
|||||||
return x
|
return x
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local ROTATE_FACE = 1
|
||||||
|
local ROTATE_AXIS = 2
|
||||||
|
local USES = 10
|
||||||
|
|
||||||
-- Handles rotation
|
-- Handles rotation
|
||||||
local function screwdriver_handler(itemstack, user, pointed_thing, mode)
|
local function screwdriver_handler(itemstack, user, pointed_thing, mode)
|
||||||
if pointed_thing.type ~= "node" then
|
if pointed_thing.type ~= "node" then
|
||||||
@ -13,8 +17,6 @@ local function screwdriver_handler(itemstack, user, pointed_thing, mode)
|
|||||||
end
|
end
|
||||||
|
|
||||||
local pos = pointed_thing.under
|
local pos = pointed_thing.under
|
||||||
local keys = user:get_player_control()
|
|
||||||
local player_name = user:get_player_name()
|
|
||||||
|
|
||||||
if minetest.is_protected(pos, user:get_player_name()) then
|
if minetest.is_protected(pos, user:get_player_name()) then
|
||||||
minetest.record_protection_violation(pos, user:get_player_name())
|
minetest.record_protection_violation(pos, user:get_player_name())
|
||||||
@ -34,22 +36,19 @@ local function screwdriver_handler(itemstack, user, pointed_thing, mode)
|
|||||||
local n = node.param2
|
local n = node.param2
|
||||||
local axisdir = math.floor(n / 4)
|
local axisdir = math.floor(n / 4)
|
||||||
local rotation = n - axisdir * 4
|
local rotation = n - axisdir * 4
|
||||||
if mode == 1 then
|
if mode == ROTATE_FACE then
|
||||||
n = axisdir * 4 + nextrange(rotation, 3)
|
n = axisdir * 4 + nextrange(rotation, 3)
|
||||||
elseif mode == 3 then
|
elseif mode == ROTATE_AXIS then
|
||||||
n = nextrange(axisdir, 5) * 4
|
n = nextrange(axisdir, 5) * 4
|
||||||
end
|
end
|
||||||
|
|
||||||
node.param2 = n
|
node.param2 = n
|
||||||
minetest.swap_node(pos, node)
|
minetest.swap_node(pos, node)
|
||||||
|
|
||||||
local item_wear = tonumber(itemstack:get_wear())
|
if not minetest.setting_getbool("creative_mode") then
|
||||||
item_wear = item_wear + 300 -- was 327
|
itemstack:add_wear(65535 / (USES - 1))
|
||||||
if item_wear > 65535 then
|
|
||||||
itemstack:clear()
|
|
||||||
return itemstack
|
|
||||||
end
|
end
|
||||||
itemstack:set_wear(item_wear)
|
|
||||||
return itemstack
|
return itemstack
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -58,11 +57,11 @@ minetest.register_tool("screwdriver:screwdriver", {
|
|||||||
description = "Screwdriver (left-click rotates face, right-click rotates axis)",
|
description = "Screwdriver (left-click rotates face, right-click rotates axis)",
|
||||||
inventory_image = "screwdriver.png",
|
inventory_image = "screwdriver.png",
|
||||||
on_use = function(itemstack, user, pointed_thing)
|
on_use = function(itemstack, user, pointed_thing)
|
||||||
screwdriver_handler(itemstack, user, pointed_thing, 1)
|
screwdriver_handler(itemstack, user, pointed_thing, ROTATE_FACE)
|
||||||
return itemstack
|
return itemstack
|
||||||
end,
|
end,
|
||||||
on_place = function(itemstack, user, pointed_thing)
|
on_place = function(itemstack, user, pointed_thing)
|
||||||
screwdriver_handler(itemstack, user, pointed_thing, 3)
|
screwdriver_handler(itemstack, user, pointed_thing, ROTATE_AXIS)
|
||||||
return itemstack
|
return itemstack
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 286 B After Width: | Height: | Size: 261 B |
Loading…
Reference in New Issue
Block a user