Skip to content

Fix Inventory summary update and unnecessary MakeList #89

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
435THz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Inventory summary update and unnecessary MakeList #89

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
7 changes: 6 additions & 1 deletion Data/Script/origin/menu/InventorySelectMenu.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,12 @@ end

--- Updates the summary window.
function InventorySelectMenu:updateSummary()
self.summary:SetItem(_DATA.Save.ActiveTeam:GetInv(self.slotList[self.menu.CurrentChoiceTotal+1].Slot))
local selected = self.slotList[self.menu.CurrentChoiceTotal+1]
if selected.IsEquipped then
self.summary:SetItem(_DATA.Save.ActiveTeam.Players.EquippedItem(selected.Slot))
else
self.summary:SetItem(_DATA.Save.ActiveTeam:GetInv(selected.Slot))
end
end

--- Extract the list of selected slots.
Expand Down
2 changes: 1 addition & 1 deletion Data/Script/origin/menu/team/TeamSelectMenu.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ function TeamSelectMenu:load_chars(char_list)
if type(char_list) == 'table' then
for _, char in pairs(char_list) do table.insert(list, char) end
else
for char in luanet.each(LUA_ENGINE:MakeList(char_list)) do table.insert(list, char) end
for char in luanet.each(char_list) do table.insert(list, char) end
end
return list
end
Expand Down