diff --git a/src/main/java/model/game/Chain.java b/src/main/java/model/game/Chain.java index cc52ed25..29691cf9 100644 --- a/src/main/java/model/game/Chain.java +++ b/src/main/java/model/game/Chain.java @@ -73,14 +73,14 @@ public void deActiveMonster() { } public boolean startChain() { - while (canAddToChain()) { - if (doesPlayerWantToAddToChain()) { - addToChain(); - } else { - break; - } - nextPlayer(); - } +// while (canAddToChain()) { +// if (doesPlayerWantToAddToChain()) { +// addToChain(); +// } else { +// break; +// } +// nextPlayer(); +// } activateChain(); return canActiveMonster; @@ -147,7 +147,7 @@ private void nextPlayer() { private void activateChain() { for (int i = chain.size() - 1; i >= 0; i--) { - nextPlayer(); +// nextPlayer(); Card card = chain.get(i); if (card instanceof SpellTrapCard) { diff --git a/src/main/java/model/game/Game.java b/src/main/java/model/game/Game.java index 3ec25fba..75e4c46a 100644 --- a/src/main/java/model/game/Game.java +++ b/src/main/java/model/game/Game.java @@ -259,10 +259,10 @@ public boolean canSummonThisMonster() { } public int summonMonster() { - Chain chain = new Chain(this, selectedCard, getPlayerOfThisTurn(), getOpponentOfThisTurn(), ChainStartState.MONSTER_SUMMON); - boolean canSummon = chain.startChain(); - - if (canSummon) { +// Chain chain = new Chain(this, selectedCard, getPlayerOfThisTurn(), getOpponentOfThisTurn(), ChainStartState.MONSTER_SUMMON); +// boolean canSummon = chain.startChain(); +// +// if (canSummon) { GameBoard gameBoard = getPlayerGameBoard(); CommandKnight.CommandKnightOnFieldWithSummonMode((MonsterCard) selectedCard, getPlayerGameBoard().getMonsterField()); @@ -279,10 +279,10 @@ public int summonMonster() { this.selectedCard = null; return 6; - } else { - return -1; - - } +// } else { +// return -1; +// +// } } public void tributeSummon(ArrayList cardsToTribute) { @@ -369,31 +369,31 @@ private boolean isTargetCellInDefensePosition(int numberOfEnemyMonsterZone) { } public int flipSummon() { - Chain chain = new Chain(this, selectedCard, getPlayerOfThisTurn(), getOpponentOfThisTurn(), ChainStartState.MONSTER_FLIP_SUMMON); - boolean canFlipSummon = chain.startChain(); +// Chain chain = new Chain(this, selectedCard, getPlayerOfThisTurn(), getOpponentOfThisTurn(), ChainStartState.MONSTER_FLIP_SUMMON); +// boolean canFlipSummon = chain.startChain(); - if (canFlipSummon) { +// if (canFlipSummon) { MonsterCard playerCard = (MonsterCard) this.selectedCard; playerCard.setPosition(PositionMonsters.ATTACK); this.selectedCard = playerCard; return 5; - } else { - return -1; +// } else { +// return -1; - } +// } } public int attack(int numberOfEnemyMonsterZone) { int result = 0; - Chain chain = new Chain(this, selectedCard, getPlayerOfThisTurn(), getOpponentOfThisTurn(), ChainStartState.MONSTER_ATTACK); - boolean canAttack = chain.startChain(); - - if (!canAttack) { - result = -1; - - } else { +// Chain chain = new Chain(this, selectedCard, getPlayerOfThisTurn(), getOpponentOfThisTurn(), ChainStartState.MONSTER_ATTACK); +// boolean canAttack = chain.startChain(); +// +// if (!canAttack) { +// result = -1; +// +// } else { GameBoard opponentGameBoard = getOpponentGameBoard(); GameBoard playerGameBoard = getPlayerGameBoard(); MonsterCard playerCard = (MonsterCard) this.selectedCard; @@ -416,7 +416,7 @@ public int attack(int numberOfEnemyMonsterZone) { , opponentGameBoard); } this.selectedCard = null; - } +// } return result; }