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

Created Core class

Browse Source
This commit is contained in:
Solargale
2019-02-18 18:38:01 -07:00
parent bd4ddd767a
commit 53a5115f01
6 changed files with 261 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

228
.idea/workspace.xml generated
View File

@@ -1,10 +1,13 @@
<?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="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" />
<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$/out/production/TaipanClone/ShipWarfare.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/TaipanClone/TaipanShop.class" beforeDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -15,32 +18,89 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<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="494">
<caret line="33" column="43" lean-forward="true" selection-start-line="33" selection-start-column="43" selection-end-line="33" selection-end-column="43" />
<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#1426#1427#0" expanded="true" />
<element signature="e#1454#1455#0" expanded="true" />
<element signature="e#1482#1483#0" expanded="true" />
<element signature="e#1509#1510#0" expanded="true" />
<element signature="e#1535#1536#0" expanded="true" />
<element signature="e#1560#1561#0" expanded="true" />
<element signature="e#1601#1602#0" expanded="true" />
<element signature="e#1641#1642#0" expanded="true" />
<element signature="e#1742#1743#0" expanded="true" />
<element signature="e#1776#1777#0" expanded="true" />
<element signature="e#1813#1814#0" expanded="true" />
<element signature="e#1845#1846#0" expanded="true" />
<element signature="e#1907#1908#0" expanded="true" />
<element signature="e#1965#1966#0" expanded="true" />
<element signature="e#1847#1848#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<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" />
<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">
<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" />
<folding>
<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#448#449#0" expanded="true" />
<element signature="e#475#476#0" expanded="true" />
<element signature="e#512#513#0" expanded="true" />
<element signature="e#544#545#0" expanded="true" />
<element signature="e#573#574#0" expanded="true" />
<element signature="e#601#602#0" expanded="true" />
<element signature="e#640#641#0" expanded="true" />
<element signature="e#674#675#0" expanded="true" />
<element signature="e#707#708#0" expanded="true" />
<element signature="e#739#740#0" expanded="true" />
<element signature="e#786#787#0" expanded="true" />
<element signature="e#828#829#0" expanded="true" />
<element signature="e#860#861#0" expanded="true" />
<element signature="e#891#892#0" expanded="true" />
<element signature="e#936#937#0" expanded="true" />
<element signature="e#976#977#0" expanded="true" />
<element signature="e#1011#1012#0" expanded="true" />
<element signature="e#1045#1046#0" expanded="true" />
<element signature="e#1096#1097#0" expanded="true" />
<element signature="e#1142#1143#0" expanded="true" />
<element signature="e#1174#1175#0" expanded="true" />
<element signature="e#1205#1206#0" expanded="true" />
<element signature="e#1250#1251#0" expanded="true" />
<element signature="e#1290#1291#0" expanded="true" />
<element signature="e#1322#1323#0" expanded="true" />
<element signature="e#1353#1354#0" expanded="true" />
<element signature="e#1398#1399#0" expanded="true" />
<element signature="e#1438#1439#0" expanded="true" />
<element signature="e#1466#1467#0" expanded="true" />
<element signature="e#1493#1494#0" expanded="true" />
<element signature="e#1530#1531#0" expanded="true" />
<element signature="e#1562#1563#0" 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>
<caret column="21" lean-forward="true" selection-start-column="21" selection-end-column="21" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@@ -56,22 +116,27 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/TaipanShop.java" />
<option value="$PROJECT_DIR$/src/ShipWarfare.java" />
<option value="$PROJECT_DIR$/src/Core.java" />
<option value="$PROJECT_DIR$/src/TaipanShop.java" />
</list>
</option>
</component>
<component name="ProjectFrameBounds">
<option name="y" value="23" />
<option name="width" value="1280" />
<option name="height" value="709" />
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-7" />
<option name="width" value="854" />
<option name="height" value="1017" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -88,15 +153,15 @@
<select />
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<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="1550458702863" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1550539884704" />
<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" />
<property name="project.structure.proportion" value="0.0" />
<property name="project.structure.side.proportion" value="0.2" />
@@ -144,7 +209,7 @@
</recent_temporary>
</component>
<component name="SvnConfiguration" cleanupOnStartRun="true">
<configuration>$USER_HOME$/.subversion</configuration>
<configuration>C:\Users\Harkamal Randhawa\AppData\Roaming\Subversion</configuration>
<supportedVersion>125</supportedVersion>
</component>
<component name="TaskManager">
@@ -155,16 +220,29 @@
<option name="presentableId" value="Default" />
<updated>1550454898506</updated>
<workItem from="1550454902781" duration="459000" />
<workItem from="1550458230268" duration="571000" />
<workItem from="1550459021117" duration="128000" />
<workItem from="1550459458251" duration="1743000" />
<workItem from="1550538713935" duration="1420000" />
</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>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1550458470138</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="459000" />
<option name="totallyTimeSpent" value="4321000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1280" height="709" extended-state="6" />
<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.2536349" />
<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" />
@@ -182,7 +260,7 @@
<window_info anchor="bottom" id="Version Control" order="8" />
<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" side_tool="true" />
<window_info active="true" anchor="bottom" id="Event Log" order="11" side_tool="true" visible="true" weight="0.3281075" />
<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" />
@@ -203,39 +281,81 @@
<path value="$PROJECT_DIR$" />
</ignored-roots>
<MESSAGE value="This should fix the project repository once and for all." />
<option name="LAST_COMMIT_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." />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="106">
<caret line="283" column="29" selection-start-line="283" selection-start-column="29" selection-end-line="283" selection-end-column="29" />
<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/ShipWarfare.java">
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="494">
<caret line="33" column="43" lean-forward="true" selection-start-line="33" selection-start-column="43" selection-end-line="33" selection-end-column="43" />
<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="e#1426#1427#0" expanded="true" />
<element signature="e#1454#1455#0" expanded="true" />
<element signature="e#1482#1483#0" expanded="true" />
<element signature="e#1509#1510#0" expanded="true" />
<element signature="e#1535#1536#0" expanded="true" />
<element signature="e#1560#1561#0" expanded="true" />
<element signature="e#1601#1602#0" expanded="true" />
<element signature="e#1641#1642#0" expanded="true" />
<element signature="e#1742#1743#0" expanded="true" />
<element signature="e#1776#1777#0" expanded="true" />
<element signature="e#1813#1814#0" expanded="true" />
<element signature="e#1845#1846#0" expanded="true" />
<element signature="e#1907#1908#0" expanded="true" />
<element signature="e#1965#1966#0" 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>
<caret column="21" lean-forward="true" selection-start-column="21" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Core.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" />
<folding>
<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#448#449#0" expanded="true" />
<element signature="e#475#476#0" expanded="true" />
<element signature="e#512#513#0" expanded="true" />
<element signature="e#544#545#0" expanded="true" />
<element signature="e#573#574#0" expanded="true" />
<element signature="e#601#602#0" expanded="true" />
<element signature="e#640#641#0" expanded="true" />
<element signature="e#674#675#0" expanded="true" />
<element signature="e#707#708#0" expanded="true" />
<element signature="e#739#740#0" expanded="true" />
<element signature="e#786#787#0" expanded="true" />
<element signature="e#828#829#0" expanded="true" />
<element signature="e#860#861#0" expanded="true" />
<element signature="e#891#892#0" expanded="true" />
<element signature="e#936#937#0" expanded="true" />
<element signature="e#976#977#0" expanded="true" />
<element signature="e#1011#1012#0" expanded="true" />
<element signature="e#1045#1046#0" expanded="true" />
<element signature="e#1096#1097#0" expanded="true" />
<element signature="e#1142#1143#0" expanded="true" />
<element signature="e#1174#1175#0" expanded="true" />
<element signature="e#1205#1206#0" expanded="true" />
<element signature="e#1250#1251#0" expanded="true" />
<element signature="e#1290#1291#0" expanded="true" />
<element signature="e#1322#1323#0" expanded="true" />
<element signature="e#1353#1354#0" expanded="true" />
<element signature="e#1398#1399#0" expanded="true" />
<element signature="e#1438#1439#0" expanded="true" />
<element signature="e#1466#1467#0" expanded="true" />
<element signature="e#1493#1494#0" expanded="true" />
<element signature="e#1530#1531#0" expanded="true" />
<element signature="e#1562#1563#0" expanded="true" />
</folding>
</state>
</provider>