diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | meta/placeholder.txt | 1 | ||||
| -rw-r--r-- | meta/readme.txt | 5 | ||||
| -rw-r--r-- | sfinv_page.lua | 2 | ||||
| -rw-r--r-- | skinlist.lua | 45 | ||||
| -rw-r--r-- | textures/readme.txt | 4 |
6 files changed, 46 insertions, 13 deletions
@@ -1,2 +1,4 @@ textures/character_*.png +textures/player_*.png meta/character_*.txt +meta/player_*.txt diff --git a/meta/placeholder.txt b/meta/placeholder.txt deleted file mode 100644 index a9e6fce..0000000 --- a/meta/placeholder.txt +++ /dev/null @@ -1 +0,0 @@ -Please run the update_from_db.py script to update the skins. diff --git a/meta/readme.txt b/meta/readme.txt new file mode 100644 index 0000000..d91806f --- /dev/null +++ b/meta/readme.txt @@ -0,0 +1,5 @@ +For each skin in textures folder a metadata file can be applied with "txt" suffilx. See character_1.txt for skin character_1.png for reference. +The file contains: +Skin name +Author +License diff --git a/sfinv_page.lua b/sfinv_page.lua index 5fcd6e2..c462efe 100644 --- a/sfinv_page.lua +++ b/sfinv_page.lua @@ -81,7 +81,7 @@ sfinv.register_page("skins:overview", { title = "Skins", get = function(self, player, context) -- collect skins data - context.skins_list = skins.get_skinlist() + context.skins_list = skins.get_skinlist("player:"..player:get_player_name(), true) context.total_pages = 1 for i, skin in ipairs(context.skins_list ) do local page = math.floor((i-1) / 16)+1 diff --git a/skinlist.lua b/skinlist.lua index 87fe3f6..328e518 100644 --- a/skinlist.lua +++ b/skinlist.lua @@ -3,42 +3,65 @@ local skins_dir_list = minetest.get_dir_list(skins.modpath.."/textures") local unsorted_skinslist = {} local sorted_skinslist for _, fn in pairs(skins_dir_list) do - if fn:find("^character_") then - nameparts = string.gsub(fn, "[.]", "_"):split("_") - local id = nameparts[2] - local name = "character_"..id + local nameparts = string.gsub(fn, "[.]", "_"):split("_") + + local name, sort_id, assignment, is_preview + if nameparts[1] == "character" then + sort_id = tonumber(nameparts[2])+5000 + name = "character_"..nameparts[2] + is_preview = (nameparts[3] == "preview") + elseif nameparts[1] == "player" then + assignment = "player:"..nameparts[2] + name = "player_"..nameparts[2] + if tonumber(nameparts[3]) then + sort_id = tonumber(nameparts[3]) + is_preview = (nameparts[4] == "preview") + name = name.."_"..nameparts[3] + else + sort_id = 1 + is_preview = (nameparts[3] == "preview") + end + end + + if name then local skin_obj = skins.get(name) or skins.new(name) - if nameparts[3] == "preview" then + if is_preview then skin_obj:set_preview(fn) else + skin_obj:set_texture(fn) + skin_obj:set_meta("_sort_id", sort_id) + if assignment then + skin_obj:set_meta("assignment", assignment) + end local file = io.open(skins.modpath.."/meta/"..name..".txt", "r") if file then local data = string.split(file:read("*all"), "\n", 3) file:close() - skin_obj:set_texture(fn) - skin_obj:set_meta("_sort_id", tonumber(id)) skin_obj:set_meta("name", data[1]) skin_obj:set_meta("author", data[2]) skin_obj:set_meta("license", data[3]) + else + skin_obj:set_meta("name", name) end table.insert(unsorted_skinslist, skin_obj) end end end --- get skinlist. listname not full implemented at the time: could be "mod:wardrobe" or "player:bell07" in feature -function skins.get_skinlist(listname) +-- get skinlist. If assignment given ("mod:wardrobe" or "player:bell07") select skins matches the assignment. select_unassigned selects the skins without any assignment too +function skins.get_skinlist(assignment, select_unassigned) -- sort on demand if not sorted_skinslist then table.sort(unsorted_skinslist, function(a,b) return a:get_meta("_sort_id") < b:get_meta("_sort_id") end) sorted_skinslist = unsorted_skinslist end - if not listname then + if not assignment then return sorted_skinslist else local ret = {} for _, skin in ipairs(sorted_skinslist) do - if skin:get_meta(listname) then + if assignment == skin:get_meta("assignment") or + (select_unassigned and skin:get_meta("assignment") == nil) then table.insert(ret, skin) end end diff --git a/textures/readme.txt b/textures/readme.txt new file mode 100644 index 0000000..45dca6b --- /dev/null +++ b/textures/readme.txt @@ -0,0 +1,4 @@ +In this folder the skin files could be placed according the next file naming convention +character_[number].png - Public skin, available for all users +player_[nick].png or player_[nick]_[number].png - one or multiple private skins for player "nick" +*_preview.png - Preview files for public and private skins |