diff --git a/HistOffline.lua b/HistOffline.lua index 5495327..c3e3cf5 100644 --- a/HistOffline.lua +++ b/HistOffline.lua @@ -14,7 +14,7 @@ local Colour_Heading_Complete = "#58FA58" --force_lang = "fr" -- or "de" or "en" for debugging -- ======================== -version= "46" +version= "47" require( "iuplua" ) require( "iupluacontrols" ) iup.SetGlobal("UTF8MODE","YES") @@ -774,6 +774,9 @@ end end count = 0 + if SQ_Info[key] == nil then + break -- Some Locations not necessarily have Skill Quests + end for _, id in ipairs (SQ_Info[key].quests) do -- get the quests of the zone @@ -854,7 +857,7 @@ end end --========== DLC - me.DLC_box= iup.matrix {numcol=5, numcol_visible=5, numlin=4, widthdef=105} + me.DLC_box= iup.matrix {numcol=7, numcol_visible=5, numlin=4, widthdef=105} iup.SetAttribute(me.DLC_box, "READONLY", "YES") me.DLC_box.dat = DLC_Dat me.DLC_box.mousemove_cb = box_mousemove_cb @@ -866,7 +869,8 @@ end me.DLC_box:setcell(0,3, Area_names[9].long) -- Hist me.DLC_box:setcell(0,4, Area_names[10].long) -- Horns me.DLC_box:setcell(0,5, Area_names[11].long) -- Bones - me.DLC_box:setcell(0,6, Area_names[12].long) -- Clock +-- me.DLC_box:setcell(0,6, Area_names[12].long) -- VVardenfell + me.DLC_box:setcell(0,6, Area_names[13].long) -- Summer for id,_ in pairs (DLC_Dat.id) do local L = DLC_Dat.id[id].L diff --git a/data/DLC.lua b/data/DLC.lua index cb805c6..fa38817 100644 --- a/data/DLC.lua +++ b/data/DLC.lua @@ -1,3 +1,4 @@ +-- Group Dungeons DLC_Dat = {} DLC_Dat.id ={ @@ -32,6 +33,14 @@ DLC_Dat.id ={ [1959] = {L=3, C=5}, -- "Fang Lair Vanquisher", "Defeat Lizabet Charnis, the Cadaverous Menagerie, Caluurion, Ulfnor and Sabina Cedus, and Orryn the Black and Thurvokun in Fang Lair.", [1960] = {L=4, C=5}, -- "Fang Lair Conqueror", "Defeat Lizabet Charnis, The Cadaverous Menagerie, Caluurion, Ulfnor and Sabina Cedus, and Orryn the Black and Thurvokun in Veteran Fang Lair.", +--Summerset + + } -- No dungeon in TG DLC_Dat.key = DLC2key + + + + + diff --git a/data/Public.lua b/data/Public.lua index e38da42..ba59492 100644 --- a/data/Public.lua +++ b/data/Public.lua @@ -23,6 +23,11 @@ Pub_Dat.id = { [1056]= {L=1, C=4}, -- Village of the Lost Conqueror [1857]= {L=2, C=4}, -- Forgotten Wastes Conqueror [1854]= {L=3, C=4}, -- "Nchuleftingth Conqueror", + +[2094] = {L=4, C=4}, -- "Karnwasten Conqueror" "Defeat all of the champions in Karnwasten.", +-- [2096] = {L=5, C=4}, -- "Karnwasten Group Event" "Defeat the Sea Sload K'Garza in Karnwasten.", +[2093] = {L=5, C=4}, -- "Sunhold Conqueror""Defeat all of the champions in Sunhold.", + } Pub_Dat.vet = false Pub_Dat.key=pubtokey -- from keys.lua file diff --git a/data/WB.lua b/data/WB.lua index dfc4f68..56e4ea2 100644 --- a/data/WB.lua +++ b/data/WB.lua @@ -121,5 +121,12 @@ WB_dat = { --World Boss Achievements [1805] = {L=2, C=4}, --Breaker of the Unbroken, Defeat the nix-ox Nilthog the Unbroken at Nilthog's Hollow. [1807] = {L=2, C=4}, --Cheater Defeater, Defeat the Skaafin, Mehz the Cozener, at Dubdil Alar Tower and seal the rift to Oblivion. [1804] = {L=2, C=4}, -- "Consort Killer""Defeat the Queen's Consort at Missir-Dadalit Egg Mine.", - +--Summerset +[2036] = {L=3, C=4}, -- "Reef Raider" "Defeat Queen of the Reef at The Queen's Hatchery.", +[2037] = {L=3, C=4}, -- "Bucking the Matriarchy" "Defeat Caanerin at Indrik Frolic.", +[2038] = {L=3, C=4}, -- "Sea Sload Slugger""Defeat the Sea Sload B'Korgen at Welenkin Cove.", +[2039] = {L=3, C=4}, -- "Talon Taker" "Defeat Haeliata and Nagravia at Gryphon Run.", +[2040] = {L=3, C=4}, -- "Amphibian Agitator""Defeat Graveld at Graveld's Hideaway.", +[2041] = {L=3, C=4}, -- "Keel Hauler" "Defeat Keelsplitter at Keelsplitter's Nest.", +[2212] = {L=3, C=4}, -- "Asp Awareness" "Defeat Keelsplitter without stepping on any of the snakes.", } diff --git a/data/en/en.lua b/data/en/en.lua index 1ba5501..f9d7424 100644 --- a/data/en/en.lua +++ b/data/en/en.lua @@ -35,9 +35,9 @@ Area_names = { [11] = { short= "Bones", medium = "Dragon Bones", long = "Dragon Bones"}, - [12] = { short= "Clock", - medium = "Clockwork City", - long = "Clockwork City"}, + [12] = { short= "Varden", + medium = "Vardenfell", + long = "Vardenfell"}, [13] = { short= "Summer", medium = "Summerset Isle", long = "Summerset Isle"}, @@ -138,9 +138,11 @@ pub_names = { ["53"]= "The Vile Manse" , --Coldharbour ["14"]= "Village of the Lost" , ---Morrowind +--Vaardenfell ["24"]= "Forgotten Wastes", ["34"]= "Nchuleftingth", + ["44"]= "Karnwasten", + ["54"]= "Sunhold", } grp_names = { @@ -245,7 +247,7 @@ Trials_Names["VH"] = { ["51"] = "Thieves Guild: Maw of Lorkhaj Difficult Mode", ["61"] = "Craglorn Trials Conqueror", } -Locations = { +Locations = { -- Used for WB --EP ["11"] = "Stonefalls", ["21"] = "Deshaan", @@ -268,6 +270,8 @@ Locations = { ["14"] = "Coldharbour", --Morrowind ["24"] = "VVardenfell", +--Summerset + ["34"] = "Summerset", } DLC_Location_names = { ["11"] = "Rkindaleft", @@ -289,7 +293,9 @@ DLC_Location_names = { ["15"] = "Scalecaller Peak", ["25"] = "Scalecaller Peak (Vet)", ["35"] = "Fang Lair", -["45"] = "Fang Lair (Vet)" +["45"] = "Fang Lair (Vet)", +["16"] = "Karnwasten Conqueror", +["17"] = "Karnwasten Group Event", } diff --git a/data/keys.lua b/data/keys.lua index 45b88b3..f2d0992 100644 --- a/data/keys.lua +++ b/data/keys.lua @@ -57,9 +57,11 @@ pubtokey = { "53", --Coldharbour "14", ---Morrowind +--Vvardendell "24", "34", +"44", -- "Karnwasten Conqueror" +"54", -- "Sunhold Conqueror"" } DLC2key={ --Orsinium @@ -89,7 +91,7 @@ DLC2key={ "35", "45", ---Clock +--Vvardendell "16", "26", "36",