Skip to content

[pob1-port] Add league information to save xmls for imported characters #1795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
github-actions wants to merge 1 commit into
base: dev
Choose a base branch
from
+43 −0
Open

[pob1-port] Add league information to save xmls for imported characters #1795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Classes/ImportTab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,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, {
Expand Down
42 changes: 42 additions & 0 deletions src/Classes/ImportTab.lua.rej
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
diff a/src/Classes/ImportTab.lua b/src/Classes/ImportTab.lua (rejected hunks)
@@ -523,11 +523,11 @@ function ImportTabClass:DownloadCharacterList()
if self.lastLeague then
charSelectLeague:SelByValue(self.lastLeague, "league")
-- check that it worked
- if charSelectLeague:GetSelValue("league") ~= self.lastLeague then
+ 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:GetSelValue("league") ~= standardLeagueName then
+ if charSelectLeague:GetSelValueByKey("league") ~= standardLeagueName then
-- give up and select the first entry. Ruthless mode may not have Standard equivalents
charSelectLeague.selIndex = 1
else
@@ -645,7 +645,7 @@ function ImportTabClass:DownloadPassiveTree()
end
self.lastCharacterHash = common.sha1(charData.name)
if not self.lastLeague then
- self.lastLeague = charSelectLeague:GetSelValue("league")
+ self.lastLeague = charSelectLeague:GetSelValueByKey("league")
end
self:ImportPassiveTreeAndJewels(response.body, charData)
end, sessionID and { header = "Cookie: POESESSID=" .. sessionID })
@@ -670,7 +670,7 @@ function ImportTabClass:DownloadItems()
end
self.lastCharacterHash = common.sha1(charData.name)
if not self.lastLeague then
- self.lastLeague = charSelectLeague:GetSelValue("league")
+ self.lastLeague = charSelectLeague:GetSelValueByKey("league")
end
self:ImportItemsAndSkills(response.body)
end, sessionID and { header = "Cookie: POESESSID=" .. sessionID })
@@ -756,7 +756,7 @@ function ImportTabClass:ImportPassiveTreeAndJewels(json, charData)
self.build.spec:BuildClusterJewelGraphs()
self.build.spec:AddUndoState()
if not self.lastLeague then
- self.lastLeague = charSelectLeague:GetSelValue("league")
+ self.lastLeague = charSelectLeague:GetSelValueByKey("league")
end
self.build.characterLevel = charData.level
self.build.characterLevelAutoMode = false