From 20f03cfcb136dde89db4330e8dcfb344ab31f379 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sun, 1 Apr 2018 12:33:59 +0200
Subject: [PATCH] Some minor changes to Momir code.

---
 .../sample-decks/Momir Basic/Momir Basic.dck  | 31 +++++--------------
 .../src/mage/game/MomirDuel.java              | 17 ----------
 .../src/mage/game/MomirFreeForAllType.java    |  4 +--
 3 files changed, 10 insertions(+), 42 deletions(-)

diff --git a/Mage.Client/release/sample-decks/Momir Basic/Momir Basic.dck b/Mage.Client/release/sample-decks/Momir Basic/Momir Basic.dck
index 1295622aa28..7720b6c3a94 100644
--- a/Mage.Client/release/sample-decks/Momir Basic/Momir Basic.dck	
+++ b/Mage.Client/release/sample-decks/Momir Basic/Momir Basic.dck	
@@ -1,23 +1,8 @@
-NAME:Mormir Basic
-3 [BFZ:259] Island
-3 [BFZ:261] Swamp
-3 [BFZ:250] Plains
-3 [BFZ:272] Forest
-3 [BFZ:260] Swamp
-3 [BFZ:271] Forest
-3 [BFZ:270] Forest
-3 [BFZ:265] Mountain
-2 [BFZ:254] Plains
-3 [BFZ:264] Swamp
-3 [BFZ:274] Forest
-1 [BFZ:252] Plains
-3 [BFZ:262] Swamp
-3 [BFZ:251] Plains
-2 [BFZ:273] Forest
-3 [BFZ:258] Island
-2 [BFZ:269] Mountain
-3 [BFZ:268] Mountain
-3 [BFZ:257] Island
-3 [BFZ:267] Mountain
-3 [BFZ:266] Mountain
-2 [BFZ:255] Island
+NAME:Mormir Basic
+12 [BFZ:250a] Plains
+12 [BFZ:260a] Swamp
+12 [BFZ:270a] Forest
+12 [BFZ:265a] Mountain
+12 [BFZ:255a] Island
+LAYOUT MAIN:(1,5)(COLOR_IDENTITY,true,5)|([BFZ:270a],[BFZ:270a],[BFZ:270a],[BFZ:270a],[BFZ:270a],[BFZ:270a],[BFZ:270a],[BFZ:270a],[BFZ:270a],[BFZ:270a],[BFZ:270a],[BFZ:270a])([BFZ:265a],[BFZ:265a],[BFZ:265a],[BFZ:265a],[BFZ:265a],[BFZ:265a],[BFZ:265a],[BFZ:265a],[BFZ:265a],[BFZ:265a],[BFZ:265a],[BFZ:265a])([BFZ:260a],[BFZ:260a],[BFZ:260a],[BFZ:260a],[BFZ:260a],[BFZ:260a],[BFZ:260a],[BFZ:260a],[BFZ:260a],[BFZ:260a],[BFZ:260a],[BFZ:260a])([BFZ:255a],[BFZ:255a],[BFZ:255a],[BFZ:255a],[BFZ:255a],[BFZ:255a],[BFZ:255a],[BFZ:255a],[BFZ:255a],[BFZ:255a],[BFZ:255a],[BFZ:255a])([BFZ:250a],[BFZ:250a],[BFZ:250a],[BFZ:250a],[BFZ:250a],[BFZ:250a],[BFZ:250a],[BFZ:250a],[BFZ:250a],[BFZ:250a],[BFZ:250a],[BFZ:250a])
+LAYOUT SIDEBOARD:(0,0)(COLOR,true,5)|
diff --git a/Mage.Server.Plugins/Mage.Game.MomirDuel/src/mage/game/MomirDuel.java b/Mage.Server.Plugins/Mage.Game.MomirDuel/src/mage/game/MomirDuel.java
index a5f1ce81cf9..37ed63aa184 100644
--- a/Mage.Server.Plugins/Mage.Game.MomirDuel/src/mage/game/MomirDuel.java
+++ b/Mage.Server.Plugins/Mage.Game.MomirDuel/src/mage/game/MomirDuel.java
@@ -28,38 +28,21 @@
 package mage.game;
 
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 import mage.abilities.Ability;
-import mage.abilities.common.LimitedTimesPerTurnActivatedAbility;
 import mage.abilities.common.SimpleStaticAbility;
-import mage.abilities.costs.common.DiscardCardCost;
-import mage.abilities.costs.mana.VariableManaCost;
-import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.InfoEffect;
-import mage.cards.Card;
-import mage.cards.ExpansionSet;
-import mage.cards.Sets;
-import mage.cards.repository.CardCriteria;
 import mage.cards.repository.CardInfo;
 import mage.cards.repository.CardRepository;
-import mage.constants.CardType;
 import mage.constants.MultiplayerAttackOption;
-import mage.constants.Outcome;
 import mage.constants.PhaseStep;
 import mage.constants.RangeOfInfluence;
-import mage.constants.SetType;
-import mage.constants.TimingRule;
 import mage.constants.Zone;
-import mage.game.command.Emblem;
 import mage.game.command.emblems.MomirEmblem;
 import mage.game.match.MatchType;
-import mage.game.permanent.token.EmptyToken;
 import mage.game.turn.TurnMod;
 import mage.players.Player;
-import mage.util.CardUtil;
-import mage.util.RandomUtil;
 
 /**
  *
diff --git a/Mage.Server.Plugins/Mage.Game.MomirGame/src/mage/game/MomirFreeForAllType.java b/Mage.Server.Plugins/Mage.Game.MomirGame/src/mage/game/MomirFreeForAllType.java
index 5eb6c301702..21f01c65f9d 100644
--- a/Mage.Server.Plugins/Mage.Game.MomirGame/src/mage/game/MomirFreeForAllType.java
+++ b/Mage.Server.Plugins/Mage.Game.MomirGame/src/mage/game/MomirFreeForAllType.java
@@ -38,14 +38,14 @@ public class MomirFreeForAllType extends MatchType {
     public MomirFreeForAllType() {
         this.name = "Momir Basic Free For All";
         this.maxPlayers = 10;
-        this.minPlayers = 2;
+        this.minPlayers = 3;
         this.numTeams = 0;
         this.useAttackOption = true;
         this.useRange = true;
         this.sideboardingAllowed = false;
     }
 
-    protected MomirFreeForAllType(final MomirFreeForAllType matchType){
+    protected MomirFreeForAllType(final MomirFreeForAllType matchType) {
         super(matchType);
     }