Test this Vikram
This commit is contained in:
KahootChampion
103
.idea/workspace.xml
generated
103
.idea/workspace.xml
generated
@@ -1,8 +1,7 @@
|
||||
<?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="Java Docs BOIZ for ShipWarafare">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
||||
<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$/out/production/TaipanClone/ShipWarfare.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/TaipanClone/ShipWarfare.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/ShipWarfare.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ShipWarfare.java" afterDir="false" />
|
||||
@@ -51,11 +50,37 @@
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/Player.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1877">
|
||||
<caret line="213" column="20" lean-forward="true" selection-start-line="213" selection-end-line="214" />
|
||||
<state relative-caret-position="315">
|
||||
<caret line="222" column="47" lean-forward="true" selection-start-line="222" selection-start-column="47" selection-end-line="222" selection-end-column="47" />
|
||||
<folding>
|
||||
<element signature="e#1253#1254#0" expanded="true" />
|
||||
<element signature="e#1286#1287#0" expanded="true" />
|
||||
<element signature="e#1280#1281#0" expanded="true" />
|
||||
<element signature="e#1313#1314#0" expanded="true" />
|
||||
<element signature="e#1559#1560#0" expanded="true" />
|
||||
<element signature="e#1588#1589#0" expanded="true" />
|
||||
<element signature="e#1733#1734#0" expanded="true" />
|
||||
<element signature="e#1760#1761#0" expanded="true" />
|
||||
<element signature="e#1800#1801#0" expanded="true" />
|
||||
<element signature="e#1832#1833#0" expanded="true" />
|
||||
<element signature="e#1858#1859#0" expanded="true" />
|
||||
<element signature="e#1883#1884#0" expanded="true" />
|
||||
<element signature="e#1974#1975#0" expanded="true" />
|
||||
<element signature="e#2001#2002#0" expanded="true" />
|
||||
<element signature="e#2138#2139#0" expanded="true" />
|
||||
<element signature="e#2166#2167#0" expanded="true" />
|
||||
<element signature="e#2312#2313#0" expanded="true" />
|
||||
<element signature="e#2344#2345#0" expanded="true" />
|
||||
<element signature="e#2509#2510#0" expanded="true" />
|
||||
<element signature="e#2540#2541#0" expanded="true" />
|
||||
<element signature="e#2703#2704#0" expanded="true" />
|
||||
<element signature="e#2737#2738#0" expanded="true" />
|
||||
<element signature="e#2912#2913#0" expanded="true" />
|
||||
<element signature="e#2943#2944#0" expanded="true" />
|
||||
<element signature="e#3103#3104#0" expanded="true" />
|
||||
<element signature="e#3134#3135#0" expanded="true" />
|
||||
<element signature="e#3290#3291#0" expanded="true" />
|
||||
<element signature="e#3317#3318#0" expanded="true" />
|
||||
<element signature="e#3461#3462#0" expanded="true" />
|
||||
<element signature="e#3488#3489#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
@@ -64,8 +89,8 @@
|
||||
<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="-1199">
|
||||
<caret line="208" column="27" selection-start-line="208" selection-start-column="27" selection-end-line="208" selection-end-column="27" />
|
||||
<state relative-caret-position="159">
|
||||
<caret line="89" column="45" selection-start-line="89" selection-start-column="45" selection-end-line="89" selection-end-column="45" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
@@ -84,7 +109,6 @@
|
||||
</component>
|
||||
<component name="FindInProjectRecents">
|
||||
<findStrings>
|
||||
<find>duplic</find>
|
||||
<find>chanceOfRun</find>
|
||||
<find>chance</find>
|
||||
<find>get</find>
|
||||
@@ -94,7 +118,6 @@
|
||||
<find>printf</find>
|
||||
<find>liu</find>
|
||||
<find>howmuchRun</find>
|
||||
<find>setPlayer</find>
|
||||
<find>setNumOf</find>
|
||||
<find>setNumOfLitty</find>
|
||||
<find>setNumOfLitt</find>
|
||||
@@ -114,6 +137,8 @@
|
||||
<find>cargoSpace</find>
|
||||
<find>delayF</find>
|
||||
<find>guns>0</find>
|
||||
<find>setPla</find>
|
||||
<find>setPlayer</find>
|
||||
</findStrings>
|
||||
<replaceStrings>
|
||||
<replace>player.getName()</replace>
|
||||
@@ -149,8 +174,8 @@
|
||||
<option value="$PROJECT_DIR$/src/main.java" />
|
||||
<option value="$PROJECT_DIR$/src/Start.java" />
|
||||
<option value="$PROJECT_DIR$/src/TaipanShop.java" />
|
||||
<option value="$PROJECT_DIR$/src/Player.java" />
|
||||
<option value="$PROJECT_DIR$/src/ShipWarfare.java" />
|
||||
<option value="$PROJECT_DIR$/src/Player.java" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
@@ -432,17 +457,24 @@
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1551148428427</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="22" />
|
||||
<task id="LOCAL-00022" summary="Small change to javadocs for shipwarfare">
|
||||
<created>1551148939938</created>
|
||||
<option name="number" value="00022" />
|
||||
<option name="presentableId" value="LOCAL-00022" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1551148939938</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="23" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="43500000" />
|
||||
<option name="totallyTimeSpent" value="44589000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="0" y="23" width="1280" height="709" extended-state="6" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.31987077" />
|
||||
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.31987077" />
|
||||
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
||||
<window_info id="Image Layers" order="2" />
|
||||
<window_info id="Designer" order="3" />
|
||||
@@ -451,7 +483,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 anchor="bottom" id="Run" order="2" sideWeight="0.49840087" weight="0.32576984" />
|
||||
<window_info anchor="bottom" id="Run" order="2" sideWeight="0.49840087" 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" />
|
||||
@@ -534,7 +566,8 @@
|
||||
<MESSAGE value="the comment somehow made it so that I couldn't compile (using the command line i couldn't compile, i could compile file using intellij) Also, you the file extended player, which is not necessary. You also were calling gameOver() and getName() directly, you needed "player." before all those methods." />
|
||||
<MESSAGE value="minor changes. Still in progress." />
|
||||
<MESSAGE value="Java Docs BOIZ for ShipWarafare" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Java Docs BOIZ for ShipWarafare" />
|
||||
<MESSAGE value="Small change to javadocs for shipwarfare" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Small change to javadocs for shipwarfare" />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/TaipanClone.iml">
|
||||
@@ -606,19 +639,45 @@
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/Player.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1877">
|
||||
<caret line="213" column="20" lean-forward="true" selection-start-line="213" selection-end-line="214" />
|
||||
<state relative-caret-position="315">
|
||||
<caret line="222" column="47" lean-forward="true" selection-start-line="222" selection-start-column="47" selection-end-line="222" selection-end-column="47" />
|
||||
<folding>
|
||||
<element signature="e#1253#1254#0" expanded="true" />
|
||||
<element signature="e#1286#1287#0" expanded="true" />
|
||||
<element signature="e#1280#1281#0" expanded="true" />
|
||||
<element signature="e#1313#1314#0" expanded="true" />
|
||||
<element signature="e#1559#1560#0" expanded="true" />
|
||||
<element signature="e#1588#1589#0" expanded="true" />
|
||||
<element signature="e#1733#1734#0" expanded="true" />
|
||||
<element signature="e#1760#1761#0" expanded="true" />
|
||||
<element signature="e#1800#1801#0" expanded="true" />
|
||||
<element signature="e#1832#1833#0" expanded="true" />
|
||||
<element signature="e#1858#1859#0" expanded="true" />
|
||||
<element signature="e#1883#1884#0" expanded="true" />
|
||||
<element signature="e#1974#1975#0" expanded="true" />
|
||||
<element signature="e#2001#2002#0" expanded="true" />
|
||||
<element signature="e#2138#2139#0" expanded="true" />
|
||||
<element signature="e#2166#2167#0" expanded="true" />
|
||||
<element signature="e#2312#2313#0" expanded="true" />
|
||||
<element signature="e#2344#2345#0" expanded="true" />
|
||||
<element signature="e#2509#2510#0" expanded="true" />
|
||||
<element signature="e#2540#2541#0" expanded="true" />
|
||||
<element signature="e#2703#2704#0" expanded="true" />
|
||||
<element signature="e#2737#2738#0" expanded="true" />
|
||||
<element signature="e#2912#2913#0" expanded="true" />
|
||||
<element signature="e#2943#2944#0" expanded="true" />
|
||||
<element signature="e#3103#3104#0" expanded="true" />
|
||||
<element signature="e#3134#3135#0" expanded="true" />
|
||||
<element signature="e#3290#3291#0" expanded="true" />
|
||||
<element signature="e#3317#3318#0" expanded="true" />
|
||||
<element signature="e#3461#3462#0" expanded="true" />
|
||||
<element signature="e#3488#3489#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-1199">
|
||||
<caret line="208" column="27" selection-start-line="208" selection-start-column="27" selection-end-line="208" selection-end-column="27" />
|
||||
<state relative-caret-position="159">
|
||||
<caret line="89" column="45" selection-start-line="89" selection-start-column="45" selection-end-line="89" selection-end-column="45" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
|
||||
Binary file not shown.
@@ -321,7 +321,10 @@ public class ShipWarfare extends Player {
|
||||
delayForSeconds(2);
|
||||
return true;
|
||||
} else if (exitValue == 2) {
|
||||
gameOver();
|
||||
player.gameOver();
|
||||
if(player.playAgain()){
|
||||
setPlayer(new Player());
|
||||
}
|
||||
return true;
|
||||
} else if (exitValue == 3) {
|
||||
System.out.printf("We made it out at %d%% ship status!\n", player.getHP());
|
||||
|
||||
Reference in New Issue
Block a user