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

Vikram, these are the types of changes Harkey and I meant for you to establish.

Browse Source
This commit is contained in:
KahootChampion
2019-02-18 22:35:29 -07:00
parent 5cb0237ef8
commit fe03244b6c
4 changed files with 254 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@@ -3,7 +3,7 @@
<component name="ProjectKey"> <component name="ProjectKey">
<option name="state" value="project://63537948-39a4-48a0-9c97-34259a0fa913" /> <option name="state" value="project://63537948-39a4-48a0-9c97-34259a0fa913" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8.0_191" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8.0_201" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
<component name="SvnBranchConfigurationManager"> <component name="SvnBranchConfigurationManager">

135
.idea/workspace.xml generated
View File

@@ -1,7 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="" /> <list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/TaipanClone/ShipWarfare.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/TaipanClone/ShipWarfare.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TaipanShop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaipanShop.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@@ -14,8 +19,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java"> <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209"> <state relative-caret-position="-673">
<caret line="11" column="36" lean-forward="true" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" /> <caret line="9" column="55" selection-start-line="9" selection-start-column="55" selection-end-line="9" selection-end-column="55" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#1150#1151#0" expanded="true" /> <element signature="e#1150#1151#0" expanded="true" />
@@ -27,23 +32,46 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java"> <entry file="file://$PROJECT_DIR$/src/Player.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380"> <state relative-caret-position="30">
<caret line="20" column="22" lean-forward="true" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" /> <caret line="2" column="35" lean-forward="true" selection-start-line="2" selection-start-column="35" selection-end-line="2" selection-end-column="35" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="e#350#351#0" expanded="true" />
<element signature="e#377#378#0" expanded="true" />
<element signature="e#417#418#0" expanded="true" />
<element signature="e#449#450#0" expanded="true" />
<element signature="e#475#476#0" expanded="true" />
<element signature="e#500#501#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/Player.java"> <entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="810">
<caret column="13" selection-start-column="13" selection-end-column="13" /> <caret line="55" column="30" lean-forward="true" selection-start-line="55" selection-start-column="30" selection-end-line="55" selection-end-column="30" />
<folding>
<element signature="e#371#372#0" expanded="true" />
<element signature="e#404#405#0" expanded="true" />
<element signature="e#453#454#0" expanded="true" />
<element signature="e#497#498#0" expanded="true" />
<element signature="e#530#531#0" expanded="true" />
<element signature="e#562#563#0" expanded="true" />
<element signature="e#609#610#0" expanded="true" />
<element signature="e#651#652#0" expanded="true" />
<element signature="e#684#685#0" expanded="true" />
<element signature="e#716#717#0" expanded="true" />
<element signature="e#763#764#0" expanded="true" />
<element signature="e#805#806#0" expanded="true" />
<element signature="e#841#842#0" expanded="true" />
<element signature="e#876#877#0" expanded="true" />
<element signature="e#929#930#0" expanded="true" />
<element signature="e#977#978#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -66,6 +94,8 @@
<find>bank</find> <find>bank</find>
<find>player.getMoney() += num *</find> <find>player.getMoney() += num *</find>
<find>opiumHeld</find> <find>opiumHeld</find>
<find>hp</find>
<find>player.</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>player.getName()</replace> <replace>player.getName()</replace>
@@ -75,6 +105,7 @@
</replaceStrings> </replaceStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="UPDATE_TYPE" value="MERGE" />
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
@@ -96,8 +127,8 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="PackagesPane" />
<pane id="Scope" /> <pane id="Scope" />
<pane id="PackagesPane" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
@@ -119,12 +150,12 @@
<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="1550544519995" /> <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550552776844" />
<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="SDKs" /> <property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.0" /> <property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" /> <property name="project.structure.side.proportion" value="0.2" />
<property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" /> <property name="settings.editor.selected.configurable" value="preferences.keymap" />
</component> </component>
<component name="RunDashboard"> <component name="RunDashboard">
<option name="ruleStates"> <option name="ruleStates">
@@ -138,7 +169,7 @@
</list> </list>
</option> </option>
</component> </component>
<component name="RunManager" selected="Application.TaipanShop"> <component name="RunManager" selected="Application.ShipWarfare">
<configuration name="Main" type="Application" factoryName="Application" temporary="true"> <configuration name="Main" type="Application" factoryName="Application" temporary="true">
<option name="MAIN_CLASS_NAME" value="Main" /> <option name="MAIN_CLASS_NAME" value="Main" />
<module name="TaipanClone" /> <module name="TaipanClone" />
@@ -170,8 +201,8 @@
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Application.TaipanShop" />
<item itemvalue="Application.ShipWarfare" /> <item itemvalue="Application.ShipWarfare" />
<item itemvalue="Application.TaipanShop" />
<item itemvalue="Application.Main" /> <item itemvalue="Application.Main" />
</list> </list>
</recent_temporary> </recent_temporary>
@@ -188,6 +219,9 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1550454898506</updated> <updated>1550454898506</updated>
<workItem from="1550454902781" duration="459000" /> <workItem from="1550454902781" duration="459000" />
<workItem from="1550550806467" duration="577000" />
<workItem from="1550552635138" duration="118000" />
<workItem from="1550553016386" duration="1451000" />
</task> </task>
<task id="LOCAL-00001" summary="Added troll comments"> <task id="LOCAL-00001" summary="Added troll comments">
<created>1550458807806</created> <created>1550458807806</created>
@@ -214,12 +248,12 @@
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="459000" /> <option name="totallyTimeSpent" value="2605000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> <frame x="0" y="23" width="1280" height="709" extended-state="6" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1705757" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27786753" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Image Layers" order="2" /> <window_info id="Image Layers" order="2" />
<window_info id="Designer" order="3" /> <window_info id="Designer" order="3" />
@@ -228,17 +262,17 @@
<window_info id="Favorites" order="6" side_tool="true" /> <window_info id="Favorites" order="6" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" weight="0.32827735" /> <window_info anchor="bottom" id="Run" order="2" weight="0.3273906" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49946696" visible="true" weight="0.32936078" /> <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49946696" weight="0.32936078" />
<window_info anchor="bottom" id="Database Changes" order="9" /> <window_info anchor="bottom" id="Database Changes" order="9" />
<window_info anchor="bottom" id="Terminal" order="10" weight="0.32936078" /> <window_info anchor="bottom" id="Terminal" order="10" weight="0.32936078" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50053304" side_tool="true" weight="0.32936078" /> <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50053304" side_tool="true" weight="0.32901135" />
<window_info anchor="bottom" id="Messages" order="12" weight="0.32827735" /> <window_info anchor="bottom" id="Messages" order="12" weight="0.60777956" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -266,17 +300,35 @@
<entry file="file://$PROJECT_DIR$/TaipanClone.iml"> <entry file="file://$PROJECT_DIR$/TaipanClone.iml">
<provider selected="true" editor-type-id="text-editor" /> <provider selected="true" editor-type-id="text-editor" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.idea/misc.xml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/Travel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" lean-forward="true" selection-start-line="2" selection-end-line="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Player.java"> <entry file="file://$PROJECT_DIR$/src/Player.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state> <state relative-caret-position="30">
<caret column="13" selection-start-column="13" selection-end-column="13" /> <caret line="2" column="35" lean-forward="true" selection-start-line="2" selection-start-column="35" selection-end-line="2" selection-end-column="35" />
<folding>
<element signature="e#350#351#0" expanded="true" />
<element signature="e#377#378#0" expanded="true" />
<element signature="e#417#418#0" expanded="true" />
<element signature="e#449#450#0" expanded="true" />
<element signature="e#475#476#0" expanded="true" />
<element signature="e#500#501#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java"> <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209"> <state relative-caret-position="-673">
<caret line="11" column="36" lean-forward="true" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" /> <caret line="9" column="55" selection-start-line="9" selection-start-column="55" selection-end-line="9" selection-end-column="55" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#1150#1151#0" expanded="true" /> <element signature="e#1150#1151#0" expanded="true" />
@@ -289,10 +341,25 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java"> <entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380"> <state relative-caret-position="810">
<caret line="20" column="22" lean-forward="true" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" /> <caret line="55" column="30" lean-forward="true" selection-start-line="55" selection-start-column="30" selection-end-line="55" selection-end-column="30" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="e#371#372#0" expanded="true" />
<element signature="e#404#405#0" expanded="true" />
<element signature="e#453#454#0" expanded="true" />
<element signature="e#497#498#0" expanded="true" />
<element signature="e#530#531#0" expanded="true" />
<element signature="e#562#563#0" expanded="true" />
<element signature="e#609#610#0" expanded="true" />
<element signature="e#651#652#0" expanded="true" />
<element signature="e#684#685#0" expanded="true" />
<element signature="e#716#717#0" expanded="true" />
<element signature="e#763#764#0" expanded="true" />
<element signature="e#805#806#0" expanded="true" />
<element signature="e#841#842#0" expanded="true" />
<element signature="e#876#877#0" expanded="true" />
<element signature="e#929#930#0" expanded="true" />
<element signature="e#977#978#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -337,7 +404,7 @@
</state> </state>
<state key="JdkListConfigurable.UI"> <state key="JdkListConfigurable.UI">
<settings> <settings>
<last-edited>1.8</last-edited> <last-edited>1.8.0_201</last-edited>
<splitter-proportions> <splitter-proportions>
<option name="proportions"> <option name="proportions">
<list> <list>

BIN
out/production/TaipanClone/ShipWarfare.class
View File

Binary file not shown.

270
src/TaipanShop.java
View File

@@ -2,7 +2,6 @@ import java.util.Random;
import java.util.Scanner; import java.util.Scanner;
public class TaipanShop extends Player { public class TaipanShop extends Player {
private Player player = new Player();
private int cargoSpace = 60; private int cargoSpace = 60;
private int currentCargo = 0; private int currentCargo = 0;
private int opiumPrice = 16000; private int opiumPrice = 16000;
@@ -10,23 +9,58 @@ public class TaipanShop extends Player {
private int armsPrice = 160; private int armsPrice = 160;
private int generalPrice = 8; private int generalPrice = 8;
public int getOpiumPrice() {
return opiumPrice;
}
public void setOpiumPrice(int opiumPrice) {
this.opiumPrice = opiumPrice;
}
public int getSilkPrice() {
return silkPrice;
}
public void setSilkPrice(int silkPrice) {
this.silkPrice = silkPrice;
}
public int getArmsPrice() {
return armsPrice;
}
public void setArmsPrice(int armsPrice) {
this.armsPrice = armsPrice;
}
public int getGeneralPrice() {
return generalPrice;
}
public void setGeneralPrice(int generalPrice) {
this.generalPrice = generalPrice;
}
private void updatePrices(){ private void updatePrices(){
String s = "\n" + player.getName() + ", the price of "; String s = "\n" + getName() + ", the price of ";
double value = 80*Math.random(); double value = 80*Math.random();
Random rand = new Random(); Random rand = new Random();
opiumPrice = (rand.nextInt(201) + 60)*100;
silkPrice = (rand.nextInt(201) + 60)*10; setOpiumPrice((rand.nextInt(201) + 60)*100);
armsPrice = (rand.nextInt(21) + 6)*10; setSilkPrice((rand.nextInt(201) + 60)*10);
generalPrice = rand.nextInt(17) + 4; setArmsPrice((rand.nextInt(21) + 6)*10);
setGeneralPrice(rand.nextInt(17) + 4);
if(value < 8){ if(value < 8){
if(value < 2){ if(value < 2){
if(value < 1){ if(value < 1){
opiumPrice /= 5; setOpiumPrice(getOpiumPrice()/5);
System.out.println(s + "Opium has dropped to " + opiumPrice +"!!!\n"); System.out.println(s + "Opium has dropped to " + getOpiumPrice() +"!!!\n");
}else{ }else{
opiumPrice *= 5; setOpiumPrice(getOpiumPrice()*5);
System.out.println(s + "Opium has risen to " + opiumPrice +"!!!\n"); System.out.println(s + "Opium has risen to " + getOpiumPrice() +"!!!\n");
} }
}else if(value < 4){ }else if(value < 4){
if(value < 3){ if(value < 3){
silkPrice /= 5; silkPrice /= 5;
@@ -56,18 +90,18 @@ public class TaipanShop extends Player {
} }
private void printShop(){ private void printShop(){
currentCargo = player.getOpiumHeld()+player.getGuns()*10+player.getSilkHeld()+player.getArmsHeld()+player.getGeneralHeld(); currentCargo = getOpiumHeld()+getGuns()*10+getSilkHeld()+getArmsHeld()+getGeneralHeld();
if(cargoSpace - currentCargo < 0){ if(cargoSpace - currentCargo < 0){
System.out.println("Hold: Overloaded" + " Guns: " + player.getGuns()); System.out.println("Hold: Overloaded" + " Guns: " + getGuns());
}else{ }else{
System.out.println("Hold: " + (cargoSpace-currentCargo) + " Guns: " + player.getGuns()); System.out.println("Hold: " + (cargoSpace-currentCargo) + " Guns: " + getGuns());
} }
System.out.println("-------------------------------------------------------------"); System.out.println("-------------------------------------------------------------");
System.out.println(" Opium: " + player.getOpiumHeld() + " Silk: " + player.getSilkHeld()); System.out.println(" Opium: " + getOpiumHeld() + " Silk: " + getSilkHeld());
System.out.println(" Arms: " + player.getArmsHeld() + " General: " + player.getGeneralHeld()); System.out.println(" Arms: " + getArmsHeld() + " General: " + getGeneralHeld());
System.out.println("-------------------------------------------------------------"); System.out.println("-------------------------------------------------------------");
System.out.println("Cash: " + player.getMoney() + " Bank: " + player.getBank()+"\n"); System.out.println("Cash: " + getMoney() + " Bank: " + getBank()+"\n");
System.out.println(player.getName() + ", present prices per unit here are:"); System.out.println(getName() + ", present prices per unit here are:");
System.out.println(" Opium: " + opiumPrice + " Silk: " + silkPrice); System.out.println(" Opium: " + opiumPrice + " Silk: " + silkPrice);
System.out.println(" Arms: " + armsPrice + " General: " + generalPrice); System.out.println(" Arms: " + armsPrice + " General: " + generalPrice);
} }
@@ -76,70 +110,70 @@ public class TaipanShop extends Player {
updatePrices(); updatePrices();
Scanner input = new Scanner(System.in); Scanner input = new Scanner(System.in);
boolean notDone = true; boolean notDone = true;
if (player.getLocation() == 1) { if (getLocation() == 1) {
while (notDone) { while (notDone) {
printShop(); printShop();
System.out.println("\nShall I Buy, Sell, Visit Bank, Transfer Cargo, or Quit Trading?"); System.out.println("\nShall I Buy, Sell, Visit Bank, Transfer Cargo, or Quit Trading?");
String response = input.next(); String response = input.next();
if (response.equalsIgnoreCase("B")) { if (response.equalsIgnoreCase("B")) {
boolean notDone2 = true; boolean notDone2 = true;
System.out.println("What do you wish me to buy, " + player.getName() + "?"); System.out.println("What do you wish me to buy, " + getName() + "?");
while (notDone2) { while (notDone2) {
response = input.nextLine(); response = input.nextLine();
if (response.equalsIgnoreCase("O")) { if (response.equalsIgnoreCase("O")) {
System.out.println("\nHow much Opium shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / opiumPrice + ")"); System.out.println("\nHow much Opium shall I buy, " + getName() + "? (You can afford " + getMoney() / opiumPrice + ")");
while (notDone2) { while (notDone2) {
int num = input.nextInt(); int num = input.nextInt();
if (num <= player.getMoney() / opiumPrice && num >= 0) { if (num <= getMoney() / opiumPrice && num >= 0) {
player.setOpiumHeld(player.getOpiumHeld()+num); setOpiumHeld(getOpiumHeld()+num);
player.setMoney(player.getMoney()-num * opiumPrice); setMoney(getMoney()-num * opiumPrice);
notDone2 = false; notDone2 = false;
} else if (num >= 0) { } else if (num >= 0) {
System.out.println(player.getName() + ", you can't afford that!"); System.out.println(getName() + ", you can't afford that!");
} else { } else {
System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " Opium?"); System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " Opium?");
} }
} }
} else if (response.equalsIgnoreCase("S")) { } else if (response.equalsIgnoreCase("S")) {
System.out.println("\nHow much Silk shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / silkPrice + ")"); System.out.println("\nHow much Silk shall I buy, " + getName() + "? (You can afford " + getMoney() / silkPrice + ")");
while (notDone2) { while (notDone2) {
int num = input.nextInt(); int num = input.nextInt();
if (num <= player.getMoney() / silkPrice && num >= 0) { if (num <= getMoney() / silkPrice && num >= 0) {
player.setSilkHeld(player.getSilkHeld()+num); setSilkHeld(getSilkHeld()+num);
player.setMoney(player.getMoney()-num * silkPrice); setMoney(getMoney()-num * silkPrice);
notDone2 = false; notDone2 = false;
} else if (num >= 0) { } else if (num >= 0) {
System.out.println(player.getName() + ", you can't afford that!"); System.out.println(getName() + ", you can't afford that!");
} else { } else {
System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " Silk?"); System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " Silk?");
} }
} }
} else if (response.equalsIgnoreCase("A")) { } else if (response.equalsIgnoreCase("A")) {
System.out.println("\nHow many Arms shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / armsPrice + ")"); System.out.println("\nHow many Arms shall I buy, " + getName() + "? (You can afford " + getMoney() / armsPrice + ")");
while (notDone2) { while (notDone2) {
int num = input.nextInt(); int num = input.nextInt();
if (num <= player.getMoney() / armsPrice && num >= 0) { if (num <= getMoney() / armsPrice && num >= 0) {
player.setArmsHeld(player.getArmsHeld()+num); setArmsHeld(getArmsHeld()+num);
player.setMoney(player.getMoney() - num*armsPrice); setMoney(getMoney() - num*armsPrice);
notDone2 = false; notDone2 = false;
} else if (num >= 0) { } else if (num >= 0) {
System.out.println(player.getName() + ", you can't afford that!"); System.out.println(getName() + ", you can't afford that!");
} else { } else {
System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " Arms?"); System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " Arms?");
} }
} }
} else if (response.equalsIgnoreCase("G")) { } else if (response.equalsIgnoreCase("G")) {
System.out.println("\nHow much General Cargo shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / generalPrice + ")"); System.out.println("\nHow much General Cargo shall I buy, " + getName() + "? (You can afford " + getMoney() / generalPrice + ")");
while (notDone2) { while (notDone2) {
int num = input.nextInt(); int num = input.nextInt();
if (num <= player.getMoney() / generalPrice && num >= 0) { if (num <= getMoney() / generalPrice && num >= 0) {
player.setGeneralHeld(player.getGeneralHeld()+num); setGeneralHeld(getGeneralHeld()+num);
player.setMoney(player.getMoney() - num*generalPrice); setMoney(getMoney() - num*generalPrice);
notDone2 = false; notDone2 = false;
} else if (num >= 0) { } else if (num >= 0) {
System.out.println(player.getName() + ", you can't afford that!"); System.out.println(getName() + ", you can't afford that!");
} else { } else {
System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " General Cargo?"); System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " General Cargo?");
} }
} }
} }
@@ -148,63 +182,63 @@ public class TaipanShop extends Player {
} else if (response.equalsIgnoreCase("S")) { } else if (response.equalsIgnoreCase("S")) {
boolean notDone2 = true; boolean notDone2 = true;
System.out.println("What do you wish me to sell, " + player.getName() + "?"); System.out.println("What do you wish me to sell, " + getName() + "?");
while (notDone2) { while (notDone2) {
response = input.nextLine(); response = input.nextLine();
if (response.equalsIgnoreCase("O")) { if (response.equalsIgnoreCase("O")) {
System.out.println("\nHow much Opium shall I sell, " + player.getName() + "? (You have " + player.getOpiumHeld() + ")"); System.out.println("\nHow much Opium shall I sell, " + getName() + "? (You have " + getOpiumHeld() + ")");
while (notDone2) { while (notDone2) {
int num = input.nextInt(); int num = input.nextInt();
if (num <= player.getOpiumHeld() && num >= 0) { if (num <= getOpiumHeld() && num >= 0) {
player.setOpiumHeld(player.getOpiumHeld()-num); setOpiumHeld(getOpiumHeld()-num);
player.setMoney(player.getMoney() + num*opiumPrice); setMoney(getMoney() + num*opiumPrice);
notDone2 = false; notDone2 = false;
} else if (num >= 0) { } else if (num >= 0) {
System.out.println(player.getName() + ", you don't have that many to sell!"); System.out.println(getName() + ", you don't have that many to sell!");
} else { } else {
System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " Opium?"); System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " Opium?");
} }
} }
} else if (response.equalsIgnoreCase("S")) { } else if (response.equalsIgnoreCase("S")) {
System.out.println("\nHow much Silk shall I sell, " + player.getName() + "? (You have " + player.getSilkHeld() + ")"); System.out.println("\nHow much Silk shall I sell, " + getName() + "? (You have " + getSilkHeld() + ")");
while (notDone2) { while (notDone2) {
int num = input.nextInt(); int num = input.nextInt();
if (num <= player.getSilkHeld() && num >= 0) { if (num <= getSilkHeld() && num >= 0) {
player.setSilkHeld(player.getSilkHeld()-num); setSilkHeld(getSilkHeld()-num);
player.setMoney(player.getMoney() + num*silkPrice); setMoney(getMoney() + num*silkPrice);
notDone2 = false; notDone2 = false;
} else if (num >= 0) { } else if (num >= 0) {
System.out.println(player.getName() + ", you don't have that many to sell!"); System.out.println(getName() + ", you don't have that many to sell!");
} else { } else {
System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " Silk?"); System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " Silk?");
} }
} }
} else if (response.equalsIgnoreCase("A")) { } else if (response.equalsIgnoreCase("A")) {
System.out.println("\nHow many Arms shall I sell, " + player.getName() + "? (You have " + player.getArmsHeld() + ")"); System.out.println("\nHow many Arms shall I sell, " + getName() + "? (You have " + getArmsHeld() + ")");
while (notDone2) { while (notDone2) {
int num = input.nextInt(); int num = input.nextInt();
if (num <= player.getArmsHeld() && num >= 0) { if (num <= getArmsHeld() && num >= 0) {
player.setArmsHeld(player.getArmsHeld()-num); setArmsHeld(getArmsHeld()-num);
player.setMoney(player.getMoney() + num*armsPrice); setMoney(getMoney() + num*armsPrice);
notDone2 = false; notDone2 = false;
} else if (num >= 0) { } else if (num >= 0) {
System.out.println(player.getName() + ", you don't have that many to sell!"); System.out.println(getName() + ", you don't have that many to sell!");
} else { } else {
System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " Arms?"); System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " Arms?");
} }
} }
} else if (response.equalsIgnoreCase("G")) { } else if (response.equalsIgnoreCase("G")) {
System.out.println("\nHow much General Cargo shall I sell, " + player.getName() + "? (You have " + player.getGeneralHeld() + ")"); System.out.println("\nHow much General Cargo shall I sell, " + getName() + "? (You have " + getGeneralHeld() + ")");
while (notDone2) { while (notDone2) {
int num = input.nextInt(); int num = input.nextInt();
if (num <= player.getGeneralHeld() && num >= 0) { if (num <= getGeneralHeld() && num >= 0) {
player.setGeneralHeld(player.getGeneralHeld()-num); setGeneralHeld(getGeneralHeld()-num);
player.setMoney(player.getMoney() + num*generalPrice); setMoney(getMoney() + num*generalPrice);
notDone2 = false; notDone2 = false;
} else if (num >= 0) { } else if (num >= 0) {
System.out.println(player.getName() + ", you don't have that many to sell!"); System.out.println(getName() + ", you don't have that many to sell!");
} else { } else {
System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " General Cargo?"); System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " General Cargo?");
} }
} }
} }
@@ -227,63 +261,63 @@ public class TaipanShop extends Player {
String response = input.next(); String response = input.next();
if (response.equalsIgnoreCase("B")) { if (response.equalsIgnoreCase("B")) {
boolean notDone2 = true; boolean notDone2 = true;
System.out.println("What do you wish me to buy, " + player.getName() + "?"); System.out.println("What do you wish me to buy, " + getName() + "?");
while (notDone2) { while (notDone2) {
response = input.nextLine(); response = input.nextLine();
if (response.equalsIgnoreCase("O")) { if (response.equalsIgnoreCase("O")) {
System.out.println("\nHow much Opium shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / opiumPrice + ")"); System.out.println("\nHow much Opium shall I buy, " + getName() + "? (You can afford " + getMoney() / opiumPrice + ")");
while (notDone2) { while (notDone2) {
int num = input.nextInt(); int num = input.nextInt();
if (num <= player.getMoney() / opiumPrice && num >= 0) { if (num <= getMoney() / opiumPrice && num >= 0) {
player.setOpiumHeld(player.getOpiumHeld()+num); setOpiumHeld(getOpiumHeld()+num);
player.setMoney(player.getMoney() - num*opiumPrice); setMoney(getMoney() - num*opiumPrice);
notDone2 = false; notDone2 = false;
} else if (num >= 0) { } else if (num >= 0) {
System.out.println(player.getName() + ", you can't afford that!"); System.out.println(getName() + ", you can't afford that!");
} else { } else {
System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " Opium?"); System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " Opium?");
} }
} }
} else if (response.equalsIgnoreCase("S")) { } else if (response.equalsIgnoreCase("S")) {
System.out.println("\nHow much Silk shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / silkPrice + ")"); System.out.println("\nHow much Silk shall I buy, " + getName() + "? (You can afford " + getMoney() / silkPrice + ")");
while (notDone2) { while (notDone2) {
int num = input.nextInt(); int num = input.nextInt();
if (num <= player.getMoney() / silkPrice && num >= 0) { if (num <= getMoney() / silkPrice && num >= 0) {
player.setSilkHeld(player.getSilkHeld()+num); setSilkHeld(getSilkHeld()+num);
player.setMoney(player.getMoney() - num*silkPrice); setMoney(getMoney() - num*silkPrice);
notDone2 = false; notDone2 = false;
} else if (num >= 0) { } else if (num >= 0) {
System.out.println(player.getName() + ", you can't afford that!"); System.out.println(getName() + ", you can't afford that!");
} else { } else {
System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " Silk?"); System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " Silk?");
} }
} }
} else if (response.equalsIgnoreCase("A")) { } else if (response.equalsIgnoreCase("A")) {
System.out.println("\nHow many Arms shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / armsPrice + ")"); System.out.println("\nHow many Arms shall I buy, " + getName() + "? (You can afford " + getMoney() / armsPrice + ")");
while (notDone2) { while (notDone2) {
int num = input.nextInt(); int num = input.nextInt();
if (num <= player.getMoney() / armsPrice && num >= 0) { if (num <= getMoney() / armsPrice && num >= 0) {
player.setArmsHeld(player.getArmsHeld()+num); setArmsHeld(getArmsHeld()+num);
player.setMoney(player.getMoney() - num*armsPrice); setMoney(getMoney() - num*armsPrice);
notDone2 = false; notDone2 = false;
} else if (num >= 0) { } else if (num >= 0) {
System.out.println(player.getName() + ", you can't afford that!"); System.out.println(getName() + ", you can't afford that!");
} else { } else {
System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " Arms?"); System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " Arms?");
} }
} }
} else if (response.equalsIgnoreCase("G")) { } else if (response.equalsIgnoreCase("G")) {
System.out.println("\nHow much General Cargo shall I buy, " + player.getName() + "? (You can afford " + player.getMoney() / generalPrice + ")"); System.out.println("\nHow much General Cargo shall I buy, " + getName() + "? (You can afford " + getMoney() / generalPrice + ")");
while (notDone2) { while (notDone2) {
int num = input.nextInt(); int num = input.nextInt();
if (num <= player.getMoney() / generalPrice && num >= 0) { if (num <= getMoney() / generalPrice && num >= 0) {
player.setGeneralHeld(player.getGeneralHeld()+num); setGeneralHeld(getGeneralHeld()+num);
player.setMoney(player.getMoney() - num*generalPrice); setMoney(getMoney() - num*generalPrice);
notDone2 = false; notDone2 = false;
} else if (num >= 0) { } else if (num >= 0) {
System.out.println(player.getName() + ", you can't afford that!"); System.out.println(getName() + ", you can't afford that!");
} else { } else {
System.out.println(player.getName() + ", how am I supposed to buy " + "'" + num + "'" + " General Cargo?"); System.out.println(getName() + ", how am I supposed to buy " + "'" + num + "'" + " General Cargo?");
} }
} }
} }
@@ -292,63 +326,63 @@ public class TaipanShop extends Player {
} else if (response.equalsIgnoreCase("S")) { } else if (response.equalsIgnoreCase("S")) {
boolean notDone2 = true; boolean notDone2 = true;
System.out.println("What do you wish me to sell, " + player.getName() + "?"); System.out.println("What do you wish me to sell, " + getName() + "?");
while (notDone2) { while (notDone2) {
response = input.nextLine(); response = input.nextLine();
if (response.equalsIgnoreCase("O")) { if (response.equalsIgnoreCase("O")) {
System.out.println("\nHow much Opium shall I sell, " + player.getName() + "? (You have " + player.getOpiumHeld() + ")"); System.out.println("\nHow much Opium shall I sell, " + getName() + "? (You have " + getOpiumHeld() + ")");
while (notDone2) { while (notDone2) {
int num = input.nextInt(); int num = input.nextInt();
if (num <= player.getOpiumHeld() && num >= 0) { if (num <= getOpiumHeld() && num >= 0) {
player.setOpiumHeld(player.getOpiumHeld()-num); setOpiumHeld(getOpiumHeld()-num);
player.setMoney(player.getMoney() + num*opiumPrice); setMoney(getMoney() + num*opiumPrice);
notDone2 = false; notDone2 = false;
} else if (num >= 0) { } else if (num >= 0) {
System.out.println(player.getName() + ", you don't have that many to sell!"); System.out.println(getName() + ", you don't have that many to sell!");
} else { } else {
System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " Opium?"); System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " Opium?");
} }
} }
} else if (response.equalsIgnoreCase("S")) { } else if (response.equalsIgnoreCase("S")) {
System.out.println("\nHow much Silk shall I sell, " + player.getName() + "? (You have " + player.getSilkHeld() + ")"); System.out.println("\nHow much Silk shall I sell, " + getName() + "? (You have " + getSilkHeld() + ")");
while (notDone2) { while (notDone2) {
int num = input.nextInt(); int num = input.nextInt();
if (num <= player.getSilkHeld() && num >= 0) { if (num <= getSilkHeld() && num >= 0) {
player.setSilkHeld(player.getSilkHeld()-num); setSilkHeld(getSilkHeld()-num);
player.setMoney(player.getMoney() + num*silkPrice); setMoney(getMoney() + num*silkPrice);
notDone2 = false; notDone2 = false;
} else if (num >= 0) { } else if (num >= 0) {
System.out.println(player.getName() + ", you don't have that many to sell!"); System.out.println(getName() + ", you don't have that many to sell!");
} else { } else {
System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " Silk?"); System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " Silk?");
} }
} }
} else if (response.equalsIgnoreCase("A")) { } else if (response.equalsIgnoreCase("A")) {
System.out.println("\nHow many Arms shall I sell, " + player.getName() + "? (You have " + player.getArmsHeld() + ")"); System.out.println("\nHow many Arms shall I sell, " + getName() + "? (You have " + getArmsHeld() + ")");
while (notDone2) { while (notDone2) {
int num = input.nextInt(); int num = input.nextInt();
if (num <= player.getArmsHeld() && num >= 0) { if (num <= getArmsHeld() && num >= 0) {
player.setArmsHeld(player.getArmsHeld()-num); setArmsHeld(getArmsHeld()-num);
player.setMoney(player.getMoney() + num*armsPrice); setMoney(getMoney() + num*armsPrice);
notDone2 = false; notDone2 = false;
} else if (num >= 0) { } else if (num >= 0) {
System.out.println(player.getName() + ", you don't have that many to sell!"); System.out.println(getName() + ", you don't have that many to sell!");
} else { } else {
System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " Arms?"); System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " Arms?");
} }
} }
} else if (response.equalsIgnoreCase("G")) { } else if (response.equalsIgnoreCase("G")) {
System.out.println("\nHow much General Cargo shall I sell, " + player.getName() + "? (You have " + player.getGeneralHeld() + ")"); System.out.println("\nHow much General Cargo shall I sell, " + getName() + "? (You have " + getGeneralHeld() + ")");
while (notDone2) { while (notDone2) {
int num = input.nextInt(); int num = input.nextInt();
if (num <= player.getGeneralHeld() && num >= 0) { if (num <= getGeneralHeld() && num >= 0) {
player.setGeneralHeld(player.getGeneralHeld()-num); setGeneralHeld(getGeneralHeld()-num);
player.setMoney(player.getMoney() + num*generalPrice); setMoney(getMoney() + num*generalPrice);
notDone2 = false; notDone2 = false;
} else if (num >= 0) { } else if (num >= 0) {
System.out.println(player.getName() + ", you don't have that many to sell!"); System.out.println(getName() + ", you don't have that many to sell!");
} else { } else {
System.out.println(player.getName() + ", how am I supposed to sell " + "'" + num + "'" + " General Cargo?"); System.out.println(getName() + ", how am I supposed to sell " + "'" + num + "'" + " General Cargo?");
} }
} }
} }