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

Think I fixed Sid's code

Browse Source
This commit is contained in:
KahootChampion
2019-02-24 20:26:05 -07:00
parent 5f1e566c8f
commit 1be615fcc4
2 changed files with 207 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
.idea/workspace.xml generated
View File

@@ -2,9 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="">
<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$/src/ShipWarfare.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ShipWarfare.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Warehouse.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Warehouse.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
@@ -60,8 +58,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/Warehouse.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="223">
<caret line="68" column="13" selection-start-line="68" selection-start-column="13" selection-end-line="68" selection-end-column="13" />
<state relative-caret-position="408">
<caret line="194" lean-forward="true" selection-start-line="194" selection-end-line="194" />
</state>
</provider>
</entry>
@@ -208,7 +206,7 @@
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1551063342521" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1551065152391" />
<property name="extract.method.default.visibility" value="public" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="project.structure.last.edited" value="Project" />
@@ -424,14 +422,22 @@
<option name="project" value="LOCAL" />
<updated>1551060038524</updated>
</task>
<option name="localTasksCounter" value="18" />
<task id="LOCAL-00018" summary="Worked On Sid's class a bit">
<created>1551063376717</created>
<option name="number" value="00018" />
<option name="presentableId" value="LOCAL-00018" />
<option name="project" value="LOCAL" />
<updated>1551063376717</updated>
</task>
<option name="localTasksCounter" value="19" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="43126000" />
<option name="totallyTimeSpent" value="45109000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1280" height="709" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.3101777" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -442,7 +448,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 active="true" anchor="bottom" id="Run" order="2" sideWeight="0.4989339" visible="true" weight="0.3241491" />
<window_info anchor="bottom" id="Run" order="2" sideWeight="0.4989339" 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" />
@@ -486,7 +492,8 @@
<MESSAGE value="Added a few comments to ShipWarfare" />
<MESSAGE value="bunch of revisions, still in progress" />
<MESSAGE value="linked all the classes together. The project is functional." />
<option name="LAST_COMMIT_MESSAGE" value="linked all the classes together. The project is functional." />
<MESSAGE value="Worked On Sid's class a bit" />
<option name="LAST_COMMIT_MESSAGE" value="Worked On Sid's class a bit" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/TaipanClone.iml">
@@ -560,8 +567,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/Warehouse.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="223">
<caret line="68" column="13" selection-start-line="68" selection-start-column="13" selection-end-line="68" selection-end-column="13" />
<state relative-caret-position="408">
<caret line="194" lean-forward="true" selection-start-line="194" selection-end-line="194" />
</state>
</provider>
</entry>