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

Changed the timing in ShipWarfare

Browse Source
This commit is contained in:
KahootChampion
2019-02-24 23:06:05 -07:00
parent f6f0c960ea
commit ae0e9c4659
3 changed files with 147 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

187
.idea/workspace.xml generated
View File

@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<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="Really small change in Sid's code that no one will probably ever notice lol">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ShipWarfare.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ShipWarfare.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/loanShark.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/loanShark.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -29,10 +30,10 @@
<component name="FileEditorManager">
<leaf>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main.java">
<entry file="file://$PROJECT_DIR$/src/loanShark.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="19" column="5" lean-forward="true" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
<state relative-caret-position="450">
<caret line="30" column="21" lean-forward="true" selection-start-line="30" selection-start-column="21" selection-end-line="30" selection-end-column="21" />
</state>
</provider>
</entry>
@@ -40,8 +41,38 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="327" lean-forward="true" selection-start-line="327" selection-end-line="327" />
<state relative-caret-position="234">
<caret line="371" column="43" lean-forward="true" selection-start-line="371" selection-start-column="43" selection-end-line="371" selection-end-column="43" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<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="136">
<caret line="63" column="38" selection-start-line="63" selection-start-column="28" selection-end-line="63" selection-end-column="38" />
</state>
</provider>
</entry>
</file>
<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="353">
<caret line="33" column="9" lean-forward="true" selection-start-line="33" selection-start-column="9" selection-end-line="33" selection-end-column="9" />
</state>
</provider>
</entry>
</file>
<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="375">
<caret line="25" column="23" selection-start-line="25" selection-start-column="23" selection-end-line="25" selection-end-column="23" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -60,15 +91,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>duplic</find>
<find>chanceOfRun</find>
<find>chance</find>
<find>get</find>
<find>Peasant</find>
<find>d</find>
<find>captain</find>
<find>printf</find>
<find>liu</find>
<find>howmuchRun</find>
<find>setPlayer</find>
<find>setNumOf</find>
@@ -90,6 +112,15 @@
<find>keep</find>
<find>showWa</find>
<find>player.get</find>
<find>throws Exception</find>
<find>would</find>
<find>.nextInt</find>
<find>getName</find>
<find>we made it</find>
<find>delayfora</find>
<find>dela</find>
<find>couldn</find>
<find>GUNS</find>
</findStrings>
<replaceStrings>
<replace>player.getName()</replace>
@@ -105,10 +136,10 @@
<replace>player.set</replace>
<replace>%s</replace>
<replace>loan();</replace>
<replace>throws InterruptedException</replace>
</replaceStrings>
</component>
<component name="Git.Settings">
<option name="UPDATE_TYPE" value="REBASE" />
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
@@ -116,13 +147,13 @@
<list>
<option value="$PROJECT_DIR$/src/Test.java" />
<option value="$PROJECT_DIR$/src/Player.java" />
<option value="$PROJECT_DIR$/src/Bank.java" />
<option value="$PROJECT_DIR$/src/Travel.java" />
<option value="$PROJECT_DIR$/src/loanShark.java" />
<option value="$PROJECT_DIR$/src/main.java" />
<option value="$PROJECT_DIR$/src/TaipanShop.java" />
<option value="$PROJECT_DIR$/src/Warehouse.java" />
<option value="$PROJECT_DIR$/src/Start.java" />
<option value="$PROJECT_DIR$/src/Warehouse.java" />
<option value="$PROJECT_DIR$/src/Bank.java" />
<option value="$PROJECT_DIR$/src/loanShark.java" />
<option value="$PROJECT_DIR$/src/ShipWarfare.java" />
</list>
</option>
@@ -258,7 +289,7 @@
<workItem from="1550899071486" duration="108000" />
<workItem from="1550954455279" duration="500000" />
<workItem from="1551066469788" duration="198000" />
<workItem from="1551066703607" duration="1375000" />
<workItem from="1551066703607" duration="6918000" />
</task>
<task id="LOCAL-00001" summary="Added troll comments">
<created>1550458807806</created>
@@ -407,11 +438,25 @@
<option name="project" value="LOCAL" />
<updated>1551065880809</updated>
</task>
<option name="localTasksCounter" value="22" />
<task id="LOCAL-00022" summary="Sneaky bug in shipWarfare regarding having 0 guns is now fixed.">
<created>1551069200511</created>
<option name="number" value="00022" />
<option name="presentableId" value="LOCAL-00022" />
<option name="project" value="LOCAL" />
<updated>1551069200512</updated>
</task>
<task id="LOCAL-00023" summary="Really small change in Sid's code that no one will probably ever notice lol">
<created>1551069620616</created>
<option name="number" value="00023" />
<option name="presentableId" value="LOCAL-00023" />
<option name="project" value="LOCAL" />
<updated>1551069620616</updated>
</task>
<option name="localTasksCounter" value="24" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="47819000" />
<option name="totallyTimeSpent" value="53362000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1280" height="709" extended-state="6" />
@@ -426,7 +471,7 @@
<window_info id="Favorites" order="6" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.4983845" visible="true" weight="0.3241491" />
<window_info anchor="bottom" id="Run" order="2" sideWeight="0.4983845" weight="0.3241491" />
<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="Inspection" order="5" weight="0.4" />
@@ -474,7 +519,9 @@
<MESSAGE value="Think I fixed Sid's code" />
<MESSAGE value="Small thing, changed an output of warehouse a bit, shows user its the warehosue they are concerned with." />
<MESSAGE value="Forgot a try catch in warehouse" />
<option name="LAST_COMMIT_MESSAGE" value="Forgot a try catch in warehouse" />
<MESSAGE value="Sneaky bug in shipWarfare regarding having 0 guns is now fixed." />
<MESSAGE value="Really small change in Sid's code that no one will probably ever notice lol" />
<option name="LAST_COMMIT_MESSAGE" value="Really small change in Sid's code that no one will probably ever notice lol" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/TaipanClone.iml">
@@ -484,44 +531,6 @@
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/Test.java" />
<entry file="file://$PROJECT_DIR$/src/Bank.java">
<provider selected="true" editor-type-id="text-editor">
<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="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="150">
<caret line="11" selection-start-line="11" selection-end-line="11" />
</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>
<entry file="file://$PROJECT_DIR$/src/loanShark.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5">
<caret line="2" column="24" lean-forward="true" selection-start-line="2" selection-start-column="24" selection-end-line="2" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Start.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="33" column="9" lean-forward="true" selection-start-line="33" selection-start-column="9" selection-end-line="33" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Player.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540">
@@ -529,24 +538,62 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Warehouse.java">
<entry file="file://$PROJECT_DIR$/src/main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2310">
<caret line="154" column="82" selection-start-line="154" selection-start-column="82" selection-end-line="154" selection-end-column="82" />
<state relative-caret-position="375">
<caret line="25" lean-forward="true" selection-start-line="25" selection-end-line="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main.java">
<entry file="file://$PROJECT_DIR$/src/Bank.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="19" column="5" lean-forward="true" selection-start-line="19" selection-start-column="5" selection-end-line="19" selection-end-column="5" />
<state relative-caret-position="375">
<caret line="25" column="23" selection-start-line="25" selection-start-column="23" selection-end-line="25" selection-end-column="23" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Warehouse.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2790">
<caret line="186" column="13" selection-start-line="186" selection-start-column="13" selection-end-line="186" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Start.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="353">
<caret line="33" column="9" lean-forward="true" selection-start-line="33" selection-start-column="9" selection-end-line="33" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/loanShark.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="30" column="21" lean-forward="true" selection-start-line="30" selection-start-column="21" selection-end-line="30" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1710">
<caret line="610" column="27" lean-forward="true" selection-start-line="610" selection-start-column="27" selection-end-line="610" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Travel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="63" column="38" selection-start-line="63" selection-start-column="28" selection-end-line="63" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="327" lean-forward="true" selection-start-line="327" selection-end-line="327" />
<state relative-caret-position="234">
<caret line="371" column="43" lean-forward="true" selection-start-line="371" selection-start-column="43" selection-end-line="371" selection-end-column="43" />
<folding>
<element signature="imports" expanded="true" />
</folding>

45
src/ShipWarfare.java
View File

@@ -48,6 +48,7 @@ public class ShipWarfare extends Player {
if (response.equalsIgnoreCase("f")) {
userAttacks = true;
System.out.println("Ohh, fight ehh?");
delayForSeconds(1);
boolean winOrLose = destroyPeasantShipsOrEscape();
if (winOrLose == true) {
break;
@@ -61,6 +62,7 @@ public class ShipWarfare extends Player {
break;
} else {
System.out.println("Phew! Got away safely");
delayForSeconds(2);
break;
}
@@ -91,10 +93,12 @@ public class ShipWarfare extends Player {
} else if (response.equalsIgnoreCase("r")) {
if (runFromShips() == false) {
System.out.println("Couldn't run away!");
delayForSeconds(1);
if (destroyLittyShipsOrEscape())
break;
} else {
System.out.println("Phew! Got away safely");
delayForSeconds(2);
break;
}
@@ -107,7 +111,7 @@ public class ShipWarfare extends Player {
public void fightOrRunMessage() {
System.out.printf("What do you want to do? Enter \"f\" to fight, and \"r\" to run (we have %d guns)", player.getGuns());
System.out.printf("What do you want to do? Enter \"f\" to fight, and \"r\" to run (we have %d guns)\n", player.getGuns());
}
@@ -128,8 +132,8 @@ public class ShipWarfare extends Player {
}
public void delayForASecond() throws Exception {
TimeUnit.SECONDS.sleep(1);
public void delayForSeconds(int num) throws Exception {
TimeUnit.SECONDS.sleep(num);
}
//The number of ships which attack is based on the amount of money one has on hand
@@ -192,13 +196,13 @@ public class ShipWarfare extends Player {
break;
}
System.out.println("Got eem");
delayForASecond();
delayForSeconds(1);
} else if (hitOrMiss == 2) {
System.out.printf("ARRG! We missed %s\n", getName());
delayForASecond();
delayForSeconds(1);
} else {
System.out.println("Darn! Their fleet tanked our attack");
delayForASecond();
delayForSeconds(1);
}
@@ -207,7 +211,8 @@ public class ShipWarfare extends Player {
}
}
} else {
System.out.println("Captain! We don't have any GUNS!!!!");
System.out.printf("%s! We don't have any GUNS!!!!\n",player.getName());
delayForSeconds(1);
}
@@ -234,7 +239,7 @@ public class ShipWarfare extends Player {
System.out.printf("%d ships remaining\n", numOfLittyShips);
System.out.println("Oh no, they are taking the offensive!");
delayForASecond();
delayForSeconds(1);
//Computer volley
int takeGunChance = randomValue.nextInt(4) + 1;
if (takeGunChance == 1 && player.getGuns() > 0) {
@@ -248,7 +253,7 @@ public class ShipWarfare extends Player {
break;
}
System.out.printf("EEK, our current ship status is %d%% \n", player.getHP());
delayForASecond();
delayForSeconds(1);
if (userAttacks == false) {
userAttacks = true;
}
@@ -259,8 +264,10 @@ public class ShipWarfare extends Player {
if (response.equalsIgnoreCase("r")) {
if (runFromShips() == false) {
System.out.println("Couldn't run away");
delayForSeconds(1);
} else {
exitValue = 3;
System.out.println("Phew! Got away safely");
delayForSeconds(2);
break;
}
}
@@ -271,15 +278,18 @@ public class ShipWarfare extends Player {
if (exitValue == 1) {
System.out.printf("\nGot eem\nVictory!\nIt appears we have defeated the enemy fleet and made it out at %d%% ship status\n", player.getHP());
delayForSeconds(1);
calculateLoot = (randomValue.nextInt(startingLittyShips) + startingLittyShips) * 300;
player.setMoney(player.getMoney() + calculateLoot);
System.out.printf("We got $%,d!\n", calculateLoot);
delayForSeconds(2);
return true;
} else if (exitValue == 2) {
gameOver();
return true;
} else if (exitValue == 3) {
System.out.printf("We made it out at %d%% ship status!\n", player.getHP());
delayForSeconds(2);
return true;
}
return false;
@@ -311,10 +321,10 @@ public class ShipWarfare extends Player {
break;
}
System.out.println("Got eem");
delayForASecond();
delayForSeconds(1);
} else {
System.out.printf("ARRG! We missed %s\n", getName());
delayForASecond();
delayForSeconds(1);
}
@@ -324,7 +334,8 @@ public class ShipWarfare extends Player {
}
}
else{
System.out.println("Captain! We don't have any GUNS!!!!");
System.out.printf("%s! We don't have any GUNS!!!!\n", player.getName());
delayForSeconds(1);
}
@@ -351,8 +362,9 @@ public class ShipWarfare extends Player {
}
System.out.printf("%d ships remaining\n", numOfPeasantShips);
delayForSeconds(1);
System.out.println("Oh no, they are taking the offensive!");
delayForASecond();
delayForSeconds(1);
//Computer volley
int takeGunChance = randomValue.nextInt(4) + 1;
if (takeGunChance == 1 && player.getGuns() > 0) {
@@ -366,7 +378,7 @@ public class ShipWarfare extends Player {
break;
}
System.out.printf("EEK, our current ship status is %d%% \n", player.getHP());
delayForASecond();
delayForSeconds(1);
if (userAttacks == false) {
userAttacks = true;
}
@@ -389,15 +401,18 @@ public class ShipWarfare extends Player {
if (exitValue == 1) {
System.out.printf("\nGot eem\nVictory!\nIt appears we have defeated the enemy fleet and made it out at %d%% ship status\n", player.getHP());
delayForSeconds(1);
calculateLoot = (randomValue.nextInt(startingPeasantShips) + startingPeasantShips) * 100;
player.setMoney(player.getMoney() + calculateLoot);
System.out.printf("We got $%,d!", calculateLoot);
delayForSeconds(2);
return true;
} else if (exitValue == 2) {
gameOver();
return true;
} else if (exitValue == 3) {
System.out.printf("We made it out at %d%% ship status!\n", player.getHP());
delayForSeconds(2);
return true;
}
return false;

2
src/loanShark.java
View File

@@ -1,7 +1,5 @@
import java.util.Scanner;
import static javafx.application.Platform.exit;
public class loanShark {
private Player player;
public void setPlayer(Player player) {