diff --git a/HistOffline.lua b/HistOffline.lua index 02f2b1e..5fc679c 100644 --- a/HistOffline.lua +++ b/HistOffline.lua @@ -80,7 +80,6 @@ load_lang = function (lang) lingua[lang].pub_names = pub_names lingua[lang].grp_names = grp_names lingua[lang].DLC_Location_names = DLC_Location_names - lingua[lang].DLC_names = DLC_names lingua[lang].Ach_Detail = Ach_Detail end @@ -130,7 +129,6 @@ for acc,_ in pairs(History_SV["Default"]) do L = lingua[accounts[acc].lang].L pub_names = lingua[accounts[acc].lang].pub_names grp_names = lingua[accounts[acc].lang].grp_names - DLC_names = lingua[accounts[acc].lang].DLC_names DLC_Location_names = lingua[accounts[acc].lang].DLC_Location_names Ach_Detail = lingua[accounts[acc].lang].Ach_Detail -- load worlds @@ -377,6 +375,7 @@ end dung.Craglorn[i].box.mousemove_cb = box_mousemove_cb dung.Craglorn[i].box.leavewindow_cb = box_leavewindow_cb + --set lines Heading dung.Craglorn[i].box:setcell(0,0, L.Location) --Set Line titles @@ -532,7 +531,7 @@ end for _, i in ipairs(Craglorn_Order) do -- For Each Dungeon me.Craglorn[i] = {} -- Dungeon data storage me.Craglorn[i].vet = Craglorn_Dat[i].vet - me.Craglorn[i].box = iup.matrix {numcol=1, numcol_visible=1, numlin=_size(Craglorn_Dat[i].id), widthdef=100} + me.Craglorn[i].box = iup.matrix {numcol=1, numcol_visible=1, numlin=_size(Craglorn_Dat[i].id), widthdef=120} iup.SetAttribute(me.Craglorn[i].box, "READONLY", "YES") me.Craglorn[i].box.dat = Craglorn_Dat[i] -- for mouseover me.Craglorn[i].box.mousemove_cb = box_mousemove_cb @@ -862,12 +861,12 @@ end me.DLC_box.leavewindow_cb = box_leavewindow_cb --Set Column titles - me.DLC_box:setcell(0,1, DLC_names[1].long) -- Orsinium - me.DLC_box:setcell(0,2, DLC_names[3].long) -- IC - me.DLC_box:setcell(0,3, DLC_names[4].long) -- Hist - me.DLC_box:setcell(0,4, DLC_names[5].long) -- Horns - me.DLC_box:setcell(0,5, DLC_names[6].long) -- Bones - me.DLC_box:setcell(0,6, DLC_names[7].long) -- Clock + me.DLC_box:setcell(0,1, Area_names[6].long) -- Orsinium + me.DLC_box:setcell(0,2, Area_names[8].long) -- IC + 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 for id,_ in pairs (DLC_Dat.id) do local L = DLC_Dat.id[id].L diff --git a/data/Craglorn.lua b/data/Craglorn.lua index 3368a43..e93c832 100644 --- a/data/Craglorn.lua +++ b/data/Craglorn.lua @@ -3,21 +3,31 @@ Craglorn_Conqueror = "" -- [1139] = "Craglorn Trials Conqueror" "Complete Hel Ra Craglorn_Dat["N"].id = { [991] = {L=1, C=1, key ="11"}, -- "Hel Ra Citadel Completed", "Defeat the Celestial Warrior, freeing him from the Serpent's control." [990] = {L=2, C=1, key ="21"}, -- "Aetherian Archive Completed", "Defeat the Celestial Mage, freeing her from the Serpent's control." -[1123] = {L=3, C=1, key ="31"}, -- "Sanctum Ophidia Completed", "Defeat the Celestial Serpent." +[1123] ={L=3, C=1, key ="31"}, -- "Sanctum Ophidia Completed", "Defeat the Celestial Serpent." [992] = {L=4, C=1, key ="41"}, -- "Dragonstar Arena Champion", "Conquer all challengers and earn the title of Dragonstar Arena Champion!", +[1808] ={L=5, C=1, key ="51"}, -- "Halls of Fabrication Completed", "Defeat the Assembly General and assist Divayth Fyr in stopping the flood of animunculi coming from the Halls of Fabrication.", } Craglorn_Dat["N"].vet = false Craglorn_Dat["N"].key = Craglorn2key["N"] Craglorn_Dat["V"].id = { -[1474] = {L=1, C=1, key ="11"}, -- "Hel Ra Citadel Conqueror", "Defeat the Celestial Warrior in Veteran Hel Ra Citadel, while the Trial is scaled to Champion 160." -[1503] = {L=2, C=1, key ="21"}, -- "Aetherian Archive Conqueror" Defeat the Celestial Mage in Veteran Aetherian Archive, while the Trial is scaled to Champion 160.", -[1462] = {L=3, C=1, key ="31"}, -- "Sanctum Ophidia Conqueror", -[870] = {L=4, C=1, key ="41"}, -- "Hel Ra Citadel: The War Horn", "Sound the war horn in Veteran Hel Ra Citadel and defeat the ancient warriors who answer.", -[1080] = {L=5, C=1, key ="51"}, -- "Time Trial: Hel Ra Citadel", "Completed the Hel Ra Citadel within a time limit of 33 minutes.", -[1081] = {L=6, C=1, key ="61"}, -- "Time Trial: Aetherian Archive", "Completed the Aetherian Archive within a time limit of 33 minutes.", -[1124] = {L=7, C=1, key ="71"}, -- "Time Trial: Sanctum Ophidia", "Completed the Sanctum Ophidia within a time limit of 33 minutes.", -[1140] = {L=8, C=1, key ="81"}, -- "Dragonstar Arena Conqueror", "Conquer all challengers on the increased difficulty version of Dragonstar Arena.", +[1474] = {L=1, C=1, key ="11"}, -- "Hel Ra Citadel Conqueror", "Defeat the Celestial Warrior in Veteran Hel Ra Citadel, while the Trial is scaled to Champion 160." +[1503] = {L=2, C=1, key ="21"}, -- "Aetherian Archive Conqueror" Defeat the Celestial Mage in Veteran Aetherian Archive, while the Trial is scaled to Champion 160.", +[1462] = {L=3, C=1, key ="31"}, -- "Sanctum Ophidia Conqueror", +[870] = {L=4, C=1, key ="41"}, -- "Hel Ra Citadel: The War Horn", "Sound the war horn in Veteran Hel Ra Citadel and defeat the ancient warriors who answer.", +[1080] = {L=5, C=1, key ="51"}, -- "Time Trial: Hel Ra Citadel", "Completed the Hel Ra Citadel within a time limit of 33 minutes.", +[1081] = {L=6, C=1, key ="61"}, -- "Time Trial: Aetherian Archive", "Completed the Aetherian Archive within a time limit of 33 minutes.", +[1124] = {L=7, C=1, key ="71"}, -- "Time Trial: Sanctum Ophidia", "Completed the Sanctum Ophidia within a time limit of 33 minutes.", +[1140] = {L=8, C=1, key ="81"}, -- "Dragonstar Arena Conqueror", "Conquer all challengers on the increased difficulty version of Dragonstar Arena.", +[1810] = {L=9, C=1, key ="91"}, -- "Halls of Fabrication Conqueror", "Defeat the Assembly General in Veteran Halls of Fabrication.", +[1809] = {L=10, C=1, key ="101"}, -- "Time Trial: Halls of Fabrication", "Complete Veteran Halls of Fabrication within a time limit of 40 minutes. Your trial begins when you enter Abanabi Cave beneath Tel Fyr.", +[1811] = {L=11, C=1, key ="111"}, -- "Well-Oiled Machine", "Complete Veteran Halls of Fabrication without suffering a group member death.", +[1831] = {L=12, C=1, key ="112"}, -- "Power House", "Defeat the Pinnacle Factotum without ever using energy from the generator to break a Refabricated Sphere's shield, in Veteran Halls of Fabrication.", +[1832] = {L=13, C=1, key ="113"}, -- "Planned Obsolescence", ,"Defeat the Refabrication Committee in Veteran Halls of Fabrication without ever allowing the Reclaimer to overcharge a Ruined Factotum.", +[1833] = {L=14, C=1, key ="114"}, -- "Environmentally Conscious", "Defeat the Assembly General in Veteran Halls of Fabrication without any group member dying to traps and hazards.", +[1834] = {L=15, C=1, key ="115"}, -- "Terminal Terminator", "Defeat the Assembly General in Veteran Halls of Fabrication without letting any Terminals complete their activation sequence.", +[1839] = {L=16, C=1, key ="116"}, -- "Kill Process", "Defeat one Hunter-Killer Fabricant while the other still has at least half of its health remaining, before defeating the remaining Fabricant in Veteran Halls of Fabrication.", +[1840] = {L=17, C=1, key ="117"}, -- "Arc-Custodian",, "In Veteran Halls of Fabrication, defeat the Archcustodian using six or fewer Shock Pylons without ever missing an opportunity to disable it with one.", } Craglorn_Dat["V"].vet = true Craglorn_Dat["V"].key = Craglorn2key["V"] @@ -26,6 +36,7 @@ Craglorn_Dat["VH"].id = { [1136] = {L=1, C=1, key ="11"}, -- "Hel Ra Citadel Difficult Mode","Defeat the Celestial Warrior after enraging him through the destruction of his statue army.", [1137] = {L=2, C=1, key ="21"}, -- "Aetherian Archive Difficult Mode" "Defeat the Celestial Mage after taunting her by smashing the Aetherial Orbs." [1138] = {L=3, C=1, key ="31"}, -- "Sanctum Ophidia Difficult Mode", Defeat the Celestial Serpent after desecrating the sacred banners of the Scaled Court", +[1829] = {L=4, C=1, key ="41"}, -- "Halls of Fabrication Vanquisher", "Defeat the Assembly General after empowering it by resetting the circuit breaker in Veteran Halls of Fabrication.", } diff --git a/data/Morrowind.lua b/data/Morrowind.lua deleted file mode 100644 index e1bc481..0000000 --- a/data/Morrowind.lua +++ /dev/null @@ -1,33 +0,0 @@ -Craglorn_Conqueror = "" -- [1139] = "Craglorn Trials Conqueror" "Complete Hel Ra Citadel, Aetherian Archive, and Sanctum Ophidia at their highest difficulties.", - -Morrowwind_Dat["N"].id = { -[991] = {L=1, C=1, key ="11"}, -- "Hel Ra Citadel Completed", "Defeat the Celestial Warrior, freeing him from the Serpent's control." -[990] = {L=2, C=1, key ="21"}, -- "Aetherian Archive Completed", "Defeat the Celestial Mage, freeing her from the Serpent's control." -[1123] = {L=3, C=1, key ="31"}, -- "Sanctum Ophidia Completed", "Defeat the Celestial Serpent." -[992] = {L=4, C=1, key ="41"}, -- "Dragonstar Arena Champion", "Conquer all challengers and earn the title of Dragonstar Arena Champion!", -} -Morrowind_Dat["N"].vet = false -Morrowind_Dat["N"].key = Morrowind2key["N"] - -Morrowind_Dat["V"].id = { -[1474] = {L=1, C=1, key ="11"}, -- "Hel Ra Citadel Conqueror", "Defeat the Celestial Warrior in Veteran Hel Ra Citadel, while the Trial is scaled to Champion 160." -[1503] = {L=2, C=1, key ="21"}, -- "Aetherian Archive Conqueror" Defeat the Celestial Mage in Veteran Aetherian Archive, while the Trial is scaled to Champion 160.", -[1462] = {L=3, C=1, key ="31"}, -- "Sanctum Ophidia Conqueror", -[870] = {L=4, C=1, key ="41"}, -- "Hel Ra Citadel: The War Horn", "Sound the war horn in Veteran Hel Ra Citadel and defeat the ancient warriors who answer.", -[1080] = {L=5, C=1, key ="51"}, -- "Time Trial: Hel Ra Citadel", "Completed the Hel Ra Citadel within a time limit of 33 minutes.", -[1081] = {L=6, C=1, key ="61"}, -- "Time Trial: Aetherian Archive", "Completed the Aetherian Archive within a time limit of 33 minutes.", -[1124] = {L=7, C=1, key ="71"}, -- "Time Trial: Sanctum Ophidia", "Completed the Sanctum Ophidia within a time limit of 33 minutes.", -[1140] = {L=8, C=1, key ="81"}, -- "Dragonstar Arena Conqueror", "Conquer all challengers on the increased difficulty version of Dragonstar Arena.", -} -Morrowind_Dat["V"].vet = true -Morrowind_Dat["V"].key = Morrowind2key["V"] - -Morrowind_Dat["VH"].id = { -[1136] = {L=1, C=1, key ="11"}, -- "Hel Ra Citadel Difficult Mode","Defeat the Celestial Warrior after enraging him through the destruction of his statue army.", -[1137] = {L=2, C=1, key ="21"}, -- "Aetherian Archive Difficult Mode" "Defeat the Celestial Mage after taunting her by smashing the Aetherial Orbs." -[1138] = {L=3, C=1, key ="31"}, -- "Sanctum Ophidia Difficult Mode", Defeat the Celestial Serpent after desecrating the sacred banners of the Scaled Court", - -} - -Morrowind_Dat["VH"].vet = true -Morrowind_Dat["VH"].key = Morrowind2key["VH"] diff --git a/data/en/en.lua b/data/en/en.lua index 1926c75..257de30 100644 --- a/data/en/en.lua +++ b/data/en/en.lua @@ -17,30 +17,32 @@ Area_names = { [5] = { short= "CRAG", medium = "Craglorn", long = "Craglorn"}, -} -DLC_names = { - [1] = { short= "ORS", + [6] = { short= "ORS", medium = "Orsinium", long = "Orsinium"}, - [2] = { short= "TG", -- Not using, no dungeons.. + [7] = { short= "TG", -- Not using, no dungeons.. medium = "Hew's Bane", long = "Hew's Bane"}, - [3] = { short= "IC", + [8] = { short= "IC", medium = "Imperial City", long = "Imperial City"}, - [4] = { short= "Hist", + [9] = { short= "Hist", medium = "Hist", long = "Shadows of the Hist"}, - [5] = { short= "Horns", + [10] = { short= "Horns", medium = "Horns of the Reach", long = "Horns of the Reach"}, - [6] = { short= "Bones", + [11] = { short= "Bones", medium = "Dragon Bones", long = "Dragon Bones"}, - [7] = { short= "Clock", + [12] = { short= "Clock", medium = "Clockwork City", long = "Clockwork City"}, + [13] = { short= "Summer", + medium = "Summerset Isle", + long = "Summerset Isle"}, + } L = { @@ -169,27 +171,38 @@ grp_names = { Craglorn_Names= {} Craglorn_Names["N"] = { - ["11"] = "Hel Ra Citadel Conqueror", - ["21"] = "Aetherian Archive Conqueror", - ["31"] = "Sanctum Ophidia Conqueror", - ["41"] = "Dragonstar Arena Champion", + ["11"] = "Craglorn: Hel Ra Citadel Conqueror", + ["21"] = "Craglorn: Aetherian Archive Conqueror", + ["31"] = "Craglorn: Sanctum Ophidia Conqueror", + ["41"] = "Craglorn: Dragonstar Arena Champion", + ["51"] = "Vvardenfell: Halls of Fabrication Champion", } Craglorn_Names["V"] = { - ["11"] = "Hel Ra Citadel Completed", - ["21"] = "Aetherian Archive Completed", - ["31"] = "Sanctum Ophidia Completed", - ["41"] = "Hel Ra Citadel: The War Horn", - ["51"] = "Time Trial: Hel Ra Citadel", - ["61"] = "Time Trial: Aetherian Archive", - ["71"] = "Time Trial: Sanctum Ophidia", - ["81"] = "Dragonstar Arena Champion", + ["11"] = "Craglorn: Hel Ra Citadel Completed", + ["21"] = "Craglorn: Aetherian Archive Completed", + ["31"] = "Craglorn: Sanctum Ophidia Completed", + ["41"] = "Craglorn: Hel Ra Citadel: The War Horn", + ["51"] = "Craglorn: Time Trial: Hel Ra Citadel", + ["61"] = "Craglorn: Time Trial: Aetherian Archive", + ["71"] = "Craglorn: Time Trial: Sanctum Ophidia", + ["81"] = "Craglorn: Dragonstar Arena Champion", + ["91"] = "Vvardenfell: Halls of Fabrication Champion", + ["101"] = "Vvardenfell: Time Trial: Halls of Fabrication", + ["111"] = "Vvardenfell: Well-Oiled Machine", + ["112"] = "Vvardenfell: Power House", + ["113"] = "Vvardenfell: Planned Obsolescence", + ["114"] = "Vvardenfell: Environmentally Conscious", + ["115"] = "Vvardenfell: Terminal Terminator", + ["116"] = "Vvardenfell: Kill Process", + ["117"] = "Vvardenfell: Arc-Custodian", } Craglorn_Names["VH"] = { - ["11"] = "Hel Ra Citadel Difficult Mode", - ["21"] = "Aetherian Archive Difficult Mode", - ["31"] = "Sanctum Ophidia Difficult Mode", - ["41"] = "Dragonstar Arena Conqueror", + ["11"] = "Craglorn: Hel Ra Citadel Difficult Mode", + ["21"] = "Craglorn: Aetherian Archive Difficult Mode", + ["31"] = "Craglorn: Sanctum Ophidia Difficult Mode", + ["41"] = "Craglorn: Dragonstar Arena Conqueror", + ["51"] = "Vvardenfell: Halls of Fabrication Champion", } Locations = { --EP diff --git a/data/keys.lua b/data/keys.lua index 552212a..fa7ec7b 100644 --- a/data/keys.lua +++ b/data/keys.lua @@ -104,6 +104,7 @@ Craglorn2key["N"] = { "21", -- "Aetherian Archive" "31", -- "Sanctum Ophidia", "41", -- "Dragonstar Arena Champion", +"51", -- "Halls of Fabrication Conqueror" } Craglorn2key["V"] = { @@ -115,6 +116,16 @@ Craglorn2key["V"] = { "61", -- "Sanctum Ophidia Completed", "Defeat the Celestial Serpent." "71", -- "Time Trial: Sanctum Ophidia", "Completed the Sanctum Ophidia within a time limit of 33 minutes.", "81", -- "Dragonstar Arena Champion", "Conquer all challengers and earn the title of Dragonstar Arena Champion!", +"91", -- "Halls of Fabrication Conqueror", "Defeat the Assembly General in Veteran Halls of Fabrication.", +"101", -- "Time Trial: Halls of Fabrication", "Complete Veteran Halls of Fabrication within a time limit of 40 minutes. Your trial begins when you enter Abanabi Cave beneath Tel Fyr.", +"111", -- "Well-Oiled Machine", "Complete Veteran Halls of Fabrication without suffering a group member death.", +"112", -- "Power House", "Defeat the Pinnacle Factotum without ever using energy from the generator to break a Refabricated Sphere's shield, in Veteran Halls of Fabrication.", +"113", -- "Planned Obsolescence", ,"Defeat the Refabrication Committee in Veteran Halls of Fabrication without ever allowing the Reclaimer to overcharge a Ruined Factotum.", +"114", -- "Environmentally Conscious", "Defeat the Assembly General in Veteran Halls of Fabrication without any group member dying to traps and hazards.", +"115", -- "Terminal Terminator", "Defeat the Assembly General in Veteran Halls of Fabrication without letting any Terminals complete their activation sequence.", +"116", -- "Kill Process", "Defeat one Hunter-Killer Fabricant while the other still has at least half of its health remaining, before defeating the remaining Fabricant in Veteran Halls of Fabrication.", +"117", -- "Arc-Custodian",, "In Veteran Halls of Fabrication, defeat the Archcustodian using six or fewer Shock Pylons without ever missing an opportunity to disable it with one.", + } Craglorn2key["VH"] = { "11", -- "Hel Ra Citadel",