mff/mff_game
1
0
Fork 0
forked from minetest/minetest_game
Code Issues Pull Requests Releases Wiki Activity

Skeleton key: Change to use left-click (tool on_use)

Browse Source 
Instead of right click, the skeleton key is now a true `tool`
in the sense that it's default left-click action is to create
a key for the locked object.

This is far better than the outcome of the patches we've done
where the only way to create a key for a locked item was to
use sneak+rightclick. Now keys are perhaps a bit more sensible,
left for making keys, right for opening stuff with keys.

Fixes #1625
This commit is contained in:
Auke Kok 2017-03-13 19:56:08 -07:00 committed by paramat
parent 780f991a87
commit 61d7c43c83
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mods/default/tools.lua
View File

@ -383,22 +383,13 @@ minetest.register_tool("default:skeleton_key", {
description = "Skeleton Key", description = "Skeleton Key",
inventory_image = "default_key_skeleton.png", inventory_image = "default_key_skeleton.png",
groups = {key = 1}, groups = {key = 1},
on_place = function(itemstack, placer, pointed_thing) on_use = function(itemstack, user, pointed_thing)
local under = pointed_thing.under
local node = minetest.get_node(under)
local def = minetest.registered_nodes[node.name]
if def and def.on_rightclick and
not (placer and placer:get_player_control().sneak) then
return def.on_rightclick(under, node, placer, itemstack,
pointed_thing) or itemstack
end
if pointed_thing.type ~= "node" then if pointed_thing.type ~= "node" then
return itemstack return itemstack
end end
local pos = pointed_thing.under local pos = pointed_thing.under
node = minetest.get_node(pos) local node = minetest.get_node(pos)
if not node then if not node then
return itemstack return itemstack
@ -413,7 +404,7 @@ minetest.register_tool("default:skeleton_key", {
random(2^16) - 1, random(2^16) - 1, random(2^16) - 1, random(2^16) - 1,
random(2^16) - 1, random(2^16) - 1) random(2^16) - 1, random(2^16) - 1)
local secret, _, _ = on_skeleton_key_use(pos, placer, newsecret) local secret, _, _ = on_skeleton_key_use(pos, user, newsecret)
if secret then if secret then
-- finish and return the new key -- finish and return the new key
@ -421,7 +412,7 @@ minetest.register_tool("default:skeleton_key", {
itemstack:add_item("default:key") itemstack:add_item("default:key")
local meta = itemstack:get_meta() local meta = itemstack:get_meta()
meta:set_string("secret", secret) meta:set_string("secret", secret)
meta:set_string("description", "Key to "..placer:get_player_name().."'s " meta:set_string("description", "Key to "..user:get_player_name().."'s "
..minetest.registered_nodes[node.name].description) ..minetest.registered_nodes[node.name].description)
return itemstack return itemstack
end end