From 622c4ab672095a60c5f24586ada48971158c6391 Mon Sep 17 00:00:00 2001 From: Vikram Date: Sun, 24 Feb 2019 16:55:01 -0700 Subject: [PATCH] bunch of revisions, still in progress --- .idea/workspace.xml | 2 +- src/loanShark.java | 66 ++++++++++++++++++++++----------------------- src/main.java | 2 +- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2c3e956..c8be5a5 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -212,7 +212,7 @@ - + diff --git a/src/loanShark.java b/src/loanShark.java index e115313..0b366f6 100644 --- a/src/loanShark.java +++ b/src/loanShark.java @@ -1,33 +1,33 @@ -import java.util.Scanner; - -public class loanShark { - private Player player; - public void setPlayer(Player player) { - Player playerDummy = new Player(player); - this.player = playerDummy; - } - - public Player getPlayer(){ - Player playerDummy = new Player(player); - return playerDummy; - } - - public loanShark(Player player){ - Player playerDummy = new Player(player); - this.player = playerDummy; - } - - public void loanMoney() { - int loanAsk = 0; - System.out.println("Please enter how much you would like to borrow"); - Scanner keyboard = new Scanner(System.in); - loanAsk = keyboard.nextInt(); - if(loanAsk <= 2*(player.getMoney() - player.getDebt())) { - player.setDebt(player.getDebt() + loanAsk); - player.setMoney(player.getMoney() + loanAsk); - } - } - public void addInterest() { - player.setDebt((int)(player.getDebt() * 1.05)); - } -} +import java.util.Scanner; + +public class loanShark { + private Player player; + public void setPlayer(Player player) { + Player playerDummy = new Player(player); + this.player = playerDummy; + } + + public Player getPlayer(){ + Player playerDummy = new Player(player); + return playerDummy; + } + + public loanShark(Player player){ + Player playerDummy = new Player(player); + this.player = playerDummy; + } + + public void loanMoney() { + int loanAsk = 0; + System.out.println("Please enter how much you would like to borrow"); + Scanner keyboard = new Scanner(System.in); + loanAsk = keyboard.nextInt(); + if(loanAsk <= 2*(player.getMoney() - player.getDebt())) { + player.setDebt(player.getDebt() + loanAsk); + player.setMoney(player.getMoney() + loanAsk); + } + } + public void addInterest() { + player.setDebt((int)(player.getDebt() * 1.01)); + } +} diff --git a/src/main.java b/src/main.java index a0c4684..b1749e2 100644 --- a/src/main.java +++ b/src/main.java @@ -31,7 +31,7 @@ public class main { player = bank.getPlayer(); } - public static void main(String[] args) throws Exception { + public static void main(String[] args) { main main = new main(); TaipanShop littyShop = new TaipanShop(main.getPlayer()); Start start = new Start(main.getPlayer());