nalc/nalc_game
1
0
Fork 1
forked from luanti-org/minetest_game
Code Issues Pull Requests Releases Wiki Activity

Keys: Show owner in description

Browse Source 
Utilizes several new features allowing the description of an item to be changed using the `description` meta key. This also moves keys from using the old single-value itemstack metadata system to the new node-like metadata system.
This commit is contained in:
octacian
2017-02-26 09:24:12 -08:00
committed by Auke Kok
parent bb18eeccaf
commit 9d3a526324
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mods/default/nodes.lua
View File

@@ -1727,9 +1727,13 @@ minetest.register_node("default:chest_locked", {
on_key_use = function(pos, player) on_key_use = function(pos, player)
local secret = minetest.get_meta(pos):get_string("key_lock_secret") local secret = minetest.get_meta(pos):get_string("key_lock_secret")
local itemstack = player:get_wielded_item() local itemstack = player:get_wielded_item()
local key_meta = minetest.parse_json(itemstack:get_metadata()) local key_meta = itemstack:get_meta()
if secret ~= key_meta.secret then if key_meta:get_string("secret") == "" then
key_meta:set_string("secret", minetest.parse_json(itemstack:get_metadata()).secret)
end
if secret ~= key_meta:get_string("secret") then
return return
end end

7
mods/default/tools.lua
View File

@@ -410,9 +410,10 @@ minetest.register_tool("default:skeleton_key", {
-- finish and return the new key -- finish and return the new key
itemstack:take_item() itemstack:take_item()
itemstack:add_item("default:key") itemstack:add_item("default:key")
itemstack:set_metadata(minetest.write_json({ local meta = itemstack:get_meta()
secret = secret meta:set_string("secret", secret)
})) meta:set_string("description", "Key to "..placer:get_player_name().."'s "
..minetest.registered_nodes[node.name].description)
return itemstack return itemstack
end end
end end

18
mods/doors/init.lua
View File

@@ -144,9 +144,14 @@ function _doors.door_toggle(pos, node, clicker)
local item = clicker:get_wielded_item() local item = clicker:get_wielded_item()
local owner = meta:get_string("doors_owner") local owner = meta:get_string("doors_owner")
if item:get_name() == "default:key" then if item:get_name() == "default:key" then
local key_meta = minetest.parse_json(item:get_metadata()) local key_meta = item:get_meta()
local secret = meta:get_string("key_lock_secret") local secret = meta:get_string("key_lock_secret")
if secret ~= key_meta.secret then
if key_meta:get_string("secret") == "" then
key_meta:set_string("secret", minetest.parse_json(item:get_metadata()).secret)
end
if secret ~= key_meta:get_string("secret") then
return false return false
end end
@@ -532,9 +537,14 @@ function _doors.trapdoor_toggle(pos, node, clicker)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local owner = meta:get_string("doors_owner") local owner = meta:get_string("doors_owner")
if item:get_name() == "default:key" then if item:get_name() == "default:key" then
local key_meta = minetest.parse_json(item:get_metadata()) local key_meta = item:get_meta()
local secret = meta:get_string("key_lock_secret") local secret = meta:get_string("key_lock_secret")
if secret ~= key_meta.secret then
if key_meta:get_string("secret") == "" then
key_meta:set_string("secret", minetest.parse_json(item:get_metadata()).secret)
end
if secret ~= key_meta:get_string("secret") then
return false return false
end end