167dddaa84
I recreated the original layout as best as practical, but by necessity there are a few minor positioning changes, since the underlying hard-wired inventory slots are square now and image positioning is now scaled by exactly 1.250 in both dimensions (as opposed to roughly 1.25 by 1.16). Backstage, I also needed to fix the aspect ratios of the various inventory slot elements. That meant redesigning the single-slot image from scratch. It was already blurry/grainy and a little ugly, and trying to alter it would have only made it worse. The slot image is now exactly 56x56 pixels square, set on a 64x64 canvas, so there's a 4 pixel empty space around the edges. The full 256px .xcf workfile is included in the UI folder. I've re-tiled all slot/inv images from the new single slot. I also re-rendered the trash can icon from it since it was blurry and oddly-sized. I couldn't find the original upstream image, so since they're free, I used one of my Linux system's icons which happens to resemble it. I also removed a couple more improper uses of `background[]` where `image[]` is more appropriate. There are tons of minor tweaks throughout the code to re-align everything, and I had to rewrite a few sections to avoid code duplication and to allow for a little more flexibility (mainly to make "lite" mode look right).
280 lines
8.4 KiB
Lua
280 lines
8.4 KiB
Lua
--[[
|
|
Bags for Minetest
|
|
|
|
Copyright (c) 2012 cornernote, Brett O'Donnell <cornernote@gmail.com>
|
|
License: GPLv3
|
|
--]]
|
|
|
|
local S = minetest.get_translator("unified_inventory")
|
|
local F = minetest.formspec_escape
|
|
local bags_inv_bg_prefix = "image[0.3,1.5;"..(unified_inventory.imgscale*8)..","
|
|
|
|
unified_inventory.register_page("bags", {
|
|
get_formspec = function(player)
|
|
local player_name = player:get_player_name()
|
|
return { formspec = table.concat({
|
|
unified_inventory.standard_inv_bg,
|
|
bags_inv_bg_prefix..uninv.imgscale..";ui_bags_header.png]",
|
|
"label["..unified_inventory.form_header_x..","..unified_inventory.form_header_y..";" .. F(S("Bags")) .. "]",
|
|
"button[0.6125,2.75;1.875,0.75;bag1;" .. F(S("Bag @1", 1)) .. "]",
|
|
"button[3.1125,2.75;1.875,0.75;bag2;" .. F(S("Bag @1", 2)) .. "]",
|
|
"button[5.6125,2.75;1.875,0.75;bag3;" .. F(S("Bag @1", 3)) .. "]",
|
|
"button[8.1125,2.75;1.875,0.75;bag4;" .. F(S("Bag @1", 4)) .. "]",
|
|
"listcolors[#00000000;#00000000]",
|
|
"list[detached:" .. F(player_name) .. "_bags;bag1;1.075,1.65;1,1;]",
|
|
"list[detached:" .. F(player_name) .. "_bags;bag2;3.575,1.65;1,1;]",
|
|
"list[detached:" .. F(player_name) .. "_bags;bag3;6.075,1.65;1,1;]",
|
|
"list[detached:" .. F(player_name) .. "_bags;bag4;8.575,1.65;1,1;]"
|
|
}) }
|
|
end,
|
|
})
|
|
|
|
unified_inventory.register_button("bags", {
|
|
type = "image",
|
|
image = "ui_bags_icon.png",
|
|
tooltip = S("Bags"),
|
|
hide_lite=true
|
|
})
|
|
|
|
local function get_player_bag_stack(player, i)
|
|
return minetest.get_inventory({
|
|
type = "detached",
|
|
name = player:get_player_name() .. "_bags"
|
|
}):get_stack("bag" .. i, 1)
|
|
end
|
|
|
|
for bag_i = 1, 4 do
|
|
unified_inventory.register_page("bag" .. bag_i, {
|
|
get_formspec = function(player)
|
|
local stack = get_player_bag_stack(player, bag_i)
|
|
local image = stack:get_definition().inventory_image
|
|
local fs = {
|
|
unified_inventory.standard_inv_bg,
|
|
"image[9.2,0.4;1,1;" .. image .. "]",
|
|
"label[0.3,0.65;" .. F(S("Bag @1", bag_i)) .. "]",
|
|
"listcolors[#00000000;#00000000]",
|
|
"listring[current_player;main]",
|
|
}
|
|
local slots = stack:get_definition().groups.bagslots
|
|
if slots == 8 then
|
|
fs[#fs + 1] = bags_inv_bg_prefix..uninv.imgscale..";ui_bags_inv_small.png]"
|
|
elseif slots == 16 then
|
|
fs[#fs + 1] = bags_inv_bg_prefix..(uninv.imgscale*2)..";ui_bags_inv_medium.png]"
|
|
elseif slots == 24 then
|
|
fs[#fs + 1] = bags_inv_bg_prefix..(uninv.imgscale*3)..";ui_bags_inv_large.png]"
|
|
end
|
|
fs[#fs + 1] = "list[current_player;bag" .. bag_i .. "contents;0.45,1.65;8,3;]"
|
|
fs[#fs + 1] = "listring[current_name;bag" .. bag_i .. "contents]"
|
|
|
|
local player_name = player:get_player_name() -- For if statement.
|
|
if unified_inventory.trash_enabled
|
|
or unified_inventory.is_creative(player_name)
|
|
or minetest.get_player_privs(player_name).give then
|
|
fs[#fs + 1] = "image[7.8,0.25;"..uninv.imgscale..","..uninv.imgscale..";ui_trash_slot.png]"
|
|
.. "list[detached:trash;main;7.95,0.25;1,1;]"
|
|
end
|
|
local inv = player:get_inventory()
|
|
for i = 1, 4 do
|
|
local def = get_player_bag_stack(player, i):get_definition()
|
|
if def.groups.bagslots then
|
|
local list_name = "bag" .. i .. "contents"
|
|
local size = inv:get_size(list_name)
|
|
local used = 0
|
|
for si = 1, size do
|
|
local stk = inv:get_stack(list_name, si)
|
|
if not stk:is_empty() then
|
|
used = used + 1
|
|
end
|
|
end
|
|
local img = def.inventory_image
|
|
local label = F(S("Bag @1", i)) .. "\n" .. used .. "/" .. size
|
|
fs[#fs + 1] = string.format("image_button[%f,0.4;1,1;%s;bag%i;%s]",
|
|
(i + 1.35)*1.25, img, i, label)
|
|
end
|
|
end
|
|
return { formspec = table.concat(fs) }
|
|
end,
|
|
})
|
|
end
|
|
|
|
minetest.register_on_player_receive_fields(function(player, formname, fields)
|
|
if formname ~= "" then
|
|
return
|
|
end
|
|
for i = 1, 4 do
|
|
if fields["bag" .. i] then
|
|
local stack = get_player_bag_stack(player, i)
|
|
if not stack:get_definition().groups.bagslots then
|
|
return
|
|
end
|
|
unified_inventory.set_inventory_formspec(player, "bag" .. i)
|
|
return
|
|
end
|
|
end
|
|
end)
|
|
|
|
local function save_bags_metadata(player, bags_inv)
|
|
local is_empty = true
|
|
local bags = {}
|
|
for i = 1, 4 do
|
|
local bag = "bag" .. i
|
|
if not bags_inv:is_empty(bag) then
|
|
-- Stack limit is 1, otherwise use stack:to_string()
|
|
bags[i] = bags_inv:get_stack(bag, 1):get_name()
|
|
is_empty = false
|
|
end
|
|
end
|
|
local meta = player:get_meta()
|
|
if is_empty then
|
|
meta:set_string("unified_inventory:bags", nil)
|
|
else
|
|
meta:set_string("unified_inventory:bags",
|
|
minetest.serialize(bags))
|
|
end
|
|
end
|
|
|
|
local function load_bags_metadata(player, bags_inv)
|
|
local player_inv = player:get_inventory()
|
|
local meta = player:get_meta()
|
|
local bags_meta = meta:get("unified_inventory:bags")
|
|
local bags = bags_meta and minetest.deserialize(bags_meta) or {}
|
|
local dirty_meta = false
|
|
if not bags_meta then
|
|
-- Backwards compatiblity
|
|
for i = 1, 4 do
|
|
local bag = "bag" .. i
|
|
if not player_inv:is_empty(bag) then
|
|
-- Stack limit is 1, otherwise use stack:to_string()
|
|
bags[i] = player_inv:get_stack(bag, 1):get_name()
|
|
dirty_meta = true
|
|
end
|
|
end
|
|
end
|
|
-- Fill detached slots
|
|
for i = 1, 4 do
|
|
local bag = "bag" .. i
|
|
bags_inv:set_size(bag, 1)
|
|
bags_inv:set_stack(bag, 1, bags[i] or "")
|
|
end
|
|
|
|
if dirty_meta then
|
|
-- Requires detached inventory to be set up
|
|
save_bags_metadata(player, bags_inv)
|
|
end
|
|
|
|
-- Clean up deprecated garbage after saving
|
|
for i = 1, 4 do
|
|
local bag = "bag" .. i
|
|
player_inv:set_size(bag, 0)
|
|
end
|
|
end
|
|
|
|
minetest.register_on_joinplayer(function(player)
|
|
local player_name = player:get_player_name()
|
|
local bags_inv = minetest.create_detached_inventory(player_name .. "_bags",{
|
|
on_put = function(inv, listname, index, stack, player)
|
|
player:get_inventory():set_size(listname .. "contents",
|
|
stack:get_definition().groups.bagslots)
|
|
save_bags_metadata(player, inv)
|
|
end,
|
|
allow_put = function(inv, listname, index, stack, player)
|
|
local new_slots = stack:get_definition().groups.bagslots
|
|
if not new_slots then
|
|
return 0
|
|
end
|
|
local player_inv = player:get_inventory()
|
|
local old_slots = player_inv:get_size(listname .. "contents")
|
|
|
|
if new_slots >= old_slots then
|
|
return 1
|
|
end
|
|
|
|
-- using a smaller bag, make sure it fits
|
|
local old_list = player_inv:get_list(listname .. "contents")
|
|
local new_list = {}
|
|
local slots_used = 0
|
|
local use_new_list = false
|
|
|
|
for i, v in ipairs(old_list) do
|
|
if v and not v:is_empty() then
|
|
slots_used = slots_used + 1
|
|
use_new_list = i > new_slots
|
|
new_list[slots_used] = v
|
|
end
|
|
end
|
|
if new_slots >= slots_used then
|
|
if use_new_list then
|
|
player_inv:set_list(listname .. "contents", new_list)
|
|
end
|
|
return 1
|
|
end
|
|
-- New bag is smaller: Disallow inserting
|
|
return 0
|
|
end,
|
|
allow_take = function(inv, listname, index, stack, player)
|
|
if player:get_inventory():is_empty(listname .. "contents") then
|
|
return stack:get_count()
|
|
end
|
|
return 0
|
|
end,
|
|
on_take = function(inv, listname, index, stack, player)
|
|
player:get_inventory():set_size(listname .. "contents", 0)
|
|
save_bags_metadata(player, inv)
|
|
end,
|
|
allow_move = function()
|
|
return 0
|
|
end,
|
|
}, player_name)
|
|
|
|
load_bags_metadata(player, bags_inv)
|
|
end)
|
|
|
|
-- register bag tools
|
|
minetest.register_tool("unified_inventory:bag_small", {
|
|
description = S("Small Bag"),
|
|
inventory_image = "bags_small.png",
|
|
groups = {bagslots=8},
|
|
})
|
|
|
|
minetest.register_tool("unified_inventory:bag_medium", {
|
|
description = S("Medium Bag"),
|
|
inventory_image = "bags_medium.png",
|
|
groups = {bagslots=16},
|
|
})
|
|
|
|
minetest.register_tool("unified_inventory:bag_large", {
|
|
description = S("Large Bag"),
|
|
inventory_image = "bags_large.png",
|
|
groups = {bagslots=24},
|
|
})
|
|
|
|
-- register bag crafts
|
|
if minetest.get_modpath("farming") ~= nil then
|
|
minetest.register_craft({
|
|
output = "unified_inventory:bag_small",
|
|
recipe = {
|
|
{"", "farming:string", ""},
|
|
{"group:wool", "group:wool", "group:wool"},
|
|
{"group:wool", "group:wool", "group:wool"},
|
|
},
|
|
})
|
|
|
|
minetest.register_craft({
|
|
output = "unified_inventory:bag_medium",
|
|
recipe = {
|
|
{"", "", ""},
|
|
{"farming:string", "unified_inventory:bag_small", "farming:string"},
|
|
{"farming:string", "unified_inventory:bag_small", "farming:string"},
|
|
},
|
|
})
|
|
|
|
minetest.register_craft({
|
|
output = "unified_inventory:bag_large",
|
|
recipe = {
|
|
{"", "", ""},
|
|
{"farming:string", "unified_inventory:bag_medium", "farming:string"},
|
|
{"farming:string", "unified_inventory:bag_medium", "farming:string"},
|
|
},
|
|
})
|
|
end
|