Fix crashes, add ModifyAttackRange effects, ArchSpirit swap in deck editor

- Bazaar Deck tab crash: null-safe float conversion for usdPrice in store_item_row.gd
- Leaderboard crash: freed-object guard in _on_leaderboard_ok (is_instance_valid check)
- Add ModifyMinAttackRangeEffect / ModifyMaxAttackRangeEffect with clamp-to-0 and correct reversal tracking
- AbilityBuilder: add new range effects to Stat Modification group + _amountOnlyTypes
- collection.set_arch_spirit: new handler, request record, and service registration
- Deck editor: show Tier-1 commander row with Change button + ArchSpirit picker panel

Generated with [Claude Code](https://claude.ai/code)
via [Happy](https://happy.engineering)

Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Happy <yesreply@happy.engineering>
This commit is contained in:
dingo
2026-03-25 11:25:44 -04:00
co-authored by Claude Happy
parent 9c42e5c1c8
commit 2a15bd2eb3
9 changed files with 276 additions and 6 deletions
@@ -50,7 +50,8 @@ func setup(item: Dictionary, fallback_art: String = "") -> void:
price_label.text = "◆ %d OP" % int(item.get("originPointPrice", 0))
var usd: float = float(item.get("usdPrice", 0.0))
var usd_raw: Variant = item.get("usdPrice", null)
var usd: float = float(usd_raw) if usd_raw != null else 0.0
if usd > 0.0:
usd_label.text = "$%.2f (coming soon)" % usd
usd_label.visible = true
@@ -26,7 +26,10 @@ const PAGE_SIZE := 100
var _deck_id : String = ""
var _deck_name : String = ""
## { cardDefinitionId(String): quantity(int) } — kept in sync after mutations
var _deck_qty : Dictionary = {}
var _deck_qty : Dictionary = {}
var _arch_spirit_id : String = ""
var _arch_spirit_row : Control = null
var _arch_picker_panel : Control = null
var _coll_page : int = 1
var _coll_total : int = 0
@@ -334,6 +337,10 @@ func _render_deck_response(payload: Dictionary) -> void:
for child in _deck_card_list.get_children():
child.queue_free()
# ── Commander (Tier-1 ArchSpirit) ───────────────────────────────────────
_arch_spirit_id = str(deck.get("archSpiritCardDefinitionId", ""))
_update_arch_spirit_row()
var cards : Array = deck.get("cards", [])
_deck_qty.clear()
var non_as_total := 0
@@ -408,3 +415,142 @@ func _collection_query_key(page: int) -> String:
if type_idx > 0:
type_filter = _type_option.get_item_text(type_idx)
return CollectionCache.cards_query_key(page, PAGE_SIZE, search, type_filter)
# ── Commander / ArchSpirit swap ───────────────────────────────────────────────
func _update_arch_spirit_row() -> void:
if is_instance_valid(_arch_spirit_row):
_arch_spirit_row.queue_free()
_arch_spirit_row = null
var def := ContentCache.get_definition(_arch_spirit_id)
var arch_name : String = str(def.get("name", "Unknown")) if not def.is_empty() else _arch_spirit_id
var outer := MarginContainer.new()
outer.add_theme_constant_override("margin_left", 2)
outer.add_theme_constant_override("margin_right", 2)
outer.add_theme_constant_override("margin_top", 2)
outer.add_theme_constant_override("margin_bottom", 4)
var row := HBoxContainer.new()
row.add_theme_constant_override("separation", 4)
outer.add_child(row)
var info := VBoxContainer.new()
info.size_flags_horizontal = Control.SIZE_EXPAND_FILL
info.add_theme_constant_override("separation", 1)
row.add_child(info)
var name_lbl := Label.new()
name_lbl.text = arch_name
name_lbl.add_theme_font_size_override("font_size", 13)
name_lbl.clip_text = true
info.add_child(name_lbl)
var sub_lbl := Label.new()
sub_lbl.text = "Commander (ArchSpirit)"
sub_lbl.add_theme_color_override("font_color", Color(0.90, 0.75, 0.35))
sub_lbl.add_theme_font_size_override("font_size", 10)
info.add_child(sub_lbl)
var change_btn := Button.new()
change_btn.text = "Change"
change_btn.custom_minimum_size = Vector2(64, 30)
change_btn.pressed.connect(_on_change_arch_spirit_pressed)
row.add_child(change_btn)
_arch_spirit_row = outer
_deck_card_list.add_child(outer)
_deck_card_list.move_child(outer, 0)
func _on_change_arch_spirit_pressed() -> void:
_close_arch_picker()
var panel := _build_arch_picker_panel()
_arch_picker_panel = panel
add_child(panel)
func _close_arch_picker() -> void:
if is_instance_valid(_arch_picker_panel):
_arch_picker_panel.queue_free()
_arch_picker_panel = null
func _build_arch_picker_panel() -> Control:
var panel := PanelContainer.new()
panel.set_anchors_preset(Control.PRESET_FULL_RECT)
var margin := MarginContainer.new()
for side in ["margin_left", "margin_right", "margin_top", "margin_bottom"]:
margin.add_theme_constant_override(side, 12)
panel.add_child(margin)
var vbox := VBoxContainer.new()
vbox.add_theme_constant_override("separation", 8)
margin.add_child(vbox)
var header := HBoxContainer.new()
vbox.add_child(header)
var title := Label.new()
title.text = "Select Commander"
title.size_flags_horizontal = Control.SIZE_EXPAND_FILL
title.add_theme_font_size_override("font_size", 15)
header.add_child(title)
var close_btn := Button.new()
close_btn.text = "✕"
close_btn.pressed.connect(_close_arch_picker)
header.add_child(close_btn)
var scroll := ScrollContainer.new()
scroll.size_flags_vertical = Control.SIZE_EXPAND_FILL
vbox.add_child(scroll)
var list := VBoxContainer.new()
list.add_theme_constant_override("separation", 4)
scroll.add_child(list)
var loading_lbl := Label.new()
loading_lbl.text = "Loading..."
list.add_child(loading_lbl)
Network.request(
"collection.get_cards",
{ "page": 1, "pageSize": 50, "cardTypeFilter": "ArchSpirit", "tierFilter": 1 },
func(_t: String, p: Variant):
if not is_instance_valid(list):
return
loading_lbl.queue_free()
var cards : Array = (p as Dictionary).get("cards", [])
for raw in cards:
var dto := raw as Dictionary
var def_id := str(dto.get("cardDefinitionId", ""))
if def_id.is_empty():
continue
var def := ContentCache.get_definition(def_id)
var card_name : String = str(def.get("name", dto.get("name", "?")))
var row_btn := Button.new()
row_btn.text = card_name
row_btn.text_overrun_behavior = TextServer.OVERRUN_TRIM_ELLIPSIS
row_btn.size_flags_horizontal = Control.SIZE_EXPAND_FILL
row_btn.disabled = def_id == _arch_spirit_id
row_btn.pressed.connect(_set_arch_spirit.bind(def_id))
list.add_child(row_btn),
func(_code: String, msg: String):
if is_instance_valid(loading_lbl):
loading_lbl.text = "Failed: %s" % msg
)
return panel
func _set_arch_spirit(def_id: String) -> void:
_close_arch_picker()
Network.request(
"collection.set_arch_spirit",
{ "deckId": _deck_id, "archSpiritCardDefinitionId": def_id },
func(_t: String, _p: Variant): _load_deck_contents(),
func(_code: String, msg: String): push_warning("DeckEditor set_arch_spirit: %s" % msg)
)
@@ -43,6 +43,8 @@ func _load_page(page: int) -> void:
func _on_leaderboard_ok(p: Variant) -> void:
if not is_instance_valid(self) or not is_inside_tree():
return
loading_lbl.visible = false
var d := p as Dictionary
var entries : Array = d.get("entries", []) as Array
@@ -1105,8 +1105,9 @@
[
new("Damage & Healing", ["DealDamage", "Heal", "DealDamageToSelf", "DOT", "HOT"]),
new("Stat Modification", ["ModifyHealth", "ModifyDefense", "ModifyDamage", "ModifyMP",
"GrantAdditionalAttack", "SetAttackRange", "SetMovementType",
"ModifyCost", "SetStatModMultiplier"]),
"GrantAdditionalAttack", "SetAttackRange",
"ModifyMinAttackRange", "ModifyMaxAttackRange",
"SetMovementType", "ModifyCost", "SetStatModMultiplier"]),
new("Player Resources", ["ModifySP", "ModifyST", "ModifyCardsDrawnPerTurn", "ModifySPAccumulation"]),
new("Unit Flags", ["SetCanMove", "SetCanAttack", "SetCanDefend", "SetCanBeAttacked",
"SetCanBeBlocked", "SetCanBeObstructed", "SetCanUseAbility", "SetCanBeSacrificed"]),
@@ -1142,7 +1143,8 @@
// ── Effect type categories for rendering ─────────────────────────────────────
private static readonly HashSet<string> _amountBypassTypes = ["DealDamage", "DealDamageToSelf"];
private static readonly HashSet<string> _amountOnlyTypes = ["Heal", "ModifyDamage", "ModifySP", "ModifyST", "ModifyCardsDrawnPerTurn", "ModifySPAccumulation"];
private static readonly HashSet<string> _amountOnlyTypes = ["Heal", "ModifyDamage", "ModifySP", "ModifyST", "ModifyCardsDrawnPerTurn", "ModifySPAccumulation",
"ModifyMinAttackRange", "ModifyMaxAttackRange"];
private static readonly HashSet<string> _amountStatTypes = ["ModifyHealth", "ModifyDefense", "ModifyMP"];
private static readonly HashSet<string> _valueTypes = [
"SetCanMove", "SetCanAttack", "SetCanDefend", "SetCanBeAttacked",
@@ -34,6 +34,12 @@ public sealed record CreateDeckRequest(string Name, Guid ArchSpiritCardDefinitio
/// <summary>Renames an existing deck the player owns.</summary>
public sealed record RenameDeckRequest(Guid DeckId, string Name);
/// <summary>
/// Replaces the Tier-1 ArchSpirit commander of an existing deck.
/// ArchSpiritCardDefinitionId must be an ArchSpirit the player owns.
/// </summary>
public sealed record SetArchSpiritRequest(Guid DeckId, Guid ArchSpiritCardDefinitionId);
/// <summary>Permanently deletes a deck and all its DeckCard rows.</summary>
public sealed record DeleteDeckRequest(Guid DeckId);
@@ -0,0 +1,90 @@
namespace SOR.Collection.Handlers;
using Microsoft.EntityFrameworkCore;
using SOR.Database.Contexts;
using SOR.Database.Enums;
using SOR.Networking.Abstractions.Messaging;
using SOR.Networking.Abstractions.Transport;
using SOR.Shared.Networking;
/// <summary>
/// collection.set_arch_spirit — replaces the Tier-1 ArchSpirit commander of an existing deck.
///
/// Validation:
/// - Deck must exist and belong to the player.
/// - New ArchSpirit must exist in the catalog as CardType.ArchSpirit.
/// - Player must own at least one copy of the chosen ArchSpirit.
/// </summary>
internal sealed class CollectionSetArchSpiritHandler : CollectionHandlerBase, IMessageHandler
{
private readonly IMessageSerializer _serializer;
private readonly CollectionDbContext _collectionDb;
private readonly CatalogDbContext _catalogDb;
public CollectionSetArchSpiritHandler(
IMessageSerializer serializer,
CollectionDbContext collectionDb,
CatalogDbContext catalogDb)
{
_serializer = serializer;
_collectionDb = collectionDb;
_catalogDb = catalogDb;
}
public string MessageType => "collection.set_arch_spirit";
public async Task<IServerMessage?> HandleAsync(
IClientMessage message,
AuthenticatedConnection connection,
CancellationToken cancellationToken)
{
var req = _serializer.DeserializePayload<SetArchSpiritRequest>(message.Payload);
var accountId = Guid.Parse(connection.UserId);
// ── Validate deck ownership ────────────────────────────────────────────
var deck = await _collectionDb.Decks
.Include(d => d.Cards)
.FirstOrDefaultAsync(
d => d.Id == req.DeckId && d.AccountId == accountId,
cancellationToken);
if (deck is null)
return ServerMessage.Error(message.Seq, "DECK_NOT_FOUND", "Deck not found.");
// ── Validate ArchSpirit exists in catalog ──────────────────────────────
var archDef = await _catalogDb.CardDefinitions
.FirstOrDefaultAsync(
cd => cd.Id == req.ArchSpiritCardDefinitionId
&& cd.CardType == CardType.ArchSpirit,
cancellationToken);
if (archDef is null)
return ServerMessage.Error(message.Seq, "INVALID_ARCH_SPIRIT",
"That card is not a valid ArchSpirit.");
// ── Validate player owns the ArchSpirit ────────────────────────────────
var ownsArch = await _collectionDb.PlayerCards
.AnyAsync(
pc => pc.AccountId == accountId
&& pc.CardDefinitionId == req.ArchSpiritCardDefinitionId,
cancellationToken);
if (!ownsArch)
return ServerMessage.Error(message.Seq, "ARCH_SPIRIT_NOT_OWNED",
"You do not own that ArchSpirit card.");
// ── Apply change ───────────────────────────────────────────────────────
deck.ArchSpiritCardDefinitionId = req.ArchSpiritCardDefinitionId;
deck.UpdatedAt = DateTimeOffset.UtcNow;
await _collectionDb.SaveChangesAsync(cancellationToken);
var summary = new DeckSummaryDto(
Id: deck.Id,
Name: deck.Name,
ArchSpiritCardDefinitionId: deck.ArchSpiritCardDefinitionId,
CardCount: deck.Cards.Sum(c => c.Quantity),
IsValid: deck.IsValid,
CreatedAt: deck.CreatedAt,
UpdatedAt: deck.UpdatedAt);
return ServerMessage.Reply("collection.set_arch_spirit.ack", message.Seq,
new DeckMutationResponse(summary));
}
}
@@ -29,6 +29,7 @@ public static class ServiceRegistration
services.AddTransient<IMessageHandler, CollectionGetDeckHandler>();
services.AddTransient<IMessageHandler, CollectionCreateDeckHandler>();
services.AddTransient<IMessageHandler, CollectionRenameDeckHandler>();
services.AddTransient<IMessageHandler, CollectionSetArchSpiritHandler>();
services.AddTransient<IMessageHandler, CollectionDeleteDeckHandler>();
services.AddTransient<IMessageHandler, CollectionAddCardHandler>();
services.AddTransient<IMessageHandler, CollectionRemoveCardHandler>();
@@ -749,6 +749,24 @@ public static class AbilitySystem
ci.InstanceId, duration, ctx);
break;
}
case ModifyMinAttackRangeEffect mmar when target is CardInstance ci:
{
int orig = ci.MinAttackRange ?? 0;
int newVal = Math.Max(0, orig + ResolveValue(mmar.Amount, ctx));
ci.MinAttackRange = newVal;
TrackEffect(new ModifyMinAttackRangeEffect { Amount = V(orig - newVal) },
ci.InstanceId, duration, ctx);
break;
}
case ModifyMaxAttackRangeEffect mmax when target is CardInstance ci:
{
int orig = ci.MaxAttackRange ?? 1;
int newVal = Math.Max(0, orig + ResolveValue(mmax.Amount, ctx));
ci.MaxAttackRange = newVal;
TrackEffect(new ModifyMaxAttackRangeEffect { Amount = V(orig - newVal) },
ci.InstanceId, duration, ctx);
break;
}
case ModifyCostEffect mc when target is CardInstance ci:
{
if (mc.Sp.HasValue) ci.SpCost = Math.Max(0, ci.SpCost + mc.Sp.Value);
@@ -16,6 +16,8 @@ using SOR.Database.Enums;
[PolyType(typeof(ModifyMPEffect), "ModifyMP")]
[PolyType(typeof(SetMovementTypeEffect), "SetMovementType")]
[PolyType(typeof(SetAttackRangeEffect), "SetAttackRange")]
[PolyType(typeof(ModifyMinAttackRangeEffect), "ModifyMinAttackRange")]
[PolyType(typeof(ModifyMaxAttackRangeEffect), "ModifyMaxAttackRange")]
[PolyType(typeof(ModifyCostEffect), "ModifyCost")]
[PolyType(typeof(SetAffinityEffect), "SetAffinity")]
[PolyType(typeof(GrantAdditionalAttackEffect), "GrantAdditionalAttack")]
@@ -102,7 +104,9 @@ public sealed class ModifyDamageEffect : Effect { public ValueExpr Amount { get
public sealed class ModifyMPEffect : Effect { public ValueExpr Amount { get; set; } = new(); public StatTarget StatTarget { get; set; } = StatTarget.Current; }
public sealed class SetMovementTypeEffect : Effect { public MovementType MovementType { get; set; } }
public sealed class SetAttackRangeEffect : Effect { public int Min { get; set; } public int Max { get; set; } }
public sealed class SetAttackRangeEffect : Effect { public int Min { get; set; } public int Max { get; set; } }
public sealed class ModifyMinAttackRangeEffect : Effect { public ValueExpr Amount { get; set; } = new(); }
public sealed class ModifyMaxAttackRangeEffect : Effect { public ValueExpr Amount { get; set; } = new(); }
public sealed class ModifyCostEffect : Effect { public int? Sp { get; set; } public int? St { get; set; } }
public sealed class SetAffinityEffect : Effect { public AffinityExpr Affinity { get; set; } = new(); }
public sealed class GrantAdditionalAttackEffect : Effect { public int N { get; set; } = 1; }