Skip to content

Commit cafc710

Browse files
bhrdbnbhrdbn
committed
Merge remote-tracking branch 'origin/newbranchnetwork' into newbranchnetwork
# Conflicts: # src/main/java/model/Board.java # src/main/java/servercontroller/GameController.java
2 parents 0afbf5e + 677767c commit cafc710

File tree

7 files changed

+63
-107
lines changed

7 files changed

+63
-107
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
@@ -86,9 +86,9 @@ else if (matcherSelect.find()) {
8686
selectOpponentMonster(Integer.parseInt(matcherSelect6.group(1)));
8787
} else if (matcherback.find()) MenuHandler.runBack(Menu.DUEL);
8888

89-
// else if (nextPhase.find()) {
90-
// goNextPhase();
91-
// }
89+
else if (nextPhase.find()) {
90+
goNextPhase();
91+
}
9292
else if (matchersummon.find()) {
9393
summon(matchersummon);
9494
} else if (matcherSet.find()) {
@@ -119,9 +119,9 @@ else if (matcherSetSpell.find())
119119
else if(matcherSetTrap.find()){
120120
setTrap(matcherSetTrap);
121121
}
122-
// else if(surrender.find()){
123-
// setWin();
124-
// }
122+
else if(surrender.find()){
123+
setWin();
124+
}
125125
else
126126
System.out.println("invalid command");
127127
}
@@ -133,9 +133,9 @@ public void setTrap(Matcher matcherSetTrap) {
133133
System.out.println(controller.setTrapCard());
134134
}
135135

136-
// public void setWin(){
137-
// controller.setWin();
138-
// }
136+
public void setWin(){
137+
controller.setWin();
138+
}
139139

140140

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

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

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

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ public Board(PlayBoard playBoardPlayer, PlayBoard playBoardOpponent) {
2020
@Override
2121
public String toString() {
2222
String board = "";
23+
// board += getOpponentPlayBoardByTurn().rotateToString();
2324
board += playBoard2.rotateToString();
2425
board += "\n----------------------\n";
26+
// board += getPlayBoardByTurn().toString();
2527
board += playBoard1.toString();
2628
board += "\n\n----------------------\n\n";
2729
return board;

‎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();
@@ -492,7 +486,7 @@ public String request(String token, String round) {
492486
}
493487

494488

495-
private String setBoard(String token, Player player) {
489+
public String setBoard(String token, Player player) {
496490
PlayBoard playBoard1 = new PlayBoard(player);
497491
PlayBoard playBoard2 = new PlayBoard(GlobalVariable.getPlayers().get(token));
498492
Board board = new Board(playBoard2, playBoard1);

‎src/main/java/servercontroller/GameController.java

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
package servercontroller;
22

3-
import clientview.MainClient;
3+
import clientview.Main;
4+
import clientview.MainView;
45
import model.*;
56

7+
68
public class GameController {
9+
int rounds;
10+
Player firstWinner;
11+
Player secondWinner;
12+
Player thirdWinner;
13+
int firstLp;
14+
int secondLp;
15+
int thirdLP;
716
private static GameController duelController = null;
817
public static GameController getInstance() {
918
if (duelController == null)
@@ -25,15 +34,15 @@ else if (!((SpellCard) card).getIcon().equals("Ritual") || GlobalVariable.getBoa
2534
return "you should ritual summon right now";
2635
else {
2736
System.out.println("please enter the cards(the number of cards) that you want to tribute");
28-
String monster1 = MainClient.scanner.nextLine();
29-
String monster2 = MainClient.scanner.nextLine();
37+
String monster1 = Main.scanner.nextLine();
38+
String monster2 = Main.scanner.nextLine();
3039
if (!isLevelMatched(monster1, monster2, card, token))
3140
return "selected monsters levels don't match with ritual monster";
3241
else {
3342
tributeMonsters(Integer.parseInt(monster1), token);
3443
tributeMonsters(Integer.parseInt(monster2), token);
3544
System.out.println("please enter the attack or defence status");
36-
String status = MainClient.scanner.nextLine();
45+
String status = Main.scanner.nextLine();
3746
if (status.equals("attacking")) {
3847
((MonsterCard) card).setIsAttack(true);
3948
card.setSide(false);
@@ -449,7 +458,7 @@ else if (((MonsterCard) GlobalVariable.getBoards().get(token).getPlayBoardByTurn
449458
if (countNokhodi(token) == 5)
450459
return "there are not enough cards for tribute";
451460
else {
452-
String s = MainClient.scanner.nextLine();
461+
String s = Main.scanner.nextLine();
453462
if (s.equals("cancel")) {
454463
deselect(token);
455464
return "";
@@ -547,7 +556,7 @@ else if (((MonsterCard) GlobalVariable.getBoards().get(token).getPlayBoardByTurn
547556
getPlayBoardByTurn().getSelectedCard().getName().equals("BeastKingBarbaros")) {
548557
int i;
549558
System.out.println("please enter which mode you want to sacrifice press 1 else 0");
550-
i = MainClient.scanner.nextInt();
559+
i = Main.scanner.nextInt();
551560
ActionMonster actionMonster = new ActionMonster();
552561
if (i == 0) {
553562
actionMonster.setAction(8, (MonsterCard) GlobalVariable.getBoards().get(token).
@@ -567,8 +576,8 @@ else if (((MonsterCard) GlobalVariable.getBoards().get(token).getPlayBoardByTurn
567576
if (countNokhodi(token) > 3)
568577
return "there are not enough cards for tribute";
569578
else {
570-
int monster = Integer.parseInt(MainClient.scanner.nextLine());
571-
int monster1 = Integer.parseInt(MainClient.scanner.nextLine());
579+
int monster = Integer.parseInt(Main.scanner.nextLine());
580+
int monster1 = Integer.parseInt(Main.scanner.nextLine());
572581
if (GlobalVariable.getBoards().get(token).getPlayBoardByTurn().getMonsters().get(monster - 1).getName().equals("nokhodi") ||
573582
GlobalVariable.getBoards().get(token).getPlayBoardByTurn().getMonsters().get(monster1 - 1).getName().equals("nokhodi"))
574583
return "there no monsters one this address";
@@ -940,8 +949,8 @@ public void activateCardAndChangeTurn(Card card, String token) {
940949
System.out.println("now it will be " + GlobalVariable.getPlayers().get(token).getUsername() + " turn");
941950
System.out.println(GlobalVariable.getBoards().get(token).getPlayBoardByTurn());
942951
System.out.println("do you want to activate your trap and spell?");
943-
String input = MainClient.scanner.nextLine();
944-
String activation = MainClient.scanner.nextLine();
952+
String input = Main.scanner.nextLine();
953+
String activation = Main.scanner.nextLine();
945954
if (input.equals("no")) {
946955
System.out.println("now it will be " + GlobalVariable.getPlayers().get(token).getUsername() + " turn");
947956
System.out.println(GlobalVariable.getBoards().get(token).getPlayBoardByTurn());

‎src/main/java/serverview/Main.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,10 @@ else if(command.equals("show opponent graveyard"))
155155
return GameController.getInstance().showOpponentGraveyard(parts[3]) + "\n" + GlobalVariable.getBoards().get(parts[3]).toString();
156156
else if(command.equals("show card"))
157157
return GameController.getInstance().showCard(parts[2]) + "\n" + GlobalVariable.getBoards().get(parts[2]).toString();
158+
else if(command.equals("next phase"))
159+
return GameController.getInstance().goNextPhase(parts[2], parts[3]) + "\n" + GlobalVariable.getBoards().get(parts[2]).toString();
160+
// else if(command.equals("surrender"))
161+
// return GameController.getInstance().setWin();
158162
return "";
159163
}
160164
}

0 commit comments

Comments
 (0)