Skip to content

Commit 6daf436

Browse files
committed
finish
1 parent ffbb4f7 commit 6daf436

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

Client/src/main/java/view/graphic/CardView.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,8 @@ private void setCardImage2() {
136136

137137
public String getFirstValidAction(GameView gameView) throws Exception {
138138
validActionNamesForShow = new ArrayList<>();
139-
DataForGameRun dataToSend = new DataForGameRun("get valid actions");
140-
dataToSend.findIdAndZoneName(gameView, this);
141-
System.out.println(dataToSend.getZoneName());
142-
System.out.println(dataToSend.getId());
143139

144-
validActionNames = gameView.gameController.sendDataToServer("get valid actions").get(0).cardNames;
140+
validActionNames = gameView.gameController.sendDataObjectToServer("get valid actions", this).get(0).cardNames;
145141

146142
for (String validAction : validActionNames) {
147143
if (validAction.equals("summon with sacrifice")) {

Client/src/main/java/view/graphic/GameGraphicController.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,14 @@ public ArrayList<DataFromGameRun> sendDataToServer(String command){
5252
(new DataForGameRun(gameCode + "&" + command)).gameGraphicData;
5353
}
5454

55+
public ArrayList<DataFromGameRun> sendDataObjectToServer(String command, CardView cardView){
56+
DataForGameRun data = new DataForGameRun(gameCode + "&" + command);
57+
data.findIdAndZoneName(gameView, cardView);
58+
System.out.println(data.getId());
59+
System.out.println(data.getZoneName());
60+
return Menu.sendDataToServer(data).gameGraphicData;
61+
}
62+
5563
public void sendDataAndRun(String command){
5664
ArrayList<DataFromGameRun> datas = sendDataToServer(command);
5765
run(datas, 0);
@@ -80,7 +88,7 @@ private void run(ArrayList<DataFromGameRun> datas, int index){
8088

8189
public void startGame() {
8290
gameView.run();
83-
new Timeline(new KeyFrame(Duration.millis(3500), event -> {
91+
new Timeline(new KeyFrame(Duration.millis(7000), event -> {
8492
sendDataAndRun("start game");
8593
})).play();
8694
}

src/main/java/controller/DuelControllers/Game.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ public synchronized DataForClientFromServer run(String command, User user, DataF
159159

160160
public ArrayList<String> getValidCommandsForCard(DataForGameRun data) {
161161
if (gameData.getCurrentGamer().getUsername().equals(Network.getUserByToken(data.token).getUsername())) {
162+
System.err.println(data.getZoneName());
162163
gameData.setSelectedCard(getCardByZoneAndId(data.getZoneName(), data.getId()));
163164
return (manager.getValidActions());
164165
}

0 commit comments

Comments
 (0)