From 9c44657deb2f21c449fd5a5d9f72fb6b025bc767 Mon Sep 17 00:00:00 2001 From: dingo Date: Sun, 22 Mar 2026 22:05:15 -0400 Subject: [PATCH] Accept legacy TileAffinityMatchesFilter discriminator as read alias Cards saved with the old typo in AbilitiesJson now deserialize correctly. - PolymorphicAbilityConverter: s_reverseMap uses TryAdd so the first [PolyType] attribute wins for writing (canonical); subsequent attributes register additional discriminators as read-only aliases. - Filters.cs: adds "TileAffinityMatchesFilter" as an alias beside the canonical "TileAffinityMatches" discriminator. Existing DB rows are accepted without migration; new saves write the correct canonical form. 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/EffectPolymorphicConverter.cs | 6 ++++-- Server/src/SOR.Game/Abilities/Models/Filters.cs | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Server/src/SOR.Game/Abilities/EffectPolymorphicConverter.cs b/Server/src/SOR.Game/Abilities/EffectPolymorphicConverter.cs index 11c5f73..3a605ee 100644 --- a/Server/src/SOR.Game/Abilities/EffectPolymorphicConverter.cs +++ b/Server/src/SOR.Game/Abilities/EffectPolymorphicConverter.cs @@ -33,8 +33,10 @@ internal abstract class PolymorphicAbilityConverter : JsonConverter where foreach (var attr in typeof(T).GetCustomAttributes()) { - s_typeMap[attr.Discriminator] = attr.DerivedType; - s_reverseMap[attr.DerivedType] = attr.Discriminator; + s_typeMap[attr.Discriminator] = attr.DerivedType; + // First [PolyType] for a given concrete type wins for writing (canonical discriminator). + // Additional attributes register read-only aliases for backwards compatibility. + s_reverseMap.TryAdd(attr.DerivedType, attr.Discriminator); } } diff --git a/Server/src/SOR.Game/Abilities/Models/Filters.cs b/Server/src/SOR.Game/Abilities/Models/Filters.cs index 6402d31..ecb1581 100644 --- a/Server/src/SOR.Game/Abilities/Models/Filters.cs +++ b/Server/src/SOR.Game/Abilities/Models/Filters.cs @@ -27,6 +27,7 @@ using SOR.Database.Enums; [PolyType(typeof(IsExactSelfFilter), "IsExactSelf")] // ── Tile filters ───────────────────────────────────────────────────────────── [PolyType(typeof(TileAffinityMatchesFilter), "TileAffinityMatches")] +[PolyType(typeof(TileAffinityMatchesFilter), "TileAffinityMatchesFilter")] // legacy alias (typo in admin v1) [PolyType(typeof(TileIsOccupiedFilter), "TileIsOccupied")] [PolyType(typeof(TileIsUnoccupiedFilter), "TileIsUnoccupied")] [PolyType(typeof(TileWithinRangeFilter), "TileWithinRange")]