From 7ca86ce858bfdc2cdc82212e959229e8997186a8 Mon Sep 17 00:00:00 2001 From: Shard Date: Thu, 19 Mar 2026 22:55:04 +0000 Subject: [PATCH] Enforce CanMove and CanUseAbility suppression in game flow --- Server/src/SOR.Game/Abilities/AbilitySystem.cs | 3 +++ Server/src/SOR.Game/GameEngine.cs | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Server/src/SOR.Game/Abilities/AbilitySystem.cs b/Server/src/SOR.Game/Abilities/AbilitySystem.cs index b20fc27..1f45fbb 100644 --- a/Server/src/SOR.Game/Abilities/AbilitySystem.cs +++ b/Server/src/SOR.Game/Abilities/AbilitySystem.cs @@ -177,6 +177,9 @@ public static class AbilitySystem var units = player.Field.OfType().ToList(); // snapshot foreach (var unit in units) { + // SetCanUseAbility(false) suppresses triggered ability firing for this unit. + if (!unit.CanUseAbility) continue; + var abilities = ParseAbilities(unit.AbilitiesJson); for (int i = 0; i < abilities.Length; i++) { diff --git a/Server/src/SOR.Game/GameEngine.cs b/Server/src/SOR.Game/GameEngine.cs index f18d8bf..75ae6ee 100644 --- a/Server/src/SOR.Game/GameEngine.cs +++ b/Server/src/SOR.Game/GameEngine.cs @@ -554,7 +554,8 @@ public static class GameEngine var unit = GetFieldCard(player, unitInstanceId); if (unit.Position is null) throw new GameException("UNIT_NOT_ON_BOARD"); - if (unit.CurrentMp <= 0) throw new GameException("NO_MP"); + if (!unit.CanMove) throw new GameException("UNIT_CANNOT_MOVE"); + if (unit.CurrentMp <= 0) throw new GameException("NO_MP"); var from = unit.Position.Value; var targetTile = board.GetTile(targetPos) ?? throw new GameException("TILE_OUT_OF_BOUNDS");