From 473550f577313107d063a980ab2923f21d931f88 Mon Sep 17 00:00:00 2001 From: Bulut Gozubuyuk Date: Sun, 20 Dec 2020 20:24:30 +0300 Subject: [PATCH] Agreement offer popup modificiation in game scene controller --- .../AgreementOfferPopupController.java | 4 +- .../scenecontrollers/GameSceneController.java | 73 ++++++++----------- 2 files changed, 33 insertions(+), 44 deletions(-) diff --git a/src/controllers/popupControllers/AgreementOfferPopupController.java b/src/controllers/popupControllers/AgreementOfferPopupController.java index b084295..336241f 100644 --- a/src/controllers/popupControllers/AgreementOfferPopupController.java +++ b/src/controllers/popupControllers/AgreementOfferPopupController.java @@ -4,7 +4,7 @@ import javafx.fxml.FXML; import models.Agreement; -public class AgreementOfferPopupController extends PopupController{ +public class AgreementOfferPopupController extends PopupController { private Agreement agreement; @FXML @@ -12,7 +12,7 @@ void closeButtonClicked(ActionEvent event) { closeStage(event); } - public void setAgreement(Agreement agreement){ + public void setAgreement(Agreement agreement) { this.agreement = agreement; } } diff --git a/src/controllers/scenecontrollers/GameSceneController.java b/src/controllers/scenecontrollers/GameSceneController.java index 4693817..615d02c 100644 --- a/src/controllers/scenecontrollers/GameSceneController.java +++ b/src/controllers/scenecontrollers/GameSceneController.java @@ -3,7 +3,6 @@ import controllers.modelcontrollers.GameManager; import controllers.popupControllers.*; import javafx.event.ActionEvent; -import javafx.event.EventHandler; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.fxml.Initializable; @@ -15,18 +14,14 @@ import javafx.scene.layout.HBox; import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; -import javafx.scene.paint.Color; -import javafx.scene.paint.Paint; import javafx.scene.text.Text; import javafx.stage.Modality; import javafx.stage.Stage; import javafx.stage.StageStyle; import models.Agreement; import models.City; -import models.Game; import models.Player; import storage.filemanager.DataManager; -import utils.Sleeper; import java.io.IOException; import java.net.URL; @@ -74,18 +69,17 @@ public void initialize(URL url, ResourceBundle resourceBundle) { } //Update the game scene according to the current player - public void renderPlayer(Player player){ + public void renderPlayer(Player player) { playerName.setText(player.getName()); money.setText(player.getMoney() + "$"); cardsBar.setStyle("-fx-spacing: 10;"); cardsBar.getChildren().clear(); - for(int i = 0; i < player.getCities().size(); i++){ + for (int i = 0; i < player.getCities().size(); i++) { int finalI = i; Button button = new Button(player.getCities().get(i).getName()); - if(player.getCities().get(finalI).isMortgaged()){ + if (player.getCities().get(finalI).isMortgaged()) { button.setStyle("-fx-text-fill: white; -fx-pref-height: 80; -fx-pref-width: 150 ;-fx-border-color: black; -fx-background-color: grey; -fx-border-width: 3 3 0 3"); - } - else{ + } else { String color1 = player.getColor(); button.setStyle("-fx-background-color:" + color1 + ";" + "-fx-text-fill: white; -fx-pref-height: 80; -fx-pref-width: 150 ;-fx-border-color: black; -fx-border-width: 3 3 0 3"); @@ -127,7 +121,7 @@ public void handleCityPopup(City city) { } public void handleAgreementPopup() throws IOException { - if(!GameManager.getInstance().isDiceRolled()) { + if (!GameManager.getInstance().isDiceRolled()) { FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("../../views/popupViews/AgreementPopup.fxml")); Parent parent = fxmlLoader.load(); @@ -136,8 +130,8 @@ public void handleAgreementPopup() throws IOException { } } - public void handleBuyBuildingPopup() throws IOException{ - if(!GameManager.getInstance().isDiceRolled()) { + public void handleBuyBuildingPopup() throws IOException { + if (!GameManager.getInstance().isDiceRolled()) { FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("../../views/popupViews/BuyBuildingPopup.fxml")); Parent parent = fxmlLoader.load(); BuyBuildingPopupController buyBuildingController = fxmlLoader.getController(); @@ -145,8 +139,8 @@ public void handleBuyBuildingPopup() throws IOException{ } } - public void handleSellBuildingPopup() throws IOException{ - if(!GameManager.getInstance().isDiceRolled()){ + public void handleSellBuildingPopup() throws IOException { + if (!GameManager.getInstance().isDiceRolled()) { FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("../../views/popupViews/SellBuildingPopup.fxml")); Parent parent = fxmlLoader.load(); SellBuildingPopupController sbpc = fxmlLoader.getController(); @@ -154,8 +148,8 @@ public void handleSellBuildingPopup() throws IOException{ } } - public void handleMortgageCityPopup() throws IOException{ - if(!GameManager.getInstance().isDiceRolled()) { + public void handleMortgageCityPopup() throws IOException { + if (!GameManager.getInstance().isDiceRolled()) { FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("../../views/popupViews/MortgageCityPopup.fxml")); Parent parent = fxmlLoader.load(); MortgageCityPopupController mcpc = fxmlLoader.getController(); @@ -163,9 +157,9 @@ public void handleMortgageCityPopup() throws IOException{ } } - public void handleRollDiceButton() throws IOException{ + public void handleRollDiceButton() throws IOException { int[] dice = GameManager.getInstance().rollDice(); - if(dice == null) { + if (dice == null) { System.out.println("Your turn is end"); return; } @@ -173,7 +167,7 @@ public void handleRollDiceButton() throws IOException{ FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("../../views/popupViews/RollDicePopup.fxml")); Parent parent = fxmlLoader.load(); RollDicePopupController rdpc = fxmlLoader.getController(); - rdpc.setDice(dice[0],dice[1]); + rdpc.setDice(dice[0], dice[1]); handlePopup(parent); @@ -187,81 +181,76 @@ public void handleRollDiceButton() throws IOException{ executorService.schedule(GameManager.getInstance()::runPerformRegionAction, dice[2] * 300, TimeUnit.MILLISECONDS); // repeat turn - if(dice[0] != dice[1]){ + if (dice[0] != dice[1]) { rollDiceButton.setVisible(false); rollDiceLabel.setVisible(false); } } - public void handleEndTurnButton(){ - if(GameManager.getInstance().isDiceRolled()){ + public void handleEndTurnButton() { + if (GameManager.getInstance().isDiceRolled()) { GameManager.getInstance().endTurn(); cameraScene.rotateTable(); - } - else{ + } else { System.out.println("Cannot end turn without rolling a dice."); } // if new player bankrupted, disable roll dice - if(GameManager.getInstance().getCurrentPlayer().isBankrupted()){ + if (GameManager.getInstance().getCurrentPlayer().isBankrupted()) { // set isDiceRolled true GameManager.getInstance().setDiceRolled(true); - } - else{ + } else { rollDiceButton.setVisible(true); rollDiceLabel.setVisible(true); } } - public void handleSaveGameButton(){ + public void handleSaveGameButton() { DataManager.getInstance().saveGame("testSave"); } - public static void handleChanceRegionPopup(){ + public static void handleChanceRegionPopup() { try { FXMLLoader fxmlLoader = new FXMLLoader( GameSceneController.class.getResource("../../views/popupViews/ChanceRegionPopup.fxml")); Parent parent = fxmlLoader.load(); handlePopup(parent); - } - catch (IOException e) { + } catch (IOException e) { e.printStackTrace(); } } - public static void handleBuyCityPopup(){ + public static void handleBuyCityPopup() { try { FXMLLoader fxmlLoader = new FXMLLoader( GameSceneController.class.getResource("../../views/popupViews/BuyCityPopup.fxml")); Parent parent = fxmlLoader.load(); handlePopup(parent); - } - catch (IOException e) { + } catch (IOException e) { e.printStackTrace(); } } - public static void handleAgreementOfferPopup(Agreement agreement){ + public static void handleAgreementOfferPopup(Agreement agreement) { try { if (!GameManager.getInstance().isDiceRolled()) { FXMLLoader fxmlLoader = new FXMLLoader(GameSceneController.class.getResource("../../views/popupViews/AgreementOfferPopup.fxml")); Parent parent = fxmlLoader.load(); AgreementOfferPopupController agreementOfferPopupController = fxmlLoader.getController(); + agreementOfferPopupController.setAgreement(agreement); handlePopup(parent); } - } - catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); } } - public static void handlePirateRegionPopup(){ - try{ + public static void handlePirateRegionPopup() { + try { FXMLLoader fxmlLoader = new FXMLLoader(GameSceneController.class.getResource("../../views/popupViews/PirateRegionPopup.fxml")); Parent parent = fxmlLoader.load(); handlePopup(parent); - } - catch (IOException e) { + } catch (IOException e) { e.printStackTrace(); } }