Skip to content
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

Jump to bottom

UI: deck: order lists correctly #287

Merged
merged 6 commits into from
Jan 26, 2024
Merged

UI: deck: order lists correctly #287

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bb79434
UI: deck: order lists correctly
AcipenserSturio Jan 26, 2024
6c7ef0c
Address requested changes & fix scrollbar
AcipenserSturio Jan 26, 2024
a3b12c1
Fix chaining OrderBy
AcipenserSturio Jan 26, 2024
7fb306a
Use .GetItem instead of .First
AcipenserSturio Jan 26, 2024
000ee3f
Fix own impatience
AcipenserSturio Jan 26, 2024
94ffa8f
Fix ThenBy order & use concise syntax
AcipenserSturio Jan 26, 2024
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
8 changes: 4 additions & 4 deletions zzre/game/systems/ui/ScrDeck.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,10 +443,10 @@ private void CreateGridList(DefaultEcs.Entity entity, ref components.ui.ScrDeck

private IEnumerable<InventoryCard> AllCardsOfType(in components.ui.ScrDeck deck) => deck.ActiveTab switch
{
Tab.Items => deck.Inventory.Items,
Tab.Fairies => deck.Inventory.Fairies,
Tab.AttackSpells => deck.Inventory.AttackSpells,
Tab.SupportSpells => deck.Inventory.SupportSpells,
Tab.Items => deck.Inventory.Items.OrderBy(c => c.cardId.EntityId),
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There the sorting is unfortunately not quite correct, but Zanzarah is a bit weird with this:
There is a column in the ItemRow, currently still called Unknown (should probably be Type) that is used as first sorting term with the order 1 -> 0 -> everything else
The EntityId is used as a secondary sorting term

Copy link
Contributor Author

@AcipenserSturio AcipenserSturio Jan 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed
that's so obscure lol, love it

Tab.Fairies => deck.Inventory.Fairies.OrderBy(c => -c.level),
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick: OrderByDescending would be slightly more clear

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Glad to know more api, fixed

Tab.AttackSpells => deck.Inventory.AttackSpells.OrderBy(c => c.cardId.EntityId),
Tab.SupportSpells => deck.Inventory.SupportSpells.OrderBy(c => c.cardId.EntityId),
_ => Enumerable.Empty<InventoryCard>()
};

Expand Down
Loading