Feature: ability-level Duration override + WhileSourceOnBattlefield in duration list

AbilityDefinition gains an optional Duration property. When set it is used
as forceDuration for every ExecuteActions call that resolves that ability,
overriding whatever per-action Duration individual effects specify.

- Active abilities: def.Duration is threaded through as forceDuration
- Triggered abilities: same
- Passive abilities: def.Duration ?? WhileSourceOnBattlefield (both
  ApplyPassivesForSource and ApplyPassivesToNewTarget paths)

AbilityBuilder admin panel:
- Duration row added after type-specific fields (dropdown + N input for ForNTurns)
- "WhileSourceOnBattlefield" added to the DurationTypeValues list
- Parse and compile paths updated for the new Duration field

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-17 23:15:05 -04:00
co-authored by Claude Happy
parent 8bcacc29d2
commit 4f0f0e9c0f
3 changed files with 58 additions and 7 deletions
@@ -158,6 +158,30 @@
</div>
}
<!-- Duration override -->
<div class="row g-2 mb-3 align-items-end">
<div class="col-auto">
<label class="form-label small mb-0">
Duration
<small class="text-muted ms-1">overrides per-action duration for all effects</small>
</label>
<select class="form-select form-select-sm" style="width:230px"
@bind="ab.DurationStr" @bind:after="Compile">
<option value="">— per-action (no override) —</option>
@foreach (var d in DurationTypeValues)
{ <option value="@d">@d</option> }
</select>
</div>
@if (ab.DurationStr == "ForNTurns")
{
<div class="col-auto">
<label class="form-label small mb-0">N</label>
<input type="number" min="1" class="form-control form-control-sm" style="width:80px"
@bind="ab.DurationN" @bind:after="Compile" />
</div>
}
</div>
<!-- Activation Conditions -->
<div class="mb-3">
<div class="d-flex justify-content-between align-items-center mb-1">
@@ -498,7 +522,7 @@
private static readonly string[] MovementTypeValues = ["Walk", "Flight", "Jump", "Teleport"];
private static readonly string[] DirectionValues = ["North", "South", "East", "West", "NorthEast", "NorthWest", "SouthEast", "SouthWest"];
private static readonly string[] ComparatorValues = ["Equal", "NotEqual", "LessThan", "LessThanOrEqual", "GreaterThan", "GreaterThanOrEqual"];
private static readonly string[] DurationTypeValues = ["Instant", "UntilEndOfTurn", "UntilStartOfOwnerTurn", "UntilStartOfSourceOwnerTurn", "ForNTurns", "PermanentInMatch"];
private static readonly string[] DurationTypeValues = ["Instant", "UntilEndOfTurn", "UntilStartOfOwnerTurn", "UntilStartOfSourceOwnerTurn", "ForNTurns", "WhileSourceOnBattlefield", "PermanentInMatch"];
private static readonly string[] StatTargetValues = ["Current", "Base", "Max"];
private static readonly string[] StatValues = ["Damage", "Defense", "Health", "MP"];
private static readonly string[] PositionValues = ["Top", "Bottom"];
@@ -732,6 +756,12 @@
ab.Actions.Add(act);
}
if (node["Duration"] is JsonObject dur)
{
ab.DurationStr = dur["Type"]?.GetValue<string>() ?? "";
ab.DurationN = dur["N"]?.GetValue<int>() ?? 1;
}
if (node["Animation"] is JsonObject anim)
{
ab.HasAnimation = true;
@@ -999,6 +1029,13 @@
node["Actions"] = actionsArr;
if (!string.IsNullOrEmpty(ab.DurationStr))
{
var durNode = new JsonObject { ["Type"] = ab.DurationStr };
if (ab.DurationStr == "ForNTurns") durNode["N"] = ab.DurationN;
node["Duration"] = durNode;
}
if (ab.HasAnimation)
{
var animNode = new JsonObject
@@ -1931,6 +1968,10 @@
public string TriggerOccupantOwnership { get; set; } = "";
public string TriggerUnitOwnership { get; set; } = "Any";
public string TriggerAuraOwnership { get; set; } = "Owner";
// Ability-level duration (overrides per-action Duration when set; "" = per-action)
public string DurationStr { get; set; } = "";
public int DurationN { get; set; } = 1;
public List<CostDraft> Costs { get; set; } = new();
public List<ConditionDraft> Conditions { get; set; } = new();
public List<ActionDraft> Actions { get; set; } = new();
@@ -100,7 +100,7 @@ public static class AbilitySystem
source.AbilityUsesThisTurn[abilityIndex] = usedThisTurn + 1;
ExecuteActions(def.Actions, ctx, clientTargets, requireClientTargets: true, activationRange: def.Range);
ExecuteActions(def.Actions, ctx, clientTargets, requireClientTargets: true, activationRange: def.Range, forceDuration: def.Duration);
return state;
}
@@ -152,7 +152,7 @@ public static class AbilitySystem
if (def.ActivationConditions.Any(c => !EvaluateCondition(c, ctx, unit)))
continue;
ExecuteActions(def.Actions, ctx, clientTargets: null);
ExecuteActions(def.Actions, ctx, clientTargets: null, forceDuration: def.Duration);
}
}
}
@@ -1933,9 +1933,10 @@ public static class AbilitySystem
if (source is null) return;
var ctx = new AbilityContext { State = state, ActorId = ownerId, Source = source };
var duration = new DurationModel { Type = DurationType.WhileSourceOnBattlefield };
var fallback = new DurationModel { Type = DurationType.WhileSourceOnBattlefield };
foreach (var def in ParseAbilities(source.AbilitiesJson).Where(d => d.Type == AbilityType.Passive))
ExecuteActions(def.Actions, ctx, clientTargets: null, forceDuration: duration);
ExecuteActions(def.Actions, ctx, clientTargets: null,
forceDuration: def.Duration ?? fallback);
}
/// <summary>
@@ -1946,7 +1947,7 @@ public static class AbilitySystem
public static void ApplyPassivesToNewTarget(GameState state, string newUnitId)
{
var restrict = new HashSet<string> { newUnitId };
var duration = new DurationModel { Type = DurationType.WhileSourceOnBattlefield };
var fallback = new DurationModel { Type = DurationType.WhileSourceOnBattlefield };
foreach (var (ownerId, player) in state.Players)
foreach (var sourceUnit in player.Field.OfType<FieldCard>()
.Where(f => f.InstanceId != newUnitId).ToList())
@@ -1954,7 +1955,7 @@ public static class AbilitySystem
var ctx = new AbilityContext { State = state, ActorId = ownerId, Source = sourceUnit };
foreach (var def in ParseAbilities(sourceUnit.AbilitiesJson).Where(d => d.Type == AbilityType.Passive))
ExecuteActions(def.Actions, ctx, clientTargets: null,
restrictTargets: restrict, forceDuration: duration);
restrictTargets: restrict, forceDuration: def.Duration ?? fallback);
}
}
@@ -51,6 +51,15 @@ public sealed class AbilityDefinition
/// </summary>
public string? Description { get; set; }
/// <summary>
/// Optional ability-level duration that overrides per-action Duration for every effect
/// this ability produces. When null, each Action's own Duration is used instead.
///
/// For Passive abilities this defaults to WhileSourceOnBattlefield when left null;
/// set it explicitly to choose a different lifespan (e.g. UntilEndOfTurn).
/// </summary>
public DurationModel? Duration { get; set; }
/// <summary>
/// Optional client-side animation and sound metadata.
/// Not used by server game logic. Null means the client uses its default effect.