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

Missed one statement that I needed to encapsulate

Browse Source
This commit is contained in:
KahootChampion
2019-03-09 18:33:33 -07:00
parent 370b3ee041
commit 5a7d1e7c34
4 changed files with 299 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

213
.idea/workspace.xml generated
View File

@@ -1,9 +1,11 @@
<?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="Fixed the commenting on a lot of the code. Also added some stuff to Travel, fixed some bugs.">
<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" 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/" />
@@ -19,19 +21,56 @@
<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="495">
<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="false">
<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="6801">
<caret line="457" column="22" selection-start-line="457" selection-start-column="22" selection-end-line="457" selection-end-column="22" />
<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>
</provider>
</entry>
</file>
<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" />
<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>
@@ -39,23 +78,14 @@
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/ShopGUI">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2" />
</provider>
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
<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="107">
<caret line="43" column="2" selection-start-line="43" selection-start-column="2" selection-end-line="43" selection-end-column="2" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1087#1088#0" expanded="true" />
<element signature="e#2205#2206#0" expanded="true" />
<element signature="e#2279#2280#0" expanded="true" />
<element signature="e#2361#2362#0" expanded="true" />
</folding>
<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>
</provider>
</entry>
@@ -71,25 +101,48 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>Hp</find>
<find>travel</find>
<find>notDone</find>
<find>GetGuns</find>
<find>get</find>
<find>set</find>
<find>TaipanShop</find>
<find>shop()</find>
<find>shop</find>
<find>being</find>
<find>label0</find>
<find>hBox</find>
<find>&lt;</find>
<find>winO</find>
<find>destroy</find>
<find>get</find>
<find>user</find>
<find>setNumOfP</find>
<find>setUs</find>
<find>starting</find>
<find>destro</find>
<find>numOfpeasantShips</find>
<find>startingPeasantShips</find>
<find>startingLittyShips</find>
<find>howMuchRun</find>
<find>pirateName</find>
<find>player</find>
<find>numOfPeasantShips</find>
<find>peasant</find>
<find>litty</find>
<find>userAttacks</find>
<find>numOfLittyShips</find>
</findStrings>
<replaceStrings>
<replace>HP</replace>
<replace>p1.get</replace>
<replace>p1.set</replace>
<replace>shipWarfare.getHowMuchRun()</replace>
<replace>shipWarfare.isUserAttacks()</replace>
<replace>shipWarfare.getNumOfPeasantShips()</replace>
</replaceStrings>
</component>
<component name="Git.Settings">
<option name="UPDATE_CHANGES_POLICY" value="SHELVE" />
<option name="UPDATE_TYPE" value="MERGE" />
<option name="UPDATE_TYPE" value="REBASE" />
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
@@ -97,17 +150,18 @@
<list>
<option value="$PROJECT_DIR$/src/Core.java" />
<option value="$PROJECT_DIR$/src/Game.java" />
<option value="$PROJECT_DIR$/src/ShipWarfare.java" />
<option value="$PROJECT_DIR$/src/Player.java" />
<option value="$PROJECT_DIR$/src/Start.java" />
<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/ShipWarfare.java" />
</list>
</option>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="48" />
<option name="y" value="23" />
<option name="width" value="1189" />
<option name="height" value="652" />
@@ -142,7 +196,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="1552173181638" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552181286375" />
<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" />
@@ -329,17 +383,31 @@
<option name="project" value="LOCAL" />
<updated>1552172956109</updated>
</task>
<option name="localTasksCounter" value="14" />
<task id="LOCAL-00014" summary="Added fight stuff">
<created>1552173216531</created>
<option name="number" value="00014" />
<option name="presentableId" value="LOCAL-00014" />
<option name="project" value="LOCAL" />
<updated>1552173216532</updated>
</task>
<task id="LOCAL-00015" summary="Made ShipWarfare easier to access by ShipWarfareGUI">
<created>1552181324520</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1552181324520</updated>
</task>
<option name="localTasksCounter" value="16" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="47207000" />
<option name="totallyTimeSpent" value="55571000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="687" height="639" extended-state="0" />
<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.9268293" />
<window_info content_ui="combo" id="Project" order="0" weight="0.9267655" />
<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" />
@@ -348,7 +416,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" weight="0.32922733" />
<window_info anchor="bottom" id="Run" order="2" weight="0.44871795" />
<window_info anchor="bottom" id="Run" order="2" weight="0.4482143" />
<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" />
@@ -358,7 +426,7 @@
<window_info anchor="bottom" id="Database Changes" order="9" />
<window_info anchor="bottom" id="Terminal" order="10" weight="0.32922733" />
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50061125" side_tool="true" weight="0.32922733" />
<window_info anchor="bottom" id="Messages" order="12" sideWeight="0.49938875" weight="0.32901135" />
<window_info anchor="bottom" id="Messages" order="12" sideWeight="0.49938875" weight="0.32857144" />
<window_info anchor="bottom" id="Duplicate detector" order="13" weight="0.32922733" />
<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" />
@@ -450,7 +518,9 @@
<MESSAGE value="Added time stuff to Shipwarfare GUI" />
<MESSAGE value="Nitified of getting attacked" />
<MESSAGE value="Notified of getting attacked" />
<option name="LAST_COMMIT_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" />
</component>
<component name="editorHistoryManager">
<entry file="uml://JAVA/ShipWarfare">
@@ -513,13 +583,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Player.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2606">
<caret line="24" column="5" lean-forward="true" selection-start-line="24" selection-start-column="5" selection-end-line="24" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="168">
@@ -530,13 +593,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<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/Travel.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="27">
@@ -547,31 +603,64 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/ShopGUI">
<entry file="file://$PROJECT_DIR$/src/Player.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2" />
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
<entry file="file://$PROJECT_DIR$/src/ShopGUI">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6801">
<caret line="457" column="22" selection-start-line="457" selection-start-column="22" selection-end-line="457" selection-end-column="22" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<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="107">
<caret line="43" column="2" selection-start-line="43" selection-start-column="2" selection-end-line="43" selection-end-column="2" />
<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#1087#1088#0" expanded="true" />
<element signature="e#2205#2206#0" expanded="true" />
<element signature="e#2279#2280#0" expanded="true" />
<element signature="e#2361#2362#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>
<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>
</provider>