From bd07c0cdde812611fdc7be9dfe5f706c28e97550 Mon Sep 17 00:00:00 2001 From: dingo Date: Mon, 9 Mar 2026 20:37:33 -0400 Subject: [PATCH] Fix: remove [JsonPolymorphic] from Effect/Condition/TriggerEvent/Filter base classes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Having both [JsonPolymorphic] on the class AND a custom JsonConverter in options causes NotSupportedException: the built-in polymorphic resolver tries to configure alongside the custom converter but requires it to support metadata reads/writes. Our custom PolymorphicAbilityConverter takes full ownership of polymorphic dispatch, so [JsonPolymorphic] is redundant. The [JsonDerivedType] attributes remain — our converter reads them via reflection for the type map; the framework ignores them without [JsonPolymorphic] present. Generated with [Claude Code](https://claude.ai/code) via [Happy](https://happy.engineering) Co-Authored-By: Claude Co-Authored-By: Happy --- Server/src/SOR.Game/Abilities/Models/Conditions.cs | 1 - Server/src/SOR.Game/Abilities/Models/Effects.cs | 1 - Server/src/SOR.Game/Abilities/Models/Filters.cs | 1 - Server/src/SOR.Game/Abilities/Models/Triggers.cs | 1 - 4 files changed, 4 deletions(-) diff --git a/Server/src/SOR.Game/Abilities/Models/Conditions.cs b/Server/src/SOR.Game/Abilities/Models/Conditions.cs index 2eec29e..5c54b48 100644 --- a/Server/src/SOR.Game/Abilities/Models/Conditions.cs +++ b/Server/src/SOR.Game/Abilities/Models/Conditions.cs @@ -10,7 +10,6 @@ using SOR.Database.Enums; /// The default subject is Self (the source unit or ability owner). /// Override with Subject = "Target" to evaluate against the current action's resolved target. /// -[JsonPolymorphic(TypeDiscriminatorPropertyName = "$type")] // Composite [JsonDerivedType(typeof(AndCondition), "AND")] [JsonDerivedType(typeof(OrCondition), "OR")] diff --git a/Server/src/SOR.Game/Abilities/Models/Effects.cs b/Server/src/SOR.Game/Abilities/Models/Effects.cs index f3c0b9f..faef8cd 100644 --- a/Server/src/SOR.Game/Abilities/Models/Effects.cs +++ b/Server/src/SOR.Game/Abilities/Models/Effects.cs @@ -9,7 +9,6 @@ using SOR.Database.Enums; /// The atomic unit of game-state mutation delivered to a resolved target. /// All effects share a DurationModel (from their containing Action). /// -[JsonPolymorphic(TypeDiscriminatorPropertyName = "$type")] // §5.1 Stat modification [JsonDerivedType(typeof(ModifyHealthEffect), "ModifyHealth")] [JsonDerivedType(typeof(ModifyDefenseEffect), "ModifyDefense")] diff --git a/Server/src/SOR.Game/Abilities/Models/Filters.cs b/Server/src/SOR.Game/Abilities/Models/Filters.cs index f87f7c7..1fed49e 100644 --- a/Server/src/SOR.Game/Abilities/Models/Filters.cs +++ b/Server/src/SOR.Game/Abilities/Models/Filters.cs @@ -9,7 +9,6 @@ using SOR.Database.Enums; /// Narrows which entities a TargetSelector or condition matches. /// Unit/card filters apply to spirits and ArchSpirits; tile filters to board tiles. /// -[JsonPolymorphic(TypeDiscriminatorPropertyName = "$type")] // ── Unit / card filters ────────────────────────────────────────────────────── [JsonDerivedType(typeof(GenusContainsFilter), "GenusContains")] [JsonDerivedType(typeof(AffinityMatchesFilter), "AffinityMatches")] diff --git a/Server/src/SOR.Game/Abilities/Models/Triggers.cs b/Server/src/SOR.Game/Abilities/Models/Triggers.cs index ac92685..c2171c6 100644 --- a/Server/src/SOR.Game/Abilities/Models/Triggers.cs +++ b/Server/src/SOR.Game/Abilities/Models/Triggers.cs @@ -9,7 +9,6 @@ using System.Text.Json.Serialization; /// Every event supports an optional ownership scope applied to the acting entity /// and most accept an optional filter for further narrowing. /// -[JsonPolymorphic(TypeDiscriminatorPropertyName = "$type")] // §8.1 Turn phase [JsonDerivedType(typeof(OnTurnStartTrigger), "OnTurnStart")] [JsonDerivedType(typeof(OnTurnEndTrigger), "OnTurnEnd")]