RecentRunner/TaipanClone
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases 11 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Siddhant Dewani
2019-03-24 22:45:25 -06:00
parent ffc2000c70 f0b1d42892
commit 0d548442d4
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/TaipanShopGUI.java
View File

@@ -161,7 +161,7 @@ public class TaipanShopGUI extends Player{
loanButton.setVisible(false);
armsButton.setVisible(false);
quitButton.setVisible(true);
quitButton.setDefaultButton(true);
//quitButton.setDefaultButton(true);
opiumButton.setVisible(false);
silkButton.setVisible(false);
numberInput.setVisible(false);
@@ -175,8 +175,7 @@ public class TaipanShopGUI extends Player{
cargoButton.setVisible(true);
loanButton.setVisible(true);
quitButton.setVisible(true);
quitButton.setDefaultButton(true);
quitButton.setDefaultButton(true);
//quitButton.setDefaultButton(true);
opiumButton.setVisible(false);
silkButton.setVisible(false);
numberInput.setVisible(false);
@@ -191,7 +190,7 @@ public class TaipanShopGUI extends Player{
loanButton.setVisible(true);
numberInput.setVisible(false);
quitButton.setVisible(true);
quitButton.setDefaultButton(true);
//quitButton.setDefaultButton(true);
opiumButton.setVisible(false);
silkButton.setVisible(false);
generalButton.setVisible(false);
@@ -497,7 +496,6 @@ public class TaipanShopGUI extends Player{
TravelGUI travelGUI = new TravelGUI(getPlayer());
travelGUI.initializeTravel(stage);
stage.show();
//System.out.println("PLACEHOLDER FOR TRAVEL");
}
});