Skip to content

Add Cultist Circle support for "and/or" #810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArchangelWTF merged 2 commits into from
Jul 23, 2026
+84 −46
Merged

Add Cultist Circle support for "and/or" #810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3294457
Add support for "and/or" cultist circle recipes. Consume non-repeatab…
Jul 17, 2026
cd6bf93
Update hideout.json Cultist Circle and/or recipes to proper consumabl…
Jul 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 54 additions & 1 deletion Libraries/SPTarkov.Server.Assets/SPT_Data/configs/hideout.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,28 @@
"craftTimeSeconds": 3960,
"repeatable": false
},
{
"reward": [
"5bc9b9ecd4351e3bac122519",
"5bc9b9ecd4351e3bac122519"
],
"requiredItems": [
"66572b8d80b1cd4b6a67847f"
],
"craftTimeSeconds": 3960,
"repeatable": false
},
{
"reward": [
"62a09dd4621468534a797ac7",
"62a09dd4621468534a797ac7"
],
"requiredItems": [
"66572b8d80b1cd4b6a67847f"
],
"craftTimeSeconds": 3960,
"repeatable": false
},
{
"reward": [
"5c0e874186f7745dc7616606"
Expand Down Expand Up @@ -157,7 +179,38 @@
},
{
"reward": [
"60a7ad3a0c5cb24b0134664a",
"56e335e4d2720b6c058b456d",
"56e335e4d2720b6c058b456d"
],
"requiredItems": [
"655c673673a43e23e857aebd"
],
"craftTimeSeconds": 3960,
"repeatable": false
},
{
"reward": [
"572b7adb24597762ae139821",
"572b7adb24597762ae139821"
],
"requiredItems": [
"655c673673a43e23e857aebd"
],
"craftTimeSeconds": 3960,
"repeatable": false
},
{
"reward": [
"60a7ad3a0c5cb24b0134664a"
],
"requiredItems": [
"66572cbdad599021091c611a"
],
"craftTimeSeconds": 3960,
"repeatable": false
},
{
"reward": [
"60a7ad2a2198820d95707a2e"
],
"requiredItems": [
Expand Down
75 changes: 30 additions & 45 deletions Libraries/SPTarkov.Server.Core/Services/Hideout/CircleOfCultistService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using Microsoft.Extensions.Logging;
using SPTarkov.Common.Extensions;
using SPTarkov.Common.Models.Logging;
using SPTarkov.DI.Annotations;
Expand All @@ -23,7 +24,6 @@
using SPTarkov.Server.Core.Services.Server;
using SPTarkov.Server.Core.Utils;
using SPTarkov.Server.Core.Utils.Cloners;
using Microsoft.Extensions.Logging;

namespace SPTarkov.Server.Core.Services.Hideout;

Expand Down Expand Up @@ -91,10 +91,11 @@ HideoutCircleOfCultistProductionStartRequestData request
// Check if it matches any direct swap recipes
var directRewardsCache = GenerateSacrificedItemsCache(hideoutConfig.CultistCircle.DirectRewards);
var directRewardSettings = CheckForDirectReward(sessionId, sacrificedItems, directRewardsCache);
var hasDirectReward = directRewardSettings?.Reward.Count > 0;
var hasDirectReward = directRewardSettings.Count > 0;
var selectedDirectReward = hasDirectReward ? randomUtil.GetArrayValue(directRewardSettings) : null;

// Get craft time and bonus status
var craftingInfo = GetCircleCraftingInfo(rewardAmountRoubles, hideoutConfig.CultistCircle, directRewardSettings);
var craftingInfo = GetCircleCraftingInfo(rewardAmountRoubles, hideoutConfig.CultistCircle, selectedDirectReward);

// Create production in pmc profile
RegisterCircleOfCultistProduction(sessionId, pmcData, cultistCraftData.Id, sacrificedItems, craftingInfo.Time);
Expand All @@ -109,7 +110,7 @@ HideoutCircleOfCultistProductionStartRequestData request
}

var rewards = hasDirectReward
? GetDirectRewards(sessionId, directRewardSettings, cultistCircleStashId.Value)
? GetDirectRewards(sessionId, selectedDirectReward, cultistCircleStashId.Value)
: GetRewardsWithinBudget(
GetCultistCircleRewardPool(sessionId, pmcData, craftingInfo, hideoutConfig.CultistCircle),
rewardAmountRoubles,
Expand Down Expand Up @@ -399,13 +400,6 @@ protected List<List<Item>> GetDirectRewards(MongoId sessionId, DirectRewardSetti
// Prep rewards array (reward can be item with children, hence array of arrays)
List<List<Item>> rewards = [];

// Handle special case of tagilla helmets - only one reward is allowed
if (directReward.Reward.Contains(ItemTpl.FACECOVER_TAGILLAS_WELDING_MASK_GORILLA))
{
// TODO: this is likely redundant with direct reward system in config?
directReward.Reward = [randomUtil.GetArrayValue(directReward.Reward)];
}

// Loop because these can include multiple rewards
foreach (var rewardTpl in directReward.Reward)
{
Expand Down Expand Up @@ -474,51 +468,33 @@ protected List<List<Item>> GetDirectRewards(MongoId sessionId, DirectRewardSetti
/// <param name="sacrificedItems">Items sacrificed</param>
/// <param name="directRewardsCache"></param>
/// <returns>Direct reward items to send to player</returns>
protected DirectRewardSettings? CheckForDirectReward(
protected List<DirectRewardSettings> CheckForDirectReward(
MongoId sessionId,
List<Item> sacrificedItems,
Dictionary<string, DirectRewardSettings> directRewardsCache
Dictionary<string, List<DirectRewardSettings>> directRewardsCache
)
{
// Get sacrificed tpls
var sacrificedItemTpls = sacrificedItems.Select(item => item.Template).Where(item => item != null);
// Create md5 key of the items player sacrificed so we can compare against the direct reward cache
var sacrificedItemsKey = CreateSacrificeCacheKey(sacrificedItemTpls);

var matchingDirectReward = directRewardsCache.GetValueOrDefault(sacrificedItemsKey);
if (matchingDirectReward is null)
// No direct reward
// return empty list if no match
if (!directRewardsCache.TryGetValue(sacrificedItemsKey, out var matchingDirectRewards))
{
return null;
return [];
}

// check if player already completed a direct reward with these sacrificed items
var fullProfile = profileHelper.GetFullProfile(sessionId);
var directRewardHash = GetDirectRewardHashKey(matchingDirectReward);
if (fullProfile.SptData.CultistRewards?.ContainsKey(directRewardHash) ?? false)
// Player has already received this direct reward
var hasCompletedNonRepeatable = fullProfile.SptData.CultistRewards?.ContainsKey(sacrificedItemsKey) ?? false;
if (!hasCompletedNonRepeatable)
{
return null;
var nonRepeatableRewards = matchingDirectRewards.Where(reward => !reward.Repeatable).ToList();
return nonRepeatableRewards.Count > 0 ? nonRepeatableRewards : matchingDirectRewards;
}

return matchingDirectReward;
}

/// <summary>
/// Create an md5 key of the sacrificed + reward items
/// </summary>
/// <param name="directReward">Direct reward to create key for</param>
/// <returns>Key</returns>
protected string GetDirectRewardHashKey(DirectRewardSettings directReward)
{
directReward.RequiredItems.Sort();
directReward.Reward.Sort();

var required = string.Join(",", directReward.RequiredItems);
var reward = string.Join(",", directReward.Reward);
// Key is sacrificed items separated by commas, a dash, then the rewards separated by commas
var key = $"{{{required}-{reward}}}";

return hashUtil.GenerateHashForData(HashingAlgorithm.MD5, key);
return matchingDirectRewards.Where(reward => reward.Repeatable).ToList();
}

/// <summary>
Expand Down Expand Up @@ -554,14 +530,15 @@ protected int GetDirectRewardBaseTypeStackSize(MongoId rewardTpl)
protected void FlagDirectRewardAsAcceptedInProfile(MongoId sessionId, DirectRewardSettings directReward)
{
var fullProfile = profileHelper.GetFullProfile(sessionId);
var sacrificeKey = CreateSacrificeCacheKey(directReward.RequiredItems);
var dataToStoreInProfile = new AcceptedCultistReward
{
Timestamp = timeUtil.GetTimeStamp(),
SacrificeItems = directReward.RequiredItems,
RewardItems = directReward.Reward,
};

fullProfile.SptData.CultistRewards[GetDirectRewardHashKey(directReward)] = dataToStoreInProfile;
fullProfile.SptData.CultistRewards[sacrificeKey] = dataToStoreInProfile;
}

/// <summary>
Expand Down Expand Up @@ -853,13 +830,21 @@ protected string CreateSacrificeCacheKey(IEnumerable<MongoId> requiredItems)
/// </summary>
/// <param name="directRewards">Direct rewards array from hideout config</param>
/// <returns>Dictionary</returns>
protected Dictionary<string, DirectRewardSettings> GenerateSacrificedItemsCache(List<DirectRewardSettings> directRewards)
protected Dictionary<string, List<DirectRewardSettings>> GenerateSacrificedItemsCache(List<DirectRewardSettings> directRewards)
{
var result = new Dictionary<string, DirectRewardSettings>();
var result = new Dictionary<string, List<DirectRewardSettings>>();

foreach (var rewardSettings in directRewards)
{
string key = CreateSacrificeCacheKey(rewardSettings.RequiredItems);
result[key] = rewardSettings;
var key = CreateSacrificeCacheKey(rewardSettings.RequiredItems);

if (!result.TryGetValue(key, out var rewards))
{
rewards = [];
result[key] = rewards;
}

rewards.Add(rewardSettings);
}

return result;
Expand Down
Loading