diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/mage-deck-constructed.iml b/Mage.Server.Plugins/Mage.Deck.Constructed/mage-deck-constructed.iml new file mode 100644 index 0000000000..cff97c34c1 --- /dev/null +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/mage-deck-constructed.iml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/Mage.Server.Plugins/Mage.Deck.Limited/mage-deck-limited.iml b/Mage.Server.Plugins/Mage.Deck.Limited/mage-deck-limited.iml new file mode 100644 index 0000000000..45c9d911b2 --- /dev/null +++ b/Mage.Server.Plugins/Mage.Deck.Limited/mage-deck-limited.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/Mage.Server.Plugins/Mage.Game.FreeForAll/mage-game-freeforall.iml b/Mage.Server.Plugins/Mage.Game.FreeForAll/mage-game-freeforall.iml new file mode 100644 index 0000000000..45c9d911b2 --- /dev/null +++ b/Mage.Server.Plugins/Mage.Game.FreeForAll/mage-game-freeforall.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/mage-game-twoplayerduel.iml b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/mage-game-twoplayerduel.iml new file mode 100644 index 0000000000..45c9d911b2 --- /dev/null +++ b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/mage-game-twoplayerduel.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/mage-player-ai-ma.iml b/Mage.Server.Plugins/Mage.Player.AI.MA/mage-player-ai-ma.iml new file mode 100644 index 0000000000..0552f87adc --- /dev/null +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/mage-player-ai-ma.iml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java index e8ba5fdec4..cddc9d692b 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/src/mage/player/ai/ComputerPlayer6.java @@ -674,6 +674,7 @@ public class ComputerPlayer6 extends ComputerPlayer implements break; } } + game.informPlayers(getName() + " payed " + cost.getPayment().count() + " for " + cost.getText()); cost.setPaid(); return true; } diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java index 816c9f3095..9fa0572226 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java @@ -901,7 +901,8 @@ public class ComputerPlayer> extends PlayerImpl i return false; } - cost.setPaid(); + game.informPlayers(getName() + " payed " + cost.getPayment().count() + " for " + cost.getText()); + cost.setPaid(); return true; } diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/mage-player-ai-mcts.iml b/Mage.Server.Plugins/Mage.Player.AIMCTS/mage-player-ai-mcts.iml new file mode 100644 index 0000000000..31dc20c6ce --- /dev/null +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/mage-player-ai-mcts.iml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java index 5e84a065dd..1da5ffe8ab 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/src/mage/player/ai/ComputerPlayerMCTS.java @@ -193,6 +193,7 @@ public class ComputerPlayerMCTS extends ComputerPlayer imple break; } } + game.informPlayers(getName() + " payed " + cost.getPayment().count() + " for " + cost.getText()); cost.setPaid(); return true; } diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/mage-player-aiminimax.iml b/Mage.Server.Plugins/Mage.Player.AIMinimax/mage-player-aiminimax.iml new file mode 100644 index 0000000000..31dc20c6ce --- /dev/null +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/mage-player-aiminimax.iml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java index ca218d30eb..ca90920deb 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java @@ -28,18 +28,6 @@ package mage.player.ai; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; -import java.util.UUID; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.FutureTask; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; import mage.Constants.Outcome; import mage.Constants.PhaseStep; import mage.Constants.RangeOfInfluence; @@ -54,7 +42,6 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.SearchEffect; import mage.cards.Cards; import mage.choices.Choice; -import mage.filter.FilterAbility; import mage.game.Game; import mage.game.combat.Combat; import mage.game.combat.CombatGroup; @@ -62,30 +49,15 @@ import mage.game.events.GameEvent; import mage.game.permanent.Permanent; import mage.game.stack.StackAbility; import mage.game.stack.StackObject; -import mage.game.turn.BeginCombatStep; -import mage.game.turn.BeginningPhase; -import mage.game.turn.CleanupStep; -import mage.game.turn.CombatDamageStep; -import mage.game.turn.CombatPhase; -import mage.game.turn.DeclareAttackersStep; -import mage.game.turn.DeclareBlockersStep; -import mage.game.turn.DrawStep; -import mage.game.turn.EndOfCombatStep; -import mage.game.turn.EndPhase; -import mage.game.turn.EndStep; -import mage.game.turn.FirstCombatDamageStep; -import mage.game.turn.Phase; -import mage.game.turn.PostCombatMainPhase; -import mage.game.turn.PostCombatMainStep; -import mage.game.turn.PreCombatMainPhase; -import mage.game.turn.PreCombatMainStep; -import mage.game.turn.UntapStep; -import mage.game.turn.UpkeepStep; +import mage.game.turn.*; import mage.players.Player; import mage.target.Target; import mage.target.TargetCard; import org.apache.log4j.Logger; +import java.util.*; +import java.util.concurrent.*; + /** * * @author BetaSteward_at_googlemail.com @@ -564,6 +536,7 @@ public class ComputerPlayer2 extends ComputerPlayer implements break; } } + game.informPlayers(getName() + " payed " + cost.getPayment().count() + " for " + cost.getText()); cost.setPaid(); return true; } diff --git a/Mage.Server.Plugins/Mage.Player.Human/mage-player-human.iml b/Mage.Server.Plugins/Mage.Player.Human/mage-player-human.iml new file mode 100644 index 0000000000..45c9d911b2 --- /dev/null +++ b/Mage.Server.Plugins/Mage.Player.Human/mage-player-human.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java index acf26ea453..022c2aa0d8 100644 --- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java @@ -446,6 +446,7 @@ public class HumanPlayer extends PlayerImpl { if (response.getBoolean() != null) { if (!response.getBoolean()) return false; + game.informPlayers(getName() + " payed " + cost.getPayment().count() + " for " + cost.getText()); cost.setPaid(); } else if (response.getUUID() != null) { playManaAbilities(game); diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/mage-tournament-boosterdraft.iml b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/mage-tournament-boosterdraft.iml new file mode 100644 index 0000000000..45c9d911b2 --- /dev/null +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/mage-tournament-boosterdraft.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/Mage.Server.Plugins/Mage.Tournament.Sealed/mage-tournament-sealed.iml b/Mage.Server.Plugins/Mage.Tournament.Sealed/mage-tournament-sealed.iml new file mode 100644 index 0000000000..45c9d911b2 --- /dev/null +++ b/Mage.Server.Plugins/Mage.Tournament.Sealed/mage-tournament-sealed.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/Mage.Server.Plugins/mage-server-plugins.iml b/Mage.Server.Plugins/mage-server-plugins.iml new file mode 100644 index 0000000000..d043fc26f8 --- /dev/null +++ b/Mage.Server.Plugins/mage-server-plugins.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/Mage.Server/plugins/mage-player-human.jar b/Mage.Server/plugins/mage-player-human.jar index aa18e1d586..ee13b7c0db 100644 Binary files a/Mage.Server/plugins/mage-player-human.jar and b/Mage.Server/plugins/mage-player-human.jar differ