claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return both indicies and items for some methods

Browse Source
This commit is contained in:
Matt Nadareski
2024-03-19 14:05:53 -04:00
parent 6a15050f0b
commit 0041898dec
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
SabreTools.DatFiles/ItemDictionaryDB.cs
View File

@@ -233,7 +233,12 @@ namespace SabreTools.DatFiles
/// <summary> /// <summary>
/// Get all bucket keys /// Get all bucket keys
/// </summary> /// </summary>
public string[] GetBucketKeys() => [.. _buckets.Keys]; public string[] GetBucketKeys()
{
List<string> keys = [.. _buckets.Keys];
keys.Sort(new NaturalComparer());
return keys.ToArray();
}
/// <summary> /// <summary>
/// Get an item based on the index /// Get an item based on the index
@@ -258,54 +263,54 @@ namespace SabreTools.DatFiles
} }
/// <summary> /// <summary>
/// Get the machine associated with an item index /// Get the index and machine associated with an item index
/// </summary> /// </summary>
public Machine? GetMachineForItem(long itemIndex) public (long, Machine?) GetMachineForItem(long itemIndex)
{ {
if (!_itemToMachineMapping.ContainsKey(itemIndex)) if (!_itemToMachineMapping.ContainsKey(itemIndex))
return null; return (-1, null);
long machineIndex = _itemToMachineMapping[itemIndex]; long machineIndex = _itemToMachineMapping[itemIndex];
if (!_machines.ContainsKey(machineIndex)) if (!_machines.ContainsKey(machineIndex))
return null; return (-1, null);
return _machines[machineIndex]; return (machineIndex, _machines[machineIndex]);
} }
/// <summary> /// <summary>
/// Get the items associated with a bucket name /// Get the indices and items associated with a bucket name
/// </summary> /// </summary>
public DatItem[]? GetDatItemsForBucket(string bucketName, bool filter = false) public (long, DatItem)[]? GetDatItemsForBucket(string bucketName, bool filter = false)
{ {
if (!_buckets.ContainsKey(bucketName)) if (!_buckets.ContainsKey(bucketName))
return null; return null;
var itemIds = _buckets[bucketName]; var itemIds = _buckets[bucketName];
var datItems = new List<DatItem>(); var datItems = new List<(long, DatItem)>();
foreach (long itemId in itemIds) foreach (long itemId in itemIds)
{ {
if (_items.ContainsKey(itemId) && (!filter || _items[itemId].GetBoolFieldValue(DatItem.RemoveKey) != true)) if (_items.ContainsKey(itemId) && (!filter || _items[itemId].GetBoolFieldValue(DatItem.RemoveKey) != true))
datItems.Add(_items[itemId]); datItems.Add((itemId, _items[itemId]));
} }
return [.. datItems]; return [.. datItems];
} }
/// <summary> /// <summary>
/// Get the items associated with a machine index /// Get the indices and items associated with a machine index
/// </summary> /// </summary>
public DatItem[]? GetDatItemsForMachine(long machineIndex, bool filter = false) public (long, DatItem)[]? GetDatItemsForMachine(long machineIndex, bool filter = false)
{ {
var itemIds = _itemToMachineMapping var itemIds = _itemToMachineMapping
.Where(mapping => mapping.Value == machineIndex) .Where(mapping => mapping.Value == machineIndex)
.Select(mapping => mapping.Key); .Select(mapping => mapping.Key);
var datItems = new List<DatItem>(); var datItems = new List<(long, DatItem)>();
foreach (long itemId in itemIds) foreach (long itemId in itemIds)
{ {
if (_items.ContainsKey(itemId) && (!filter || _items[itemId].GetBoolFieldValue(DatItem.RemoveKey) != true)) if (_items.ContainsKey(itemId) && (!filter || _items[itemId].GetBoolFieldValue(DatItem.RemoveKey) != true))
datItems.Add(_items[itemId]); datItems.Add((itemId, _items[itemId]));
} }
return [.. datItems]; return [.. datItems];