Skip to content

Commit 677767c

Browse files
aylasalehiaylasalehi
committed
edit
1 parent df28f4e commit 677767c

File tree

7 files changed

+157
-333
lines changed

7 files changed

+157
-333
lines changed

‎src/main/java/clientcontroller/Controller.java

Lines changed: 23 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -541,40 +541,6 @@ public String selectOpponentField() {
541541
}
542542
}
543543

544-
// public String managePhase() {
545-
// Phase phase = GlobalVariable.getBoard().getPhase();
546-
// switch (phase) {
547-
// case DRAW:
548-
// return "draw phase\n" +
549-
// (GlobalVariable.getBoard().addToHand(GlobalVariable.getBoard().getPlayBoardByTurn()));
550-
// case STANDBY:
551-
// return "standby phase";
552-
//
553-
// case MAIN1:
554-
// return "1st Main phase";
555-
//
556-
// case BATTLE:
557-
// return "battle phase";
558-
//
559-
// case MAIN2:
560-
// return "2nd main phase";
561-
//
562-
// case END:
563-
// GlobalVariable.getBoard().changePhase(Phase.END);
564-
// GlobalVariable.getBoard().getPlayBoardByTurn().setCardSummonedOrSet(false);
565-
// GlobalVariable.getBoard().getPlayBoardByTurn().setSetSummonedMonster(null);
566-
// GlobalVariable.getBoard().reverseTurn();
567-
// if (GlobalVariable.getBoard().getPlayBoardByTurn().getPlayer() instanceof AI) {
568-
// return manageAIPhaseAndPlay();
569-
// } else return "End phase\n" + GlobalVariable.getBoard().getTurn().getNickname() + "'s turn" + "\n" +
570-
// "draw phase\n" +
571-
// (GlobalVariable.getBoard().addToHand(GlobalVariable.getBoard().getPlayBoardByTurn()));
572-
//
573-
// default:
574-
// return "";
575-
// }
576-
// }
577-
//
578544
// public String manageAIPhaseAndPlay() {
579545
// String finalOut = "End phase\n" + GlobalVariable.getBoard().getTurn().getNickname() + "'s turn" + "\n" +
580546
// "draw phase\n" +
@@ -723,17 +689,19 @@ public String selectOpponentField() {
723689
// GlobalVariable.setBoard(board);
724690
// }
725691
//
726-
// public String goNextPhase() {
727-
// if (GlobalVariable.getBoard().getPhase() == Phase.MAIN2 && (GlobalVariable.getBoard().isDeckFinished() ||
728-
// GlobalVariable.getBoard().getPlayBoardByTurn().getLifePoint() <= 0)) {
729-
// lose();
730-
//
731-
// }
732-
// GlobalVariable.getBoard().changePhase(GlobalVariable.getBoard().getPhase());
733-
// return managePhase();
734-
// }
735-
//
736-
//
692+
public String goNextPhase() {
693+
try {
694+
dataOutputStream.writeUTF("next phase " + boardToken + token);
695+
dataOutputStream.flush();
696+
String result = dataInputStream.readUTF();
697+
return result;
698+
} catch (IOException ioException) {
699+
ioException.printStackTrace();
700+
return "exception";
701+
}
702+
}
703+
704+
737705
public String deselect() {
738706
try {
739707
dataOutputStream.writeUTF("select -d " + boardToken);
@@ -746,26 +714,16 @@ public String deselect() {
746714
}
747715
}
748716

749-
// public void setWin() {
750-
// if (rounds == 1) {
751-
// GlobalVariable.getBoard().getPlayBoardByTurn().getPlayer().increasePlayerMoney(100);
752-
// GlobalVariable.getBoard().getOpponentPlayBoardByTurn().getPlayer().increasePlayerMoney(1000 +
753-
// GlobalVariable.getBoard().getOpponentPlayBoardByTurn().getLifePoint());
754-
// GlobalVariable.getBoard().getOpponentPlayBoardByTurn().getPlayer().increaseScore(1000);
755-
// System.out.println(GlobalVariable.getBoard().getOpponentPlayBoardByTurn().getPlayer().getUsername() + " won the game : " +
756-
// GlobalVariable.getBoard().getOpponentPlayBoardByTurn().getPlayer().getScore());
757-
// MainView.getInstance().run();
758-
// } else {
759-
// GlobalVariable.getBoard().getPlayBoardByTurn().getPlayer().increasePlayerMoney(300);
760-
// GlobalVariable.getBoard().getOpponentPlayBoardByTurn().getPlayer().increasePlayerMoney(3000 +
761-
// GlobalVariable.getBoard().getOpponentPlayBoardByTurn().getLifePoint());
762-
// GlobalVariable.getBoard().getOpponentPlayBoardByTurn().getPlayer().increaseScore(3000);
763-
// System.out.println(GlobalVariable.getBoard().getOpponentPlayBoardByTurn().getPlayer().getUsername() + " won whole match : " +
764-
// GlobalVariable.getBoard().getOpponentPlayBoardByTurn().getPlayer().getScore());
765-
// MainView.getInstance().run();
766-
// }
767-
//
768-
// }
717+
public void setWin() {
718+
try {
719+
dataOutputStream.writeUTF("surrender " + boardToken);
720+
dataOutputStream.flush();
721+
} catch (IOException ioException) {
722+
ioException.printStackTrace();
723+
}
724+
725+
726+
}
769727
//// ** monster ba ehzare vizhe ro nazadam **
770728

771729
public String summon() {

‎src/main/java/clientview/Duel.java

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ else if (matcherSelect.find()) {
8787
selectOpponentMonster(Integer.parseInt(matcherSelect6.group(1)));
8888
} else if (matcherback.find()) MenuHandler.runBack(Menu.DUEL);
8989

90-
// else if (nextPhase.find()) {
91-
// goNextPhase();
92-
// }
90+
else if (nextPhase.find()) {
91+
goNextPhase();
92+
}
9393
else if (matchersummon.find()) {
9494
summon(matchersummon);
9595
} else if (matcherSet.find()) {
@@ -120,9 +120,9 @@ else if (matcherSetSpell.find())
120120
else if(matcherSetTrap.find()){
121121
setTrap(matcherSetTrap);
122122
}
123-
// else if(surrender.find()){
124-
// setWin();
125-
// }
123+
else if(surrender.find()){
124+
setWin();
125+
}
126126
else
127127
System.out.println("invalid command");
128128
}
@@ -134,9 +134,9 @@ public void setTrap(Matcher matcherSetTrap) {
134134
System.out.println(controller.setTrapCard());
135135
}
136136

137-
// public void setWin(){
138-
// controller.setWin();
139-
// }
137+
public void setWin(){
138+
controller.setWin();
139+
}
140140

141141

142142
public void activateEffect(Matcher activateEffect) {
@@ -167,20 +167,9 @@ public void set() {
167167
System.out.println(controller.setMonster());
168168
}
169169

170-
// public void newDuel(Matcher matcherPlayer, int flag) {
171-
// if (flag == 0)
172-
// System.out.println(controller.newDuel(Integer.parseInt
173-
// (matcherPlayer.group(2)), matcherPlayer.group(1), GlobalVariable.getPlayer().getUsername()));
174-
// else
175-
// System.out.println(controller.getInstance().newDuel(Integer.parseInt
176-
// (matcherPlayer.group(1)), matcherPlayer.group(2), GlobalVariable.getPlayer().getUsername()));
177-
// System.out.println(GlobalVariable.getBoard().toString());
178-
// }
179-
//
180-
// public void goNextPhase() {
181-
// System.out.println(controller.goNextPhase());
182-
// System.out.println(GlobalVariable.getBoard().toString());
183-
// }
170+
public void goNextPhase() {
171+
System.out.println(controller.goNextPhase());
172+
}
184173

185174
public void selectOwnMonster(int number) {
186175
System.out.println(controller.selectOwnMonster(number));

‎src/main/java/model/Board.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ public Board(PlayBoard playBoardPlayer, PlayBoard playBoardOpponent) {
2020
@Override
2121
public String toString() {
2222
String board = "";
23-
board += getOpponentPlayBoardByTurn().rotateToString();
23+
// board += getOpponentPlayBoardByTurn().rotateToString();
24+
board += playBoard2.rotateToString();
2425
board += "\n----------------------\n";
25-
board += getPlayBoardByTurn().toString();
26+
// board += getPlayBoardByTurn().toString();
27+
board += playBoard1.toString();
2628
board += "\n\n----------------------\n\n";
2729
return board;
2830
}

‎src/main/java/sample/sample.fxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
<Button layoutX="171.0" layoutY="21.0" mnemonicParsing="false" onMouseClicked="#rewatchPastGames" prefHeight="32.0" prefWidth="126.0" text="rewatchPastGames" />
1212
<Button layoutX="553.0" layoutY="20.0" mnemonicParsing="false" onMouseClicked="#Back" prefHeight="39.0" prefWidth="75.0" text="back" />
1313
</children>
14-
</AnchorPane>
14+
</AnchorPane>

‎src/main/java/servercontroller/Controller.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,7 @@ public class Controller {
2929
ArrayList<SpellCard> allSpells = new ArrayList<>();
3030
ArrayList<TrapCard> allTraps = new ArrayList<>();
3131
private static Controller loginController = null;
32-
int rounds;
33-
Player firstWinner;
34-
Player secondWinner;
35-
Player thirdWinner;
36-
int firstLp;
37-
int secondLp;
38-
int thirdLP;
32+
3933

4034
private Controller() {
4135
shopInit();
@@ -474,7 +468,7 @@ public String request(String token, String round) {
474468
}
475469

476470

477-
private String setBoard(String token, Player player) {
471+
public String setBoard(String token, Player player) {
478472
PlayBoard playBoard1 = new PlayBoard(player);
479473
PlayBoard playBoard2 = new PlayBoard(GlobalVariable.getPlayers().get(token));
480474
Board board = new Board(playBoard2, playBoard1);

0 commit comments

Comments
 (0)