Skip to content

V0.103.3 #85

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

Open
aAltria wants to merge 4 commits into
base: main
Choose a base branch
from
Open

V0.103.3 #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65607ce
fix(headless): ICardSelector.GetSelectedCardReward returns CardModel?…
Jun 5, 2026
ef84807
fix(headless): MerchantRoom.GetLocalInventory() -> Inventory property
Jun 5, 2026
efb03ba
fix: migrate to sts2.dll v0.103.3 API changes
Jun 5, 2026
8d0a454
chore: ignore test_scripts/
Jun 6, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ obj/
.obsidian/
logs/
saves/*
test_scripts/
52 changes: 25 additions & 27 deletions src/Sts2Headless/RunSimulator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1022,13 +1022,11 @@ private static bool TryRollbackSerializedSaveToPreRoom(SerializableRun serializa
return DetectDecisionPoint();
}

// STS2 build 23372702 removed CombatManager.IsPlayPhase (global) in favor of a
// per-player PlayerCombatState.Phase. Headless is single-player, so the local
// player (Players[0]) being in the Play phase is the equivalent signal.
// Newer STS2 builds removed PlayerCombatState.Phase / PlayerTurnPhase in favor of a
// simple CombatManager.Instance.IsPlayPhase property.
private bool IsPlayPhase()
{
var p = (_runState != null && _runState.Players.Count > 0) ? _runState.Players[0] : null;
return p?.PlayerCombatState?.Phase == MegaCrit.Sts2.Core.Combat.PlayerTurnPhase.Play;
return CombatManager.Instance.IsPlayPhase;
}

private Dictionary<string, object?> DoEndTurn(Player player)
Expand Down Expand Up @@ -1276,8 +1274,8 @@ private bool IsPlayPhase()
return Error("buy_card requires 'card_index'");

var idx = Convert.ToInt32(args["card_index"]);
var allEntries = merchantRoom.GetLocalInventory().CharacterCardEntries
.Concat(merchantRoom.GetLocalInventory().ColorlessCardEntries).ToList();
var allEntries = merchantRoom.Inventory.CharacterCardEntries
.Concat(merchantRoom.Inventory.ColorlessCardEntries).ToList();
if (idx < 0 || idx >= allEntries.Count)
return Error($"Invalid card index {idx}");

Expand All @@ -1287,7 +1285,7 @@ private bool IsPlayPhase()

try
{
entry.OnTryPurchaseWrapper(merchantRoom.GetLocalInventory()).GetAwaiter().GetResult();
entry.OnTryPurchaseWrapper(merchantRoom.Inventory).GetAwaiter().GetResult();
_syncCtx.Pump();
Log($"Bought card: {entry.CreationResult?.Card?.GetType().Name ?? "?"} for {entry.Cost}g");
}
Expand All @@ -1304,7 +1302,7 @@ private bool IsPlayPhase()
return Error("buy_relic requires 'relic_index'");

var idx = Convert.ToInt32(args["relic_index"]);
var entries = merchantRoom.GetLocalInventory().RelicEntries;
var entries = merchantRoom.Inventory.RelicEntries;
if (idx < 0 || idx >= entries.Count) return Error($"Invalid relic index {idx}");

var entry = entries[idx];
Expand All @@ -1317,7 +1315,7 @@ private bool IsPlayPhase()
// Adroit, #80). Run the purchase on a background task and yield as soon as a
// pending selection appears so the caller can resolve it; the background task
// continues once the selector's TCS is fed by select_cards.
var inv = merchantRoom.GetLocalInventory();
var inv = merchantRoom.Inventory;
var task = Task.Run(() => entry.OnTryPurchaseWrapper(inv));
for (int i = 0; i < 100; i++)
{
Expand Down Expand Up @@ -1349,7 +1347,7 @@ private bool IsPlayPhase()
return Error("buy_potion requires 'potion_index'");

var idx = Convert.ToInt32(args["potion_index"]);
var entries = merchantRoom.GetLocalInventory().PotionEntries;
var entries = merchantRoom.Inventory.PotionEntries;
if (idx < 0 || idx >= entries.Count) return Error($"Invalid potion index {idx}");

var entry = entries[idx];
Expand All @@ -1358,7 +1356,7 @@ private bool IsPlayPhase()

try
{
entry.OnTryPurchaseWrapper(merchantRoom.GetLocalInventory()).GetAwaiter().GetResult();
entry.OnTryPurchaseWrapper(merchantRoom.Inventory).GetAwaiter().GetResult();
_syncCtx.Pump();
Log($"Bought potion: {entry.Model.GetType().Name} for {entry.Cost}g");
}
Expand All @@ -1376,14 +1374,14 @@ private bool IsPlayPhase()
if (_runState?.CurrentRoom is not MerchantRoom merchantRoom)
return Error("Not in a shop");

var removal = merchantRoom.GetLocalInventory().CardRemovalEntry;
var removal = merchantRoom.Inventory.CardRemovalEntry;
if (removal == null) return Error("No card removal available");
if (player.Gold < removal.Cost) return Error("Not enough gold");

try
{
// Run on background thread so card selection can pause (same pattern as event options)
var task = Task.Run(() => removal.OnTryPurchaseWrapper(merchantRoom.GetLocalInventory()));
var task = Task.Run(() => removal.OnTryPurchaseWrapper(merchantRoom.Inventory));
for (int i = 0; i < 100; i++)
{
_syncCtx.Pump();
Expand Down Expand Up @@ -2374,7 +2372,7 @@ private void HealBetweenActs()
if (reward is GoldReward || reward is MegaCrit.Sts2.Core.Rewards.RelicReward
|| reward is MegaCrit.Sts2.Core.Rewards.PotionReward)
{
try { reward.SelectUnsynchronized().GetAwaiter().GetResult(); _syncCtx.Pump(); }
try { reward.OnSelectWrapper().GetAwaiter().GetResult(); _syncCtx.Pump(); }
catch (Exception ex) { Log($"Auto-collect reward: {ex.Message}"); }
}
else if (reward is CardReward cr)
Expand Down Expand Up @@ -2690,7 +2688,7 @@ private void ForceToMap()

private Dictionary<string, object?> ShopState(MerchantRoom merchantRoom, Player player)
{
var inv = merchantRoom.GetLocalInventory();
var inv = merchantRoom.Inventory;
if (inv == null) { ForceToMap(); return MapSelectState(); }

var cards = inv.CharacterCardEntries.Concat(inv.ColorlessCardEntries)
Expand Down Expand Up @@ -2755,7 +2753,7 @@ private void ForceToMap()
["is_stocked"] = e.IsStocked,
}).ToList();

var removal = merchantRoom.GetLocalInventory().CardRemovalEntry;
var removal = merchantRoom.Inventory.CardRemovalEntry;

return new Dictionary<string, object?>
{
Expand Down Expand Up @@ -3367,15 +3365,15 @@ public void CancelPending()
private ManualResetEventSlim? _rewardWait;
private int _rewardChoice = -1;

// NOTE: STS2 build 23372702 changed ICardSelector.GetSelectedCardReward to return
// a CardRewardSelection struct { CardModel card; CardRewardAlternative alternative }.
// CardReward.OnSelect interprets: alternative != null → pick that alternative
// (Skip/Reroll); else card != null → take that card; both null → skip (no card kept).
public MegaCrit.Sts2.Core.TestSupport.CardRewardSelection GetSelectedCardReward(
IReadOnlyList<MegaCrit.Sts2.Core.Entities.Cards.CardCreationResult> options,
// NOTE: STS2 post-build 23372702 reverted ICardSelector.GetSelectedCardReward
// back to a `CardModel?` return type. Null means skip; non-null means take that card.
// (An earlier intermediate build used a CardRewardSelection struct { card, alternative }
// here, but it has since been removed upstream.)
public CardModel? GetSelectedCardReward(
IReadOnlyList<CardCreationResult> options,
IReadOnlyList<CardRewardAlternative> alternatives)
{
if (options.Count == 0) return default; // Skip
if (options.Count == 0) return null; // Skip

// Store pending and block until main loop resolves
PendingRewardCards = options.ToList();
Expand All @@ -3390,8 +3388,8 @@ public MegaCrit.Sts2.Core.TestSupport.CardRewardSelection GetSelectedCardReward(
_rewardWait = null;

if (choice >= 0 && choice < options.Count)
return new MegaCrit.Sts2.Core.TestSupport.CardRewardSelection { card = options[choice].Card };
return default; // Skip (card=null, alternative=null)
return options[choice].Card;
return null; // Skip
}

public bool HasPendingReward => PendingRewardCards != null && _rewardWait != null;
Expand Down Expand Up @@ -3735,7 +3733,7 @@ private static async Task NeutralizeSafe(CardModel card, PlayerChoiceContext ctx
{
await CreatureCmd.Damage(ctx, play.Target!, card.DynamicVars.Damage.BaseValue,
MegaCrit.Sts2.Core.ValueProps.ValueProp.Move, card);
await PowerCmd.Apply<WeakPower>(ctx, play.Target!, card.DynamicVars["WeakPower"].BaseValue,
await PowerCmd.Apply<WeakPower>(play.Target!, card.DynamicVars["WeakPower"].BaseValue,
card.Owner.Creature, card, false);
}
catch (Exception ex) { Console.Error.WriteLine($"[WARN] Neutralize safe: {ex.Message}"); }
Expand Down