From 2cac56acc2a29a563a8ab70e8d4480776f478ef0 Mon Sep 17 00:00:00 2001 From: Chomp Date: Thu, 6 Feb 2025 10:27:35 +0000 Subject: [PATCH] Further cleanup --- .../Core/Controllers/TraderController.cs | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Libraries/Core/Controllers/TraderController.cs b/Libraries/Core/Controllers/TraderController.cs index 6f2bf24c..2428e2ca 100644 --- a/Libraries/Core/Controllers/TraderController.cs +++ b/Libraries/Core/Controllers/TraderController.cs @@ -45,17 +45,18 @@ public class TraderController( var traderResetStartsWithServer = _traderConfig.TradersResetFromServerStart; var traders = _databaseService.GetTraders(); - foreach (var trader in traders) + foreach (var (traderId, trader) in traders) { - if (trader.Key is "ragfair" or Traders.LIGHTHOUSEKEEPER) + if (traderId is "ragfair" or Traders.LIGHTHOUSEKEEPER) { continue; } - if (trader.Key == Traders.FENCE) + if (traderId == Traders.FENCE) { _fenceBaseAssortGenerator.GenerateFenceBaseAssorts(); _fenceService.GenerateFenceAssorts(); + continue; } @@ -66,26 +67,25 @@ public class TraderController( } // Create dict of pristine trader assorts on server start - if (_traderAssortService.GetPristineTraderAssort(trader.Key) == null) + if (_traderAssortService.GetPristineTraderAssort(traderId) == null) { - var assortsClone = _cloner.Clone(trader.Value.Assort); - _traderAssortService.SetPristineTraderAssort(trader.Key, assortsClone); + var assortsClone = _cloner.Clone(trader.Assort); + _traderAssortService.SetPristineTraderAssort(traderId, assortsClone); } - _traderPurchasePersisterService.RemoveStalePurchasesFromProfiles(trader.Key); + _traderPurchasePersisterService.RemoveStalePurchasesFromProfiles(traderId); - // Set to next hour on clock or current time + 60 mins - trader.Value.Base.NextResupply = - traderResetStartsWithServer ? (int)_traderHelper.GetNextUpdateTimestamp(trader.Value.Base.Id) : (int)nextHourTimestamp; + // Set to next hour on clock or current time + 60 minutes + trader.Base.NextResupply = + traderResetStartsWithServer ? (int)_traderHelper.GetNextUpdateTimestamp(trader.Base.Id) : (int)nextHourTimestamp; } } - protected void AdjustTraderItemPrices(KeyValuePair trader, double multiplier) + protected void AdjustTraderItemPrices(Trader trader, double multiplier) { - foreach (var kvp in trader.Value?.Assort?.BarterScheme) + foreach (var kvp in trader.Assort?.BarterScheme) { var barterSchemeItem = kvp.Value[0][0]; - if (barterSchemeItem != null && _paymentHelper.IsMoneyTpl(barterSchemeItem.Template)) { barterSchemeItem.Count += Math.Round(