diff --git a/Client/origin-client/autoloads/Game.gd b/Client/origin-client/autoloads/Game.gd index 46b5f69..248e6f0 100644 --- a/Client/origin-client/autoloads/Game.gd +++ b/Client/origin-client/autoloads/Game.gd @@ -697,11 +697,8 @@ func _merge_unit_delta(unit: Dictionary, ud: Dictionary) -> void: if ud.has("effectsJson") and ud["effectsJson"] != null: unit["effectsJson"] = ud["effectsJson"] if ud.has("abilitiesJson") and ud["abilitiesJson"] != null: unit["abilitiesJson"] = ud["abilitiesJson"] if ud.has("abilityUsesJson") and ud["abilityUsesJson"] != null: unit["abilityUsesJson"] = ud["abilityUsesJson"] - if ud.has("art2dUrl") and ud["art2dUrl"] != null: unit["art2dUrl"] = ud["art2dUrl"] - if ud.has("Art2dUrl") and ud["Art2dUrl"] != null: unit["Art2dUrl"] = ud["Art2dUrl"] - if ud.has("modelUrl") and ud["modelUrl"] != null: unit["modelUrl"] = ud["modelUrl"] - if ud.has("ModelUrl") and ud["ModelUrl"] != null: unit["ModelUrl"] = ud["ModelUrl"] - if ud.has("modelurl") and ud["modelurl"] != null: unit["modelurl"] = ud["modelurl"] + # art2dUrl and modelUrl are not merged from deltas — they are fixed per card definition + # and are set once when the unit is added via unitsAdded (UnitSnapshot). func _on_server_push(type: String, payload: Variant) -> void: diff --git a/Server/src/SOR.Game/GameMessages.cs b/Server/src/SOR.Game/GameMessages.cs index 6490a47..a622d75 100644 --- a/Server/src/SOR.Game/GameMessages.cs +++ b/Server/src/SOR.Game/GameMessages.cs @@ -556,9 +556,8 @@ public sealed record UnitDelta( int? ExtraAttacksRemaining, CoordDto? Position, string? AbilitiesJson, - string? AbilityUsesJson, - string? Art2dUrl, - string? ModelUrl); + string? AbilityUsesJson); + // Art2dUrl and ModelUrl removed: fixed per card definition, sent once in UnitSnapshot. public sealed record PublicCountsDelta( int? DeckCount, diff --git a/Server/src/SOR.Game/GameStateDiffer.cs b/Server/src/SOR.Game/GameStateDiffer.cs index 5ef3d16..263c74d 100644 --- a/Server/src/SOR.Game/GameStateDiffer.cs +++ b/Server/src/SOR.Game/GameStateDiffer.cs @@ -251,9 +251,10 @@ internal static class GameStateDiffer prevC.ExtraAttacksRemaining != nextC.ExtraAttacksRemaining || prevFc?.Position != nextFc?.Position || prevC.AbilitiesJson != nextC.AbilitiesJson || - prevC.Art2dUrl != nextC.Art2dUrl || - prevC.ModelUrl != nextC.ModelUrl || abilityUsesChanged; + // Art2dUrl and ModelUrl are intentionally excluded: they are fixed for the + // lifetime of a card definition and are already sent in the initial UnitSnapshot. + // Including them in UnitDelta would waste bandwidth on every stat change. if (!anyChange) return null; @@ -282,9 +283,7 @@ internal static class GameStateDiffer ExtraAttacksRemaining : prevC.ExtraAttacksRemaining != nextC.ExtraAttacksRemaining ? nextC.ExtraAttacksRemaining : null, Position : positionDelta, AbilitiesJson : prevC.AbilitiesJson != nextC.AbilitiesJson ? nextC.AbilitiesJson : null, - AbilityUsesJson : abilityUsesJson, - Art2dUrl : prevC.Art2dUrl != nextC.Art2dUrl ? nextC.Art2dUrl : null, - ModelUrl : prevC.ModelUrl != nextC.ModelUrl ? nextC.ModelUrl : null); + AbilityUsesJson : abilityUsesJson); } private static PlayerStatsDelta? DiffPlayerStats(PlayerState prev, PlayerState next)