diff --git a/HistOffline.lua b/HistOffline.lua index d38414f..113b09a 100644 --- a/HistOffline.lua +++ b/HistOffline.lua @@ -1,4 +1,4 @@ --- Licence: MI Licence +-- Licence: MIT Licence -- Some code from the luatz project (MIT Licence) -- Configuration ========== @@ -178,7 +178,7 @@ btn_archive = iup.button{title="Archive", FGCOLOR = "#FF0000"} -- == Cumulative TimePlayed accounts[acc].name[char].timeplayed = math.floor(thischar.levels[level].time/60) - -- Generate the levelling box. ============================ + -- Generate the leveling box. ============================ local leveling_box = {} accounts[acc].name[char].leveling_box = iup.matrix {numcol=6, numcol_visible=6, widthdef=60} accounts[acc].name[char].leveling_box:setcell(0,1, L.Level) @@ -186,8 +186,8 @@ btn_archive = iup.button{title="Archive", FGCOLOR = "#FF0000"} accounts[acc].name[char].leveling_box:setcell(0,3, L.Start) accounts[acc].name[char].leveling_box:setcell(0,4, L.Deaths) accounts[acc].name[char].leveling_box:setcell(0,5, L.APts) - accounts[acc].name[char].leveling_box:setcell(0,6, L.FirstDeath) - iup.SetAttribute(accounts[acc].name[char].leveling_box, "WIDTH6", 90) + accounts[acc].name[char].leveling_box:setcell(0,6, L.Location) + iup.SetAttribute(accounts[acc].name[char].leveling_box, "WIDTH6", "100") iup.SetAttribute(accounts[acc].name[char].leveling_box, "READONLY", "YES") @@ -200,7 +200,6 @@ btn_archive = iup.button{title="Archive", FGCOLOR = "#FF0000"} table.sort(levels) for i,j in ipairs(levels) do -- traverse in sorted order - -- print (char, i,j) local timelevel = math.floor(thischar.levels[j].time) accounts[acc].name[char].leveling_box.numlin = i accounts[acc].name[char].leveling_box:setcell(i,1, j) @@ -208,14 +207,9 @@ btn_archive = iup.button{title="Archive", FGCOLOR = "#FF0000"} accounts[acc].name[char].leveling_box:setcell(i,3, os.date("%Y-%m-%d",thischar.levels[j].begin)) accounts[acc].name[char].leveling_box:setcell(i,4, thischar.levels[j].deaths) accounts[acc].name[char].leveling_box:setcell(i,5, thischar.levels[j].Ach_Points) - -- Do we have map data for this level? + -- Do we have map name for this level? if thischar.levels[j].map ~= nil then - local thismap = "" - for map, _ in pairs (thischar.levels[j].map) do - print("Map: " .. map .." " .. thischar.levels[j].map[map]) - thismap = map - end - accounts[acc].name[char].leveling_box:setcell(i,6, thismap) + accounts[acc].name[char].leveling_box:setcell(i,6, thischar.levels[j].map) end end @@ -274,7 +268,6 @@ btn_archive = iup.button{title="Archive", FGCOLOR = "#FF0000"} accounts[acc].name[char].Grp_box.Redraw= "ALL" - -- Create Pub Dungeon Achievements Box========================== accounts[acc].name[char].Pub_box = iup.matrix {numcol=4, numcol_visible=4, numlin=5, widthdef=90} for i=1, 4 do -- Load text @@ -319,7 +312,6 @@ btn_archive = iup.button{title="Archive", FGCOLOR = "#FF0000"} accounts[acc].name[char].Pub_box.Redraw= "ALL" - -- Create Vet Dungeon Achievements Box========================== accounts[acc].name[char].Vet_box= iup.matrix {numcol=5, numcol_visible=5, numlin=5, widthdef=110} @@ -369,8 +361,8 @@ btn_archive = iup.button{title="Archive", FGCOLOR = "#FF0000"} accounts[acc].name[char].Vet_box.Redraw= "ALL" - -- Create Maps Box============================================== - accounts[acc].name[char].Map_box= iup.matrix {numcol=6, numcol_visible=6, numlin=0, widthdefault=30} + -- Create Locations Box============================================== + accounts[acc].name[char].Map_box= iup.matrix {numcol=6, numcol_visible=6, numlin=0, widthdef=60} accounts[acc].name[char].Map_box:setcell(0,0, L.Location) accounts[acc].name[char].Map_box:setcell(0,1, L.Visits) @@ -380,10 +372,13 @@ btn_archive = iup.button{title="Archive", FGCOLOR = "#FF0000"} accounts[acc].name[char].Map_box:setcell(0,5, L.FirstDeath) accounts[acc].name[char].Map_box:setcell(0,6, L.Deaths) - iup.SetAttribute(accounts[acc].name[char].Map_box, "READONLY", "YES") iup.SetAttribute(accounts[acc].name[char].Map_box, "ALIGNMENT0", "ALEFT") iup.SetAttribute(accounts[acc].name[char].Map_box, "WIDTH0", "100") + iup.SetAttribute(accounts[acc].name[char].Map_box, "WIDTH1", "40") + iup.SetAttribute(accounts[acc].name[char].Map_box, "WIDTH4", "55") + iup.SetAttribute(accounts[acc].name[char].Map_box, "WIDTH6", "40") + local map_names = {} for map,_ in pairs(thischar.maps) do @@ -401,7 +396,7 @@ btn_archive = iup.button{title="Archive", FGCOLOR = "#FF0000"} accounts[acc].name[char].Map_box:setcell( Line,1, thischar.maps[map].visit) end - if thischar.maps[map].firstvisited ~= nil then + if thischar.maps[map].firstvisitdate ~= nil then local firstvisit = os.date(dateformat,thischar.maps[map].firstvisitdate) accounts[acc].name[char].Map_box:setcell( Line,2, firstvisit) end @@ -410,8 +405,8 @@ btn_archive = iup.button{title="Archive", FGCOLOR = "#FF0000"} accounts[acc].name[char].Map_box:setcell( Line,3, thischar.maps[map].firstlevel) end - if thischar.maps[map].timesleveled ~= nil then - accounts[acc].name[char].Map_box:setcell( Line,4, thischar.maps[map].timesleveled) + if thischar.maps[map].timeslevel ~= nil then + accounts[acc].name[char].Map_box:setcell( Line,4, thischar.maps[map].timeslevel) end if thischar.maps[map].firstdeathlevel ~= nil then @@ -474,7 +469,7 @@ btn_archive = iup.button{title="Archive", FGCOLOR = "#FF0000"} } -- end of tabs for characters vbox iup.Append(accounts[acc].tabs,accounts[acc].name[char].tab) - local panel =(#accounts[acc].names * 90) + local panel =(#accounts[acc].names * 90) if panel < 650 then panel = 650 elseif panel >950 then diff --git a/Screenshots/Locations.jpg b/Screenshots/Locations.jpg index bc73815..c0c1bec 100644 Binary files a/Screenshots/Locations.jpg and b/Screenshots/Locations.jpg differ diff --git a/history.lua b/history.lua index b65d5a5..57ec4c1 100644 --- a/history.lua +++ b/history.lua @@ -169,15 +169,13 @@ local function levelup(_, unitTag,_) local map = new_map() --Update Level data with map if hist.me.levels[hist.me.level].map == nil then - hist.me.levels[hist.me.level].map = {} - hist.me.levels[hist.me.level].map[map] = 1 + hist.me.levels[hist.me.level].map = map + local msg = "First Levelup in map " ..map log (msg) if hist.debug then d("First Levelup in map " ..map) end - else - hist.me.levels[hist.me.level].map[map] = hist.me.levels[hist.me.level].map[map] +1 end diff --git a/shortcuts/Addons path.jpg b/shortcuts/Addons path.jpg index dd1ba32..ae1e00b 100644 Binary files a/shortcuts/Addons path.jpg and b/shortcuts/Addons path.jpg differ
