From 2b7ca68805adb59bd56aab6735c77cb8ad20abc5 Mon Sep 17 00:00:00 2001
From: PilzAdam <pilzadam@minetest.net>
Date: Sun, 7 Dec 2014 12:23:43 +0100
Subject: [PATCH] Cleanup * Remove unused variables * Fix wearing out of
screwdriver * Move magic numbers into constants * Scale down texture
---
mods/screwdriver/init.lua | 23 +++++++++++-----------
mods/screwdriver/textures/screwdriver.png | Bin 286 -> 261 bytes
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/mods/screwdriver/init.lua b/mods/screwdriver/init.lua
index 59c00443..4aadaa0a 100644
--- a/mods/screwdriver/init.lua
+++ b/mods/screwdriver/init.lua
@@ -6,6 +6,10 @@ 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
@@ -13,8 +17,6 @@ local function screwdriver_handler(itemstack, user, pointed_thing, mode)
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,
})
diff --git a/mods/screwdriver/textures/screwdriver.png b/mods/screwdriver/textures/screwdriver.png
index f471756d4239d51092fb9bbe957a78fe6275b639..33cb83f71a4fa6a4398a84cfe13e0ac49de28137 100644
GIT binary patch
literal 261
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdm+fgWR1M)}51i$-uy15a1Ky
z+8nN-C(moGF65#s5@0G3VJQ=9D_P*JoS2YOR@TrzY1-1|D|hbMckSklr?1}p{`<Qr
zZTk@h1_s8GAirP+hi5m^K%69RcNc~ZR#^`Q1_sUokH}&M25w;xW@MN(M}mQYfxX1j
z*OmPq4?DM*u*Me2^$ZLQj-D=#Asp9}6B-!jZ8kWzmo<Z@ZR-97Jp1Zq2(bHfFe;YB
zFr3mVZ8Gw?#H7Hp>`K6j3E2`M9jYcAYEKwa4Gb9=dfE9RQfuyQXJBAp@O1TaS?83{
F1OO?EPCNhr
delta 272
zcmZo=n#bhQ8Q|y6%O%Cdz`(%k>ERN@z`&pY!W_&D3=A$yx{fh0Fc=5;gt%HTFzCti
zTB{4W=!yiGN<>)7#M(+0cq=!DYfSW$sGla<<HNwfz*rLG7tG-B>_!>`1H(*D7sn8b
z(|gZ*3msPAVGcO{z+X70>i^|w%Puc<4Zj+e-=cU+ech4T6do71v~xW!+?LPxcujcB
z#w@cjazW44^E)osAGe(6km6#qKw;KS;V<zQ&6*^;5<VZ!F5IM>@KyG#&l>qV+6UGx
zN?PYUHKTX;iq+mb9ouh3F*b$k$7WsJb*C^<=SrDV*1`MXGd8?X{lRfzf9s(-&a_{u
a`UyAK?<U{jkYiwAVDNPHb6Mw<&;$StoMwFh
--
GitLab