diff --git a/src/Classes/ImportTab.lua b/src/Classes/ImportTab.lua index 9975a98ebc..2ebd9a6048 100644 --- a/src/Classes/ImportTab.lua +++ b/src/Classes/ImportTab.lua @@ -37,8 +37,8 @@ local ImportTabClass = newClass("ImportTab", "ControlHost", "Control", function( self.controls.accountNameHeader.shown = function() return self.charImportMode == "GETACCOUNTNAME" end - self.controls.accountRealm = new("DropDownControl", {"TOPLEFT",self.controls.accountNameHeader,"BOTTOMLEFT"}, {0, 4, 60, 20}, realmList ) - self.controls.accountRealm:SelByValue( main.lastRealm or "PC", "id" ) + self.controls.accountRealm = new("DropDownControl", {"TOPLEFT",self.controls.accountNameHeader,"BOTTOMLEFT"}, {0, 4, 60, 20}, realmList) + self.controls.accountRealm:SelByValue(main.lastRealm or "PC", "id") self.controls.accountName = new("EditControl", {"LEFT",self.controls.accountRealm,"RIGHT"}, {8, 0, 200, 20}, main.lastAccountName or "", nil, "%c", nil, nil, nil, nil, true) self.controls.accountName.pasteFilter = function(text) return text:gsub(".", function(c) @@ -369,7 +369,9 @@ end) function ImportTabClass:Load(xml, fileName) self.lastRealm = xml.attrib.lastRealm - self.controls.accountRealm:SelByValue( self.lastRealm or main.lastRealm or "PC", "id" ) + self.controls.accountRealm:SelByValue(self.lastRealm or main.lastRealm or "PC", "id") + self.lastLeague = xml.attrib.lastLeague + self.controls.charSelectLeague:SelByValue(self.lastLeague or "Standard", "id") self.lastAccountHash = xml.attrib.lastAccountHash self.importLink = xml.attrib.importLink self.controls.enablePartyExportBuffs.state = xml.attrib.exportParty == "true" @@ -387,6 +389,7 @@ end function ImportTabClass:Save(xml) xml.attrib = { lastRealm = self.lastRealm, + lastLeague = self.lastLeague, lastAccountHash = self.lastAccountHash, lastCharacterHash = self.lastCharacterHash, exportParty = tostring(self.controls.enablePartyExportBuffs.state), @@ -414,6 +417,23 @@ function ImportTabClass:Draw(viewPort, inputEvents) end function ImportTabClass:DownloadCharacterList() + function FindMatchingStandardLeague(league) + -- Find a Standard league name for a given league name + -- Reference https://api.pathofexile.com/league?realm=pc + if string.find(league, "Hardcore") then + return "Hardcore" + elseif string.find(league, "HC SSF") then + -- includes Ruthless "HC SSF R " + return "SSF Hardcore" + elseif string.find(league, "SSF") then + -- Any non HardCore SSF's - includes Ruthless "SSF R " + return "SSF Standard" + else + -- normal league and ruthless league (Sanctum, Ruthless Sanctum) + return "Standard" + end + end + self.charImportMode = "DOWNLOADCHARLIST" self.charImportStatus = "Retrieving character list..." local realm = realmList[self.controls.accountRealm.selIndex] @@ -488,6 +508,7 @@ function ImportTabClass:DownloadCharacterList() end end table.sort(leagueList) + charSelectLeague = self.controls.charSelectLeague wipeTable(self.controls.charSelectLeague.list) for _, league in ipairs(leagueList) do t_insert(self.controls.charSelectLeague.list, { @@ -498,8 +519,25 @@ function ImportTabClass:DownloadCharacterList() t_insert(self.controls.charSelectLeague.list, { label = "All", }) - if self.controls.charSelectLeague.selIndex > #self.controls.charSelectLeague.list then - self.controls.charSelectLeague.selIndex = 1 + -- set the league combo to the last used if possible, used for previously imported characters + if self.lastLeague then + charSelectLeague:SelByValue(self.lastLeague, "league") + -- check that it worked + if charSelectLeague:GetSelValueByKey("league") ~= self.lastLeague then + -- League maybe over, Character will be in standard + standardLeagueName = FindMatchingStandardLeague(self.lastLeague) + self.controls.charSelectLeague:SelByValue(standardLeagueName, "league") + if charSelectLeague:GetSelValueByKey("league") ~= standardLeagueName then + -- give up and select the first entry. Ruthless mode may not have Standard equivalents + charSelectLeague.selIndex = 1 + else + self.lastLeague = standardLeagueName + end + end + else + if self.controls.charSelectLeague.selIndex > #self.controls.charSelectLeague.list then + self.controls.charSelectLeague.selIndex = 1 + end end self.lastCharList = charList self:BuildCharacterList(self.controls.charSelectLeague:GetSelValueByKey("league")) @@ -606,6 +644,9 @@ function ImportTabClass:DownloadPassiveTree() return end self.lastCharacterHash = common.sha1(charData.name) + if not self.lastLeague then + self.lastLeague = charSelectLeague:GetSelValueByKey("league") + end self:ImportPassiveTreeAndJewels(response.body, charData) end, sessionID and { header = "Cookie: POESESSID=" .. sessionID }) end @@ -628,6 +669,9 @@ function ImportTabClass:DownloadItems() return end self.lastCharacterHash = common.sha1(charData.name) + if not self.lastLeague then + self.lastLeague = charSelectLeague:GetSelValueByKey("league") + end self:ImportItemsAndSkills(response.body) end, sessionID and { header = "Cookie: POESESSID=" .. sessionID }) end @@ -711,6 +755,9 @@ function ImportTabClass:ImportPassiveTreeAndJewels(json, charData) self.build.treeTab:SetActiveSpec(self.build.treeTab.activeSpec) self.build.spec:BuildClusterJewelGraphs() self.build.spec:AddUndoState() + if not self.lastLeague then + self.lastLeague = charSelectLeague:GetSelValueByKey("league") + end self.build.characterLevel = charData.level self.build.characterLevelAutoMode = false self.build.configTab:UpdateLevel()