vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

v1.0.13.1 (first post-1.0 patch)

Browse Source
This commit is contained in:
Regalis11
2023-05-10 15:07:17 +03:00
parent 96fb49ba14
commit ee1db852b1
272 changed files with 5738 additions and 2413 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/Facepunch.Steamworks/SteamInventory.cs
+27 -23
View File
@@ -14,7 +14,7 @@ namespace Steamworks
/// </summary>
public class SteamInventory : SteamSharedClass<SteamInventory>
{
internal static ISteamInventory Internal => Interface as ISteamInventory;
internal static ISteamInventory? Internal => Interface as ISteamInventory;
internal override void InitializeInterface( bool server )
{
@@ -41,8 +41,8 @@ namespace Steamworks
OnInventoryUpdated?.Invoke( r );
}
public static event Action<InventoryResult> OnInventoryUpdated;
public static event Action OnDefinitionsUpdated;
public static event Action<InventoryResult>? OnInventoryUpdated;
public static event Action? OnDefinitionsUpdated;
static void LoadDefinitions()
{
@@ -79,7 +79,7 @@ namespace Steamworks
LoadDefinitions();
}
Internal.LoadItemDefinitions();
Internal?.LoadItemDefinitions();
}
/// <summary>
@@ -113,7 +113,7 @@ namespace Steamworks
/// Try to find the definition that matches this definition ID.
/// Uses a dictionary so should be about as fast as possible.
/// </summary>
public static InventoryDef FindDefinition( InventoryDefId defId )
public static InventoryDef? FindDefinition( InventoryDefId defId )
{
if ( _defMap == null )
return null;
@@ -124,15 +124,17 @@ namespace Steamworks
return null;
}
public static string Currency { get; internal set; }
public static string Currency { get; internal set; } = "";
public static async Task<InventoryDef[]> GetDefinitionsWithPricesAsync()
public static async Task<InventoryDef[]?> GetDefinitionsWithPricesAsync()
{
if (Internal is null) { return null; }
var priceRequest = await Internal.RequestPrices();
if ( !priceRequest.HasValue || priceRequest.Value.Result != Result.OK )
if ( priceRequest?.Result != Result.OK )
return null;
Currency = priceRequest?.CurrencyUTF8();
Currency = priceRequest.Value.CurrencyUTF8();
var num = Internal.GetNumItemsWithPrices();
@@ -153,15 +155,15 @@ namespace Steamworks
/// <summary>
/// We will try to keep this list of your items automatically up to date.
/// </summary>
public static InventoryItem[] Items { get; internal set; }
public static InventoryItem[]? Items { get; internal set; }
public static InventoryDef[] Definitions { get; internal set; }
static Dictionary<int, InventoryDef> _defMap;
public static InventoryDef[]? Definitions { get; internal set; }
static Dictionary<int, InventoryDef>? _defMap;
internal static InventoryDef[] GetDefinitions()
internal static InventoryDef[]? GetDefinitions()
{
uint num = 0;
if ( !Internal.GetItemDefinitionIDs( null, ref num ) )
if ( Internal is null || !Internal.GetItemDefinitionIDs( null, ref num ) )
return null;
var defs = new InventoryDefId[num];
@@ -178,7 +180,7 @@ namespace Steamworks
public static bool GetAllItems()
{
var sresult = Defines.k_SteamInventoryResultInvalid;
return Internal.GetAllItems( ref sresult );
return Internal != null && Internal.GetAllItems( ref sresult );
}
/// <summary>
@@ -188,7 +190,7 @@ namespace Steamworks
{
var sresult = Defines.k_SteamInventoryResultInvalid;
if ( !Internal.GetAllItems( ref sresult ) )
if ( Internal is null || !Internal.GetAllItems( ref sresult ) )
return null;
return await InventoryResult.GetAsync( sresult );
@@ -207,7 +209,7 @@ namespace Steamworks
var defs = new InventoryDefId[] { target.Id };
var cnts = new uint[] { (uint)amount };
if ( !Internal.GenerateItems( ref sresult, defs, cnts, 1 ) )
if ( Internal is null || !Internal.GenerateItems( ref sresult, defs, cnts, 1 ) )
return null;
return await InventoryResult.GetAsync( sresult );
@@ -228,7 +230,7 @@ namespace Steamworks
var sell = list.Select( x => x.Id ).ToArray();
var sellc = list.Select( x => (uint)1 ).ToArray();
if ( !Internal.ExchangeItems( ref sresult, give, givec, 1, sell, sellc, (uint)sell.Length ) )
if ( Internal is null || !Internal.ExchangeItems( ref sresult, give, givec, 1, sell, sellc, (uint)sell.Length ) )
return null;
return await InventoryResult.GetAsync( sresult );
@@ -249,7 +251,7 @@ namespace Steamworks
var sell = list.Select( x => x.Item.Id ).ToArray();
var sellc = list.Select( x => (uint) x.Quantity ).ToArray();
if ( !Internal.ExchangeItems( ref sresult, give, givec, 1, sell, sellc, (uint)sell.Length ) )
if ( Internal is null || !Internal.ExchangeItems( ref sresult, give, givec, 1, sell, sellc, (uint)sell.Length ) )
return null;
return await InventoryResult.GetAsync( sresult );
@@ -285,7 +287,7 @@ namespace Steamworks
var sresult = Defines.k_SteamInventoryResultInvalid;
if ( !Internal.DeserializeResult( ref sresult, (IntPtr)ptr, (uint)dataLength, false ) )
if ( Internal is null || !Internal.DeserializeResult( ref sresult, (IntPtr)ptr, (uint)dataLength, false ) )
return null;
@@ -306,7 +308,7 @@ namespace Steamworks
{
var sresult = Defines.k_SteamInventoryResultInvalid;
if ( !Internal.GrantPromoItems( ref sresult ) )
if ( Internal is null || !Internal.GrantPromoItems( ref sresult ) )
return null;
return await InventoryResult.GetAsync( sresult );
@@ -320,7 +322,7 @@ namespace Steamworks
{
var sresult = Defines.k_SteamInventoryResultInvalid;
if ( !Internal.TriggerItemDrop( ref sresult, id ) )
if ( Internal is null || !Internal.TriggerItemDrop( ref sresult, id ) )
return null;
return await InventoryResult.GetAsync( sresult );
@@ -334,7 +336,7 @@ namespace Steamworks
{
var sresult = Defines.k_SteamInventoryResultInvalid;
if ( !Internal.AddPromoItem( ref sresult, id ) )
if ( Internal is null || !Internal.AddPromoItem( ref sresult, id ) )
return null;
return await InventoryResult.GetAsync( sresult );
@@ -347,6 +349,8 @@ namespace Steamworks
/// </summary>
public static async Task<InventoryPurchaseResult?> StartPurchaseAsync( InventoryDef[] items )
{
if (Internal is null) { return null; }
var item_i = items.Select( x => x._id ).ToArray();
var item_q = items.Select( x => (uint)1 ).ToArray();