start implementing handbookhelper

This commit is contained in:
CWX
2025-01-19 20:59:26 +00:00
parent 8714e0761f
commit 00ccc92519
7 changed files with 131 additions and 17 deletions
@@ -345,7 +345,7 @@ public class RagfairController
var fleaPrices = _databaseService.GetPrices();
if (!fleaPrices.TryGetValue(getPriceRequest.TemplateId, out var tplPrice))
{
tplPrice = _handbookHelper.GetTemplatePrice(getPriceRequest.TemplateId);
tplPrice = _handbookHelper.GetTemplatePrice(getPriceRequest.TemplateId) ?? 0;
}
return new GetItemPriceResult{ Avg = tplPrice, Min = tplPrice, Max = tplPrice };
@@ -559,7 +559,7 @@ public class BotLootGenerator(
// Stop adding items to bots pool if rolling total is over total limit
if (totalValueLimitRub > 0)
{
currentTotalRub += _handbookHelper.GetTemplatePrice(itemToAddTemplate.Id);
currentTotalRub += _handbookHelper.GetTemplatePrice(itemToAddTemplate.Id) ?? 0;
if (currentTotalRub > totalValueLimitRub)
{
break;
+123 -9
View File
@@ -1,17 +1,69 @@
using SptCommon.Annotations;
using Core.Models.Eft.Common.Tables;
using Core.Models.Enums;
using Core.Models.Spt.Config;
using Core.Servers;
using Core.Services;
using Core.Utils.Cloners;
namespace Core.Helpers;
[Injectable]
public class HandbookHelper
public class HandbookHelper(
DatabaseService _databaseService,
ConfigServer _configServer,
ICloner _cloner
)
{
protected ItemConfig _itemConfig = _configServer.GetConfig<ItemConfig>();
protected bool _lookupCacheGenerated = false;
protected LookupCollection _handbookPriceCache = new LookupCollection();
/// <summary>
/// Create an in-memory cache of all items with associated handbook price in handbookPriceCache class
/// </summary>
public void HydrateLookup()
{
throw new NotImplementedException();
var handbook = _databaseService.GetHandbook();
// Add handbook overrides found in items.json config into db
foreach (var itemTplKey in _itemConfig.HandbookPriceOverride) {
var data = _itemConfig.HandbookPriceOverride[itemTplKey.Key];
var itemToUpdate = handbook.Items.FirstOrDefault(item => item.Id == itemTplKey.Key);
if (itemToUpdate is null) {
handbook.Items.Add( new HandbookItem {
Id = itemTplKey.Key,
ParentId = data.ParentId,
Price = data.Price,
});
itemToUpdate = handbook.Items.FirstOrDefault(item => item.Id == itemTplKey.Key);
}
itemToUpdate.Price = data.Price;
}
var handbookDbClone = _cloner.Clone(handbook);
foreach (var handbookItem in handbookDbClone.Items) {
_handbookPriceCache.Items.ById.TryAdd(handbookItem.Id, handbookItem.Price ?? 0);
if (!_handbookPriceCache.Items.ByParent.TryGetValue(handbookItem.ParentId, out var _)) {
_handbookPriceCache.Items.ByParent.TryAdd(handbookItem.ParentId, []);
}
_handbookPriceCache.Items.ByParent.TryGetValue(handbookItem.ParentId, out var array);
array.Add(handbookItem.Id);
}
foreach (var handbookCategory in handbookDbClone.Categories) {
_handbookPriceCache.Categories.ById.TryAdd(handbookCategory.Id, handbookCategory.ParentId);
if (handbookCategory.ParentId is not null) {
if (!_handbookPriceCache.Categories.ByParent.TryGetValue(handbookCategory.ParentId, out var _)) {
_handbookPriceCache.Categories.ByParent.TryAdd(handbookCategory.ParentId, []);
}
_handbookPriceCache.Categories.ByParent.TryGetValue(handbookCategory.ParentId, out var array);
array.Add(handbookCategory.Id);
}
}
}
/// <summary>
@@ -20,14 +72,47 @@ public class HandbookHelper
/// </summary>
/// <param name="tpl">Item tpl to look up price for</param>
/// <returns>price in roubles</returns>
public double GetTemplatePrice(string tpl)
public double? GetTemplatePrice(string tpl)
{
throw new NotImplementedException();
if (!_lookupCacheGenerated)
{
HydrateLookup();
_lookupCacheGenerated = true;
}
if (_handbookPriceCache.Items.ById.TryGetValue(tpl, out var item))
{
return item;
}
var handbookItem = _databaseService.GetHandbook().Items?.FirstOrDefault(item => item.Id == tpl);
if (handbookItem is null)
{
var newValue = 0;
if (!_handbookPriceCache.Items.ById.TryAdd(tpl, newValue))
{
_handbookPriceCache.Items.ById[tpl] = newValue;
}
return newValue;
}
if (!_handbookPriceCache.Items.ById.TryAdd(tpl, handbookItem.Price ?? 0))
{
_handbookPriceCache.Items.ById[tpl] = handbookItem.Price ?? 0;
}
return handbookItem.Price;
}
public double GetTemplatePriceForItems(List<Item> items)
{
throw new NotImplementedException();
var total = 0D;
foreach (var item in items) {
total += GetTemplatePrice(item.Template) ?? 0;
}
return total;
}
/// <summary>
@@ -37,7 +122,9 @@ public class HandbookHelper
/// <returns>string array</returns>
public List<string> TemplatesWithParent(string parentId)
{
throw new NotImplementedException();
_handbookPriceCache.Items.ByParent.TryGetValue(parentId, out var template);
return template ?? [];
}
/// <summary>
@@ -47,7 +134,7 @@ public class HandbookHelper
/// <returns>true if exists in cache</returns>
public bool IsCategory(string category)
{
throw new NotImplementedException();
return _handbookPriceCache.Categories.ById.TryGetValue(category, out var _);
}
/// <summary>
@@ -57,7 +144,8 @@ public class HandbookHelper
/// <returns>string array</returns>
public List<string> ChildrenCategories(string categoryParent)
{
throw new NotImplementedException();
_handbookPriceCache.Categories.ByParent.TryGetValue(categoryParent, out var category);
return category ?? [];
}
/// <summary>
@@ -68,7 +156,9 @@ public class HandbookHelper
/// <returns>Count in roubles</returns>
public double InRUB(double nonRoubleCurrencyCount, string currencyTypeFrom)
{
throw new NotImplementedException();
return currencyTypeFrom == Money.ROUBLES
? nonRoubleCurrencyCount
: Math.Round(nonRoubleCurrencyCount * (GetTemplatePrice(currencyTypeFrom) ?? 0));
}
/// <summary>
@@ -87,3 +177,27 @@ public class HandbookHelper
throw new NotImplementedException();
}
}
public class LookupItem<T, I>
{
public Dictionary<string, T> ById { get; set; }
public Dictionary<string, List<I>> ByParent { get; set; }
public LookupItem()
{
ById = new Dictionary<string, T>();
ByParent = new Dictionary<string, List<I>>();
}
}
public class LookupCollection
{
public LookupItem<double, string> Items { get; set; }
public LookupItem<string, string> Categories { get; set; }
public LookupCollection()
{
Items = new LookupItem<double, string>();
Categories = new LookupItem<string, string>();
}
}
+3 -3
View File
@@ -384,7 +384,7 @@ public class ItemHelper(
/// </summary>
/// <param name="tpl">Item to look price up of</param>
/// <returns>Price in roubles</returns>
public double GetItemPrice(string tpl)
public double? GetItemPrice(string tpl)
{
var handbookPrice = GetStaticItemPrice(tpl);
if (handbookPrice >= 1)
@@ -406,7 +406,7 @@ public class ItemHelper(
var staticPrice = GetStaticItemPrice(tpl);
var dynamicPrice = GetDynamicItemPrice(tpl);
return Math.Max(staticPrice, dynamicPrice);
return Math.Max(staticPrice ?? 0, dynamicPrice);
}
/// <summary>
@@ -414,7 +414,7 @@ public class ItemHelper(
/// </summary>
/// <param name="tpl">Items tpl id to look up price</param>
/// <returns>Price in roubles (0 if not found)</returns>
public double GetStaticItemPrice(string tpl)
public double? GetStaticItemPrice(string tpl)
{
var handbookPrice = _handbookHelper.GetTemplatePrice(tpl);
if (handbookPrice >= 1)
@@ -41,5 +41,5 @@ public record HandbookItem
public string? ParentId { get; set; }
[JsonPropertyName("Price")]
public decimal? Price { get; set; }
public double? Price { get; set; }
}
@@ -40,7 +40,7 @@ public record HandbookPriceOverride
{
/** Price in roubles */
[JsonPropertyName("price")]
public decimal Price { get; set; }
public double Price { get; set; }
/** NOT parentId from items.json, but handbook.json */
[JsonPropertyName("parentId")]
@@ -38,7 +38,7 @@ public class RagfairPriceService(
{
foreach (var item in _databaseService.GetItems().Where((x) => x.Value.Type == "Item"))
{
_prices.StaticPrices[item.Key] = Math.Round(_handbookHelper.GetTemplatePrice(item.Key));
_prices.StaticPrices[item.Key] = Math.Round(_handbookHelper.GetTemplatePrice(item.Key) ?? 0);
}
}