From d395d91730e5087b4b031b7771b40a3013617b78 Mon Sep 17 00:00:00 2001 From: Solargale Date: Sun, 10 Mar 2019 18:54:03 -0600 Subject: [PATCH] Made it so you're not locked out of Taipan shop for Bank and Loanshark --- src/bankGUI.java | 12 +++++++----- src/loanSharkGUI.java | 4 +++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/bankGUI.java b/src/bankGUI.java index f20fbf9..4818102 100644 --- a/src/bankGUI.java +++ b/src/bankGUI.java @@ -126,11 +126,13 @@ public class bankGUI{ ); b3.setOnAction(new EventHandler() { - @Override - public void handle(ActionEvent event) { - System.out.println("PLACEHOLDER FOR SHOP"); - } - } + @Override + public void handle(ActionEvent event) { + TaipanShopGUI shopGUI = new TaipanShopGUI(player); + shopGUI.initializeShop(primaryStage); + primaryStage.show(); + } + } ); diff --git a/src/loanSharkGUI.java b/src/loanSharkGUI.java index 1505994..c1dc880 100644 --- a/src/loanSharkGUI.java +++ b/src/loanSharkGUI.java @@ -133,7 +133,9 @@ public class loanSharkGUI{ b3.setOnAction(new EventHandler() { @Override public void handle(ActionEvent event) { - System.out.println("PLACEHOLDER FOR SHOP"); + TaipanShopGUI shopGUI = new TaipanShopGUI(player); + shopGUI.initializeShop(primaryStage); + primaryStage.show(); } } );