deckMenu fixed

aps2019project · Jun 24, 2019 · 783174f · 783174f
1 parent 6346c32
commit 783174f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/src/controller/BattleMenuController.java b/src/controller/BattleMenuController.java
@@ -2,7 +2,10 @@
 
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
@@ -13,11 +16,13 @@
 import models.GamePlay.Match;
 import request.battleMenuRequest.battleMenuRequestChilds.MultiPlayerMenuRequest;
 
+import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.ResourceBundle;
 
 public class BattleMenuController implements Initializable {
+    double x,y;
     private Account account;
     private MatchType matchType;
     @FXML
@@ -51,10 +56,27 @@ public class BattleMenuController implements Initializable {
     private Button btnMode2;
 
     @FXML
-    void gotoStartMenu(ActionEvent event) {
-
+    void gotoStartMenu() {
+        try {
+            Parent root = FXMLLoader.load(getClass().getResource("../view/StartMenuView.fxml"));
+            Scene scene = new Scene(root);
+            scene.setOnMousePressed(event -> {
+                x = event.getSceneX();
+                y = event.getSceneY();
+            });
+
+            scene.setOnMouseDragged(event -> {
+
+                Controller.stage.setX(event.getScreenX() - x);
+                Controller.stage.setY(event.getScreenY() - y);
+
+            });
+            Controller.stage.setScene(scene);
+        } catch (IOException e) {
+        }
     }
 
+
     @FXML
     void playSinglePlayer(ActionEvent event) {
         if (!checkValidateDeck())

diff --git a/src/models/Deck.java b/src/models/Deck.java
@@ -23,7 +23,7 @@ public ArrayList<Card> getCards() {
     }
 
     public boolean isDeckValidate() {
-        int numOfCards = 0, numOfHero = 0, numOfItem = 0;
+        int numOfCards = 0, numOfHero = 0;
         for (Card card : cards)
             switch (card.getType()) {
                 case SPELL:
@@ -36,9 +36,9 @@ public boolean isDeckValidate() {
                     numOfCards++;
                     break;
                 case USABLE_ITEM:
-                    numOfItem++;
+                    numOfCards++;
             }
-        return numOfCards == 20 && numOfHero == 1 && numOfItem == 1;
+        return numOfCards == 20 && numOfHero == 1;
 
     }