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

Please find error

Browse Source
This commit is contained in:
KahootChampion
2019-03-09 20:03:51 -07:00
parent f5845cb8df
commit 80102eabee
2 changed files with 501 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

230
.idea/workspace.xml generated
View File

@@ -3,13 +3,10 @@
<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$/out/production/TaipanClone/ShipWarfare.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/TaipanClone/ShipWarfare.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Player.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Player.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ShipWarfare.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ShipWarfare.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ShipWarfareGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ShipWarfareGUI.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone\.idea\shelf/" />
<ignored path="$PROJECT_DIR$/.idea/shelf/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -19,39 +16,12 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="177">
<caret line="33" column="35" selection-start-line="33" selection-start-column="35" selection-end-line="33" selection-end-column="35" />
</state>
</provider>
</entry>
</file>
<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="-348">
<caret line="264" column="40" selection-start-line="264" selection-start-column="40" selection-end-line="264" selection-end-column="40" />
<state relative-caret-position="5025">
<caret line="353" column="100" selection-end-line="503" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2604#2605#0" expanded="true" />
<element signature="e#2644#2645#0" expanded="true" />
<element signature="e#2683#2684#0" expanded="true" />
<element signature="e#2721#2722#0" expanded="true" />
<element signature="e#2759#2760#0" expanded="true" />
<element signature="e#2793#2794#0" expanded="true" />
<element signature="e#2837#2838#0" expanded="true" />
<element signature="e#2880#2881#0" expanded="true" />
<element signature="e#2922#2923#0" expanded="true" />
<element signature="e#2963#2964#0" expanded="true" />
<element signature="e#2997#2998#0" expanded="true" />
<element signature="e#3030#3031#0" expanded="true" />
<element signature="e#3067#3068#0" expanded="true" />
<element signature="e#3100#3101#0" expanded="true" />
<element signature="e#3155#3156#0" expanded="true" />
<element signature="e#3201#3202#0" expanded="true" />
<element signature="e#7408#7409#0" expanded="true" />
<element signature="e#7452#7453#0" expanded="true" />
</folding>
</state>
</provider>
@@ -60,22 +30,35 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2672">
<caret line="241" column="31" selection-start-line="241" selection-start-column="31" selection-end-line="241" selection-end-column="31" />
<state relative-caret-position="2580">
<caret line="172" column="5" selection-start-line="172" selection-start-column="5" selection-end-line="172" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1150#1151#0" expanded="true" />
<element signature="e#1178#1179#0" expanded="true" />
<element signature="e#5971#5972#0" expanded="true" />
<element signature="e#6019#6020#0" expanded="true" />
<element signature="e#6052#6053#0" expanded="true" />
<element signature="e#6093#6094#0" expanded="true" />
<element signature="e#6137#6138#0" expanded="true" />
<element signature="e#6175#6176#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" column="4" selection-end-line="55" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Start.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/ShopGUI">
<provider selected="true" editor-type-id="text-editor" />
@@ -84,8 +67,8 @@
<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="90">
<caret line="6" column="29" lean-forward="true" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />
<state relative-caret-position="135">
<caret line="9" column="32" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
</state>
</provider>
</entry>
@@ -101,8 +84,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>travel</find>
<find>notDone</find>
<find>GetGuns</find>
<find>set</find>
<find>TaipanShop</find>
@@ -131,6 +112,8 @@
<find>litty</find>
<find>userAttacks</find>
<find>numOfLittyShips</find>
<find>delay</find>
<find>Hp</find>
</findStrings>
<replaceStrings>
<replace>HP</replace>
@@ -154,8 +137,8 @@
<option value="$PROJECT_DIR$/src/TaipanShop.java" />
<option value="$PROJECT_DIR$/src/main.java" />
<option value="$PROJECT_DIR$/src/Travel.java" />
<option value="$PROJECT_DIR$/src/Player.java" />
<option value="$PROJECT_DIR$/src/ShipWarfareGUI.java" />
<option value="$PROJECT_DIR$/src/Player.java" />
<option value="$PROJECT_DIR$/src/ShipWarfare.java" />
</list>
</option>
@@ -172,6 +155,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -189,14 +173,13 @@
</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="1552181286375" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552182988336" />
<property name="extract.method.default.visibility" value="private" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../GitHub/Cpsc233" />
<property name="project.structure.last.edited" value="Project" />
@@ -216,7 +199,7 @@
</list>
</option>
</component>
<component name="RunManager" selected="Application.ShipWarfareGUI">
<component name="RunManager" selected="Application.main">
<configuration name="Game" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Game" />
<module name="TaipanClone" />
@@ -261,8 +244,8 @@
</list>
<recent_temporary>
<list>
<item itemvalue="Application.ShipWarfareGUI" />
<item itemvalue="Application.main" />
<item itemvalue="Application.ShipWarfareGUI" />
<item itemvalue="Application.TaipanShop" />
<item itemvalue="Application.Game" />
<item itemvalue="Application.ShipWarfare" />
@@ -291,6 +274,11 @@
<workItem from="1550878072546" duration="2009000" />
<workItem from="1551065104002" duration="1313000" />
<workItem from="1551158469442" duration="4822000" />
<workItem from="1552183127375" duration="5000" />
<workItem from="1552183173819" duration="43000" />
<workItem from="1552183247090" duration="42000" />
<workItem from="1552183350012" duration="132000" />
<workItem from="1552183501892" duration="5000" />
</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>
@@ -397,17 +385,31 @@
<option name="project" value="LOCAL" />
<updated>1552181324520</updated>
</task>
<option name="localTasksCounter" value="16" />
<task id="LOCAL-00016" summary="Missed one statement that I needed to encapsulate">
<created>1552181613507</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1552181613507</updated>
</task>
<task id="LOCAL-00017" summary="Messed up player by setting money to 1000">
<created>1552181667375</created>
<option name="number" value="00017" />
<option name="presentableId" value="LOCAL-00017" />
<option name="project" value="LOCAL" />
<updated>1552181667376</updated>
</task>
<option name="localTasksCounter" value="18" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="55571000" />
<option name="totallyTimeSpent" value="57306000" />
</component>
<component name="ToolWindowManager">
<frame x="48" y="23" width="1189" height="652" extended-state="0" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" weight="0.9267655" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21621622" />
<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" />
@@ -520,7 +522,9 @@
<MESSAGE value="Notified of getting attacked" />
<MESSAGE value="Added fight stuff" />
<MESSAGE value="Made ShipWarfare easier to access by ShipWarfareGUI" />
<option name="LAST_COMMIT_MESSAGE" value="Made ShipWarfare easier to access by ShipWarfareGUI" />
<MESSAGE value="Missed one statement that I needed to encapsulate" />
<MESSAGE value="Messed up player by setting money to 1000" />
<option name="LAST_COMMIT_MESSAGE" value="Messed up player by setting money to 1000" />
</component>
<component name="editorHistoryManager">
<entry file="uml://JAVA/ShipWarfare">
@@ -562,37 +566,9 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Game.java" />
<entry file="file://$PROJECT_DIR$/src/Warehouse.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34">
<caret line="2" column="3" selection-start-line="2" selection-start-column="3" selection-end-line="2" selection-end-column="3" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Start.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="590">
<caret line="70" column="24" lean-forward="true" selection-start-line="70" selection-start-column="24" selection-end-line="70" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Bank.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-872">
<caret line="7" column="6" lean-forward="true" selection-start-line="7" selection-start-column="6" selection-end-line="7" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
<caret line="594" column="42" lean-forward="true" selection-start-line="594" selection-start-column="42" selection-end-line="594" selection-end-column="42" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Warehouse.java" />
<entry file="file://$PROJECT_DIR$/src/Bank.java" />
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java" />
<entry file="file://$PROJECT_DIR$/src/Travel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="27">
@@ -603,65 +579,49 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Player.java">
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="6" column="29" lean-forward="true" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />
<state relative-caret-position="5025">
<caret line="353" column="100" selection-end-line="503" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2580">
<caret line="172" column="5" selection-start-line="172" selection-start-column="5" selection-end-line="172" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1150#1151#0" expanded="true" />
<element signature="e#1178#1179#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/ShopGUI">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/Player.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" column="32" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Start.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="177">
<caret line="33" column="35" selection-start-line="33" selection-start-column="35" selection-end-line="33" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2672">
<caret line="241" column="31" selection-start-line="241" selection-start-column="31" selection-end-line="241" selection-end-column="31" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1178#1179#0" expanded="true" />
<element signature="e#5971#5972#0" expanded="true" />
<element signature="e#6019#6020#0" expanded="true" />
<element signature="e#6052#6053#0" expanded="true" />
<element signature="e#6093#6094#0" expanded="true" />
<element signature="e#6137#6138#0" expanded="true" />
<element signature="e#6175#6176#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="-348">
<caret line="264" column="40" selection-start-line="264" selection-start-column="40" selection-end-line="264" selection-end-column="40" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2604#2605#0" expanded="true" />
<element signature="e#2644#2645#0" expanded="true" />
<element signature="e#2683#2684#0" expanded="true" />
<element signature="e#2721#2722#0" expanded="true" />
<element signature="e#2759#2760#0" expanded="true" />
<element signature="e#2793#2794#0" expanded="true" />
<element signature="e#2837#2838#0" expanded="true" />
<element signature="e#2880#2881#0" expanded="true" />
<element signature="e#2922#2923#0" expanded="true" />
<element signature="e#2963#2964#0" expanded="true" />
<element signature="e#2997#2998#0" expanded="true" />
<element signature="e#3030#3031#0" expanded="true" />
<element signature="e#3067#3068#0" expanded="true" />
<element signature="e#3100#3101#0" expanded="true" />
<element signature="e#3155#3156#0" expanded="true" />
<element signature="e#3201#3202#0" expanded="true" />
<element signature="e#7408#7409#0" expanded="true" />
<element signature="e#7452#7453#0" expanded="true" />
</folding>
<state relative-caret-position="135">
<caret line="9" column="4" selection-end-line="55" />
</state>
</provider>
</entry>