From 94b7caf398c41a903d4dcad02fc895140c0df36b Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 15 Jan 2025 11:52:33 +0000 Subject: [PATCH] fixed up config enums --- Core/Controllers/DialogueController.cs | 2 +- Core/Controllers/HideoutController.cs | 2 +- Core/Generators/BotGenerator.cs | 4 ++-- Core/Helpers/BotGeneratorHelper.cs | 2 +- Core/Helpers/BotHelper.cs | 4 ++-- Core/Services/BotEquipmentFilterService.cs | 2 +- Core/Services/BotNameService.cs | 2 +- Core/Services/ItemFilterService.cs | 2 +- Core/Services/SeasonalEventService.cs | 10 +++++----- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Core/Controllers/DialogueController.cs b/Core/Controllers/DialogueController.cs index db9da360..2f86f5a8 100644 --- a/Core/Controllers/DialogueController.cs +++ b/Core/Controllers/DialogueController.cs @@ -31,7 +31,7 @@ public class DialogueController _configServer = configServer; _saveServer = saveServer; - _coreConfig = _configServer.GetConfig(ConfigTypes.CORE); + _coreConfig = _configServer.GetConfig(); } /// diff --git a/Core/Controllers/HideoutController.cs b/Core/Controllers/HideoutController.cs index b53df52c..d5c902fc 100644 --- a/Core/Controllers/HideoutController.cs +++ b/Core/Controllers/HideoutController.cs @@ -89,7 +89,7 @@ public class HideoutController _cloner = cloner; _configServer = configServer; - _hideoutConfig = _configServer.GetConfig(ConfigTypes.HIDEOUT); + _hideoutConfig = _configServer.GetConfig(); } public void StartUpgrade(PmcData pmcData, HideoutUpgradeRequestData info, string sessionId, ItemEventRouterResponse output) diff --git a/Core/Generators/BotGenerator.cs b/Core/Generators/BotGenerator.cs index 78da8cf7..d22c1594 100644 --- a/Core/Generators/BotGenerator.cs +++ b/Core/Generators/BotGenerator.cs @@ -77,8 +77,8 @@ public class BotGenerator _configServer = configServer; _cloner = cloner; - _botConfig = _configServer.GetConfig(ConfigTypes.BOT); - _pmcConfig = _configServer.GetConfig(ConfigTypes.PMC); + _botConfig = _configServer.GetConfig(); + _pmcConfig = _configServer.GetConfig(); } /// diff --git a/Core/Helpers/BotGeneratorHelper.cs b/Core/Helpers/BotGeneratorHelper.cs index 5e73642d..ecb8fd73 100644 --- a/Core/Helpers/BotGeneratorHelper.cs +++ b/Core/Helpers/BotGeneratorHelper.cs @@ -17,7 +17,7 @@ public class BotGeneratorHelper ) { _configServer = configServer; - _pmcConfig = _configServer.GetConfig(ConfigTypes.PMC); + _pmcConfig = _configServer.GetConfig(); } /// diff --git a/Core/Helpers/BotHelper.cs b/Core/Helpers/BotHelper.cs index b0352be9..f6d8189a 100644 --- a/Core/Helpers/BotHelper.cs +++ b/Core/Helpers/BotHelper.cs @@ -36,8 +36,8 @@ public class BotHelper _databaseService = databaseService; _randomUtil = randomUtil; _configServer = configServer; - _botConfig = configServer.GetConfig(ConfigTypes.BOT); - _pmcConfig = configServer.GetConfig(ConfigTypes.PMC); + _botConfig = configServer.GetConfig(); + _pmcConfig = configServer.GetConfig(); } /// diff --git a/Core/Services/BotEquipmentFilterService.cs b/Core/Services/BotEquipmentFilterService.cs index 260d01ab..8dcd00ee 100644 --- a/Core/Services/BotEquipmentFilterService.cs +++ b/Core/Services/BotEquipmentFilterService.cs @@ -18,7 +18,7 @@ public class BotEquipmentFilterService { _configServer = configServer; - _botConfig = _configServer.GetConfig(ConfigTypes.BOT); + _botConfig = _configServer.GetConfig(); } /// diff --git a/Core/Services/BotNameService.cs b/Core/Services/BotNameService.cs index c6b63a7b..814c243a 100644 --- a/Core/Services/BotNameService.cs +++ b/Core/Services/BotNameService.cs @@ -38,7 +38,7 @@ public class BotNameService _databaseService = databaseService; _configServer = configServer; - _botConfig = _configServer.GetConfig(ConfigTypes.BOT); + _botConfig = _configServer.GetConfig(); _usedNameCache = new HashSet(); } diff --git a/Core/Services/ItemFilterService.cs b/Core/Services/ItemFilterService.cs index b3f1fbd7..6f36841b 100644 --- a/Core/Services/ItemFilterService.cs +++ b/Core/Services/ItemFilterService.cs @@ -30,7 +30,7 @@ public class ItemFilterService _databaseServer = databaseServer; _configServer = configServer; - _itemConfig = _configServer.GetConfig(ConfigTypes.ITEM); + _itemConfig = _configServer.GetConfig(); } /** diff --git a/Core/Services/SeasonalEventService.cs b/Core/Services/SeasonalEventService.cs index e2353709..51cce4fc 100644 --- a/Core/Services/SeasonalEventService.cs +++ b/Core/Services/SeasonalEventService.cs @@ -84,11 +84,11 @@ public class SeasonalEventService _profileHelper = profileHelper; _configServer = configServer; - _seasonalEventConfig = _configServer.GetConfig(ConfigTypes.SEASONAL_EVENT); - _questConfig = _configServer.GetConfig(ConfigTypes.QUEST); - _httpConfig = _configServer.GetConfig(ConfigTypes.HTTP); - _weatherConfig = _configServer.GetConfig(ConfigTypes.WEATHER); - _locationConfig = _configServer.GetConfig(ConfigTypes.LOCATION); + _seasonalEventConfig = _configServer.GetConfig(); + _questConfig = _configServer.GetConfig(); + _httpConfig = _configServer.GetConfig(); + _weatherConfig = _configServer.GetConfig(); + _locationConfig = _configServer.GetConfig(); } ///