magician fixed and tested

Author: RobotHanzo

src/main/kotlin/dev/robothanzo/werewolf/game/roles/actions/MagicianSwapAction.kt

@@ -32,11 +32,11 @@ class MagicianSwapAction : BaseRoleAction(
         alivePlayers: List<Int>,
         accumulatedState: ActionExecutionResult
     ): List<Int> {
-        // Can swap any two players (including self, dead players? description says "exchange two players' numbers")
-        // Usually Magician can swap anyone.
+        // Can swap any two alive players.
         // Constraint: "Each number can only be exchanged once."
-        // Allow selecting already-swapped targets so they can be deselected in UI
-        return session.players.keys.map { it.toInt() }
+        // We filter out players whose numbers have been swapped in previous nights.
+        val usedTargets = session.stateData.magicianSwapTargets
+        return alivePlayers.filter { it !in usedTargets }
     }
 
     override fun validate(session: Session, actor: Int, targets: List<Int>): String? {

src/main/kotlin/dev/robothanzo/werewolf/game/steps/NightStep.kt

@@ -523,8 +523,12 @@ internal object NightSequence {
                     var actions =
                         lockedSession.getAvailableActionsForPlayer(pid, step.roleRegistry, ignoreEffect = true)
                     if (player.wolf) actions = actions.filter { it.actionId != ActionDefinitionId.WEREWOLF_KILL }
-                    if (player.roles.contains("夢魘")) actions =
-                        actions.filter { it.actionId != ActionDefinitionId.NIGHTMARE_FEAR }
+                    actions =
+                        actions.filter { action -> // we don't want to re-execute actions that were executed already at prior phases (e.g. wolf yb, nightmare and magician...etc)
+                            lockedSession.stateData.submittedActions.none {
+                                it.actor == pid && it.actionDefinitionId == action.actionId && it.status.executed
+                            }
+                        }
 
                     if (actions.isNotEmpty()) {
                         if (currentFearedId != null && currentFearedId == pid) {