OMGeeky/ItemChecklist
1
0
Fork 0
mirror of https://github.com/OMGeeky/ItemChecklist.git synced 2026-01-07 04:01:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

v0.6 release, initial 1.4 release

Browse Source
This commit is contained in:
JavidPack
2022-09-22 00:37:29 -06:00
parent 8ed93d4589
commit 509e083190
10 changed files with 75 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
SharedUI.cs
View File

@@ -286,7 +286,7 @@ namespace ItemChecklist
foreach (int type in itemTexturePreload)
Main.instance.LoadItem(type);
//Texture2D terrariaSort = ResizeImage(Main.inventorySortTexture[1], 24, 24);
Texture2D terrariaSort = ResizeImage(TextureAssets.InventorySort[0], 24, 24);
Texture2D rarity = ResizeImage(TextureAssets.Item[ItemID.MetalDetector], 24, 24);
// TODO: Implement Badge text as used in Item Checklist.
@@ -296,7 +296,7 @@ namespace ItemChecklist
new Sort("Value", "Images/sortValue", (x,y)=>x.value.CompareTo(y.value), x=>x.value.ToString()),
new Sort("Alphabetical", "Images/sortAZ", (x,y)=>x.Name.CompareTo(y.Name), x=>x.Name.ToString()),
new Sort("Rarity", rarity, (x,y)=> x.rare==y.rare ? x.value.CompareTo(y.value) : Math.Abs(x.rare).CompareTo(Math.Abs(y.rare)), x=>x.rare.ToString()),
//new Sort("Terraria Sort", terrariaSort, (x,y)=> -ItemChecklistUI.vanillaIDsInSortOrder[x.type].CompareTo(ItemChecklistUI.vanillaIDsInSortOrder[y.type]), x=>ItemChecklistUI.vanillaIDsInSortOrder[x.type].ToString()),
new Sort("Terraria Sort", terrariaSort, ByCreativeSortingId, ByCreativeSortingIdBadgeText),
};
Texture2D materialsIcon = Utilities.StackResizeImage(new[] { TextureAssets.Item[ItemID.SpellTome] }, 24, 24);
@@ -590,6 +590,22 @@ namespace ItemChecklist
SelectedCategory = categories[0];
}
private string ByCreativeSortingIdBadgeText(Item x) {
return ItemChecklistUI.vanillaIDsInSortOrder[x.type].ToString();
}
private int ByCreativeSortingId(Item x, Item y) {
return ItemChecklistUI.vanillaIDsInSortOrder[x.type].CompareTo(ItemChecklistUI.vanillaIDsInSortOrder[y.type]);
ContentSamples.CreativeHelper.ItemGroupAndOrderInGroup itemGroupAndOrderInGroup = ContentSamples.ItemCreativeSortingId[x.type];
ContentSamples.CreativeHelper.ItemGroupAndOrderInGroup itemGroupAndOrderInGroup2 = ContentSamples.ItemCreativeSortingId[y.type];
int num = itemGroupAndOrderInGroup.Group.CompareTo(itemGroupAndOrderInGroup2.Group);
if (num == 0)
num = itemGroupAndOrderInGroup.OrderInGroup.CompareTo(itemGroupAndOrderInGroup2.OrderInGroup);
return num;
}
// TODO: Update with new 1.4 values.
Dictionary<int, float> vanillaGrappleRanges = new Dictionary<int, float>() {
[13] = 300f,