Skip to content
Permalink
Browse files

Cleanup

* Remove unused variables
* Fix wearing out of screwdriver
* Move magic numbers into constants
* Scale down texture
  • Loading branch information
PilzAdam committed Dec 12, 2014
1 parent bd24c15 commit 2b7ca68805adb59bd56aab6735c77cb8ad20abc5
Showing with 11 additions and 12 deletions.
  1. +11 −12 mods/screwdriver/init.lua
  2. BIN mods/screwdriver/textures/screwdriver.png
@@ -6,15 +6,17 @@ local function nextrange(x, max)
return x
end

local ROTATE_FACE = 1
local ROTATE_AXIS = 2
local USES = 10

-- Handles rotation
local function screwdriver_handler(itemstack, user, pointed_thing, mode)
if pointed_thing.type ~= "node" then
return
end

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
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 axisdir = math.floor(n / 4)
local rotation = n - axisdir * 4
if mode == 1 then
if mode == ROTATE_FACE then
n = axisdir * 4 + nextrange(rotation, 3)
elseif mode == 3 then
elseif mode == ROTATE_AXIS then
n = nextrange(axisdir, 5) * 4
end

node.param2 = n
minetest.swap_node(pos, node)

local item_wear = tonumber(itemstack:get_wear())
item_wear = item_wear + 300 -- was 327
if item_wear > 65535 then
itemstack:clear()
return itemstack
if not minetest.setting_getbool("creative_mode") then
itemstack:add_wear(65535 / (USES - 1))
end
itemstack:set_wear(item_wear)

return itemstack
end

@@ -58,11 +57,11 @@ minetest.register_tool("screwdriver:screwdriver", {
description = "Screwdriver (left-click rotates face, right-click rotates axis)",
inventory_image = "screwdriver.png",
on_use = function(itemstack, user, pointed_thing)
screwdriver_handler(itemstack, user, pointed_thing, 1)
screwdriver_handler(itemstack, user, pointed_thing, ROTATE_FACE)
return itemstack
end,
on_place = function(itemstack, user, pointed_thing)
screwdriver_handler(itemstack, user, pointed_thing, 3)
screwdriver_handler(itemstack, user, pointed_thing, ROTATE_AXIS)
return itemstack
end,
})
Binary file not shown.

0 comments on commit 2b7ca68

Please sign in to comment.