Created Player class
This commit is contained in:
142
.idea/workspace.xml
generated
142
.idea/workspace.xml
generated
@@ -1,13 +1,9 @@
|
||||
<?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="This should fix the ShipWarfare file and bring it up to date with the rest of the file.">
|
||||
<change afterPath="$PROJECT_DIR$/src/Core.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/Travel.java" afterDir="false" />
|
||||
<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" />
|
||||
<change beforePath="$PROJECT_DIR$/out/production/TaipanClone/TaipanShop.class" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/Core.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" />
|
||||
@@ -21,12 +17,25 @@
|
||||
<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="867">
|
||||
<caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
|
||||
<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" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#1497#1498#0" expanded="true" />
|
||||
<element signature="e#1525#1526#0" expanded="true" />
|
||||
<element signature="e#1553#1554#0" expanded="true" />
|
||||
<element signature="e#1580#1581#0" expanded="true" />
|
||||
<element signature="e#1606#1607#0" expanded="true" />
|
||||
<element signature="e#1631#1632#0" expanded="true" />
|
||||
<element signature="e#1672#1673#0" expanded="true" />
|
||||
<element signature="e#1712#1713#0" expanded="true" />
|
||||
<element signature="e#1813#1814#0" expanded="true" />
|
||||
<element signature="e#1847#1848#0" expanded="true" />
|
||||
<element signature="e#1884#1885#0" expanded="true" />
|
||||
<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#main#0;class#ShipWarfare#0" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
@@ -35,22 +44,25 @@
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="187">
|
||||
<caret line="11" column="32" lean-forward="true" selection-start-line="11" selection-start-column="32" selection-end-line="11" selection-end-column="32" />
|
||||
<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" />
|
||||
<element signature="method#printShop#0;class#TaipanShop#0" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/src/Core.java">
|
||||
<entry file="file://$PROJECT_DIR$/src/Player.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="238">
|
||||
<caret line="14" column="5" lean-forward="true" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
|
||||
<state relative-caret-position="228">
|
||||
<caret line="80" lean-forward="true" selection-start-line="80" selection-end-line="80" />
|
||||
<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" />
|
||||
@@ -110,15 +122,21 @@
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="FindInProjectRecents">
|
||||
<findStrings>
|
||||
<find>Hp</find>
|
||||
</findStrings>
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="IdeDocumentHistory">
|
||||
<option name="CHANGED_PATHS">
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/src/ShipWarfare.java" />
|
||||
<option value="$PROJECT_DIR$/src/Core.java" />
|
||||
<option value="$PROJECT_DIR$/src/TaipanShop.java" />
|
||||
<option value="$PROJECT_DIR$/src/Core.java" />
|
||||
<option value="$PROJECT_DIR$/src/ShipWarfare.java" />
|
||||
<option value="$PROJECT_DIR$/src/Player.java" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
@@ -159,7 +177,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="1550539884704" />
|
||||
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550540754648" />
|
||||
<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" />
|
||||
@@ -223,7 +241,7 @@
|
||||
<workItem from="1550458230268" duration="571000" />
|
||||
<workItem from="1550459021117" duration="128000" />
|
||||
<workItem from="1550459458251" duration="1743000" />
|
||||
<workItem from="1550538713935" duration="1420000" />
|
||||
<workItem from="1550538713935" duration="1933000" />
|
||||
</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>
|
||||
@@ -232,17 +250,24 @@
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1550458470138</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="2" />
|
||||
<task id="LOCAL-00002" summary="Created Core class">
|
||||
<created>1550540282400</created>
|
||||
<option name="number" value="00002" />
|
||||
<option name="presentableId" value="LOCAL-00002" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1550540282400</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="3" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="4321000" />
|
||||
<option name="totallyTimeSpent" value="4834000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="-8" y="-8" width="1696" height="1026" extended-state="6" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15770172" />
|
||||
<window_info active="true" 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" />
|
||||
@@ -257,10 +282,10 @@
|
||||
<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" />
|
||||
<window_info 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 active="true" anchor="bottom" id="Event Log" order="11" side_tool="true" visible="true" weight="0.3281075" />
|
||||
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50061125" side_tool="true" visible="true" weight="0.32922733" />
|
||||
<window_info anchor="bottom" id="Messages" order="12" />
|
||||
<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" />
|
||||
@@ -282,32 +307,10 @@
|
||||
</ignored-roots>
|
||||
<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." />
|
||||
<option name="LAST_COMMIT_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" />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="867">
|
||||
<caret line="59" lean-forward="true" selection-start-line="59" selection-end-line="59" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#1813#1814#0" expanded="true" />
|
||||
<element signature="e#1847#1848#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="187">
|
||||
<caret line="11" column="32" lean-forward="true" selection-start-line="11" selection-start-column="32" selection-end-line="11" selection-end-column="32" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="method#printShop#0;class#TaipanShop#0" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/Travel.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state>
|
||||
@@ -315,11 +318,50 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/Core.java">
|
||||
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="238">
|
||||
<caret line="14" column="5" lean-forward="true" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
|
||||
<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" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#1497#1498#0" expanded="true" />
|
||||
<element signature="e#1525#1526#0" expanded="true" />
|
||||
<element signature="e#1553#1554#0" expanded="true" />
|
||||
<element signature="e#1580#1581#0" expanded="true" />
|
||||
<element signature="e#1606#1607#0" expanded="true" />
|
||||
<element signature="e#1631#1632#0" expanded="true" />
|
||||
<element signature="e#1672#1673#0" expanded="true" />
|
||||
<element signature="e#1712#1713#0" expanded="true" />
|
||||
<element signature="e#1813#1814#0" expanded="true" />
|
||||
<element signature="e#1847#1848#0" expanded="true" />
|
||||
<element signature="e#1884#1885#0" expanded="true" />
|
||||
<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#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" />
|
||||
<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" />
|
||||
|
||||
Reference in New Issue
Block a user