SVSim/SVSimServer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(tk2): honor consume_item_type (ticket/crystal/rupy/free) + correct entry ticket id

Browse Source 
- ArenaTwoPickConfig: add TicketItemId=1, TicketCost=1, CrystalCost=150, RupyCost=150 scalars
- ArenaTwoPickService.EntryAsync: switch on eARENA_PAY (1/3/4/5); crystal/rupy go through
  ICurrencySpendService.TrySpendAsync; ticket uses item id 1 (challenge ticket, not 80001);
  free entry returns empty reward_list; invalid type throws
- Tests: fix ticket id 80001→1 in entry/e2e; add 4 new path tests; update ctor (10th arg)
  across all 4 service test files; fix e2e retire assertion (reward ticket 80001 post-state=1)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
gamer147
2026-05-31 12:26:57 -04:00
parent 668779e8a4
commit dc19289818
7 changed files with 166 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SVSim.Database/Models/Config/ArenaTwoPickConfig.cs
View File

@@ -21,6 +21,14 @@ public class ArenaTwoPickConfig
public double NeutralMixRate { get; set; } = 0.25;
/// <summary>TK2 entry ticket — item id 1 (challenge ticket). Distinct from the run-end
/// REWARD ticket id (80001, throwback pack ticket).</summary>
public int TicketItemId { get; set; } = 1;
public int TicketCost { get; set; } = 1;
public int CrystalCost { get; set; } = 150;
public int RupyCost { get; set; } = 150;
public List<int> AllowedClassIds { get; set; } = new();
public static ArenaTwoPickConfig ShippedDefaults() => new()

113
SVSim.EmulatedEntrypoint/Services/ArenaTwoPickService.cs
View File

@@ -21,6 +21,7 @@ public class ArenaTwoPickService : IArenaTwoPickService
private readonly IViewerEntitlements _entitlements;
private readonly IRandom _rng;
private readonly SVSimDbContext _db;
private readonly ICurrencySpendService _spend;
public ArenaTwoPickService(
IArenaTwoPickRunRepository runs,
@@ -31,10 +32,12 @@ public class ArenaTwoPickService : IArenaTwoPickService
RewardGrantService grants,
IViewerEntitlements entitlements,
IRandom rng,
SVSimDbContext db)
SVSimDbContext db,
ICurrencySpendService spend)
{
_runs = runs; _rewards = rewards; _pool = pool; _config = config;
_viewers = viewers; _grants = grants; _entitlements = entitlements; _rng = rng; _db = db;
_spend = spend;
}
public async Task<TopResponseDto> GetTopAsync(long viewerId)
@@ -62,37 +65,20 @@ public class ArenaTwoPickService : IArenaTwoPickService
if (await _runs.GetByViewerIdAsync(viewerId) is not null)
throw new ArenaTwoPickException("arena_two_pick_already_in_progress");
const long ticketItemId = 80001;
var viewer = await LoadViewerForGrantsAsync(viewerId);
var ticket = viewer.Items.FirstOrDefault(i => i.Item.Id == (int)ticketItemId);
int postStateTickets;
if (_entitlements.IsFreeplay)
{
postStateTickets = ticket?.Count ?? 0;
}
else
{
if (ticket is null || ticket.Count < 1)
throw new ArenaTwoPickException("insufficient_ticket");
ticket.Count -= 1;
postStateTickets = ticket.Count;
}
var aCfg = _config.Get<SVSim.Database.Models.Config.ArenaTwoPickConfig>();
var rawMaxWins = await _rewards.GetMaxWinCountAsync();
int maxWins;
if (rawMaxWins == 0)
var viewer = await LoadViewerForGrantsAsync(viewerId);
// Dispatch on the client's chosen payment method (ArenaData.eARENA_PAY).
RewardEntryDto? feeEntry = consumeItemType switch
{
// Reward catalog not seeded — bootstrap hasn't run. Fall back to the spec's
// documented default (7) and log a warning so misconfigured deployments are visible.
Console.Error.WriteLine("[ArenaTwoPickService] ArenaTwoPickRewards catalog empty; defaulting MaxBattleCount=7. Run SVSim.Bootstrap to seed.");
maxWins = 7;
}
else
{
maxWins = rawMaxWins;
}
1 => await DebitCrystalsAsync(viewer, aCfg.CrystalCost),
3 => DebitTicket(viewer, aCfg.TicketItemId, aCfg.TicketCost),
4 => await DebitRupiesAsync(viewer, aCfg.RupyCost),
5 => null, // Free entry — no fee.
_ => throw new ArenaTwoPickException("invalid_consume_item_type"),
};
var maxWins = await ResolveMaxBattleCountAsync();
var candidates = SampleCandidateClasses(aCfg.AllowedClassIds, _rng);
var run = new ViewerArenaTwoPickRun
@@ -120,18 +106,77 @@ public class ArenaTwoPickService : IArenaTwoPickService
await _runs.UpsertAsync(run);
await _db.SaveChangesAsync();
var rewardList = feeEntry is null ? new List<RewardEntryDto>() : new List<RewardEntryDto> { feeEntry };
return new EntryResponseDto
{
EntryInfo = ProjectEntryInfo(run, viewerId),
RewardList = new List<RewardEntryDto>
{
new RewardEntryDto { RewardType = 4, RewardId = ticketItemId, RewardNum = postStateTickets },
},
RewardList = rewardList,
CandidateClassIds = candidates,
BattleResults = new BattleResultsDto { WinCount = 0, ResultList = new List<int>() },
};
}
private RewardEntryDto DebitTicket(SVSim.Database.Models.Viewer viewer, int ticketItemId, int ticketCost)
{
var ticket = viewer.Items.FirstOrDefault(i => i.Item.Id == ticketItemId);
int postStateCount;
if (_entitlements.IsFreeplay)
{
postStateCount = ticket?.Count ?? 0;
}
else
{
if (ticket is null || ticket.Count < ticketCost)
throw new ArenaTwoPickException("insufficient_ticket");
ticket.Count -= ticketCost;
postStateCount = ticket.Count;
}
return new RewardEntryDto
{
RewardType = (int)SVSim.Database.Enums.UserGoodsType.Item,
RewardId = ticketItemId,
RewardNum = postStateCount,
};
}
private async Task<RewardEntryDto> DebitCrystalsAsync(SVSim.Database.Models.Viewer viewer, int cost)
{
var result = await _spend.TrySpendAsync(viewer, SVSim.Database.Services.SpendCurrency.Crystal, cost);
if (!result.Success)
throw new ArenaTwoPickException("insufficient_crystal");
return new RewardEntryDto
{
RewardType = (int)SVSim.Database.Enums.UserGoodsType.Crystal,
RewardId = 0,
RewardNum = (int)result.PostStateTotal,
};
}
private async Task<RewardEntryDto> DebitRupiesAsync(SVSim.Database.Models.Viewer viewer, int cost)
{
var result = await _spend.TrySpendAsync(viewer, SVSim.Database.Services.SpendCurrency.Rupee, cost);
if (!result.Success)
throw new ArenaTwoPickException("insufficient_rupy");
return new RewardEntryDto
{
RewardType = (int)SVSim.Database.Enums.UserGoodsType.Rupy,
RewardId = 0,
RewardNum = (int)result.PostStateTotal,
};
}
private async Task<int> ResolveMaxBattleCountAsync()
{
var rawMaxWins = await _rewards.GetMaxWinCountAsync();
if (rawMaxWins == 0)
{
Console.Error.WriteLine("[ArenaTwoPickService] ArenaTwoPickRewards catalog empty; defaulting MaxBattleCount=7. Run SVSim.Bootstrap to seed.");
return 7;
}
return rawMaxWins;
}
private static List<int> SampleCandidateClasses(List<int> allowed, IRandom rng)
{
if (allowed.Count < 3)

21
SVSim.UnitTests/Integration/ArenaTwoPickEndToEndTests.cs
View File

@@ -18,7 +18,7 @@ public class ArenaTwoPickEndToEndTests
using var factory = new SVSimTestFactory();
// Load globals: challenge-config (pool_card_set_ids includes 10015), item master
// (ticket 80001), and arena-two-pick rewards.
// (includes 80001, the run-end reward ticket), and arena-two-pick rewards.
await factory.SeedGlobalsAsync();
// Seed card set 10015 with one Bronze collectible card per class (1-8) + one neutral.
@@ -68,10 +68,10 @@ public class ArenaTwoPickEndToEndTests
db, Path.Combine(AppContext.BaseDirectory, "Data", "seeds"));
}
// Seed viewer with 5 TK2 tickets. SeedGlobalsAsync already loaded ItemEntry 80001.
// Seed viewer with 5 entry tickets (item id 1 = challenge ticket).
long viewerId = await factory.SeedViewerAsync();
await factory.SeedOwnedItemAsync(viewerId, itemId: 80001, count: 5,
itemName: "TK2 Ticket", itemType: 2);
await factory.SeedOwnedItemAsync(viewerId, itemId: 1, count: 5,
itemName: "TK2 Entry Ticket", itemType: 2);
// Capture starting Rupees so the retire assertion can compute expected post-state
// regardless of the default-grants config value (currently 50 000).
@@ -91,7 +91,7 @@ public class ArenaTwoPickEndToEndTests
Assert.That(top.StatusCode, Is.EqualTo(HttpStatusCode.OK));
StringAssert.Contains("\"entry_info\":null", await top.Content.ReadAsStringAsync());
// 2) /entry → deducts 1 ticket (post-state = 4), returns 3 candidate class ids.
// 2) /entry → deducts 1 entry ticket (id 1, post-state = 4), returns 3 candidate class ids.
var entry = await client.PostAsync("/arena_two_pick/entry",
JsonContent.Create(new { consume_item_type = 3, viewer_id = Vid, steam_id = Sid, steam_session_ticket = Stk }));
Assert.That(entry.StatusCode, Is.EqualTo(HttpStatusCode.OK),
@@ -129,8 +129,9 @@ public class ArenaTwoPickEndToEndTests
.GetProperty("id").GetString()!);
}
// 5) /retire at 0 wins → 1 ticket + 100 rupies from the seed table.
// Post-state: ticket = 4 (after debit) + 1 (grant) = 5; rupies = 0 + 100 = 100.
// 5) /retire at 0 wins → 1 ticket (80001) + 100 rupies from the seed table.
// Entry ticket (id 1): 5 - 1 debit = 4 remaining (not in reward_list).
// Reward ticket (id 80001): starts at 0, granted 1 → post-state = 1.
var retire = await client.PostAsync("/arena_two_pick/retire",
JsonContent.Create(new { viewer_id = Vid, steam_id = Sid, steam_session_ticket = Stk }));
Assert.That(retire.StatusCode, Is.EqualTo(HttpStatusCode.OK),
@@ -148,10 +149,10 @@ public class ArenaTwoPickEndToEndTests
Assert.That(rupyEntry.GetProperty("reward_num").GetString(), Is.EqualTo(expectedRupees),
$"post-state rupy = {startRupees} + 100");
// reward_type 4 = Item (ticket 80001); post-state = 4 (after debit) + 1 (grant) = 5.
// reward_type 4 = Item (reward ticket 80001); post-state = 0 (start) + 1 (grant) = 1.
var ticketEntry = rewardList.Single(r => r.GetProperty("reward_type").GetInt32() == 4);
Assert.That(ticketEntry.GetProperty("reward_num").GetString(), Is.EqualTo("5"),
"post-state ticket = 4 (after debit) + 1 (grant) = 5");
Assert.That(ticketEntry.GetProperty("reward_num").GetString(), Is.EqualTo("1"),
"post-state reward ticket (80001) = 0 + 1 grant = 1");
// 6) /top → entry_info:null again (run was deleted by /retire).
var topAgain = await client.PostAsync("/arena_two_pick/top",

3
SVSim.UnitTests/Services/ArenaTwoPickServiceDraftTests.cs
View File

@@ -76,7 +76,8 @@ public class ArenaTwoPickServiceDraftTests
scope.ServiceProvider.GetRequiredService<RewardGrantService>(),
new FakeEntitlements(),
new SystemRandom(seed: 1),
db);
db,
scope.ServiceProvider.GetRequiredService<ICurrencySpendService>());
return (svc, runs, 7);
}

67
SVSim.UnitTests/Services/ArenaTwoPickServiceEntryTests.cs
View File

@@ -14,7 +14,7 @@ namespace SVSim.UnitTests.Services;
public class ArenaTwoPickServiceEntryTests
{
private const long TicketItemId = 80001;
private const long TicketItemId = 1;
/// <summary>Minimal stub — EntryAsync never calls pool methods.</summary>
private sealed class NullCardPoolService : IArenaTwoPickCardPoolService
@@ -38,7 +38,7 @@ public class ArenaTwoPickServiceEntryTests
}
private static async Task<(SVSimDbContext db, IArenaTwoPickService svc, long viewerId)> SetupAsync(
int ticketCount, bool freeplay = false)
int ticketCount, bool freeplay = false, ulong crystals = 0, ulong rupees = 0)
{
var factory = new SVSimTestFactory();
var scope = factory.Services.CreateScope();
@@ -50,7 +50,7 @@ public class ArenaTwoPickServiceEntryTests
var viewer = new SVSim.Database.Models.Viewer
{
Id = 99, DisplayName = "X",
Currency = new ViewerCurrency(),
Currency = new ViewerCurrency { Crystals = crystals, Rupees = rupees },
};
viewer.Items.Add(new OwnedItemEntry { Item = ticketItem, Count = ticketCount });
db.Viewers.Add(viewer);
@@ -72,7 +72,8 @@ public class ArenaTwoPickServiceEntryTests
grants,
new FakeEntitlements { IsFreeplay = freeplay },
new SystemRandom(seed: 1234),
db);
db,
scope.ServiceProvider.GetRequiredService<ICurrencySpendService>());
return (db, svc, viewer.Id);
}
@@ -137,4 +138,62 @@ public class ArenaTwoPickServiceEntryTests
var ex = Assert.ThrowsAsync<ArenaTwoPickException>(() => svc.EntryAsync(viewerId, 3));
Assert.That(ex!.ErrorCode, Is.EqualTo("arena_two_pick_already_in_progress"));
}
[Test]
public async Task EntryAsync_with_crystals_debits_150_and_emits_reward_list_with_post_state_crystal_balance()
{
var (db, svc, viewerId) = await SetupAsync(ticketCount: 0, crystals: 500);
await using var _ = db;
var dto = await svc.EntryAsync(viewerId, consumeItemType: 1);
Assert.That(dto.RewardList.Count, Is.EqualTo(1));
Assert.That(dto.RewardList[0].RewardType, Is.EqualTo((int)SVSim.Database.Enums.UserGoodsType.Crystal));
Assert.That(dto.RewardList[0].RewardId, Is.EqualTo(0));
Assert.That(dto.RewardList[0].RewardNum, Is.EqualTo(350), "post-state = 500 - 150");
var updated = await db.Viewers.Include(v => v.Currency).FirstAsync(v => v.Id == viewerId);
Assert.That((long)updated.Currency!.Crystals, Is.EqualTo(350));
}
[Test]
public async Task EntryAsync_with_rupies_debits_150_and_emits_reward_list_with_post_state_rupy_balance()
{
var (db, svc, viewerId) = await SetupAsync(ticketCount: 0, rupees: 500);
await using var _ = db;
var dto = await svc.EntryAsync(viewerId, consumeItemType: 4);
Assert.That(dto.RewardList.Count, Is.EqualTo(1));
Assert.That(dto.RewardList[0].RewardType, Is.EqualTo((int)SVSim.Database.Enums.UserGoodsType.Rupy));
Assert.That(dto.RewardList[0].RewardId, Is.EqualTo(0));
Assert.That(dto.RewardList[0].RewardNum, Is.EqualTo(350), "post-state = 500 - 150");
var updated = await db.Viewers.Include(v => v.Currency).FirstAsync(v => v.Id == viewerId);
Assert.That((long)updated.Currency!.Rupees, Is.EqualTo(350));
}
[Test]
public async Task EntryAsync_free_entry_emits_empty_reward_list_and_creates_run()
{
var (db, svc, viewerId) = await SetupAsync(ticketCount: 0);
await using var _ = db;
var dto = await svc.EntryAsync(viewerId, consumeItemType: 5);
Assert.That(dto.RewardList, Is.Empty, "free entry emits no fee entry");
var run = await db.ViewerArenaTwoPickRuns.FirstAsync(r => r.ViewerId == viewerId);
Assert.That(run, Is.Not.Null);
}
[Test]
public async Task EntryAsync_with_invalid_consume_item_type_throws()
{
var (db, svc, viewerId) = await SetupAsync(ticketCount: 5);
await using var _ = db;
var ex = Assert.ThrowsAsync<ArenaTwoPickException>(() => svc.EntryAsync(viewerId, consumeItemType: 99));
Assert.That(ex!.ErrorCode, Is.EqualTo("invalid_consume_item_type"));
Assert.That(await db.ViewerArenaTwoPickRuns.AnyAsync(), Is.False);
}
}

3
SVSim.UnitTests/Services/ArenaTwoPickServiceFinishTests.cs
View File

@@ -93,7 +93,8 @@ public class ArenaTwoPickServiceFinishTests
scope.ServiceProvider.GetRequiredService<RewardGrantService>(),
new FakeEntitlements(),
new SystemRandom(seed: 1),
db);
db,
scope.ServiceProvider.GetRequiredService<ICurrencySpendService>());
return (db, svc, 7L);
}

2
SVSim.UnitTests/Services/ArenaTwoPickServiceTopTests.cs
View File

@@ -82,6 +82,6 @@ public class ArenaTwoPickServiceTopTests
{
// GetTopAsync only uses _runs — every other dep can be null! because the test path
// never touches them. The 9th positional arg (db) is required from Task 13 onward.
return new ArenaTwoPickService(runRepo, null!, null!, null!, null!, null!, null!, null!, db);
return new ArenaTwoPickService(runRepo, null!, null!, null!, null!, null!, null!, null!, db, null!);
}
}