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

bunch of revisions, still in progress

Browse Source
This commit is contained in:
Vikram
2019-02-24 19:00:38 -07:00
parent 6511f40b8b
commit 5e64bc95dc
8 changed files with 196 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
.idea/workspace.xml generated
View File

@@ -3,10 +3,12 @@
<component name="ChangeListManager">
<list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Player.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Player.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Bank.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Bank.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Start.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Start.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TaipanShop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaipanShop.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Travel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Travel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Warehouse.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Warehouse.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/loanShark.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/loanShark.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
@@ -32,11 +34,20 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
<caret line="18" column="34" lean-forward="true" selection-start-line="18" selection-start-column="34" selection-end-line="18" selection-end-column="34" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/loanShark.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="668">
<caret line="38" column="26" lean-forward="true" selection-start-line="38" selection-start-column="26" selection-end-line="38" selection-end-column="26" />
<caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
</state>
</provider>
</entry>
@@ -57,17 +68,17 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Warehouse.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2736">
<caret line="144" column="48" selection-start-line="144" selection-start-column="48" selection-end-line="144" selection-end-column="48" />
<state relative-caret-position="855">
<caret line="45" column="75" selection-start-line="45" selection-start-column="75" selection-end-line="45" selection-end-column="75" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
<caret line="12" column="25" lean-forward="true" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
<state relative-caret-position="269">
<caret line="162" column="105" lean-forward="true" selection-start-line="162" selection-start-column="105" selection-end-line="162" selection-end-column="105" />
</state>
</provider>
</entry>
@@ -75,8 +86,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Travel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-371">
<caret line="60" column="35" selection-start-line="60" selection-start-column="35" selection-end-line="60" selection-end-column="35" />
<state relative-caret-position="370">
<caret line="108" column="65" lean-forward="true" selection-start-line="108" selection-start-column="65" selection-end-line="108" selection-end-column="65" />
</state>
</provider>
</entry>
@@ -84,11 +95,10 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Bank.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="931">
<caret line="49" column="53" selection-start-line="49" selection-start-column="53" selection-end-line="49" selection-end-column="53" />
<state relative-caret-position="421">
<caret line="66" column="6" selection-start-line="66" selection-start-column="6" selection-end-line="66" selection-end-column="6" />
<folding>
<element signature="e#1027#1028#0" expanded="true" />
<element signature="e#1075#1076#0" expanded="true" />
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
@@ -97,8 +107,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Start.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="437">
<caret line="35" column="9" lean-forward="true" selection-start-line="35" selection-start-column="9" selection-end-line="35" selection-end-column="9" />
<state relative-caret-position="475">
<caret line="43" column="35" selection-start-line="43" selection-start-column="35" selection-end-line="43" selection-end-column="35" />
</state>
</provider>
</entry>
@@ -114,7 +124,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>heal</find>
<find>eek</find>
<find>setg</find>
<find>guns</find>
@@ -144,6 +153,7 @@
<find>setmone</find>
<find>set</find>
<find>player.</find>
<find>System.out.println(&quot;\n*** PLACEHOLDER FOR LOAN SHARK ***\n&quot;);</find>
</findStrings>
<replaceStrings>
<replace>player.getName()</replace>
@@ -158,6 +168,7 @@
<replace>Litty</replace>
<replace>player.set</replace>
<replace>%s</replace>
<replace>loan();</replace>
</replaceStrings>
</component>
<component name="Git.Settings">
@@ -168,13 +179,14 @@
<list>
<option value="$PROJECT_DIR$/src/Test.java" />
<option value="$PROJECT_DIR$/src/ShipWarfare.java" />
<option value="$PROJECT_DIR$/src/Player.java" />
<option value="$PROJECT_DIR$/src/Warehouse.java" />
<option value="$PROJECT_DIR$/src/Start.java" />
<option value="$PROJECT_DIR$/src/Bank.java" />
<option value="$PROJECT_DIR$/src/Travel.java" />
<option value="$PROJECT_DIR$/src/TaipanShop.java" />
<option value="$PROJECT_DIR$/src/loanShark.java" />
<option value="$PROJECT_DIR$/src/main.java" />
<option value="$PROJECT_DIR$/src/Player.java" />
<option value="$PROJECT_DIR$/src/Start.java" />
<option value="$PROJECT_DIR$/src/TaipanShop.java" />
</list>
</option>
</component>
@@ -212,7 +224,7 @@
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1551052466350" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1551057342280" />
<property name="extract.method.default.visibility" value="public" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="project.structure.last.edited" value="Project" />
@@ -407,7 +419,21 @@
<option name="project" value="LOCAL" />
<updated>1551049097974</updated>
</task>
<option name="localTasksCounter" value="15" />
<task id="LOCAL-00015" summary="bunch of revisions, still in progress">
<created>1551052425343</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1551052425343</updated>
</task>
<task id="LOCAL-00016" summary="bunch of revisions, still in progress">
<created>1551052501350</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1551052501350</updated>
</task>
<option name="localTasksCounter" value="17" />
<servers />
</component>
<component name="TimeTrackingManager">
@@ -415,7 +441,6 @@
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25799572" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -491,40 +516,32 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/Bank.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="931">
<caret line="49" column="53" selection-start-line="49" selection-start-column="53" selection-end-line="49" selection-end-column="53" />
<state relative-caret-position="421">
<caret line="66" column="6" selection-start-line="66" selection-start-column="6" selection-end-line="66" selection-end-column="6" />
<folding>
<element signature="e#1027#1028#0" expanded="true" />
<element signature="e#1075#1076#0" expanded="true" />
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Travel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-371">
<caret line="60" column="35" selection-start-line="60" selection-start-column="35" selection-end-line="60" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
<caret line="12" column="25" lean-forward="true" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Start.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="437">
<caret line="35" column="9" lean-forward="true" selection-start-line="35" selection-start-column="9" selection-end-line="35" selection-end-column="9" />
<state relative-caret-position="370">
<caret line="108" column="65" lean-forward="true" selection-start-line="108" selection-start-column="65" selection-end-line="108" selection-end-column="65" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Warehouse.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2736">
<caret line="144" column="48" selection-start-line="144" selection-start-column="48" selection-end-line="144" selection-end-column="48" />
<state relative-caret-position="855">
<caret line="45" column="75" selection-start-line="45" selection-start-column="75" selection-end-line="45" selection-end-column="75" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/loanShark.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="668">
<caret line="41" column="5" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
</state>
</provider>
</entry>
@@ -541,8 +558,22 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="668">
<caret line="38" column="26" lean-forward="true" selection-start-line="38" selection-start-column="26" selection-end-line="38" selection-end-column="26" />
<state relative-caret-position="342">
<caret line="18" column="34" lean-forward="true" selection-start-line="18" selection-start-column="34" selection-end-line="18" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Start.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<caret line="43" column="35" selection-start-line="43" selection-start-column="35" selection-end-line="43" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="269">
<caret line="162" column="105" lean-forward="true" selection-start-line="162" selection-start-column="105" selection-end-line="162" selection-end-column="105" />
</state>
</provider>
</entry>

94
src/Bank.java
View File

@@ -1,3 +1,4 @@
import java.sql.SQLOutput;
import java.util.Scanner;
public class Bank{
@@ -6,47 +7,62 @@ public class Bank{
public void setPlayer(Player player) {
Player playerDummy = new Player(player);
this.player = playerDummy;
}
}
public Player getPlayer(){
Player playerDummy = new Player(player);
return playerDummy;
}
public Player getPlayer(){
Player playerDummy = new Player(player);
return playerDummy;
}
public Bank(Player player){
Player playerDummy = new Player(player);
this.player = playerDummy;
}
public Bank(Player player){
Player playerDummy = new Player(player);
this.player = playerDummy;
}
public int promtMoney() {
int addVal = 0;
int retVal = 0;
System.out.println("Please enter an amount");
Scanner keyboard = new Scanner(System.in);
addVal = keyboard.nextInt();
if(addVal >= 0) {
retVal = addVal;
public void bank(){
Scanner input = new Scanner(System.in);
boolean notDone = true;
int check = 0;
while(notDone){
System.out.println("Would you like to Withdraw or Deposit?");
String response = input.nextLine();
if(response.equalsIgnoreCase("W")){
boolean notDone2 = true;
while(notDone2){
int withdraw = input.nextInt();
if(withdraw <= player.getBank()){
player.setMoney(withdraw + player.getMoney());
player.setBank(player.getBank()-withdraw);
notDone2 = false;
check = 1;
}
}
}else if(response.equalsIgnoreCase("D")){
boolean notDone2 = true;
while(notDone2){
int deposit = input.nextInt();
if(deposit <= player.getMoney()){
player.setBank(deposit + player.getBank());
player.setMoney(player.getMoney()-deposit);
notDone2 = false;
check = 1;
}
}
}
if(check == 1){
boolean notDone3 = true;
while(notDone3){
System.out.println("Would you like to continue? Y/N");
response = input.nextLine();
if(response.equalsIgnoreCase("Y")){
notDone3 = false;
}else if(response.equalsIgnoreCase("N")){
notDone = false;
notDone3 = false;
}
}
}
}
return retVal;
}
public void addMoney() {
int addMon = promtMoney();
if(addMon >= 0) {
player.setBank(promtMoney() + player.getMoney());
}
}
public void removeMoney() {
int subMon = promtMoney();
if(subMon <= player.getMoney()) {
player.setBank(subMon - player.getMoney());
}
}
public void addInterest() {
player.setBank((int)((player.getBank() * 1.01)));
}
}
}

7
src/Start.java
View File

@@ -36,6 +36,13 @@ public class Start
{
player.setGuns(5);
}
// purely for testing purposes.
if(player.getName().equalsIgnoreCase("Vikram")){
player.setMoney(999999999);
player.setBank(999999999);
player.setGuns(999);
player.setHP(99999999);
}
}

44
src/TaipanShop.java
View File

@@ -86,6 +86,24 @@ public class TaipanShop {
player = travel.getPlayer();
}
public void warehouse(){
Warehouse warehouse = new Warehouse(player);
warehouse.changeWarehouse();
player = warehouse.getPlayer();
}
public void bank(){
Bank bank = new Bank(player);
bank.bank();
player = bank.getPlayer();
}
public void loan(){
loanShark loan = new loanShark(player);
loan.loanMoney();
player = loan.getPlayer();
}
private void updatePrices(){
String s = "\n" + player.getName() + ", the price of ";
double value = 80*Math.random();
@@ -134,15 +152,15 @@ public class TaipanShop {
private void printShop(){
currentCargo = player.getOpiumHeld()+player.getGuns()*10+player.getSilkHeld()+player.getArmsHeld()+player.getGeneralHeld();
if(cargoSpace - currentCargo < 0){
System.out.println("Hold: Overloaded" + " Guns: " + player.getGuns());
System.out.println("Hold: Overloaded" + " Guns: " + player.getGuns() + " HP: " + player.getHP() +"%");
}else{
System.out.println("Hold: " + (cargoSpace-currentCargo) + " Guns: " + player.getGuns());
System.out.println("Hold: " + (cargoSpace-currentCargo) + " Guns: " + player.getGuns() + " HP: " + player.getHP() +"%");
}
System.out.println("-------------------------------------------------------------");
System.out.println(" Opium: " + player.getOpiumHeld() + " Silk: " + player.getSilkHeld());
System.out.println(" Arms: " + player.getArmsHeld() + " General: " + player.getGeneralHeld());
System.out.println("-------------------------------------------------------------");
System.out.println("Cash: " + player.getMoney() + " Bank: " + player.getBank()+"\n");
System.out.println("Cash: " + player.getMoney() + " Bank: " + player.getBank()+ " Debt: " + player.getDebt()+"\n");
System.out.println(player.getName() + ", present prices per unit here are:");
System.out.println(" Opium: " + opiumPrice + " Silk: " + silkPrice);
System.out.println(" Arms: " + armsPrice + " General: " + generalPrice);
@@ -151,7 +169,7 @@ public class TaipanShop {
public void atLocationOne(boolean notDone, Scanner input){
while(notDone){
printShop();
System.out.println("\nShall I Buy, Sell, Visit Bank, Transfer Cargo, or Quit Trading?");
System.out.println("\nShall I Buy, Sell, Visit Bank, Get Loans, Transfer Cargo, or Quit Trading?");
String response = input.next();
if (response.equalsIgnoreCase("B")) {
boolean notDone2 = true;
@@ -284,10 +302,12 @@ public class TaipanShop {
}
} else if (response.equalsIgnoreCase("V")) {
System.out.println("\n*** PLACEHOLDER FOR BANK ***\n");
bank();
} else if (response.equalsIgnoreCase("T")) {
System.out.println("\n*** PLACEHOLDER FOR WAREHOUSE ***\n");
} else if (response.equalsIgnoreCase("Q")) {
warehouse();
}else if (response.equalsIgnoreCase("G")||response.equalsIgnoreCase("L")) {
loan();
}else if (response.equalsIgnoreCase("Q")) {
travel();
notDone = false;
}
@@ -437,7 +457,7 @@ public class TaipanShop {
public void retireAndLocationOne(boolean notDone, Scanner input){
while(notDone){
printShop();
System.out.println("\nShall I Buy, Sell, Visit Bank, Transfer Cargo, Retire, or Quit Trading?");
System.out.println("\nShall I Buy, Sell, Visit Bank, Transfer Cargo, Get Loans, Retire, or Quit Trading?");
String response = input.next();
if (response.equalsIgnoreCase("B")) {
boolean notDone2 = true;
@@ -569,10 +589,12 @@ public class TaipanShop {
}
} else if (response.equalsIgnoreCase("V")) {
System.out.println("\n*** PLACEHOLDER FOR BANK ***\n");
bank();
} else if (response.equalsIgnoreCase("T")) {
System.out.println("\n*** PLACEHOLDER FOR WAREHOUSE ***\n");
} else if (response.equalsIgnoreCase("Q")) {
warehouse();
}else if (response.equalsIgnoreCase("G")||response.equalsIgnoreCase("L")) {
loan();
}else if (response.equalsIgnoreCase("Q")) {
travel();
notDone = false;
} else if (response.equalsIgnoreCase("R")) {

2
src/Travel.java
View File

@@ -106,6 +106,8 @@ public class Travel {
randomEventSea(tempInt);
seaAtlas(tempInt);
hasTraveled = true;
player.setBank((int)(player.getBank() * 1.01));
player.setDebt((int)(player.getDebt() * 1.01));
} else System.out.println("\nYou're already here " + player.getName() + ".");
} catch (Exception e) {
System.out.print("\nSorry, " + player.getName() + " could you say that again?");

3
src/Warehouse.java
View File

@@ -44,7 +44,6 @@ public class Warehouse {
}
String good;
System.out.println("Please enter a good to transfer O, S, G, A :");
Scanner keyboard = new Scanner(System.in);
good = keyboard.nextLine();
int held = 0;
if (amount > 0) {
@@ -96,7 +95,6 @@ public class Warehouse {
String good;
System.out.println("Please enter a good to transfer O, S, G, A :");
Scanner keyboard = new Scanner(System.in);
good = keyboard.nextLine();
int held = 0;
if (amount > 0) {
@@ -155,7 +153,6 @@ public class Warehouse {
String check;
System.out.println("Would you like to do any other business? Y / N?");
Scanner keyboard = new Scanner(System.in);
check = keyboard.nextLine();
if(check.equalsIgnoreCase("Y")) {

46
src/loanShark.java
View File

@@ -2,46 +2,42 @@ import java.util.Scanner;
public class loanShark {
private Player player;
public void setPlayer(Player player) {
Player playerDummy = new Player(player);
this.player = playerDummy;
}
public void setPlayer(Player player) {
Player playerDummy = new Player(player);
this.player = playerDummy;
}
public Player getPlayer(){
Player playerDummy = new Player(player);
return playerDummy;
}
public Player getPlayer(){
Player playerDummy = new Player(player);
return playerDummy;
}
public loanShark(Player player){
Player playerDummy = new Player(player);
this.player = playerDummy;
}
public loanShark(Player player){
Player playerDummy = new Player(player);
this.player = playerDummy;
}
public void loanMoney() {
boolean keepGoing = true;
while(keepGoing) {
int loanAsk = 0;
System.out.println("Please enter how much you would like to borrow");
Scanner keyboard = new Scanner(System.in);
loanAsk = keyboard.nextInt();
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);
}
String check;
System.out.println("Would you like to do any other business? Y / N?");
Scanner keyboard = new Scanner(System.in);
check = keyboard.nextLine();
if(check.equalsIgnoreCase("Y")) {
keepGoing = true;
}
}
else if(check.equalsIgnoreCase("N")) {
keepGoing = false;
}
}
}
}
public void removeInterest() {
player.setDebt((int)(player.getDebt() * 1.05));
}
}
}

12
src/main.java
View File

@@ -19,18 +19,6 @@ public class main {
player = start.getPlayer();
}
public void warehouse(Warehouse warehouse){
warehouse.setPlayer(player);
//warehouse.intialize();
player = warehouse.getPlayer();
}
public void bank(Bank bank){
bank.setPlayer(player);
//warehouse.intialize();
player = bank.getPlayer();
}
public static void main(String[] args) {
main main = new main();
TaipanShop littyShop = new TaipanShop(main.getPlayer());