neckfire/the-cycle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix crate rotation

Browse Source
This commit is contained in:
Yury
2025-05-02 09:15:31 +03:00
parent 878da2a325
commit 21a243dfed
2 changed files with 44 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Prospect.Server.Api/Models/Title/DailyCrateInfo.cs
+16
View File
@@ -1,6 +1,22 @@
using System.Text.Json.Serialization;
public class TitleDataDailyCrateInfo {
[JsonPropertyName("Name")]
public string Name { get; set; }
[JsonPropertyName("Level")]
public int Level { get; set; }
[JsonPropertyName("RewardGrants")]
public TitleDataDailyCrateInfoRewardGrants[] RewardGrants { get; set; }
}
public class TitleDataDailyCrateInfoRewardGrants {
[JsonPropertyName("Pool")]
public TitleDataDailyCrateInfoPoolItem[] Pool { get; set; }
[JsonPropertyName("Amount")]
public int Amount { get; set; }
}
public class TitleDataDailyCrateInfoPoolItem {
[JsonPropertyName("Name")]
public string Name { get; set; }
[JsonPropertyName("Weight")]
src/Prospect.Server.Api/Services/CloudScript/Functions/ClaimGeneratorIncomeClient.cs
+9 -8
View File
@@ -43,9 +43,9 @@ public class ClaimGeneratorIncomeClient : ICloudScriptFunction<FYClaimGeneratorI
static readonly Random random = new();
private TitleDataDailyCrateInfo[] PickItems(TitleDataDailyCrateInfo[] items, int numPicks)
private TitleDataDailyCrateInfoPoolItem[] PickItems(TitleDataDailyCrateInfoPoolItem[] items, int numPicks)
{
var itemList = new (TitleDataDailyCrateInfo item, float cumulativeWeight)[items.Length];
var itemList = new (TitleDataDailyCrateInfoPoolItem item, float cumulativeWeight)[items.Length];
float totalWeight = 0;
for (int i = 0; i < items.Length; i++) {
@@ -54,7 +54,7 @@ public class ClaimGeneratorIncomeClient : ICloudScriptFunction<FYClaimGeneratorI
itemList[i] = (item, totalWeight);
}
var selectedItems = new TitleDataDailyCrateInfo[numPicks];
var selectedItems = new TitleDataDailyCrateInfoPoolItem[numPicks];
for (int i = 0; i < numPicks; i++) {
float pick = (float)random.NextDouble() * totalWeight;
@@ -108,7 +108,7 @@ public class ClaimGeneratorIncomeClient : ICloudScriptFunction<FYClaimGeneratorI
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
var techTreeBonuses = JsonSerializer.Deserialize<CharacterTechTreeBonuses>(userData["CharacterTechTreeBonuses"].Value);
var titleData = _titleDataService.Find(new List<string>{"PassiveGenerators", "DailyCrateRewardsPools", "Blueprints"});
var titleData = _titleDataService.Find(new List<string>{"PassiveGenerators", "DailyCrateSetups", "Blueprints"});
var passiveGenerators = JsonSerializer.Deserialize<Dictionary<string, TitleDataPassiveGeneratorsInfo>>(titleData["PassiveGenerators"]);
var now = (int)DateTimeOffset.UtcNow.ToUnixTimeSeconds();
@@ -187,12 +187,12 @@ public class ClaimGeneratorIncomeClient : ICloudScriptFunction<FYClaimGeneratorI
};
}
var dailyCrateRewards = JsonSerializer.Deserialize<TitleDataDailyCrateInfo[][]>(titleData["DailyCrateRewardsPools"]);
var dailyCrateSetups = JsonSerializer.Deserialize<TitleDataDailyCrateInfo[]>(titleData["DailyCrateSetups"]);
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
var rewardsPool = dailyCrateRewards[crateTier - 1];
var rewardsPool = dailyCrateSetups[crateTier - 1];
// TODO: Get rewardGrants from PassiveGenerators_CrateRewards_DT
var items = PickItems(rewardsPool, 5);
foreach (var grant in rewardsPool.RewardGrants) {
var items = PickItems(grant.Pool, grant.Amount);
// TODO: Stackable? GrantedItems doesn't imply granted OR updated.
foreach (var item in items) {
var itemInfo = blueprints[item.Name];
@@ -213,6 +213,7 @@ public class ClaimGeneratorIncomeClient : ICloudScriptFunction<FYClaimGeneratorI
inventory.Add(grantedItem);
grantedItems.Add(grantedItem);
}
}
break;
}
default: {