From 1b879d42c37be89fbba84df1bd0ab227b6cdb3ae Mon Sep 17 00:00:00 2001 From: Spirtix Date: Thu, 25 Jul 2024 22:39:11 +0200 Subject: [PATCH] purchase: change GetItemQuantity API --- src/Controllers/Common/ContentController.cs | 2 +- src/Services/ItemService.cs | 16 ++++------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/Controllers/Common/ContentController.cs b/src/Controllers/Common/ContentController.cs index a7bc3dd..f5ce109 100644 --- a/src/Controllers/Common/ContentController.cs +++ b/src/Controllers/Common/ContentController.cs @@ -2235,7 +2235,7 @@ public class ContentController : Controller { ItemData bundleItem = itemService.GetItem(i.Key); // resolve items in the bundle foreach (var reward in bundleItem.Relationship.Where(e => e.Type == "Bundle")) { - int quantity = itemService.GetBulkItemQuantity(reward, i.Value); + int quantity = itemService.GetItemQuantity(reward, i.Value); inventoryItemsToAdd.TryAdd(reward.ItemId, 0); inventoryItemsToAdd[reward.ItemId] += quantity; itemsToSendBack.TryAdd(reward.ItemId, 0); diff --git a/src/Services/ItemService.cs b/src/Services/ItemService.cs index 2b2e8d6..a0ab4ea 100644 --- a/src/Services/ItemService.cs +++ b/src/Services/ItemService.cs @@ -41,22 +41,14 @@ namespace sodoff.Services { return items[itemID]; } - public int GetItemQuantity(ItemDataRelationship itemData) { - return GetItemQuantityImpl(itemData); - } - - public int GetBulkItemQuantity(ItemDataRelationship itemData, int quantity) { - return GetItemQuantityImpl(itemData, quantity); - } - - private int GetItemQuantityImpl(ItemDataRelationship itemData, int repeat = 1) { + public int GetItemQuantity(ItemDataRelationship itemData, int bulkSize = 1) { if (itemData.MaxQuantity is null || itemData.MaxQuantity < 2 || itemData.MaxQuantity == itemData.Quantity) { if (itemData.Quantity == 0) - return 1 * repeat; + return 1 * bulkSize; else - return itemData.Quantity * repeat; + return itemData.Quantity * bulkSize; } - return random.Next(1 * repeat, (int)itemData.MaxQuantity * repeat + 1); + return random.Next(1 * bulkSize, (int)itemData.MaxQuantity * bulkSize + 1); } public ItemDataRelationship OpenBox(ItemData boxItem, Gender gender) {