Fix: replace [JsonDerivedType] with [PolyType] to avoid STJ PolymorphicTypeResolver conflict
[JsonDerivedType] alone (without [JsonPolymorphic]) is sufficient in .NET 8 to activate the built-in PolymorphicTypeResolver, which then throws NotSupportedException because our custom converter does not support metadata reads/writes. Introduce PolyTypeAttribute — a plain internal attribute unknown to the framework — and replace all [JsonDerivedType] usages on Effect, Condition, TriggerEvent, and Filter with [PolyType]. PolymorphicAbilityConverter<T> reads [PolyType] via reflection to build its type map; the framework ignores it entirely. 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:
@@ -31,13 +31,10 @@ internal abstract class PolymorphicAbilityConverter<T> : JsonConverter<T> where
|
||||
s_typeMap = new Dictionary<string, Type>(StringComparer.OrdinalIgnoreCase);
|
||||
s_reverseMap = new Dictionary<Type, string>();
|
||||
|
||||
foreach (var attr in typeof(T).GetCustomAttributes<JsonDerivedTypeAttribute>())
|
||||
foreach (var attr in typeof(T).GetCustomAttributes<PolyTypeAttribute>())
|
||||
{
|
||||
if (attr.TypeDiscriminator is string disc)
|
||||
{
|
||||
s_typeMap[disc] = attr.DerivedType;
|
||||
s_reverseMap[attr.DerivedType] = disc;
|
||||
}
|
||||
s_typeMap[attr.Discriminator] = attr.DerivedType;
|
||||
s_reverseMap[attr.DerivedType] = attr.Discriminator;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
namespace SOR.Game.Abilities.Models;
|
||||
|
||||
using System.Text.Json.Serialization;
|
||||
using SOR.Database.Enums;
|
||||
|
||||
// ── Condition base ────────────────────────────────────────────────────────────
|
||||
@@ -11,40 +10,40 @@ using SOR.Database.Enums;
|
||||
/// Override with Subject = "Target" to evaluate against the current action's resolved target.
|
||||
/// </summary>
|
||||
// Composite
|
||||
[JsonDerivedType(typeof(AndCondition), "AND")]
|
||||
[JsonDerivedType(typeof(OrCondition), "OR")]
|
||||
[JsonDerivedType(typeof(XorCondition), "XOR")]
|
||||
[PolyType(typeof(AndCondition), "AND")]
|
||||
[PolyType(typeof(OrCondition), "OR")]
|
||||
[PolyType(typeof(XorCondition), "XOR")]
|
||||
// Unit (§6.1)
|
||||
[JsonDerivedType(typeof(HealthBelowCondition), "HealthBelow")]
|
||||
[JsonDerivedType(typeof(HealthAboveCondition), "HealthAbove")]
|
||||
[JsonDerivedType(typeof(DefenseIsCondition), "DefenseIs")]
|
||||
[JsonDerivedType(typeof(HasGenusCondition), "HasGenus")]
|
||||
[JsonDerivedType(typeof(HasAbilityCondition), "HasAbility")]
|
||||
[JsonDerivedType(typeof(IsOnTileWithAffinityCondition), "IsOnTileWithAffinity")]
|
||||
[JsonDerivedType(typeof(IsAdjacentToCondition), "IsAdjacentTo")]
|
||||
[JsonDerivedType(typeof(WithinRangeOfCondition), "WithinRangeOf")]
|
||||
[JsonDerivedType(typeof(MovementTypeIsCondition), "MovementTypeIs")]
|
||||
[PolyType(typeof(HealthBelowCondition), "HealthBelow")]
|
||||
[PolyType(typeof(HealthAboveCondition), "HealthAbove")]
|
||||
[PolyType(typeof(DefenseIsCondition), "DefenseIs")]
|
||||
[PolyType(typeof(HasGenusCondition), "HasGenus")]
|
||||
[PolyType(typeof(HasAbilityCondition), "HasAbility")]
|
||||
[PolyType(typeof(IsOnTileWithAffinityCondition), "IsOnTileWithAffinity")]
|
||||
[PolyType(typeof(IsAdjacentToCondition), "IsAdjacentTo")]
|
||||
[PolyType(typeof(WithinRangeOfCondition), "WithinRangeOf")]
|
||||
[PolyType(typeof(MovementTypeIsCondition), "MovementTypeIs")]
|
||||
// Player (§6.2)
|
||||
[JsonDerivedType(typeof(SPAtLeastCondition), "SPAtLeast")]
|
||||
[JsonDerivedType(typeof(SPAtMostCondition), "SPAtMost")]
|
||||
[JsonDerivedType(typeof(STAtLeastCondition), "STAtLeast")]
|
||||
[JsonDerivedType(typeof(STAtMostCondition), "STAtMost")]
|
||||
[JsonDerivedType(typeof(HandSizeAtLeastCondition), "HandSizeAtLeast")]
|
||||
[JsonDerivedType(typeof(HandSizeAtMostCondition), "HandSizeAtMost")]
|
||||
[JsonDerivedType(typeof(DeckSizeAtLeastCondition), "DeckSizeAtLeast")]
|
||||
[JsonDerivedType(typeof(DiscardSizeAtLeastCondition), "DiscardSizeAtLeast")]
|
||||
[PolyType(typeof(SPAtLeastCondition), "SPAtLeast")]
|
||||
[PolyType(typeof(SPAtMostCondition), "SPAtMost")]
|
||||
[PolyType(typeof(STAtLeastCondition), "STAtLeast")]
|
||||
[PolyType(typeof(STAtMostCondition), "STAtMost")]
|
||||
[PolyType(typeof(HandSizeAtLeastCondition), "HandSizeAtLeast")]
|
||||
[PolyType(typeof(HandSizeAtMostCondition), "HandSizeAtMost")]
|
||||
[PolyType(typeof(DeckSizeAtLeastCondition), "DeckSizeAtLeast")]
|
||||
[PolyType(typeof(DiscardSizeAtLeastCondition), "DiscardSizeAtLeast")]
|
||||
// Tile (§6.3)
|
||||
[JsonDerivedType(typeof(TileAffinityMatchesCondition), "TileAffinityMatches")]
|
||||
[JsonDerivedType(typeof(TileIsOccupiedCondition), "TileIsOccupied")]
|
||||
[JsonDerivedType(typeof(TileIsUnoccupiedCondition), "TileIsUnoccupied")]
|
||||
[PolyType(typeof(TileAffinityMatchesCondition), "TileAffinityMatches")]
|
||||
[PolyType(typeof(TileIsOccupiedCondition), "TileIsOccupied")]
|
||||
[PolyType(typeof(TileIsUnoccupiedCondition), "TileIsUnoccupied")]
|
||||
// Turn/timing (§6.4)
|
||||
[JsonDerivedType(typeof(IsOwnTurnCondition), "IsOwnTurn")]
|
||||
[JsonDerivedType(typeof(IsOpponentTurnCondition), "IsOpponentTurn")]
|
||||
[JsonDerivedType(typeof(IsAllyTurnCondition), "IsAllyTurn")]
|
||||
[JsonDerivedType(typeof(IsActivePlayerTurnCondition), "IsActivePlayerTurn")]
|
||||
[PolyType(typeof(IsOwnTurnCondition), "IsOwnTurn")]
|
||||
[PolyType(typeof(IsOpponentTurnCondition), "IsOpponentTurn")]
|
||||
[PolyType(typeof(IsAllyTurnCondition), "IsAllyTurn")]
|
||||
[PolyType(typeof(IsActivePlayerTurnCondition), "IsActivePlayerTurn")]
|
||||
// Battlefield (§6.5)
|
||||
[JsonDerivedType(typeof(UnitCountOnBattlefieldCondition), "UnitCountOnBattlefield")]
|
||||
[JsonDerivedType(typeof(CardInZoneCondition), "CardInZone")]
|
||||
[PolyType(typeof(UnitCountOnBattlefieldCondition), "UnitCountOnBattlefield")]
|
||||
[PolyType(typeof(CardInZoneCondition), "CardInZone")]
|
||||
public abstract class Condition
|
||||
{
|
||||
/// <summary>
|
||||
|
||||
@@ -10,86 +10,86 @@ using SOR.Database.Enums;
|
||||
/// All effects share a DurationModel (from their containing Action).
|
||||
/// </summary>
|
||||
// §5.1 Stat modification
|
||||
[JsonDerivedType(typeof(ModifyHealthEffect), "ModifyHealth")]
|
||||
[JsonDerivedType(typeof(ModifyDefenseEffect), "ModifyDefense")]
|
||||
[JsonDerivedType(typeof(ModifyDamageEffect), "ModifyDamage")]
|
||||
[JsonDerivedType(typeof(ModifyMPEffect), "ModifyMP")]
|
||||
[JsonDerivedType(typeof(SetMovementTypeEffect), "SetMovementType")]
|
||||
[JsonDerivedType(typeof(SetAttackRangeEffect), "SetAttackRange")]
|
||||
[JsonDerivedType(typeof(ModifyCostEffect), "ModifyCost")]
|
||||
[JsonDerivedType(typeof(SetAffinityEffect), "SetAffinity")]
|
||||
[JsonDerivedType(typeof(GrantAdditionalAttackEffect), "GrantAdditionalAttack")]
|
||||
[JsonDerivedType(typeof(SetStatModMultiplierEffect), "SetStatModMultiplier")]
|
||||
[PolyType(typeof(ModifyHealthEffect), "ModifyHealth")]
|
||||
[PolyType(typeof(ModifyDefenseEffect), "ModifyDefense")]
|
||||
[PolyType(typeof(ModifyDamageEffect), "ModifyDamage")]
|
||||
[PolyType(typeof(ModifyMPEffect), "ModifyMP")]
|
||||
[PolyType(typeof(SetMovementTypeEffect), "SetMovementType")]
|
||||
[PolyType(typeof(SetAttackRangeEffect), "SetAttackRange")]
|
||||
[PolyType(typeof(ModifyCostEffect), "ModifyCost")]
|
||||
[PolyType(typeof(SetAffinityEffect), "SetAffinity")]
|
||||
[PolyType(typeof(GrantAdditionalAttackEffect), "GrantAdditionalAttack")]
|
||||
[PolyType(typeof(SetStatModMultiplierEffect), "SetStatModMultiplier")]
|
||||
// §5.2 Flag modification — unit
|
||||
[JsonDerivedType(typeof(SetCanMoveEffect), "SetCanMove")]
|
||||
[JsonDerivedType(typeof(SetCanAttackEffect), "SetCanAttack")]
|
||||
[JsonDerivedType(typeof(SetCanDefendEffect), "SetCanDefend")]
|
||||
[JsonDerivedType(typeof(SetCanBeAttackedEffect), "SetCanBeAttacked")]
|
||||
[JsonDerivedType(typeof(SetCanBeBlockedEffect), "SetCanBeBlocked")]
|
||||
[JsonDerivedType(typeof(SetCanBeObstructedEffect), "SetCanBeObstructed")]
|
||||
[JsonDerivedType(typeof(SetCanUseAbilityEffect), "SetCanUseAbility")]
|
||||
[JsonDerivedType(typeof(SetCanBeSacrificedEffect), "SetCanBeSacrificed")]
|
||||
[PolyType(typeof(SetCanMoveEffect), "SetCanMove")]
|
||||
[PolyType(typeof(SetCanAttackEffect), "SetCanAttack")]
|
||||
[PolyType(typeof(SetCanDefendEffect), "SetCanDefend")]
|
||||
[PolyType(typeof(SetCanBeAttackedEffect), "SetCanBeAttacked")]
|
||||
[PolyType(typeof(SetCanBeBlockedEffect), "SetCanBeBlocked")]
|
||||
[PolyType(typeof(SetCanBeObstructedEffect), "SetCanBeObstructed")]
|
||||
[PolyType(typeof(SetCanUseAbilityEffect), "SetCanUseAbility")]
|
||||
[PolyType(typeof(SetCanBeSacrificedEffect), "SetCanBeSacrificed")]
|
||||
// §5.2 Flag modification — player
|
||||
[JsonDerivedType(typeof(SetCanDrawCardsEffect), "SetCanDrawCards")]
|
||||
[JsonDerivedType(typeof(SetAccumulatesSPEffect), "SetAccumulatesSP")]
|
||||
[JsonDerivedType(typeof(SetCanChannelSpiritEffect), "SetCanChannelSpirit")]
|
||||
[JsonDerivedType(typeof(SetCanSacrificeSpiritEffect), "SetCanSacrificeSpirit")]
|
||||
[JsonDerivedType(typeof(SetCanAscendArchSpiritEffect), "SetCanAscendArchSpirit")]
|
||||
[JsonDerivedType(typeof(SetCanTransitionArchSpiritEffect), "SetCanTransitionArchSpirit")]
|
||||
[JsonDerivedType(typeof(SetCanChannelRepentanceEffect), "SetCanChannelRepentance")]
|
||||
[JsonDerivedType(typeof(SetCanChannelInstinctEffect), "SetCanChannelInstinct")]
|
||||
[JsonDerivedType(typeof(SetCanChannelRuinEffect), "SetCanChannelRuin")]
|
||||
[JsonDerivedType(typeof(SetCanChannelTerramorphaMonoEffect), "SetCanChannelTerramorphaMono")]
|
||||
[JsonDerivedType(typeof(SetCanChannelTerramorphaDiEffect), "SetCanChannelTerramorphaDi")]
|
||||
[JsonDerivedType(typeof(SetCanChannelTerramorphaTriEffect), "SetCanChannelTerramorphaTri")]
|
||||
[PolyType(typeof(SetCanDrawCardsEffect), "SetCanDrawCards")]
|
||||
[PolyType(typeof(SetAccumulatesSPEffect), "SetAccumulatesSP")]
|
||||
[PolyType(typeof(SetCanChannelSpiritEffect), "SetCanChannelSpirit")]
|
||||
[PolyType(typeof(SetCanSacrificeSpiritEffect), "SetCanSacrificeSpirit")]
|
||||
[PolyType(typeof(SetCanAscendArchSpiritEffect), "SetCanAscendArchSpirit")]
|
||||
[PolyType(typeof(SetCanTransitionArchSpiritEffect), "SetCanTransitionArchSpirit")]
|
||||
[PolyType(typeof(SetCanChannelRepentanceEffect), "SetCanChannelRepentance")]
|
||||
[PolyType(typeof(SetCanChannelInstinctEffect), "SetCanChannelInstinct")]
|
||||
[PolyType(typeof(SetCanChannelRuinEffect), "SetCanChannelRuin")]
|
||||
[PolyType(typeof(SetCanChannelTerramorphaMonoEffect), "SetCanChannelTerramorphaMono")]
|
||||
[PolyType(typeof(SetCanChannelTerramorphaDiEffect), "SetCanChannelTerramorphaDi")]
|
||||
[PolyType(typeof(SetCanChannelTerramorphaTriEffect), "SetCanChannelTerramorphaTri")]
|
||||
// §5.3 Ability modification
|
||||
[JsonDerivedType(typeof(AddAbilityEffect), "AddAbility")]
|
||||
[JsonDerivedType(typeof(RemoveAbilityEffect), "RemoveAbility")]
|
||||
[JsonDerivedType(typeof(EnableAbilityEffect), "EnableAbility")]
|
||||
[JsonDerivedType(typeof(DisableAbilityEffect),"DisableAbility")]
|
||||
[PolyType(typeof(AddAbilityEffect), "AddAbility")]
|
||||
[PolyType(typeof(RemoveAbilityEffect), "RemoveAbility")]
|
||||
[PolyType(typeof(EnableAbilityEffect), "EnableAbility")]
|
||||
[PolyType(typeof(DisableAbilityEffect),"DisableAbility")]
|
||||
// §5.4 Genus modification
|
||||
[JsonDerivedType(typeof(AddGenusEffect), "AddGenus")]
|
||||
[JsonDerivedType(typeof(RemoveGenusEffect), "RemoveGenus")]
|
||||
[PolyType(typeof(AddGenusEffect), "AddGenus")]
|
||||
[PolyType(typeof(RemoveGenusEffect), "RemoveGenus")]
|
||||
// §5.5 Player resource modification
|
||||
[JsonDerivedType(typeof(ModifySPEffect), "ModifySP")]
|
||||
[JsonDerivedType(typeof(ModifySPAccumulationEffect), "ModifySPAccumulation")]
|
||||
[JsonDerivedType(typeof(ModifySTEffect), "ModifyST")]
|
||||
[JsonDerivedType(typeof(ModifyCardsDrawnPerTurnEffect), "ModifyCardsDrawnPerTurn")]
|
||||
[PolyType(typeof(ModifySPEffect), "ModifySP")]
|
||||
[PolyType(typeof(ModifySPAccumulationEffect), "ModifySPAccumulation")]
|
||||
[PolyType(typeof(ModifySTEffect), "ModifyST")]
|
||||
[PolyType(typeof(ModifyCardsDrawnPerTurnEffect), "ModifyCardsDrawnPerTurn")]
|
||||
// §5.6 Tile modification
|
||||
[JsonDerivedType(typeof(SetBaseAffinity1Effect), "SetBaseAffinity1")]
|
||||
[JsonDerivedType(typeof(SetBaseAffinity2Effect), "SetBaseAffinity2")]
|
||||
[JsonDerivedType(typeof(PushAffinityEffect), "PushAffinity")]
|
||||
[JsonDerivedType(typeof(PushFinalAffinityEffect), "PushFinalAffinity")]
|
||||
[PolyType(typeof(SetBaseAffinity1Effect), "SetBaseAffinity1")]
|
||||
[PolyType(typeof(SetBaseAffinity2Effect), "SetBaseAffinity2")]
|
||||
[PolyType(typeof(PushAffinityEffect), "PushAffinity")]
|
||||
[PolyType(typeof(PushFinalAffinityEffect), "PushFinalAffinity")]
|
||||
// §5.7 Zone / card operations
|
||||
[JsonDerivedType(typeof(DrawCardsEffect), "DrawCards")]
|
||||
[JsonDerivedType(typeof(DiscardCardsEffect), "DiscardCards")]
|
||||
[JsonDerivedType(typeof(ReturnToHandEffect), "ReturnToHand")]
|
||||
[JsonDerivedType(typeof(ReturnToDeckEffect), "ReturnToDeck")]
|
||||
[JsonDerivedType(typeof(ReturnToBattlefieldEffect), "ReturnToBattlefield")]
|
||||
[JsonDerivedType(typeof(SendToDiscardEffect), "SendToDiscard")]
|
||||
[JsonDerivedType(typeof(SearchDeckEffect), "SearchDeck")]
|
||||
[JsonDerivedType(typeof(ShuffleDeckEffect), "ShuffleDeck")]
|
||||
[JsonDerivedType(typeof(RevealCardsEffect), "RevealCards")]
|
||||
[JsonDerivedType(typeof(PlaceOnDeckEffect), "PlaceOnDeck")]
|
||||
[JsonDerivedType(typeof(ChannelCardEffect), "ChannelCard")]
|
||||
[PolyType(typeof(DrawCardsEffect), "DrawCards")]
|
||||
[PolyType(typeof(DiscardCardsEffect), "DiscardCards")]
|
||||
[PolyType(typeof(ReturnToHandEffect), "ReturnToHand")]
|
||||
[PolyType(typeof(ReturnToDeckEffect), "ReturnToDeck")]
|
||||
[PolyType(typeof(ReturnToBattlefieldEffect), "ReturnToBattlefield")]
|
||||
[PolyType(typeof(SendToDiscardEffect), "SendToDiscard")]
|
||||
[PolyType(typeof(SearchDeckEffect), "SearchDeck")]
|
||||
[PolyType(typeof(ShuffleDeckEffect), "ShuffleDeck")]
|
||||
[PolyType(typeof(RevealCardsEffect), "RevealCards")]
|
||||
[PolyType(typeof(PlaceOnDeckEffect), "PlaceOnDeck")]
|
||||
[PolyType(typeof(ChannelCardEffect), "ChannelCard")]
|
||||
// §5.8 Combat / damage
|
||||
[JsonDerivedType(typeof(DealDamageEffect), "DealDamage")]
|
||||
[JsonDerivedType(typeof(HealEffect), "Heal")]
|
||||
[JsonDerivedType(typeof(DealDamageToSelfEffect), "DealDamageToSelf")]
|
||||
[JsonDerivedType(typeof(DOTEffect), "DOT")]
|
||||
[JsonDerivedType(typeof(HOTEffect), "HOT")]
|
||||
[PolyType(typeof(DealDamageEffect), "DealDamage")]
|
||||
[PolyType(typeof(HealEffect), "Heal")]
|
||||
[PolyType(typeof(DealDamageToSelfEffect), "DealDamageToSelf")]
|
||||
[PolyType(typeof(DOTEffect), "DOT")]
|
||||
[PolyType(typeof(HOTEffect), "HOT")]
|
||||
// §5.9 Displacement
|
||||
[JsonDerivedType(typeof(PushUnitEffect), "PushUnit")]
|
||||
[JsonDerivedType(typeof(PullUnitEffect), "PullUnit")]
|
||||
[JsonDerivedType(typeof(DisplaceUnitEffect), "DisplaceUnit")]
|
||||
[PolyType(typeof(PushUnitEffect), "PushUnit")]
|
||||
[PolyType(typeof(PullUnitEffect), "PullUnit")]
|
||||
[PolyType(typeof(DisplaceUnitEffect), "DisplaceUnit")]
|
||||
// §5.10 Control
|
||||
[JsonDerivedType(typeof(TakeControlEffect), "TakeControl")]
|
||||
[JsonDerivedType(typeof(GrantMovementControlEffect), "GrantMovementControl")]
|
||||
[JsonDerivedType(typeof(SetFixedSacrificeReturnEffect),"SetFixedSacrificeReturn")]
|
||||
[PolyType(typeof(TakeControlEffect), "TakeControl")]
|
||||
[PolyType(typeof(GrantMovementControlEffect), "GrantMovementControl")]
|
||||
[PolyType(typeof(SetFixedSacrificeReturnEffect),"SetFixedSacrificeReturn")]
|
||||
// §5.11 Token
|
||||
[JsonDerivedType(typeof(SummonTokenEffect), "SummonToken")]
|
||||
[PolyType(typeof(SummonTokenEffect), "SummonToken")]
|
||||
// §5.12 Deferred
|
||||
[JsonDerivedType(typeof(ApplyOnEventEffect), "ApplyOnEvent")]
|
||||
[PolyType(typeof(ApplyOnEventEffect), "ApplyOnEvent")]
|
||||
public abstract class Effect { }
|
||||
|
||||
// ── §5.1 Stat modification ────────────────────────────────────────────────────
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
namespace SOR.Game.Abilities.Models;
|
||||
|
||||
using System.Text.Json.Serialization;
|
||||
using SOR.Database.Enums;
|
||||
|
||||
// ── Filter base ───────────────────────────────────────────────────────────────
|
||||
@@ -10,30 +9,30 @@ using SOR.Database.Enums;
|
||||
/// Unit/card filters apply to spirits and ArchSpirits; tile filters to board tiles.
|
||||
/// </summary>
|
||||
// ── Unit / card filters ──────────────────────────────────────────────────────
|
||||
[JsonDerivedType(typeof(GenusContainsFilter), "GenusContains")]
|
||||
[JsonDerivedType(typeof(AffinityMatchesFilter), "AffinityMatches")]
|
||||
[JsonDerivedType(typeof(HealthBelowFilter), "HealthBelow")]
|
||||
[JsonDerivedType(typeof(HealthAboveFilter), "HealthAbove")]
|
||||
[JsonDerivedType(typeof(DamageRangeFilter), "DamageRange")]
|
||||
[JsonDerivedType(typeof(DefenseRangeFilter), "DefenseRange")]
|
||||
[JsonDerivedType(typeof(MPRangeFilter), "MPRange")]
|
||||
[JsonDerivedType(typeof(HasFlagFilter), "HasFlag")]
|
||||
[JsonDerivedType(typeof(TierIsFilter), "TierIs")]
|
||||
[JsonDerivedType(typeof(IsAdjacentToSourceFilter), "IsAdjacentToSource")]
|
||||
[JsonDerivedType(typeof(CardTypeIsFilter), "CardTypeIs")]
|
||||
[JsonDerivedType(typeof(CardSPCostRangeFilter), "CardSPCostRange")]
|
||||
[JsonDerivedType(typeof(CardSTCostRangeFilter), "CardSTCostRange")]
|
||||
[JsonDerivedType(typeof(WithinRangeFilter), "WithinRange")]
|
||||
[JsonDerivedType(typeof(IsSelfFilter), "IsSelf")]
|
||||
[JsonDerivedType(typeof(IsExactSelfFilter), "IsExactSelf")]
|
||||
[PolyType(typeof(GenusContainsFilter), "GenusContains")]
|
||||
[PolyType(typeof(AffinityMatchesFilter), "AffinityMatches")]
|
||||
[PolyType(typeof(HealthBelowFilter), "HealthBelow")]
|
||||
[PolyType(typeof(HealthAboveFilter), "HealthAbove")]
|
||||
[PolyType(typeof(DamageRangeFilter), "DamageRange")]
|
||||
[PolyType(typeof(DefenseRangeFilter), "DefenseRange")]
|
||||
[PolyType(typeof(MPRangeFilter), "MPRange")]
|
||||
[PolyType(typeof(HasFlagFilter), "HasFlag")]
|
||||
[PolyType(typeof(TierIsFilter), "TierIs")]
|
||||
[PolyType(typeof(IsAdjacentToSourceFilter), "IsAdjacentToSource")]
|
||||
[PolyType(typeof(CardTypeIsFilter), "CardTypeIs")]
|
||||
[PolyType(typeof(CardSPCostRangeFilter), "CardSPCostRange")]
|
||||
[PolyType(typeof(CardSTCostRangeFilter), "CardSTCostRange")]
|
||||
[PolyType(typeof(WithinRangeFilter), "WithinRange")]
|
||||
[PolyType(typeof(IsSelfFilter), "IsSelf")]
|
||||
[PolyType(typeof(IsExactSelfFilter), "IsExactSelf")]
|
||||
// ── Tile filters ─────────────────────────────────────────────────────────────
|
||||
[JsonDerivedType(typeof(TileAffinityMatchesFilter), "TileAffinityMatches")]
|
||||
[JsonDerivedType(typeof(TileIsOccupiedFilter), "TileIsOccupied")]
|
||||
[JsonDerivedType(typeof(TileIsUnoccupiedFilter), "TileIsUnoccupied")]
|
||||
[JsonDerivedType(typeof(TileWithinRangeFilter), "TileWithinRange")]
|
||||
[JsonDerivedType(typeof(TileIsAdjacentToUnitFilter), "TileIsAdjacentToUnit")]
|
||||
[JsonDerivedType(typeof(TileIsOnPlayerSideFilter), "TileIsOnPlayerSide")]
|
||||
[JsonDerivedType(typeof(TileIsInArchSpiritChannelRangeFilter), "TileIsInArchSpiritChannelRange")]
|
||||
[PolyType(typeof(TileAffinityMatchesFilter), "TileAffinityMatches")]
|
||||
[PolyType(typeof(TileIsOccupiedFilter), "TileIsOccupied")]
|
||||
[PolyType(typeof(TileIsUnoccupiedFilter), "TileIsUnoccupied")]
|
||||
[PolyType(typeof(TileWithinRangeFilter), "TileWithinRange")]
|
||||
[PolyType(typeof(TileIsAdjacentToUnitFilter), "TileIsAdjacentToUnit")]
|
||||
[PolyType(typeof(TileIsOnPlayerSideFilter), "TileIsOnPlayerSide")]
|
||||
[PolyType(typeof(TileIsInArchSpiritChannelRangeFilter), "TileIsInArchSpiritChannelRange")]
|
||||
public abstract class Filter { }
|
||||
|
||||
// ── Unit / card filter implementations ───────────────────────────────────────
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
namespace SOR.Game.Abilities.Models;
|
||||
|
||||
/// <summary>
|
||||
/// Maps a type-discriminator string to a concrete derived type for the custom
|
||||
/// <c>PolymorphicAbilityConverter<T></c>. This is intentionally NOT a
|
||||
/// <see cref="System.Text.Json.Serialization.JsonDerivedTypeAttribute"/> — using
|
||||
/// that attribute (even without [JsonPolymorphic]) causes System.Text.Json to
|
||||
/// activate its built-in PolymorphicTypeResolver, which conflicts with our
|
||||
/// custom converter.
|
||||
/// </summary>
|
||||
[AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
|
||||
internal sealed class PolyTypeAttribute(Type derivedType, string discriminator) : Attribute
|
||||
{
|
||||
public Type DerivedType { get; } = derivedType;
|
||||
public string Discriminator { get; } = discriminator;
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
namespace SOR.Game.Abilities.Models;
|
||||
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
// ── TriggerEvent base ─────────────────────────────────────────────────────────
|
||||
|
||||
@@ -10,56 +9,56 @@ using System.Text.Json.Serialization;
|
||||
/// and most accept an optional filter for further narrowing.
|
||||
/// </summary>
|
||||
// §8.1 Turn phase
|
||||
[JsonDerivedType(typeof(OnTurnStartTrigger), "OnTurnStart")]
|
||||
[JsonDerivedType(typeof(OnTurnEndTrigger), "OnTurnEnd")]
|
||||
[PolyType(typeof(OnTurnStartTrigger), "OnTurnStart")]
|
||||
[PolyType(typeof(OnTurnEndTrigger), "OnTurnEnd")]
|
||||
// §8.2 Channeling
|
||||
[JsonDerivedType(typeof(OnChanneledTrigger), "OnChanneled")]
|
||||
[PolyType(typeof(OnChanneledTrigger), "OnChanneled")]
|
||||
// §8.3 ArchSpirit tier actions
|
||||
[JsonDerivedType(typeof(OnAscendTrigger), "OnAscend")]
|
||||
[JsonDerivedType(typeof(OnTransitionTrigger), "OnTransition")]
|
||||
[PolyType(typeof(OnAscendTrigger), "OnAscend")]
|
||||
[PolyType(typeof(OnTransitionTrigger), "OnTransition")]
|
||||
// §8.4 Unit actions
|
||||
[JsonDerivedType(typeof(OnUnitMoveTrigger), "OnUnitMove")]
|
||||
[JsonDerivedType(typeof(OnUnitAttackTrigger), "OnUnitAttack")]
|
||||
[JsonDerivedType(typeof(OnUnitAbilityActivatedTrigger), "OnUnitAbilityActivated")]
|
||||
[JsonDerivedType(typeof(OnUnitMPSpentTrigger), "OnUnitMPSpent")]
|
||||
[PolyType(typeof(OnUnitMoveTrigger), "OnUnitMove")]
|
||||
[PolyType(typeof(OnUnitAttackTrigger), "OnUnitAttack")]
|
||||
[PolyType(typeof(OnUnitAbilityActivatedTrigger), "OnUnitAbilityActivated")]
|
||||
[PolyType(typeof(OnUnitMPSpentTrigger), "OnUnitMPSpent")]
|
||||
// §8.5 Damage and healing
|
||||
[JsonDerivedType(typeof(OnDamageDealtTrigger), "OnDamageDealt")]
|
||||
[JsonDerivedType(typeof(OnDamagePreventedTrigger), "OnDamagePrevented")]
|
||||
[JsonDerivedType(typeof(OnHealedTrigger), "OnHealed")]
|
||||
[PolyType(typeof(OnDamageDealtTrigger), "OnDamageDealt")]
|
||||
[PolyType(typeof(OnDamagePreventedTrigger), "OnDamagePrevented")]
|
||||
[PolyType(typeof(OnHealedTrigger), "OnHealed")]
|
||||
// §8.6 Unit lifecycle
|
||||
[JsonDerivedType(typeof(OnUnitEnterBattlefieldTrigger), "OnUnitEnterBattlefield")]
|
||||
[JsonDerivedType(typeof(OnUnitLeaveBattlefieldTrigger), "OnUnitLeaveBattlefield")]
|
||||
[JsonDerivedType(typeof(OnUnitDeathTrigger), "OnUnitDeath")]
|
||||
[JsonDerivedType(typeof(OnUnitSentToDiscardTrigger), "OnUnitSentToDiscard")]
|
||||
[JsonDerivedType(typeof(OnSpiritSacrificedTrigger), "OnSpiritSacrificed")]
|
||||
[JsonDerivedType(typeof(OnTokenSummonedTrigger), "OnTokenSummoned")]
|
||||
[PolyType(typeof(OnUnitEnterBattlefieldTrigger), "OnUnitEnterBattlefield")]
|
||||
[PolyType(typeof(OnUnitLeaveBattlefieldTrigger), "OnUnitLeaveBattlefield")]
|
||||
[PolyType(typeof(OnUnitDeathTrigger), "OnUnitDeath")]
|
||||
[PolyType(typeof(OnUnitSentToDiscardTrigger), "OnUnitSentToDiscard")]
|
||||
[PolyType(typeof(OnSpiritSacrificedTrigger), "OnSpiritSacrificed")]
|
||||
[PolyType(typeof(OnTokenSummonedTrigger), "OnTokenSummoned")]
|
||||
// §8.7 Unit state changes
|
||||
[JsonDerivedType(typeof(OnStatModifiedTrigger), "OnStatModified")]
|
||||
[JsonDerivedType(typeof(OnAbilityAddedTrigger), "OnAbilityAdded")]
|
||||
[JsonDerivedType(typeof(OnAbilityRemovedTrigger), "OnAbilityRemoved")]
|
||||
[JsonDerivedType(typeof(OnGenusChangedTrigger), "OnGenusChanged")]
|
||||
[PolyType(typeof(OnStatModifiedTrigger), "OnStatModified")]
|
||||
[PolyType(typeof(OnAbilityAddedTrigger), "OnAbilityAdded")]
|
||||
[PolyType(typeof(OnAbilityRemovedTrigger), "OnAbilityRemoved")]
|
||||
[PolyType(typeof(OnGenusChangedTrigger), "OnGenusChanged")]
|
||||
// §8.8 Ruin
|
||||
[JsonDerivedType(typeof(OnRuinActivationTrigger), "OnRuinActivation")]
|
||||
[JsonDerivedType(typeof(OnUnitOccupyRuinTrigger), "OnUnitOccupyRuin")]
|
||||
[PolyType(typeof(OnRuinActivationTrigger), "OnRuinActivation")]
|
||||
[PolyType(typeof(OnUnitOccupyRuinTrigger), "OnUnitOccupyRuin")]
|
||||
// §8.9 Tile
|
||||
[JsonDerivedType(typeof(OnTileAffinityChangedTrigger), "OnTileAffinityChanged")]
|
||||
[PolyType(typeof(OnTileAffinityChangedTrigger), "OnTileAffinityChanged")]
|
||||
// §8.10 Player resources
|
||||
[JsonDerivedType(typeof(OnSPGainedTrigger), "OnSPGained")]
|
||||
[JsonDerivedType(typeof(OnSPSpentTrigger), "OnSPSpent")]
|
||||
[JsonDerivedType(typeof(OnSTGainedTrigger), "OnSTGained")]
|
||||
[JsonDerivedType(typeof(OnSTSpentTrigger), "OnSTSpent")]
|
||||
[PolyType(typeof(OnSPGainedTrigger), "OnSPGained")]
|
||||
[PolyType(typeof(OnSPSpentTrigger), "OnSPSpent")]
|
||||
[PolyType(typeof(OnSTGainedTrigger), "OnSTGained")]
|
||||
[PolyType(typeof(OnSTSpentTrigger), "OnSTSpent")]
|
||||
// §8.11 Card zone events
|
||||
[JsonDerivedType(typeof(OnCardDrawnTrigger), "OnCardDrawn")]
|
||||
[JsonDerivedType(typeof(OnCardDiscardedTrigger), "OnCardDiscarded")]
|
||||
[JsonDerivedType(typeof(OnCardReturnedToHandTrigger), "OnCardReturnedToHand")]
|
||||
[JsonDerivedType(typeof(OnCardReturnedToDeckTrigger), "OnCardReturnedToDeck")]
|
||||
[JsonDerivedType(typeof(OnDeckShuffledTrigger), "OnDeckShuffled")]
|
||||
[JsonDerivedType(typeof(OnCardsRevealedTrigger), "OnCardsRevealed")]
|
||||
[PolyType(typeof(OnCardDrawnTrigger), "OnCardDrawn")]
|
||||
[PolyType(typeof(OnCardDiscardedTrigger), "OnCardDiscarded")]
|
||||
[PolyType(typeof(OnCardReturnedToHandTrigger), "OnCardReturnedToHand")]
|
||||
[PolyType(typeof(OnCardReturnedToDeckTrigger), "OnCardReturnedToDeck")]
|
||||
[PolyType(typeof(OnDeckShuffledTrigger), "OnDeckShuffled")]
|
||||
[PolyType(typeof(OnCardsRevealedTrigger), "OnCardsRevealed")]
|
||||
// §8.12 Effect and targeting lifecycle
|
||||
[JsonDerivedType(typeof(OnTargetedByAbilityTrigger), "OnTargetedByAbility")]
|
||||
[JsonDerivedType(typeof(OnEffectAppliedTrigger), "OnEffectApplied")]
|
||||
[JsonDerivedType(typeof(OnEnterAuraRangeTrigger), "OnEnterAuraRange")]
|
||||
[JsonDerivedType(typeof(OnLeaveAuraRangeTrigger), "OnLeaveAuraRange")]
|
||||
[PolyType(typeof(OnTargetedByAbilityTrigger), "OnTargetedByAbility")]
|
||||
[PolyType(typeof(OnEffectAppliedTrigger), "OnEffectApplied")]
|
||||
[PolyType(typeof(OnEnterAuraRangeTrigger), "OnEnterAuraRange")]
|
||||
[PolyType(typeof(OnLeaveAuraRangeTrigger), "OnLeaveAuraRange")]
|
||||
public abstract class TriggerEvent { }
|
||||
|
||||
// ── §8.1 Turn phase ───────────────────────────────────────────────────────────
|
||||
|
||||
Reference in New Issue
Block a user