some changes...

This commit is contained in:
Vikram
2019-03-10 21:49:50 -06:00
parent 461171ff46
commit ffb77b14a0
7 changed files with 276 additions and 133 deletions

View File

@@ -491,7 +491,7 @@ public class TaipanShopGUI {
bankButton.setOnAction(new EventHandler<ActionEvent>() {
@Override
public void handle(ActionEvent event) {
bankGUI bank = new bankGUI();
bankGUI bank = new bankGUI(getPlayer());
bank.initializeBank(stage);
stage.show();
}
@@ -520,7 +520,7 @@ public class TaipanShopGUI {
loanButton.setOnAction(new EventHandler<ActionEvent>() {
@Override
public void handle(ActionEvent event) {
loanSharkGUI loan = new loanSharkGUI();
loanSharkGUI loan = new loanSharkGUI(getPlayer());
loan.initializeLoanShark(stage);
stage.show();
}
@@ -779,16 +779,19 @@ public class TaipanShopGUI {
public String shipStatusString(){
String shipStatus;
switch(player.getHP()){
case 100: shipStatus = "Mint Condition"; break;
case 80: shipStatus = "Great"; break;
case 70: shipStatus = "Good"; break;
case 60: shipStatus = "Acceptable"; break;
case 50: shipStatus = "Tolerable"; break;
case 30: shipStatus = "Damaged"; break;
case 10: shipStatus = "Poor"; break;
case 1: shipStatus = "Extremely Poor"; break;
default: shipStatus = "Sinking"; break;
switch(player.getHP()/10){
case 10: shipStatus = "Mint Condition"; break;
case 9: shipStatus = "Near Perfect"; break;
case 8: shipStatus = "Great"; break;
case 7: shipStatus = "Good"; break;
case 6: shipStatus = "Acceptable"; break;
case 5: shipStatus = "Tolerable"; break;
case 4: shipStatus = "Needs Repair"; break;
case 3: shipStatus = "Damaged"; break;
case 2: shipStatus = "Indangered"; break;
case 1: shipStatus = "Near Sinking"; break;
case 0: shipStatus = "Sinking"; break;
default: shipStatus = "Invincible"; break;
}
return shipStatus;
}