feat(insurance,fortuna): payout on death + Fortuna Pass claim safety
Build & Deploy / build (push) Successful in 21s
Build & Deploy / build (push) Successful in 21s
- CompleteInventoryUpdate: insured items lost in a raid (present in
ItemsToRemove) are recovered back to the stash and the insurance is
consumed. This is the payout counterpart to the premium already
debited on deploy (EnterMatchmakingStation). Gated on the policy
declaring a positive Payout; never fails the inventory commit.
- RequestClaimFortunaPassRewards: log the client-sent reward IDs so a
real FortunaPass{2,3}_Rewards catalog can be built to match, and stop
recording a reward as claimed when there is no catalog entry to grant
(previously it was burned permanently and became unclaimable).
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -2,6 +2,7 @@ using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||
using Prospect.Server.Api.Services.CloudScript;
|
||||
using Prospect.Server.Api.Services.CloudScript.Functions;
|
||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||
using Prospect.Server.Api.Services.UserData;
|
||||
|
||||
@@ -45,12 +46,14 @@ public class CompleteInventoryUpdateFunction : ICloudScriptFunction<CompleteInve
|
||||
private readonly ILogger<CompleteInventoryUpdateFunction> _logger;
|
||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||
private readonly UserDataService _userDataService;
|
||||
private readonly TitleDataService _titleDataService;
|
||||
|
||||
public CompleteInventoryUpdateFunction(ILogger<CompleteInventoryUpdateFunction> logger, IHttpContextAccessor httpContextAccessor, UserDataService userDataService)
|
||||
public CompleteInventoryUpdateFunction(ILogger<CompleteInventoryUpdateFunction> logger, IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
|
||||
{
|
||||
_logger = logger;
|
||||
_httpContextAccessor = httpContextAccessor;
|
||||
_userDataService = userDataService;
|
||||
_titleDataService = titleDataService;
|
||||
}
|
||||
|
||||
public async Task<CompleteInventoryUpdateResponse> ExecuteAsync(CompleteInventoryUpdateRequest request)
|
||||
@@ -64,6 +67,42 @@ public class CompleteInventoryUpdateFunction : ICloudScriptFunction<CompleteInve
|
||||
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"Inventory"});
|
||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||
|
||||
// Insurance payout: this request also reports the end-of-match inventory, so items
|
||||
// the player lost (death / left behind) arrive in ItemsToRemove. Any of those that
|
||||
// were insured on deploy (EnterMatchmakingStation) are recovered back to the stash —
|
||||
// the premium was already paid up-front — and the insurance is consumed (one raid).
|
||||
// Recovery is only performed if the item's policy declares a positive Payout.
|
||||
var recoveredInsured = new HashSet<string>();
|
||||
if (request.ItemsToRemove is { Count: > 0 })
|
||||
{
|
||||
try
|
||||
{
|
||||
var td = _titleDataService.Find(new List<string> { "InventoryInsurance" });
|
||||
if (td.TryGetValue("InventoryInsurance", out var rawPolicies) && !string.IsNullOrEmpty(rawPolicies))
|
||||
{
|
||||
var policies = JsonSerializer.Deserialize<Dictionary<string, InventoryInsurancePolicy>>(rawPolicies);
|
||||
foreach (var item in inventory)
|
||||
{
|
||||
if (!request.ItemsToRemove.Contains(item.ItemId)) continue;
|
||||
if (string.IsNullOrEmpty(item.Insurance) || item.InsuranceOwnerPlayfabId != userId) continue;
|
||||
if (policies == null || !policies.TryGetValue(item.Insurance, out var policy) || policy.Payout <= 0) continue;
|
||||
recoveredInsured.Add(item.ItemId);
|
||||
item.Insurance = ""; // consumed for this raid
|
||||
item.InsuranceOwnerPlayfabId = "";
|
||||
}
|
||||
if (recoveredInsured.Count > 0)
|
||||
{
|
||||
_logger.LogInformation("Recovered {Count} insured item(s) for user {User}", recoveredInsured.Count, userId);
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
// Never fail the inventory commit because of insurance handling.
|
||||
_logger.LogWarning(e, "Failed to process insurance payout");
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: Optimize
|
||||
// TODO: Check deleted items to see if other stacks/mods were updated correctly
|
||||
// Process inventory update. The player may:
|
||||
@@ -74,7 +113,8 @@ public class CompleteInventoryUpdateFunction : ICloudScriptFunction<CompleteInve
|
||||
// IMPORTANT: The same request is currently used to report the updated inventory in the end of match.
|
||||
var newInventory = new List<FYCustomItemInfo>(inventory.Count);
|
||||
foreach (var item in inventory) {
|
||||
if (!request.ItemsToRemove.Contains(item.ItemId)) {
|
||||
// Keep items that weren't removed, plus insured items recovered above.
|
||||
if (!request.ItemsToRemove.Contains(item.ItemId) || recoveredInsured.Contains(item.ItemId)) {
|
||||
newInventory.Add(item);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user