diff --git a/HistOffline.lua b/HistOffline.lua index f6bcce0..164ff5f 100644 --- a/HistOffline.lua +++ b/HistOffline.lua @@ -37,7 +37,7 @@ dofile "./data/Trial.lua" dofile "./data/Keys.lua" --Linking tables -function dump(o) +dump = function (o) if type(o) == 'table' then local s = '{ ' for k,v in pairs(o) do @@ -52,7 +52,7 @@ end -- Minimally effective quoting -function quote(astring) +quote = function (astring) local quoted1 = string.gsub(astring,'\"', '\\"') local quoted2 = '"' .. string.gsub(quoted1,"%'", "\\'") .. '"' local linefeed = string.gsub(quoted2,"\n", "\\n") @@ -60,7 +60,7 @@ function quote(astring) end -function write_saved(o) +write_saved = function (o) -- local escaped if type(o) == 'table' then local s = '{\n' @@ -80,7 +80,7 @@ function write_saved(o) end lingua= {} -- Translated data -function load_lang(lang) +load_lang = function (lang) if lingua[lang] ~= nil then return end @@ -100,6 +100,15 @@ function load_lang(lang) lingua[lang].Ach_Detail = Ach_Detail end +_size = function (t) -- return number of elements in table + local i = 0 + for _,_ in pairs(t) do + i = i +1 + end + return i +end + + --SQ_Dat loaded from data.lua SQ_Info= {} -- keyed by "LC" string as the ZONE Identifier for id,_ in pairs (SQ_dat) do -- Load all Quest Data by Achievement ID @@ -251,6 +260,21 @@ end for _,i in ipairs(Grp_Order) do dung.Grp[i]= {} + dung.Grp[i].key ={} -- key lookup + dung.Grp[i].box = iup.matrix {numcol=#accounts[acc].playerIDs, numlin=_size(Grp_Dat[i].dat), widthdef=100} + dung.Grp[i].tab = iup.vbox { + ["tabtitle"] =L.Grp_TabName[i], + dung.Grp[i].box, + iup.fill{}, + } + + --Set Line titles + for i,key in ipairs(grp2tokey) do +-- dung.Grp[i].box:setcell(i, 0, grp_names[key]) + end + --set lines +-- dung.Grp[i].box:setcell(0,0, L.Location) + end dung.trials = {} @@ -416,7 +440,6 @@ end iup.SetAttribute(me.Grp["1N"].box , "BGCOLOR0:3", Colour_Heading_Complete) end --- local key = "" for _,i in ipairs(Grp_Order) do for _, id in pairs (Grp_Dat[i].dat) do local L = id.L @@ -1013,6 +1036,11 @@ iup.Append(accounts[acc].char_tabs, accounts[acc].log_tab) iup.Append(accounts[acc].dung_tabs, dung.Pub_tab) + -- Grp Dungeons =========================================== + for _,i in ipairs (Grp_Order) do + iup.Append(accounts[acc].dung_tabs, dung.Grp[i].tab) + end + -- Create DLC Dungeon Character Box========================= dung.DLC_box = {} diff --git a/data/de/de.lua b/data/de/de.lua index 7ae20f2..f2bff93 100644 --- a/data/de/de.lua +++ b/data/de/de.lua @@ -70,6 +70,7 @@ DLC_names = { Characters = "Charaktere", Dungeons = "Verliese", Mode = "Anzeige fuer", + Grp_TabName={}, Grp = "Gruppen", Pub = "Offene", Vet = "Veteranen", @@ -88,7 +89,12 @@ DLC_names = { ChooseAccounttoDelete = "Choose Account to Delete", ChooseChartoDelete = "Choose Character to Delete", } - +L.Grp_TabName["1N"] = "Mode 1N" +L.Grp_TabName["1V"] = "Mode 1V" +L.Grp_TabName["1VH"] = "Mode 1VH" +L.Grp_TabName["2N"] = "Mode 2N" +L.Grp_TabName["2V"] = "Mode 2V" +L.Grp_TabName["2VH"] = "Mode 2VH" pub_names = { --EP ["11"]= "Kraehenwald", diff --git a/data/en/en.lua b/data/en/en.lua index 0d5a3c7..59d51b3 100644 --- a/data/en/en.lua +++ b/data/en/en.lua @@ -69,12 +69,6 @@ DLC_names = { Dungeons = "Dungeons", Mode = "Showing", Grp_TabName={}, - Grp1N = "Mode 1N", - Grp1V = "Mode 1V", - Grp1VH = "Mode 1VH", - Grp2N = "Mode 2N", - Grp2V = "Mode 2V", - Grp2VH = "Mode 2VH", Pub = "Public", Vet = "Veteran", Trials = "Trials", diff --git a/data/fr/fr.lua b/data/fr/fr.lua index 7a72a5c..c50c5ce 100644 --- a/data/fr/fr.lua +++ b/data/fr/fr.lua @@ -66,6 +66,7 @@ DLC_names = { Characters = "Characters", Dungeons = "Dungeons", Mode = "Showing", + Grp_TabName={}, Grp = "Group", Pub = "Public", Vet = "Veteran", @@ -84,6 +85,12 @@ DLC_names = { ChooseAccounttoDelete = "Choose Account to Delete", ChooseChartoDelete = "Choose Character to Delete", } +L.Grp_TabName["1N"] = "Mode 1N" +L.Grp_TabName["1V"] = "Mode 1V" +L.Grp_TabName["1VH"] = "Mode 1VH" +L.Grp_TabName["2N"] = "Mode 2N" +L.Grp_TabName["2V"] = "Mode 2V" +L.Grp_TabName["2VH"] = "Mode 2VH" pub_names = { --EP diff --git a/data/keys.lua b/data/keys.lua index 7da0277..0571584 100644 --- a/data/keys.lua +++ b/data/keys.lua @@ -50,14 +50,3 @@ trial2key = { "41", -- "Dragonstar Arena", } ---list vet dungeons. Not all Grp Dungeons have veteran difficulty -vet2tokey = { -"11", --Fungal Grotto -"21", --Darkshade -"12", --Spindleclutch -"22", --Wayrest Sewers -"32", --Crypt of Hearts -"13", --Banished Cells -"23", --Elden Hollow -"33", --City of Ash -}