diff --git a/Client/origin-client/scenes/game/game_screen.gd b/Client/origin-client/scenes/game/game_screen.gd index 3dfa498..93e59f0 100644 --- a/Client/origin-client/scenes/game/game_screen.gd +++ b/Client/origin-client/scenes/game/game_screen.gd @@ -2491,7 +2491,8 @@ func _start_ability_targeting() -> void: var count_all : bool = count_dict.get("all", false) # Actions auto-resolved by the server need no player input. - var auto_ownerships := ["Self", "ExactSelf", "Random"] + # "Target" means "owner of the last targeted card" — resolved server-side from ctx.ResolvedTargets. + var auto_ownerships := ["Self", "ExactSelf", "Random", "Target"] if count_all or ownership in auto_ownerships: _ability_cur_action_idx += 1 _start_ability_targeting() diff --git a/Server/src/SOR.Game/Abilities/AbilitySystem.cs b/Server/src/SOR.Game/Abilities/AbilitySystem.cs index 8d32288..7bbeff5 100644 --- a/Server/src/SOR.Game/Abilities/AbilitySystem.cs +++ b/Server/src/SOR.Game/Abilities/AbilitySystem.cs @@ -61,9 +61,11 @@ public static class AbilitySystem IReadOnlyList? clientTargets) { var player = state.Players[actorId]; + // ArchSpirit is stored in player.ArchSpirit, not player.Field — check both. var source = player.Field.OfType() - .FirstOrDefault(f => f.InstanceId == sourceInstanceId) - ?? throw new GameException("UNIT_NOT_FOUND"); + .FirstOrDefault(f => f.InstanceId == sourceInstanceId) + ?? (player.ArchSpirit?.InstanceId == sourceInstanceId ? player.ArchSpirit : null) + ?? throw new GameException("UNIT_NOT_FOUND"); if (source.IsExhausted) throw new GameException("UNIT_EXHAUSTED");