bunch of revisions, still in progress

This commit is contained in:
Vikram
2019-02-24 16:55:01 -07:00
parent 0f20b9a8ec
commit 622c4ab672
3 changed files with 35 additions and 35 deletions

2
.idea/workspace.xml generated
View File

@@ -212,7 +212,7 @@
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1551052389633" /> <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1551052466350" />
<property name="extract.method.default.visibility" value="public" /> <property name="extract.method.default.visibility" value="public" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="project.structure.last.edited" value="Project" /> <property name="project.structure.last.edited" value="Project" />

View File

@@ -1,33 +1,33 @@
import java.util.Scanner; import java.util.Scanner;
public class loanShark { public class loanShark {
private Player player; private Player player;
public void setPlayer(Player player) { public void setPlayer(Player player) {
Player playerDummy = new Player(player); Player playerDummy = new Player(player);
this.player = playerDummy; this.player = playerDummy;
} }
public Player getPlayer(){ public Player getPlayer(){
Player playerDummy = new Player(player); Player playerDummy = new Player(player);
return playerDummy; return playerDummy;
} }
public loanShark(Player player){ public loanShark(Player player){
Player playerDummy = new Player(player); Player playerDummy = new Player(player);
this.player = playerDummy; this.player = playerDummy;
} }
public void loanMoney() { public void loanMoney() {
int loanAsk = 0; int loanAsk = 0;
System.out.println("Please enter how much you would like to borrow"); System.out.println("Please enter how much you would like to borrow");
Scanner keyboard = new Scanner(System.in); Scanner keyboard = new Scanner(System.in);
loanAsk = keyboard.nextInt(); loanAsk = keyboard.nextInt();
if(loanAsk <= 2*(player.getMoney() - player.getDebt())) { if(loanAsk <= 2*(player.getMoney() - player.getDebt())) {
player.setDebt(player.getDebt() + loanAsk); player.setDebt(player.getDebt() + loanAsk);
player.setMoney(player.getMoney() + loanAsk); player.setMoney(player.getMoney() + loanAsk);
} }
} }
public void addInterest() { public void addInterest() {
player.setDebt((int)(player.getDebt() * 1.05)); player.setDebt((int)(player.getDebt() * 1.01));
} }
} }

View File

@@ -31,7 +31,7 @@ public class main {
player = bank.getPlayer(); player = bank.getPlayer();
} }
public static void main(String[] args) throws Exception { public static void main(String[] args) {
main main = new main(); main main = new main();
TaipanShop littyShop = new TaipanShop(main.getPlayer()); TaipanShop littyShop = new TaipanShop(main.getPlayer());
Start start = new Start(main.getPlayer()); Start start = new Start(main.getPlayer());