From aaee85f61dd7a7322013d37917cb804007a9afde Mon Sep 17 00:00:00 2001
From: Peppi-Lotta Saari <plsaar@utu.fi>
Date: Thu, 11 Mar 2021 18:10:14 +0200
Subject: [PATCH] parannelut check
---
src/main/java/fi/utu/tech/gui/javafx/Check.java | 16 ++++++++--------
.../java/fi/utu/tech/gui/javafx/Controller.java | 3 ++-
.../java/fi/utu/tech/gui/javafx/GameWindow.java | 2 ++
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/java/fi/utu/tech/gui/javafx/Check.java b/src/main/java/fi/utu/tech/gui/javafx/Check.java
index 884ada6..bba2587 100644
--- a/src/main/java/fi/utu/tech/gui/javafx/Check.java
+++ b/src/main/java/fi/utu/tech/gui/javafx/Check.java
@@ -3,7 +3,7 @@ package fi.utu.tech.gui.javafx;
import javafx.scene.control.Alert;
public class Check {
- public static GameWindow check(Object grid, Object lentotuki, Object taistelu, Object risteily, Object sukellus, Object kevyt){
+ public static void check(Object grid, Object lentotuki, Object taistelu, Object risteily, Object sukellus, Object kevyt){
int l = (Integer) lentotuki;
int t = (Integer) taistelu;
int r = (Integer) risteily;
@@ -11,24 +11,24 @@ public class Check {
int k = (Integer) kevyt;
if (grid.equals("5 x 5") && (l+t+r+s+k)<=25){
- return GameWindow.game(5,l,t,r,s,k);
+ GameWindow.game(5,l,t,r,s,k);
}
if (grid.equals("6 x 6") && (l+t+r+s+k)<=36){
- return GameWindow.game(6,l,t,r,s,k);
+ GameWindow.game(6,l,t,r,s,k);
}
if (grid.equals("7 x 7") && (l+t+r+s+k)<=49){
- return GameWindow.game(7,l,t,r,s,k);
+ GameWindow.game(7,l,t,r,s,k);
}
if (grid.equals("8 x 8") && (l+t+r+s+k)<=64){
- return GameWindow.game(8,l,t,r,s,k);
+ GameWindow.game(8,l,t,r,s,k);
}
if (grid.equals("9 x 9") && (l+t+r+s+k)<=81){
- return GameWindow.game(9,l,t,r,s,k);
+ GameWindow.game(9,l,t,r,s,k);
}
if (grid.equals("10 x 10") && (l+t+r+s+k)<=100){
- return GameWindow.game(10,l,t,r,s,k);
+ GameWindow.game(10,l,t,r,s,k);
}
- else {
+ else{
Alert alert = new Alert(Alert.AlertType.INFORMATION);
alert.setTitle("Information Dialog");
alert.setHeaderText("Liikaa posankoita!!!");
diff --git a/src/main/java/fi/utu/tech/gui/javafx/Controller.java b/src/main/java/fi/utu/tech/gui/javafx/Controller.java
index 13f6fab..daa3b4a 100644
--- a/src/main/java/fi/utu/tech/gui/javafx/Controller.java
+++ b/src/main/java/fi/utu/tech/gui/javafx/Controller.java
@@ -28,11 +28,12 @@ public class Controller {
private Button start;
@FXML
- void startGamePressed(ActionEvent e){
+ void startGamePressed(ActionEvent e) {
Check.check(grid.getValue(),
lentotuki.getValue(),
taistelija.getValue(),
risteily.getValue(),
sukellus.getValue(),
kevyt.getValue());
+ }
}
diff --git a/src/main/java/fi/utu/tech/gui/javafx/GameWindow.java b/src/main/java/fi/utu/tech/gui/javafx/GameWindow.java
index 78d2c71..6914ad8 100644
--- a/src/main/java/fi/utu/tech/gui/javafx/GameWindow.java
+++ b/src/main/java/fi/utu/tech/gui/javafx/GameWindow.java
@@ -7,4 +7,6 @@ public class GameWindow {
public static GameWindow game(int ruudukko, int lento, int taisto, int risse, int sukel, int kev ) {
//peli ikkunan sisältö
}
+
}
+
--
GitLab