From 27ac10061841047d6fb5ebddbc1165d5209625d9 Mon Sep 17 00:00:00 2001
From: KahootChampion <p.harismuhammadkhan@gmail.com>
Date: Mon, 25 Feb 2019 20:00:35 -0700
Subject: [PATCH] Test this Vikram

---
 .idea/workspace.xml                          | 103 +++++++++++++++----
 out/production/TaipanClone/ShipWarfare.class | Bin 7522 -> 7592 bytes
 src/ShipWarfare.java                         |   5 +-
 3 files changed, 85 insertions(+), 23 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dab5ad0..df30480 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -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&gt;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 &quot;player.&quot; 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>
diff --git a/out/production/TaipanClone/ShipWarfare.class b/out/production/TaipanClone/ShipWarfare.class
index 0127a96af4a5c16e81b4c0b2201481b1cd016177..ed2afdeb7d4665cb5a98f0f2a32055cb54ce7299 100644
GIT binary patch
delta 2431
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

delta 2426
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

diff --git a/src/ShipWarfare.java b/src/ShipWarfare.java
index 2beb1ae..98de061 100644
--- a/src/ShipWarfare.java
+++ b/src/ShipWarfare.java
@@ -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());