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

Added Item Lists for Inventory, Stash and Cube #106

Merged
merged 2 commits into from
Nov 11, 2020
Merged

Added Item Lists for Inventory, Stash and Cube #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e060cd9
Added Item Lists for Inventory, Stash and Cube
Nov 2, 2020
dbfd4e3
Merge branch 'master' into allitems_httpClient
Zutatensuppe Nov 11, 2020
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
18 changes: 18 additions & 0 deletions src/D2Reader/D2DataReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,9 @@ Character ReadCharacterData(GameInfo gameInfo, bool isNewChar)
character.Parse(unitReader, gameInfo);
character.InventoryItemIds = ReadInventoryItemIds(gameInfo.Player);
character.Items = GetItemInfosByItems(GetEquippedItems(gameInfo.Player), gameInfo.Player);
character.CubeItems = GetItemInfosByItems(GetCubeItems(gameInfo.Player), gameInfo.Player);
character.StashItems = GetItemInfosByItems(GetStashItems(gameInfo.Player), gameInfo.Player);
character.InventoryItems = GetItemInfosByItems(GetInventoryItems(gameInfo.Player), gameInfo.Player);
}

return character;
Expand All @@ -601,6 +604,21 @@ private IEnumerable<Item> GetEquippedItems(D2Unit owner)
return GetInventoryItemsFiltered(owner, (Item i) => i.IsEquipped());
}

private IEnumerable<Item> GetCubeItems(D2Unit owner)
{
return GetInventoryItemsFiltered(owner, (Item i) => !i.IsEquipped() && i.IsInCube());
}

private IEnumerable<Item> GetStashItems(D2Unit owner)
{
return GetInventoryItemsFiltered(owner, (Item i) => !i.IsEquipped() && i.IsInStash());
}

private IEnumerable<Item> GetInventoryItems(D2Unit owner)
{
return GetInventoryItemsFiltered(owner, (Item i) => !i.IsEquipped() && i.IsInInventory());
}

private List<ItemInfo> GetItemInfosByItems(IEnumerable<Item> items, D2Unit owner)
{
return items
Expand Down
3 changes: 3 additions & 0 deletions src/D2Reader/Models/Character.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,9 @@ public class Character
// TODO: use Item model for these:
virtual public List<int> InventoryItemIds { get; internal set; }
public List<ItemInfo> Items { get; internal set; }
public List<ItemInfo> CubeItems { get; internal set; }
public List<ItemInfo> StashItems { get; internal set; }
public List<ItemInfo> InventoryItems { get; internal set; }

public int RealFRW()
{
Expand Down
4 changes: 4 additions & 0 deletions src/D2Reader/Models/Item.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,9 @@ public class Item
internal bool IsIdentified() => HasFlag(ItemFlag.Identified);
internal bool IsEthereal() => HasFlag(ItemFlag.Ethereal);
internal bool HasRuneWord() => HasFlag(ItemFlag.Runeword);

internal bool IsInCube() => ItemData.InvPage == InventoryPage.HoradricCube;
internal bool IsInStash() => ItemData.InvPage == InventoryPage.Stash;
internal bool IsInInventory() => ItemData.InvPage == InventoryPage.Inventory;
}
}
3 changes: 3 additions & 0 deletions src/D2Reader/Models/ItemInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
Expand Down Expand Up @@ -32,6 +33,7 @@ public class ItemInfo
public string QualityColor { get; set; }
public List<string> Properties { get; set; }
public BodyLocation Location { get; set; }
public int GUID { get; set; }

// backwards compatibility with D2ID
public string BaseItem { get; set; }
Expand All @@ -54,6 +56,7 @@ IInventoryReader inventoryReader
QualityColor = QualityColorDefault(item);
Properties = unitReader.GetMagicalStrings(item, owner, inventoryReader);
Location = item.ItemData.BodyLoc;
GUID = item.Unit.GUID;

// Backward compatibility for D2ID:
// TODO: add Slug/Image/EnglishBaseName or something like that, D2ID currently uses ItemName/BaseItem for
Expand Down
67 changes: 67 additions & 0 deletions src/DiabloInterface.Plugin.HttpClient/Plugin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,15 @@ private class RequestBody
public List<ItemInfo> Items { get; set; }
public List<ItemInfo> AddedItems { get; set; }
public List<BodyLocation> RemovedItems { get; set; }
public List<ItemInfo> CubeItems { get; set; }
public List<ItemInfo> AddedCubeItems { get; set; }
public List<int> RemovedCubeItems { get; set; }
public List<ItemInfo> StashItems { get; set; }
public List<ItemInfo> AddedStashItems { get; set; }
public List<int> RemovedStashItems { get; set; }
public List<ItemInfo> InventoryItems { get; set; }
public List<ItemInfo> AddedInventoryItems { get; set; }
public List<int> RemovedInventoryItems { get; set; }
public Dictionary<GameDifficulty, List<QuestId>> Quests { get; set; }
public Dictionary<GameDifficulty, List<QuestId>> CompletedQuests { get; set; }

Expand Down Expand Up @@ -213,6 +222,18 @@ private RequestBody GetDiff(RequestBody newVal, RequestBody prevVal)
diff.AddedItems = itemDiff.Item1;
diff.RemovedItems = itemDiff.Item2;

var cubeItemDiff = UnequippedItemsDiff(newVal.CubeItems, prevVal.CubeItems);
diff.AddedCubeItems = cubeItemDiff.Item1;
diff.RemovedCubeItems = cubeItemDiff.Item2;

var stashItemDiff = UnequippedItemsDiff(newVal.StashItems, prevVal.StashItems);
diff.AddedStashItems = stashItemDiff.Item1;
diff.RemovedStashItems = stashItemDiff.Item2;

var inventoryItemDiff = UnequippedItemsDiff(newVal.InventoryItems, prevVal.InventoryItems);
diff.AddedInventoryItems = inventoryItemDiff.Item1;
diff.RemovedInventoryItems = inventoryItemDiff.Item2;

diff.CompletedQuests = BuildCompletedQuestsDiff(
newVal.Quests,
prevVal.Quests
Expand All @@ -231,7 +252,13 @@ private RequestBody GetDiff(RequestBody newVal, RequestBody prevVal)

hasDiff = hasDiff
|| diff.AddedItems != null
|| diff.AddedCubeItems != null
|| diff.AddedStashItems != null
|| diff.AddedInventoryItems != null
|| diff.RemovedItems != null
|| diff.RemovedCubeItems != null
|| diff.RemovedStashItems != null
|| diff.RemovedInventoryItems != null
|| diff.CompletedQuests != null
|| diff.Hireling != null;
return hasDiff ? diff : null;
Expand Down Expand Up @@ -356,6 +383,43 @@ List<ItemInfo> prevItems
);
}

// returns a list for added items and a list with the ??GUID?? of removed items
private Tuple<List<ItemInfo>, List<int>> UnequippedItemsDiff(
List<ItemInfo> newItems,
List<ItemInfo> prevItems
)
{
List<ItemInfo> addedItems = new List<ItemInfo>();
List<int> removedItems = new List<int>();

if (newItems != null)
{
foreach (var newItem in newItems)
{
if (prevItems == null || !prevItems.Any(prevItem => ItemInfo.AreEqual(prevItem, newItem)))
{
addedItems.Add(newItem);
}
}
}

if (prevItems != null)
{
foreach (var prevItem in prevItems)
{
if (newItems == null || !newItems.Any(newItem => ItemInfo.AreEqual(prevItem, newItem)))
{
removedItems.Add(prevItem.GUID);
}
}
}

return new Tuple<List<ItemInfo>, List<int>>(
addedItems.Count > 0 ? addedItems : null,
removedItems.Count > 0 ? removedItems : null
);
}

async private Task PostJson(string json)
{
SendingData = true;
Expand Down Expand Up @@ -421,6 +485,9 @@ private void Game_DataRead(object sender, DataReadEventArgs e)
IncreasedAttackSpeed = e.Character.IncreasedAttackSpeed,
MagicFind = e.Character.MagicFind,
Items = e.Character.Items,
CubeItems = e.Character.CubeItems,
StashItems = e.Character.StashItems,
InventoryItems = e.Character.InventoryItems,
Quests = e.Quests.CompletedQuestIds,
Hireling = new HirelingDiff
{
Expand Down