diff --git a/Server/src/SOR.Admin/Components/Pages/Cards/AbilityBuilder.razor b/Server/src/SOR.Admin/Components/Pages/Cards/AbilityBuilder.razor index 01ec92a..78fd59d 100644 --- a/Server/src/SOR.Admin/Components/Pages/Cards/AbilityBuilder.razor +++ b/Server/src/SOR.Admin/Components/Pages/Cards/AbilityBuilder.razor @@ -150,9 +150,9 @@
- +
+ @RenderTriggerFields(ab) +
@@ -504,8 +504,10 @@ private static readonly string[] PositionValues = ["Top", "Bottom"]; private static readonly string[] PlayerValues = ["Owner", "Opponent", "Both", "Any"]; private static readonly string[] OwnershipValues = ["Any", "Owner", "Ally", "Enemy"]; - private static readonly string[] UnitTypeValues = ["Unit", "Spirit", "ArchSpirit", "SpiritToken"]; - private static readonly string[] ControllerValues = ["Owner", "Opponent"]; + private static readonly string[] UnitTypeValues = ["Unit", "Spirit", "ArchSpirit", "SpiritToken"]; + private static readonly string[] TriggerCardTypeValues = ["Spirit", "ArchSpirit", "Ruin", "Repentance", "Instinct", "Terramorpha"]; + private static readonly string[] TriggerDamageTypeValues= ["Any", "HP", "Defense"]; + private static readonly string[] ControllerValues = ["Owner", "Opponent"]; private static readonly string[] ZoneValues = ["Hand", "Deck", "Discard", "Battlefield"]; private static readonly string[] AnimationTypes = ["Projectile", "LinearProjectile", "ArcProjectile", "Aura"]; @@ -674,8 +676,22 @@ if (node["TriggerEvent"] is JsonNode trig) { - ab.TriggerJson = trig.ToJsonString(); - ab.TriggerType = trig["$type"]?.GetValue() ?? ""; + ab.TriggerType = trig["$type"]?.GetValue() ?? ""; + ab.TriggerPlayer = trig["Player"]?.GetValue() ?? "Owner"; + ab.TriggerOwnership = trig["Ownership"]?.GetValue() ?? "Owner"; + ab.TriggerSourceOwnership = trig["SourceOwnership"]?.GetValue() ?? "Any"; + ab.TriggerTargetOwnership = trig["TargetOwnership"]?.GetValue() ?? "Any"; + ab.TriggerUnitType = trig["UnitType"]?.GetValue() ?? "Unit"; + ab.TriggerCardType = trig["CardType"]?.GetValue() ?? "Spirit"; + ab.TriggerDamageType = trig["DamageType"]?.GetValue() ?? "Any"; + ab.TriggerAmount = trig["Amount"] is JsonNode amtNode ? amtNode.GetValue() : null; + ab.TriggerStat = trig["Stat"]?.GetValue() ?? ""; + ab.TriggerCause = trig["Cause"]?.GetValue() ?? ""; + ab.TriggerCausedBy = trig["CausedBy"]?.GetValue() ?? ""; + ab.TriggerRuinOwnership = trig["RuinOwnership"]?.GetValue() ?? "Any"; + ab.TriggerOccupantOwnership = trig["OccupantOwnership"]?.GetValue() ?? ""; + ab.TriggerUnitOwnership = trig["UnitOwnership"]?.GetValue() ?? "Any"; + ab.TriggerAuraOwnership = trig["AuraOwnership"]?.GetValue() ?? "Owner"; } if (node["Cost"] is JsonArray costs) @@ -935,9 +951,9 @@ ["Max"] = ab.AuraRangeMax ?? 1, }; } - else if (ab.TypeStr == "Triggered" && !string.IsNullOrWhiteSpace(ab.TriggerJson)) + else if (ab.TypeStr == "Triggered" && !string.IsNullOrEmpty(ab.TriggerType)) { - try { node["TriggerEvent"] = JsonNode.Parse(ab.TriggerJson); } catch { } + node["TriggerEvent"] = CompileTrigger(ab); } if (ab.Conditions.Count > 0) @@ -1049,6 +1065,116 @@ return node; } + private static JsonObject CompileTrigger(AbilityDraft ab) + { + var t = ab.TriggerType; + var n = new JsonObject { ["$type"] = t }; + + // Player-only + if (t is "OnTurnStart" or "OnTurnEnd" or "OnCardDrawn" + or "OnCardReturnedToHand" or "OnCardReturnedToDeck" + or "OnDeckShuffled" or "OnCardsRevealed") + { + n["Player"] = ab.TriggerPlayer; + } + // Player + optional Amount + else if (t is "OnSPGained" or "OnSPSpent" or "OnSTGained" or "OnSTSpent") + { + n["Player"] = ab.TriggerPlayer; + if (ab.TriggerAmount.HasValue) n["Amount"] = ab.TriggerAmount.Value; + } + // Player + optional Cause + else if (t == "OnCardDiscarded") + { + n["Player"] = ab.TriggerPlayer; + if (!string.IsNullOrEmpty(ab.TriggerCause)) n["Cause"] = ab.TriggerCause; + } + // Ownership-only + else if (t is "OnAscend" or "OnTransition" or "OnUnitMove" or "OnUnitAttack" + or "OnUnitAbilityActivated" or "OnSpiritSacrificed" or "OnTokenSummoned" + or "OnAbilityAdded" or "OnAbilityRemoved" or "OnGenusChanged") + { + n["Ownership"] = ab.TriggerOwnership; + } + // Ownership + optional Amount + else if (t == "OnUnitMPSpent") + { + n["Ownership"] = ab.TriggerOwnership; + if (ab.TriggerAmount.HasValue) n["Amount"] = ab.TriggerAmount.Value; + } + // Ownership + optional Stat + else if (t == "OnStatModified") + { + n["Ownership"] = ab.TriggerOwnership; + if (!string.IsNullOrEmpty(ab.TriggerStat)) n["Stat"] = ab.TriggerStat; + } + // Ownership + CardType + else if (t == "OnChanneled") + { + n["Ownership"] = ab.TriggerOwnership; + n["CardType"] = ab.TriggerCardType; + } + // Ownership + UnitType + else if (t is "OnUnitEnterBattlefield" or "OnUnitLeaveBattlefield" or "OnUnitDeath") + { + n["Ownership"] = ab.TriggerOwnership; + n["UnitType"] = ab.TriggerUnitType; + } + // Ownership + UnitType + optional CausedBy + else if (t == "OnUnitSentToDiscard") + { + n["Ownership"] = ab.TriggerOwnership; + n["UnitType"] = ab.TriggerUnitType; + if (!string.IsNullOrEmpty(ab.TriggerCausedBy)) n["CausedBy"] = ab.TriggerCausedBy; + } + // SourceOwnership + TargetOwnership + optional DamageType + optional Amount + else if (t == "OnDamageDealt") + { + n["SourceOwnership"] = ab.TriggerSourceOwnership; + n["TargetOwnership"] = ab.TriggerTargetOwnership; + if (ab.TriggerDamageType != "Any") n["DamageType"] = ab.TriggerDamageType; + if (ab.TriggerAmount.HasValue) n["Amount"] = ab.TriggerAmount.Value; + } + // TargetOwnership only + else if (t == "OnDamagePrevented") + { + n["TargetOwnership"] = ab.TriggerTargetOwnership; + } + // TargetOwnership + optional Amount + else if (t == "OnHealed") + { + n["TargetOwnership"] = ab.TriggerTargetOwnership; + if (ab.TriggerAmount.HasValue) n["Amount"] = ab.TriggerAmount.Value; + } + // TargetOwnership + SourceOwnership + else if (t is "OnTargetedByAbility" or "OnEffectApplied") + { + n["TargetOwnership"] = ab.TriggerTargetOwnership; + n["SourceOwnership"] = ab.TriggerSourceOwnership; + } + // RuinOwnership + optional OccupantOwnership + else if (t == "OnRuinActivation") + { + n["RuinOwnership"] = ab.TriggerRuinOwnership; + if (!string.IsNullOrEmpty(ab.TriggerOccupantOwnership)) + n["OccupantOwnership"] = ab.TriggerOccupantOwnership; + } + // UnitOwnership only + else if (t == "OnUnitOccupyRuin") + { + n["UnitOwnership"] = ab.TriggerUnitOwnership; + } + // AuraOwnership + UnitOwnership + else if (t is "OnEnterAuraRange" or "OnLeaveAuraRange") + { + n["AuraOwnership"] = ab.TriggerAuraOwnership; + n["UnitOwnership"] = ab.TriggerUnitOwnership; + } + // OnTileAffinityChanged: no additional fields + + return n; + } + private static JsonObject CompileEffect(EffectDraft d) { var node = new JsonObject { ["$type"] = d.TypeKey }; @@ -1435,6 +1561,161 @@ } }; + private RenderFragment RenderTriggerFields(AbilityDraft ab) => __builder => + { + var t = ab.TriggerType; + if (string.IsNullOrEmpty(t)) + { + __builder.OpenElement(0, "span"); + __builder.AddAttribute(1, "class", "text-muted small fst-italic"); + __builder.AddContent(2, "Select a trigger event."); + __builder.CloseElement(); + return; + } + + // Player-only + if (t is "OnTurnStart" or "OnTurnEnd" or "OnCardDrawn" + or "OnCardReturnedToHand" or "OnCardReturnedToDeck" + or "OnDeckShuffled" or "OnCardsRevealed") + { + BuildSelect(__builder, PlayerValues, ab.TriggerPlayer, + v => { ab.TriggerPlayer = v; Compile(); }, 100); + } + // Player + optional Amount + else if (t is "OnSPGained" or "OnSPSpent" or "OnSTGained" or "OnSTSpent") + { + BuildSelect(__builder, PlayerValues, ab.TriggerPlayer, + v => { ab.TriggerPlayer = v; Compile(); }, 100); + BuildOptionalAmountInput(__builder, ab.TriggerAmount, + v => { ab.TriggerAmount = v; Compile(); }); + } + // Player + optional Cause + else if (t == "OnCardDiscarded") + { + BuildSelect(__builder, PlayerValues, ab.TriggerPlayer, + v => { ab.TriggerPlayer = v; Compile(); }, 100); + BuildStringInput(__builder, ab.TriggerCause, + v => { ab.TriggerCause = v; Compile(); }, 130, "Cause (optional)"); + } + // Ownership-only + else if (t is "OnAscend" or "OnTransition" or "OnUnitMove" or "OnUnitAttack" + or "OnUnitAbilityActivated" or "OnSpiritSacrificed" or "OnTokenSummoned" + or "OnAbilityAdded" or "OnAbilityRemoved" or "OnGenusChanged") + { + BuildSelect(__builder, OwnershipValues, ab.TriggerOwnership, + v => { ab.TriggerOwnership = v; Compile(); }, 100); + } + // Ownership + optional Amount + else if (t == "OnUnitMPSpent") + { + BuildSelect(__builder, OwnershipValues, ab.TriggerOwnership, + v => { ab.TriggerOwnership = v; Compile(); }, 100); + BuildOptionalAmountInput(__builder, ab.TriggerAmount, + v => { ab.TriggerAmount = v; Compile(); }); + } + // Ownership + optional Stat + else if (t == "OnStatModified") + { + BuildSelect(__builder, OwnershipValues, ab.TriggerOwnership, + v => { ab.TriggerOwnership = v; Compile(); }, 100); + BuildOptionalStringSelect(__builder, StatValues, ab.TriggerStat, + v => { ab.TriggerStat = v; Compile(); }, 110, "Any stat"); + } + // Ownership + CardType + else if (t == "OnChanneled") + { + BuildSelect(__builder, OwnershipValues, ab.TriggerOwnership, + v => { ab.TriggerOwnership = v; Compile(); }, 100); + BuildSelect(__builder, TriggerCardTypeValues, ab.TriggerCardType, + v => { ab.TriggerCardType = v; Compile(); }, 120); + } + // Ownership + UnitType + else if (t is "OnUnitEnterBattlefield" or "OnUnitLeaveBattlefield" or "OnUnitDeath") + { + BuildSelect(__builder, OwnershipValues, ab.TriggerOwnership, + v => { ab.TriggerOwnership = v; Compile(); }, 100); + BuildSelect(__builder, UnitTypeValues, ab.TriggerUnitType, + v => { ab.TriggerUnitType = v; Compile(); }, 110); + } + // Ownership + UnitType + optional CausedBy + else if (t == "OnUnitSentToDiscard") + { + BuildSelect(__builder, OwnershipValues, ab.TriggerOwnership, + v => { ab.TriggerOwnership = v; Compile(); }, 100); + BuildSelect(__builder, UnitTypeValues, ab.TriggerUnitType, + v => { ab.TriggerUnitType = v; Compile(); }, 110); + BuildStringInput(__builder, ab.TriggerCausedBy, + v => { ab.TriggerCausedBy = v; Compile(); }, 140, "CausedBy (optional)"); + } + // SourceOwnership → TargetOwnership + DamageType + optional Amount + else if (t == "OnDamageDealt") + { + BuildSelect(__builder, OwnershipValues, ab.TriggerSourceOwnership, + v => { ab.TriggerSourceOwnership = v; Compile(); }, 100); + __builder.OpenElement(50, "span"); + __builder.AddAttribute(51, "class", "text-muted small"); + __builder.AddContent(52, "→"); + __builder.CloseElement(); + BuildSelect(__builder, OwnershipValues, ab.TriggerTargetOwnership, + v => { ab.TriggerTargetOwnership = v; Compile(); }, 100); + BuildSelect(__builder, TriggerDamageTypeValues, ab.TriggerDamageType, + v => { ab.TriggerDamageType = v; Compile(); }, 100); + BuildOptionalAmountInput(__builder, ab.TriggerAmount, + v => { ab.TriggerAmount = v; Compile(); }); + } + // TargetOwnership only + else if (t == "OnDamagePrevented") + { + BuildSelect(__builder, OwnershipValues, ab.TriggerTargetOwnership, + v => { ab.TriggerTargetOwnership = v; Compile(); }, 100); + } + // TargetOwnership + optional Amount + else if (t == "OnHealed") + { + BuildSelect(__builder, OwnershipValues, ab.TriggerTargetOwnership, + v => { ab.TriggerTargetOwnership = v; Compile(); }, 100); + BuildOptionalAmountInput(__builder, ab.TriggerAmount, + v => { ab.TriggerAmount = v; Compile(); }); + } + // TargetOwnership + SourceOwnership + else if (t is "OnTargetedByAbility" or "OnEffectApplied") + { + BuildSelect(__builder, OwnershipValues, ab.TriggerTargetOwnership, + v => { ab.TriggerTargetOwnership = v; Compile(); }, 100); + BuildSelect(__builder, OwnershipValues, ab.TriggerSourceOwnership, + v => { ab.TriggerSourceOwnership = v; Compile(); }, 100); + } + // RuinOwnership + optional OccupantOwnership + else if (t == "OnRuinActivation") + { + BuildSelect(__builder, OwnershipValues, ab.TriggerRuinOwnership, + v => { ab.TriggerRuinOwnership = v; Compile(); }, 100); + BuildOptionalStringSelect(__builder, OwnershipValues, ab.TriggerOccupantOwnership, + v => { ab.TriggerOccupantOwnership = v; Compile(); }, 110, "Any occupant"); + } + // UnitOwnership only + else if (t == "OnUnitOccupyRuin") + { + BuildSelect(__builder, OwnershipValues, ab.TriggerUnitOwnership, + v => { ab.TriggerUnitOwnership = v; Compile(); }, 100); + } + // AuraOwnership + UnitOwnership + else if (t is "OnEnterAuraRange" or "OnLeaveAuraRange") + { + BuildSelect(__builder, OwnershipValues, ab.TriggerAuraOwnership, + v => { ab.TriggerAuraOwnership = v; Compile(); }, 100); + BuildSelect(__builder, OwnershipValues, ab.TriggerUnitOwnership, + v => { ab.TriggerUnitOwnership = v; Compile(); }, 100); + } + else if (t == "OnTileAffinityChanged") + { + __builder.OpenElement(0, "span"); + __builder.AddAttribute(1, "class", "text-muted small fst-italic"); + __builder.AddContent(2, "No additional fields."); + __builder.CloseElement(); + } + }; + // ── Builder helper methods (emit common UI patterns) ───────────────────────── private void BuildSelect(RenderTreeBuilder b, string[] options, string current, @@ -1508,14 +1789,77 @@ BuildIntInput(b, d.DurationN, v => { d.DurationN = v; Compile(); }, 60, "N"); } + private void BuildStringInput(RenderTreeBuilder b, string value, Action onChange, int widthPx, string placeholder) + { + b.OpenElement(0, "input"); + b.AddAttribute(1, "class", "form-control form-control-sm"); + b.AddAttribute(2, "style", $"width:{widthPx}px"); + b.AddAttribute(3, "placeholder", placeholder); + b.AddAttribute(4, "value", value); + b.AddAttribute(5, "onchange", EventCallback.Factory.Create( + this, e => onChange(e.Value?.ToString() ?? ""))); + b.CloseElement(); + } + + private void BuildOptionalAmountInput(RenderTreeBuilder b, int? value, Action onChange) + { + b.OpenElement(0, "input"); + b.AddAttribute(1, "type", "number"); + b.AddAttribute(2, "class", "form-control form-control-sm"); + b.AddAttribute(3, "style", "width:90px"); + b.AddAttribute(4, "placeholder", "Amt (opt)"); + b.AddAttribute(5, "title", "Minimum amount (blank = any)"); + b.AddAttribute(6, "value", value?.ToString() ?? ""); + b.AddAttribute(7, "onchange", EventCallback.Factory.Create( + this, e => onChange(int.TryParse(e.Value?.ToString(), out var v) ? v : null))); + b.CloseElement(); + } + + private void BuildOptionalStringSelect(RenderTreeBuilder b, string[] options, string current, + Action onChange, int widthPx, string emptyLabel) + { + b.OpenElement(0, "select"); + b.AddAttribute(1, "class", "form-select form-select-sm"); + b.AddAttribute(2, "style", $"width:{widthPx}px"); + b.AddAttribute(3, "value", current); + b.AddAttribute(4, "onchange", EventCallback.Factory.Create( + this, e => onChange(e.Value?.ToString() ?? ""))); + b.OpenElement(5, "option"); + b.AddAttribute(6, "value", ""); + if (string.IsNullOrEmpty(current)) b.AddAttribute(7, "selected", true); + b.AddContent(8, $"— {emptyLabel} —"); + b.CloseElement(); + foreach (var opt in options) + { + b.OpenElement(5, "option"); + b.AddAttribute(6, "value", opt); + if (opt == current) b.AddAttribute(7, "selected", true); + b.AddContent(8, opt); + b.CloseElement(); + } + b.CloseElement(); + } + // ── Event helpers ───────────────────────────────────────────────────────────── private void SelectTrigger(AbilityDraft ab, string triggerType) { - ab.TriggerType = triggerType; - if (!string.IsNullOrEmpty(triggerType)) - ab.TriggerJson = TriggerTemplates.GetValueOrDefault( - triggerType, "{\"$type\":\"" + triggerType + "\"}"); + ab.TriggerType = triggerType; + ab.TriggerPlayer = "Owner"; + ab.TriggerOwnership = "Owner"; + ab.TriggerSourceOwnership = "Any"; + ab.TriggerTargetOwnership = "Any"; + ab.TriggerUnitType = "Unit"; + ab.TriggerCardType = "Spirit"; + ab.TriggerDamageType = "Any"; + ab.TriggerAmount = null; + ab.TriggerStat = ""; + ab.TriggerCause = ""; + ab.TriggerCausedBy = ""; + ab.TriggerRuinOwnership = "Any"; + ab.TriggerOccupantOwnership = ""; + ab.TriggerUnitOwnership = "Any"; + ab.TriggerAuraOwnership = "Owner"; Compile(); } @@ -1571,8 +1915,22 @@ public int UsesPerTurn { get; set; } = 1; public int? AuraRangeMin { get; set; } public int? AuraRangeMax { get; set; } - public string TriggerType { get; set; } = ""; - public string TriggerJson { get; set; } = ""; + public string TriggerType { get; set; } = ""; + public string TriggerPlayer { get; set; } = "Owner"; + public string TriggerOwnership { get; set; } = "Owner"; + public string TriggerSourceOwnership { get; set; } = "Any"; + public string TriggerTargetOwnership { get; set; } = "Any"; + public string TriggerUnitType { get; set; } = "Unit"; + public string TriggerCardType { get; set; } = "Spirit"; + public string TriggerDamageType { get; set; } = "Any"; + public int? TriggerAmount { get; set; } + public string TriggerStat { get; set; } = ""; + public string TriggerCause { get; set; } = ""; + public string TriggerCausedBy { get; set; } = ""; + public string TriggerRuinOwnership { get; set; } = "Any"; + public string TriggerOccupantOwnership { get; set; } = ""; + public string TriggerUnitOwnership { get; set; } = "Any"; + public string TriggerAuraOwnership { get; set; } = "Owner"; public List Costs { get; set; } = new(); public List Conditions { get; set; } = new(); public List Actions { get; set; } = new();