ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-03 14:23:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Pull MBStart into a read method

Browse source
This commit is contained in:
Raymond 2021-11-10 20:24:07 -05:00
parent 45520657fc
commit 6c1b50174a
2 changed files with 11 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Dalamud/Game/Network/Internal/NetworkHandlers.cs
View file

@ -77,18 +77,10 @@ namespace Dalamud.Game.Network.Internal
{
if (opCode == dataManager.ServerOpCodes["MarketBoardItemRequestStart"])
{
var catalogId = (uint)Marshal.ReadInt32(dataPtr);
var amount = Marshal.ReadByte(dataPtr + 0xB);
var data = MarketBoardItemRequest.Read(dataPtr);
this.marketBoardRequests.Add(data);
this.marketBoardRequests.Add(new MarketBoardItemRequest
{
CatalogId = catalogId,
AmountToArrive = amount,
Listings = new List<MarketBoardCurrentOfferings.MarketBoardItemListing>(),
History = new List<MarketBoardHistory.MarketBoardHistoryListing>(),
});
Log.Verbose($"NEW MB REQUEST START: item#{catalogId} amount#{amount}");
Log.Verbose($"NEW MB REQUEST START: item#{data.CatalogId} amount#{data.AmountToArrive}");
return;
}

22
Dalamud/Game/Network/Structures/MarketBoardCurrentOfferings.cs
View file

@ -10,17 +10,14 @@ namespace Dalamud.Game.Network.Structures
/// </summary>
public class MarketBoardCurrentOfferings
{
/// <summary>
/// Initializes a new instance of the <see cref="MarketBoardCurrentOfferings"/> class.
/// </summary>
internal MarketBoardCurrentOfferings()
private MarketBoardCurrentOfferings()
{
}
/// <summary>
/// Gets the list of individual item listings.
/// </summary>
public List<MarketBoardItemListing> ItemListings { get; internal set; }
public List<MarketBoardItemListing> ItemListings { get; } = new();
/// <summary>
/// Gets the listing end index.
@ -49,8 +46,6 @@ namespace Dalamud.Game.Network.Structures
using var stream = new UnmanagedMemoryStream((byte*)dataPtr.ToPointer(), 1544);
using var reader = new BinaryReader(stream);
output.ItemListings = new List<MarketBoardItemListing>();
for (var i = 0; i < 10; i++)
{
var listingEntry = new MarketBoardItemListing();
@ -70,15 +65,14 @@ namespace Dalamud.Game.Network.Structures
reader.ReadUInt16(); // durability
reader.ReadUInt16(); // spiritbond
listingEntry.Materia = new List<MarketBoardItemListing.ItemMateria>();
for (var materiaIndex = 0; materiaIndex < 5; materiaIndex++)
{
var materiaVal = reader.ReadUInt16();
var materiaEntry = new MarketBoardItemListing.ItemMateria();
materiaEntry.MateriaId = (materiaVal & 0xFF0) >> 4;
materiaEntry.Index = materiaVal & 0xF;
var materiaEntry = new MarketBoardItemListing.ItemMateria()
{
MateriaId = (materiaVal & 0xFF0) >> 4,
Index = materiaVal & 0xF,
};
if (materiaEntry.MateriaId != 0)
listingEntry.Materia.Add(materiaEntry);
@ -154,7 +148,7 @@ namespace Dalamud.Game.Network.Structures
/// <summary>
/// Gets the list of materia attached to this item.
/// </summary>
public List<ItemMateria> Materia { get; internal set; }
public List<ItemMateria> Materia { get; } = new();
/// <summary>
/// Gets the amount of attached materia.