From a5cbc87906662fa5882bf122d3e8c64464977684 Mon Sep 17 00:00:00 2001
From: Solargale <harkamalsr@gmail.com>
Date: Mon, 18 Feb 2019 18:56:45 -0700
Subject: [PATCH] Created Player class

---
 .idea/workspace.xml | 88 ++++++++++++++++++++++++++-------------------
 src/Player.java     | 16 ++++-----
 2 files changed, 59 insertions(+), 45 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 95049a0..89f9e3b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,7 @@
   <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/Core.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Player.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Player.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Player.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -17,8 +17,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="5" column="26" selection-start-line="5" selection-start-column="26" selection-end-line="5" selection-end-column="26" />
+            <state relative-caret-position="204">
+              <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="e#1497#1498#0" expanded="true" />
@@ -35,6 +35,9 @@
                 <element signature="e#1916#1917#0" expanded="true" />
                 <element signature="e#1979#1980#0" expanded="true" />
                 <element signature="e#2037#2038#0" expanded="true" />
+                <element signature="method#gameOver#0;class#ShipWarfare#0" />
+                <element signature="method#numOfShips#0;class#ShipWarfare#0" />
+                <element signature="method#fightShips#0;class#ShipWarfare#0" />
                 <element signature="method#main#0;class#ShipWarfare#0" />
               </folding>
             </state>
@@ -45,7 +48,7 @@
         <entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="306">
-              <caret line="18" column="25" lean-forward="true" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
+              <caret line="18" column="25" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -56,17 +59,17 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/Player.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="228">
-              <caret line="80" lean-forward="true" selection-start-line="80" selection-end-line="80" />
+            <state relative-caret-position="194">
+              <caret line="78" column="24" lean-forward="true" selection-start-line="78" selection-start-column="24" selection-end-line="78" selection-end-column="24" />
               <folding>
-                <element signature="e#343#344#0" expanded="true" />
-                <element signature="e#368#369#0" expanded="true" />
-                <element signature="e#401#402#0" expanded="true" />
-                <element signature="e#424#425#0" expanded="true" />
                 <element signature="e#321#322#0" expanded="true" />
                 <element signature="e#348#349#0" expanded="true" />
                 <element signature="e#388#389#0" expanded="true" />
                 <element signature="e#420#421#0" expanded="true" />
+                <element signature="e#343#344#0" expanded="true" />
+                <element signature="e#368#369#0" expanded="true" />
+                <element signature="e#401#402#0" expanded="true" />
+                <element signature="e#424#425#0" expanded="true" />
                 <element signature="e#448#449#0" expanded="true" />
                 <element signature="e#475#476#0" expanded="true" />
                 <element signature="e#512#513#0" expanded="true" />
@@ -108,7 +111,7 @@
         <entry file="file://$PROJECT_DIR$/src/Travel.java">
           <provider selected="true" editor-type-id="text-editor">
             <state>
-              <caret column="21" lean-forward="true" selection-start-column="21" selection-end-column="21" />
+              <caret column="21" selection-start-column="21" selection-end-column="21" />
             </state>
           </provider>
         </entry>
@@ -177,7 +180,7 @@
     <property name="ChangesTree.GroupingKeys" value="" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550540754648" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550541286814" />
     <property name="extract.method.default.visibility" value="private" />
     <property name="last_opened_file_path" value="$USER_HOME$/Documents/GitHub/Cpsc233" />
     <property name="project.structure.last.edited" value="SDKs" />
@@ -241,7 +244,7 @@
       <workItem from="1550458230268" duration="571000" />
       <workItem from="1550459021117" duration="128000" />
       <workItem from="1550459458251" duration="1743000" />
-      <workItem from="1550538713935" duration="1933000" />
+      <workItem from="1550538713935" duration="2576000" />
     </task>
     <task id="LOCAL-00001" summary="This should fix the ShipWarfare file and bring it up to date with the rest of the file.">
       <created>1550458470138</created>
@@ -257,17 +260,24 @@
       <option name="project" value="LOCAL" />
       <updated>1550540282400</updated>
     </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="Created Player class">
+      <created>1550540820542</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1550540820542</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="4834000" />
+    <option name="totallyTimeSpent" value="5477000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1696" height="1026" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15770172" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15770172" />
       <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" />
@@ -282,7 +292,7 @@
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <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="Version Control" order="8" sideWeight="0.49938875" visible="true" weight="0.32922733" />
+      <window_info active="true" anchor="bottom" id="Version Control" order="8" sideWeight="0.49938875" visible="true" weight="0.32922733" />
       <window_info anchor="bottom" id="Database Changes" order="9" />
       <window_info anchor="bottom" id="Terminal" order="10" />
       <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50061125" side_tool="true" visible="true" weight="0.32922733" />
@@ -308,20 +318,31 @@
     <MESSAGE value="This should fix the project repository once and for all." />
     <MESSAGE value="This should fix the ShipWarfare file and bring it up to date with the rest of the file." />
     <MESSAGE value="Created Core class" />
-    <option name="LAST_COMMIT_MESSAGE" value="Created Core class" />
+    <MESSAGE value="Created Player class" />
+    <option name="LAST_COMMIT_MESSAGE" value="Created Player class" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/Travel.java">
       <provider selected="true" editor-type-id="text-editor">
         <state>
-          <caret column="21" lean-forward="true" selection-start-column="21" selection-end-column="21" />
+          <caret column="21" selection-start-column="21" 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="306">
+          <caret line="18" column="25" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
+          <folding>
+            <element signature="imports" 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="85">
-          <caret line="5" column="26" selection-start-line="5" selection-start-column="26" selection-end-line="5" selection-end-column="26" />
+        <state relative-caret-position="204">
+          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="e#1497#1498#0" expanded="true" />
@@ -338,34 +359,27 @@
             <element signature="e#1916#1917#0" expanded="true" />
             <element signature="e#1979#1980#0" expanded="true" />
             <element signature="e#2037#2038#0" expanded="true" />
+            <element signature="method#gameOver#0;class#ShipWarfare#0" />
+            <element signature="method#numOfShips#0;class#ShipWarfare#0" />
+            <element signature="method#fightShips#0;class#ShipWarfare#0" />
             <element signature="method#main#0;class#ShipWarfare#0" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="18" column="25" lean-forward="true" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/Player.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="80" lean-forward="true" selection-start-line="80" selection-end-line="80" />
+        <state relative-caret-position="194">
+          <caret line="78" column="24" lean-forward="true" selection-start-line="78" selection-start-column="24" selection-end-line="78" selection-end-column="24" />
           <folding>
-            <element signature="e#343#344#0" expanded="true" />
-            <element signature="e#368#369#0" expanded="true" />
-            <element signature="e#401#402#0" expanded="true" />
-            <element signature="e#424#425#0" expanded="true" />
             <element signature="e#321#322#0" expanded="true" />
             <element signature="e#348#349#0" expanded="true" />
             <element signature="e#388#389#0" expanded="true" />
             <element signature="e#420#421#0" expanded="true" />
+            <element signature="e#343#344#0" expanded="true" />
+            <element signature="e#368#369#0" expanded="true" />
+            <element signature="e#401#402#0" expanded="true" />
+            <element signature="e#424#425#0" expanded="true" />
             <element signature="e#448#449#0" expanded="true" />
             <element signature="e#475#476#0" expanded="true" />
             <element signature="e#512#513#0" expanded="true" />
diff --git a/src/Player.java b/src/Player.java
index e87375b..7d6bfb3 100644
--- a/src/Player.java
+++ b/src/Player.java
@@ -11,14 +11,6 @@ public class Player {
     private int guns = 0;
     private int Hp = 100;
 
-    public int getHp() {
-        return Hp;
-    }
-
-    public void setHp(int hp) {
-        Hp = hp;
-    }
-
     public String getName() {
         return name;
     }
@@ -27,6 +19,14 @@ public class Player {
         this.name = name;
     }
 
+    public int getHp() {
+        return Hp;
+    }
+
+    public void setHp(int hp) {
+        Hp = hp;
+    }
+
     public int getBank() {
         return bank;
     }