Fixed some little problems with documenting.
This commit is contained in:
8
.idea/misc.xml
generated
8
.idea/misc.xml
generated
@@ -1,9 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="JavadocGenerationManager">
|
||||
<option name="OUTPUT_DIRECTORY" value="$USER_HOME$/Desktop/Javadocs TaipanClone" />
|
||||
<option name="OPTION_HIERARCHY" value="false" />
|
||||
<option name="OPTION_NAVIGATOR" value="false" />
|
||||
<option name="OPTION_INDEX" value="false" />
|
||||
</component>
|
||||
<component name="ProjectKey">
|
||||
<option name="state" value="project://63537948-39a4-48a0-9c97-34259a0fa913" />
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8.0_201" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8.0_141" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
<component name="SvnBranchConfigurationManager">
|
||||
|
||||
717
.idea/workspace.xml
generated
717
.idea/workspace.xml
generated
@@ -1,47 +1,69 @@
|
||||
<?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="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" />
|
||||
<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/Travel.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Travel.java" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main.java" afterDir="false" />
|
||||
</list>
|
||||
<ignored path="$PROJECT_DIR$/out/" />
|
||||
<ignored path="C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone\.idea\shelf/" />
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="DatabaseView">
|
||||
<option name="SHOW_INTERMEDIATE" value="true" />
|
||||
<option name="GROUP_DATA_SOURCES" value="true" />
|
||||
<option name="GROUP_SCHEMA" value="true" />
|
||||
<option name="GROUP_CONTENTS" value="false" />
|
||||
<option name="SORT_POSITIONED" value="false" />
|
||||
<option name="SHOW_EMPTY_GROUPS" value="false" />
|
||||
<option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
|
||||
<option name="HIDDEN_KINDS">
|
||||
<set />
|
||||
</option>
|
||||
<expand />
|
||||
<select />
|
||||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<leaf>
|
||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||
<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="240">
|
||||
<caret line="16" column="19" selection-start-line="16" selection-end-line="17" />
|
||||
<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>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/Warehouse.java">
|
||||
<entry file="file://$PROJECT_DIR$/src/main.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="132">
|
||||
<caret line="35" column="2" selection-start-line="35" selection-start-column="2" selection-end-line="40" />
|
||||
<state relative-caret-position="184">
|
||||
<caret line="42" column="62" selection-start-line="42" selection-start-column="62" selection-end-line="42" selection-end-column="62" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/src/Travel.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="27">
|
||||
<caret line="125" column="63" selection-start-line="125" selection-start-column="63" selection-end-line="125" selection-end-column="63" />
|
||||
<folding>
|
||||
<element signature="imports" 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="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>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<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>
|
||||
@@ -49,50 +71,29 @@
|
||||
<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="325">
|
||||
<caret line="222" column="47" lean-forward="true" selection-start-line="222" selection-start-column="47" selection-end-line="222" selection-end-column="47" />
|
||||
<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>
|
||||
</file>
|
||||
<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="17">
|
||||
<caret line="353" column="11" selection-start-line="353" selection-start-column="11" selection-end-line="353" selection-end-column="11" />
|
||||
<folding>
|
||||
<element signature="e#1280#1281#0" expanded="true" />
|
||||
<element signature="e#1313#1314#0" expanded="true" />
|
||||
<element signature="e#1559#1560#0" expanded="true" />
|
||||
<element signature="e#1588#1589#0" expanded="true" />
|
||||
<element signature="e#1733#1734#0" expanded="true" />
|
||||
<element signature="e#1760#1761#0" expanded="true" />
|
||||
<element signature="e#1800#1801#0" expanded="true" />
|
||||
<element signature="e#1832#1833#0" expanded="true" />
|
||||
<element signature="e#1858#1859#0" expanded="true" />
|
||||
<element signature="e#1883#1884#0" expanded="true" />
|
||||
<element signature="e#1974#1975#0" expanded="true" />
|
||||
<element signature="e#2001#2002#0" expanded="true" />
|
||||
<element signature="e#2138#2139#0" expanded="true" />
|
||||
<element signature="e#2166#2167#0" expanded="true" />
|
||||
<element signature="e#2312#2313#0" expanded="true" />
|
||||
<element signature="e#2344#2345#0" expanded="true" />
|
||||
<element signature="e#2509#2510#0" expanded="true" />
|
||||
<element signature="e#2540#2541#0" expanded="true" />
|
||||
<element signature="e#2703#2704#0" expanded="true" />
|
||||
<element signature="e#2737#2738#0" expanded="true" />
|
||||
<element signature="e#2912#2913#0" expanded="true" />
|
||||
<element signature="e#2943#2944#0" expanded="true" />
|
||||
<element signature="e#3103#3104#0" expanded="true" />
|
||||
<element signature="e#3134#3135#0" expanded="true" />
|
||||
<element signature="e#3290#3291#0" expanded="true" />
|
||||
<element signature="e#3317#3318#0" expanded="true" />
|
||||
<element signature="e#3461#3462#0" expanded="true" />
|
||||
<element signature="e#3488#3489#0" expanded="true" />
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/Warehouse.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2923">
|
||||
<caret line="199" column="24" lean-forward="true" selection-start-line="199" selection-start-column="24" selection-end-line="199" selection-end-column="24" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
<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>
|
||||
@@ -108,88 +109,57 @@
|
||||
</component>
|
||||
<component name="FindInProjectRecents">
|
||||
<findStrings>
|
||||
<find>chance</find>
|
||||
<find>Hp</find>
|
||||
<find>travel</find>
|
||||
<find>notDone</find>
|
||||
<find>GetGuns</find>
|
||||
<find>get</find>
|
||||
<find>Peasant</find>
|
||||
<find>d</find>
|
||||
<find>captain</find>
|
||||
<find>printf</find>
|
||||
<find>liu</find>
|
||||
<find>howmuchRun</find>
|
||||
<find>setNumOf</find>
|
||||
<find>setNumOfLitty</find>
|
||||
<find>setNumOfLitt</find>
|
||||
<find>setG</find>
|
||||
<find>setMoney</find>
|
||||
<find>setN</find>
|
||||
<find>setNum</find>
|
||||
<find>startingPeasantShips</find>
|
||||
<find>startingLittyShips</find>
|
||||
<find>destroy</find>
|
||||
<find>litty</find>
|
||||
<find>peasant</find>
|
||||
<find>setmone</find>
|
||||
<find>set</find>
|
||||
<find>player.</find>
|
||||
<find>System.out.println("\n*** PLACEHOLDER FOR LOAN SHARK ***\n");</find>
|
||||
<find>cargoSpace</find>
|
||||
<find>delayF</find>
|
||||
<find>guns>0</find>
|
||||
<find>setPla</find>
|
||||
<find>setPlayer</find>
|
||||
<find>player.game</find>
|
||||
<find>TaipanShop</find>
|
||||
<find>shop()</find>
|
||||
<find>shop</find>
|
||||
</findStrings>
|
||||
<replaceStrings>
|
||||
<replace>player.getName()</replace>
|
||||
<replace>player.getBank()</replace>
|
||||
<replace>player.setMoney(player.getMoney() + num*)</replace>
|
||||
<replace>player.getOpiumHeld()</replace>
|
||||
<replace>numOfPeasantShips</replace>
|
||||
<replace>typeOfShip</replace>
|
||||
<replace>chanceOfRun</replace>
|
||||
<replace>litty</replace>
|
||||
<replace>Liitty</replace>
|
||||
<replace>Litty</replace>
|
||||
<replace>player.set</replace>
|
||||
<replace>%s</replace>
|
||||
<replace>loan();</replace>
|
||||
<replace>player.getCargoSpace()</replace>
|
||||
<replace>delayForSeconds(1)</replace>
|
||||
<replace>delayForSeconds(1)</replace>
|
||||
<replace>HP</replace>
|
||||
<replace>p1.get</replace>
|
||||
<replace>p1.set</replace>
|
||||
</replaceStrings>
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
<option name="UPDATE_TYPE" value="REBASE" />
|
||||
<option name="UPDATE_CHANGES_POLICY" value="SHELVE" />
|
||||
<option name="UPDATE_TYPE" value="MERGE" />
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="IdeDocumentHistory">
|
||||
<option name="CHANGED_PATHS">
|
||||
<list>
|
||||
<option value="$PROJECT_DIR$/src/Test.java" />
|
||||
<option value="$PROJECT_DIR$/src/Warehouse.java" />
|
||||
<option value="$PROJECT_DIR$/src/Bank.java" />
|
||||
<option value="$PROJECT_DIR$/src/Travel.java" />
|
||||
<option value="$PROJECT_DIR$/src/loanShark.java" />
|
||||
<option value="$PROJECT_DIR$/src/main.java" />
|
||||
<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/Player.java" />
|
||||
<option value="$PROJECT_DIR$/src/ShipWarfare.java" />
|
||||
<option value="$PROJECT_DIR$/src/main.java" />
|
||||
<option value="$PROJECT_DIR$/src/Travel.java" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectFrameBounds" extendedState="6">
|
||||
<option name="y" value="23" />
|
||||
<option name="width" value="1280" />
|
||||
<option name="height" value="709" />
|
||||
<option name="x" value="167" />
|
||||
<option name="y" value="-11" />
|
||||
<option name="width" value="1696" />
|
||||
<option name="height" value="1026" />
|
||||
</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="Scope" />
|
||||
<pane id="PackagesPane" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<expand>
|
||||
@@ -206,19 +176,19 @@
|
||||
<select />
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="PackagesPane" />
|
||||
</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="1551057342280" />
|
||||
<property name="extract.method.default.visibility" value="public" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
||||
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1551163322073" />
|
||||
<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="Project" />
|
||||
<property name="project.structure.proportion" value="0.15" />
|
||||
<property name="project.structure.side.proportion" value="0.2" />
|
||||
<property name="settings.editor.selected.configurable" value="preferences.keymap" />
|
||||
<property name="settings.editor.selected.configurable" value="editing.templates" />
|
||||
</component>
|
||||
<component name="RunDashboard">
|
||||
<option name="ruleStates">
|
||||
@@ -233,18 +203,8 @@
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunManager" selected="Application.main">
|
||||
<configuration name="Main" type="Application" factoryName="Application" temporary="true">
|
||||
<option name="MAIN_CLASS_NAME" value="Main" />
|
||||
<module name="TaipanClone" />
|
||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||
<RunnerSettings RunnerId="Run" />
|
||||
<ConfigurationWrapper RunnerId="Run" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="Player" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="Player" />
|
||||
<configuration name="Game" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="Game" />
|
||||
<module name="TaipanClone" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
@@ -257,8 +217,15 @@
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="Test" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="Test" />
|
||||
<configuration name="TaipanShop" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="TaipanShop" />
|
||||
<module name="TaipanClone" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="Travel" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="Travel" />
|
||||
<module name="TaipanClone" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
@@ -272,24 +239,24 @@
|
||||
</method>
|
||||
</configuration>
|
||||
<list>
|
||||
<item itemvalue="Application.Main" />
|
||||
<item itemvalue="Application.Player" />
|
||||
<item itemvalue="Application.ShipWarfare" />
|
||||
<item itemvalue="Application.Test" />
|
||||
<item itemvalue="Application.TaipanShop" />
|
||||
<item itemvalue="Application.Travel" />
|
||||
<item itemvalue="Application.Game" />
|
||||
<item itemvalue="Application.main" />
|
||||
</list>
|
||||
<recent_temporary>
|
||||
<list>
|
||||
<item itemvalue="Application.main" />
|
||||
<item itemvalue="Application.TaipanShop" />
|
||||
<item itemvalue="Application.Game" />
|
||||
<item itemvalue="Application.ShipWarfare" />
|
||||
<item itemvalue="Application.Main" />
|
||||
<item itemvalue="Application.Test" />
|
||||
<item itemvalue="Application.Player" />
|
||||
<item itemvalue="Application.Travel" />
|
||||
</list>
|
||||
</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">
|
||||
@@ -300,194 +267,104 @@
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1550454898506</updated>
|
||||
<workItem from="1550454902781" duration="459000" />
|
||||
<workItem from="1550550806467" duration="577000" />
|
||||
<workItem from="1550552635138" duration="118000" />
|
||||
<workItem from="1550553016386" duration="7671000" />
|
||||
<workItem from="1550672213804" duration="29657000" />
|
||||
<workItem from="1550872712636" duration="122000" />
|
||||
<workItem from="1550879399892" duration="1335000" />
|
||||
<workItem from="1550899071486" duration="108000" />
|
||||
<workItem from="1550954455279" duration="500000" />
|
||||
<workItem from="1550458230268" duration="571000" />
|
||||
<workItem from="1550459021117" duration="128000" />
|
||||
<workItem from="1550459458251" duration="1743000" />
|
||||
<workItem from="1550538713935" duration="16351000" />
|
||||
<workItem from="1550614728336" duration="8160000" />
|
||||
<workItem from="1550704188250" duration="4948000" />
|
||||
<workItem from="1550810552736" duration="1982000" />
|
||||
<workItem from="1550878072546" duration="2009000" />
|
||||
<workItem from="1551065104002" duration="1313000" />
|
||||
<workItem from="1551158469442" duration="4822000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="Added troll comments">
|
||||
<created>1550458807806</created>
|
||||
<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>1550458807807</updated>
|
||||
<updated>1550458470138</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00002" summary="the shop now uses the player class as a parent class.">
|
||||
<created>1550544462410</created>
|
||||
<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>1550544462410</updated>
|
||||
<updated>1550540282400</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00003" summary="the shop now uses the player class as a parent class.">
|
||||
<created>1550544805794</created>
|
||||
<task id="LOCAL-00003" summary="Created Player class">
|
||||
<created>1550540820542</created>
|
||||
<option name="number" value="00003" />
|
||||
<option name="presentableId" value="LOCAL-00003" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1550544805794</updated>
|
||||
<updated>1550540820542</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00004" summary="Vikram, these are the types of changes Harkey and I meant for you to establish.">
|
||||
<created>1550554529721</created>
|
||||
<task id="LOCAL-00004" summary="Created Player class">
|
||||
<created>1550541406597</created>
|
||||
<option name="number" value="00004" />
|
||||
<option name="presentableId" value="LOCAL-00004" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1550554529721</updated>
|
||||
<updated>1550541406597</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00005" summary="Added GameOver() Method to Player class, btw System.out.flush just straight up Thanos's the terminal at the time (clears it).">
|
||||
<created>1550555424630</created>
|
||||
<task id="LOCAL-00005" summary="Fixed the setters to be greater than 0">
|
||||
<created>1550541751914</created>
|
||||
<option name="number" value="00005" />
|
||||
<option name="presentableId" value="LOCAL-00005" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1550555424631</updated>
|
||||
<updated>1550541751914</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00006" summary="I think I got the basic battling system down. Would appreciate i some of you guys beta tested it though and let me know the errors if there are any.">
|
||||
<created>1550673099893</created>
|
||||
<task id="LOCAL-00006" summary="Created Player class">
|
||||
<created>1550543764970</created>
|
||||
<option name="number" value="00006" />
|
||||
<option name="presentableId" value="LOCAL-00006" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1550673099893</updated>
|
||||
<updated>1550543764971</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00007" summary="Perhaps done basic ship warfare?">
|
||||
<created>1550674024950</created>
|
||||
<task id="LOCAL-00007" summary="Added some stuff for the Travel Class">
|
||||
<created>1550575512841</created>
|
||||
<option name="number" value="00007" />
|
||||
<option name="presentableId" value="LOCAL-00007" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1550674024950</updated>
|
||||
<updated>1550575512841</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00008" summary="Perhaps done basic ship warfare? (still must add Liu yen difficulty, ships running away, and Loot)">
|
||||
<created>1550681271530</created>
|
||||
<task id="LOCAL-00008" summary="Added disasters as well as removing a bug from the flee method in Haris's code">
|
||||
<created>1550623749854</created>
|
||||
<option name="number" value="00008" />
|
||||
<option name="presentableId" value="LOCAL-00008" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1550681271530</updated>
|
||||
<updated>1550623749854</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00009" summary="Perhaps done basic ship warfare? (still must add Liu yen difficulty, ships running away, and Loot)">
|
||||
<created>1550704064692</created>
|
||||
<task id="LOCAL-00009" summary="Fixed a bunch of stuff inside of Travel, but also discovered a MASSIVE problem with our code">
|
||||
<created>1550628232136</created>
|
||||
<option name="number" value="00009" />
|
||||
<option name="presentableId" value="LOCAL-00009" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1550704064692</updated>
|
||||
<updated>1550628232136</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00010" summary="Added loot. Still need to have ships escape sometimes and Liu yen">
|
||||
<created>1550810365166</created>
|
||||
<task id="LOCAL-00010" summary="Brought back Vikram's changes">
|
||||
<created>1550879092914</created>
|
||||
<option name="number" value="00010" />
|
||||
<option name="presentableId" value="LOCAL-00010" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1550810365166</updated>
|
||||
<updated>1550879092914</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00011" summary="Sloppy but completed ShipWarfare class">
|
||||
<created>1550817871034</created>
|
||||
<task id="LOCAL-00011" summary="Fixed the commenting on a lot of the code. Also added some stuff to Travel, fixed some bugs.">
|
||||
<created>1551162699319</created>
|
||||
<option name="number" value="00011" />
|
||||
<option name="presentableId" value="LOCAL-00011" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1550817871034</updated>
|
||||
<updated>1551162699319</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00012" summary="Fixed like 3 naming/logical errors in ShipWarfare">
|
||||
<created>1550820057346</created>
|
||||
<option name="number" value="00012" />
|
||||
<option name="presentableId" value="LOCAL-00012" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1550820057346</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00013" summary="Added a few comments to ShipWarfare">
|
||||
<created>1550954954057</created>
|
||||
<option name="number" value="00013" />
|
||||
<option name="presentableId" value="LOCAL-00013" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1550954954057</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00014" summary="bunch of revisions, still in progress">
|
||||
<created>1551049097974</created>
|
||||
<option name="number" value="00014" />
|
||||
<option name="presentableId" value="LOCAL-00014" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1551049097974</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00015" summary="bunch of revisions, still in progress">
|
||||
<created>1551052425343</created>
|
||||
<option name="number" value="00015" />
|
||||
<option name="presentableId" value="LOCAL-00015" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1551052425343</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00016" summary="bunch of revisions, still in progress">
|
||||
<created>1551052501350</created>
|
||||
<option name="number" value="00016" />
|
||||
<option name="presentableId" value="LOCAL-00016" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1551052501350</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00017" summary="bunch of revisions, still in progress">
|
||||
<created>1551060038524</created>
|
||||
<option name="number" value="00017" />
|
||||
<option name="presentableId" value="LOCAL-00017" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1551060038524</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00018" summary="linked all the classes together. The project is functional.">
|
||||
<created>1551060234136</created>
|
||||
<option name="number" value="00018" />
|
||||
<option name="presentableId" value="LOCAL-00018" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1551060234136</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00019" summary="the comment somehow made it so that I couldn't compile (using the command line i couldn't compile, i could compile file using intellij) Also, you the file extended player, which is not necessary. You also were calling gameOver() and getName() directly, you needed "player." before all those methods.">
|
||||
<created>1551105597993</created>
|
||||
<option name="number" value="00019" />
|
||||
<option name="presentableId" value="LOCAL-00019" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1551105597993</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00020" summary="minor changes. Still in progress.">
|
||||
<created>1551144715114</created>
|
||||
<option name="number" value="00020" />
|
||||
<option name="presentableId" value="LOCAL-00020" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1551144715114</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00021" summary="Java Docs BOIZ for ShipWarafare">
|
||||
<created>1551148428427</created>
|
||||
<option name="number" value="00021" />
|
||||
<option name="presentableId" value="LOCAL-00021" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1551148428427</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00022" summary="Small change to javadocs for shipwarfare">
|
||||
<created>1551148939938</created>
|
||||
<option name="number" value="00022" />
|
||||
<option name="presentableId" value="LOCAL-00022" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1551148939938</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00023" summary="Test this Vikram">
|
||||
<created>1551150035612</created>
|
||||
<option name="number" value="00023" />
|
||||
<option name="presentableId" value="LOCAL-00023" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1551150035612</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00024" summary="Aight fixed some stuff">
|
||||
<created>1551150382078</created>
|
||||
<option name="number" value="00024" />
|
||||
<option name="presentableId" value="LOCAL-00024" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1551150382078</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="25" />
|
||||
<option name="localTasksCounter" value="12" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="45004000" />
|
||||
<option name="totallyTimeSpent" value="42486000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="0" y="23" width="1280" height="709" extended-state="6" />
|
||||
<editor active="true" />
|
||||
<frame x="-8" y="-8" width="1696" height="1026" extended-state="7" />
|
||||
<layout>
|
||||
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.31987077" />
|
||||
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.21026894" />
|
||||
<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" />
|
||||
@@ -495,29 +372,61 @@
|
||||
<window_info id="Capture Tool" order="5" />
|
||||
<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 anchor="bottom" id="Run" order="2" sideWeight="0.49840087" weight="0.3241491" />
|
||||
<window_info anchor="bottom" id="Find" order="1" weight="0.32922733" />
|
||||
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3975364" />
|
||||
<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" />
|
||||
<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" sideWeight="0.49946696" weight="0.32901135" />
|
||||
<window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49938875" weight="0.32922733" />
|
||||
<window_info anchor="bottom" id="Database Changes" order="9" />
|
||||
<window_info anchor="bottom" id="Terminal" order="10" weight="0.32936078" />
|
||||
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50159913" side_tool="true" visible="true" weight="0.32719395" />
|
||||
<window_info anchor="bottom" id="Messages" order="12" weight="0.032502707" />
|
||||
<window_info anchor="bottom" id="Duplicate detector" order="13" weight="0.32901135" />
|
||||
<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.32922733" />
|
||||
<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" />
|
||||
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
||||
<window_info anchor="right" id="Palette" order="3" />
|
||||
<window_info anchor="right" id="Database" order="4" weight="0.32956383" />
|
||||
<window_info anchor="right" id="Database" order="4" />
|
||||
<window_info anchor="right" id="Theme Preview" order="5" />
|
||||
<window_info anchor="right" id="Maven" order="6" />
|
||||
<window_info anchor="right" id="Capture Analysis" order="7" />
|
||||
<window_info anchor="right" id="Palette	" order="8" />
|
||||
</layout>
|
||||
<layout-to-restore>
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21026894" />
|
||||
<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" />
|
||||
<window_info id="UI Designer" order="4" />
|
||||
<window_info id="Capture Tool" order="5" />
|
||||
<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.3975364" />
|
||||
<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" />
|
||||
<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" sideWeight="0.49938875" weight="0.32922733" />
|
||||
<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.32922733" />
|
||||
<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" />
|
||||
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
||||
<window_info anchor="right" id="Palette" order="3" />
|
||||
<window_info anchor="right" id="Database" order="4" />
|
||||
<window_info anchor="right" id="Theme Preview" order="5" />
|
||||
<window_info anchor="right" id="Maven" order="6" />
|
||||
<window_info anchor="right" id="Capture Analysis" order="7" />
|
||||
<window_info anchor="right" id="Palette	" order="8" />
|
||||
</layout-to-restore>
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
<option name="version" value="1" />
|
||||
@@ -532,167 +441,122 @@
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
<option name="TAB_STATES">
|
||||
<map>
|
||||
<entry key="MAIN">
|
||||
<value>
|
||||
<State>
|
||||
<option name="RECENTLY_FILTERED_USER_GROUPS">
|
||||
<collection />
|
||||
</option>
|
||||
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
|
||||
<collection />
|
||||
</option>
|
||||
<option name="COLUMN_ORDER">
|
||||
<list>
|
||||
<option value="0" />
|
||||
<option value="1" />
|
||||
<option value="2" />
|
||||
<option value="3" />
|
||||
</list>
|
||||
</option>
|
||||
</State>
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<ignored-roots>
|
||||
<path value="$PROJECT_DIR$" />
|
||||
</ignored-roots>
|
||||
<MESSAGE value="This should fix the project repository once and for all." />
|
||||
<MESSAGE value="Added troll comments" />
|
||||
<MESSAGE value="the shop now uses the player class as a parent class." />
|
||||
<MESSAGE value="Vikram, these are the types of changes Harkey and I meant for you to establish." />
|
||||
<MESSAGE value="Added GameOver() Method to Player class, btw System.out.flush just straight up Thanos's the terminal at the time (clears it)." />
|
||||
<MESSAGE value="I think I got the basic battling system down. Would appreciate i some of you guys beta tested it though and let me know the errors if there are any." />
|
||||
<MESSAGE value="Perhaps done basic ship warfare?" />
|
||||
<MESSAGE value="Perhaps done basic ship warfare? (still must add Liu yen difficulty, ships running away, and Loot)" />
|
||||
<MESSAGE value="Added loot. Still need to have ships escape sometimes and Liu yen" />
|
||||
<MESSAGE value="Sloppy but completed ShipWarfare class" />
|
||||
<MESSAGE value="Fixed like 3 naming/logical errors in ShipWarfare" />
|
||||
<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." />
|
||||
<MESSAGE value="the comment somehow made it so that I couldn't compile (using the command line i couldn't compile, i could compile file using intellij) Also, you the file extended player, which is not necessary. You also were calling gameOver() and getName() directly, you needed "player." before all those methods." />
|
||||
<MESSAGE value="minor changes. Still in progress." />
|
||||
<MESSAGE value="Java Docs BOIZ for ShipWarafare" />
|
||||
<MESSAGE value="Small change to javadocs for shipwarfare" />
|
||||
<MESSAGE value="Test this Vikram" />
|
||||
<MESSAGE value="Aight fixed some stuff" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Aight fixed some stuff" />
|
||||
<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" />
|
||||
<MESSAGE value="Fixed the setters to be greater than 0" />
|
||||
<MESSAGE value="Created Player class" />
|
||||
<MESSAGE value="Added some stuff for the Travel Class" />
|
||||
<MESSAGE value="Added disasters as well as removing a bug from the flee method in Haris's code" />
|
||||
<MESSAGE value="Fixed a bunch of stuff inside of Travel, but also discovered a MASSIVE problem with our code" />
|
||||
<MESSAGE value="Fixed stupid problem where you can't access methods above yours" />
|
||||
<MESSAGE value="Brought back Vikram's changes" />
|
||||
<MESSAGE value="Fixed the commenting on a lot of the code. Also added some stuff to Travel, fixed some bugs." />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Fixed the commenting on a lot of the code. Also added some stuff to Travel, fixed some bugs." />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="file://$PROJECT_DIR$/TaipanClone.iml">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/.idea/misc.xml">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/Test.java" />
|
||||
<entry file="file://$USER_HOME$/Desktop/src/main.java" />
|
||||
<entry file="file://$PROJECT_DIR$/src/Travel.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="535">
|
||||
<caret line="108" column="65" selection-start-line="108" selection-start-column="65" selection-end-line="108" selection-end-column="65" />
|
||||
<entry file="uml://JAVA/ShipWarfare">
|
||||
<provider selected="true" editor-type-id="UmlEditorProvider">
|
||||
<state>
|
||||
<ID>JAVA</ID>
|
||||
<OriginalElement>ShipWarfare</OriginalElement>
|
||||
<nodes>
|
||||
<node x="" y="">ShipWarfare</node>
|
||||
<node x="" y="">Player</node>
|
||||
</nodes>
|
||||
<notes />
|
||||
<edges />
|
||||
<settings layout="Hierarchic Group" zoom="1.0" x="213.0" y="195.0" />
|
||||
<SelectedNodes />
|
||||
<Categories />
|
||||
<SCOPE>Project Files</SCOPE>
|
||||
<VISIBILITY>private</VISIBILITY>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="95">
|
||||
<caret line="5" column="41" selection-start-line="5" selection-start-column="41" selection-end-line="5" selection-end-column="41" />
|
||||
<entry file="uml://JAVA/TaipanShop">
|
||||
<provider selected="true" editor-type-id="UmlEditorProvider">
|
||||
<state>
|
||||
<ID>JAVA</ID>
|
||||
<OriginalElement>TaipanShop</OriginalElement>
|
||||
<nodes>
|
||||
<node x="" y="">TaipanShop</node>
|
||||
<node x="" y="">Player</node>
|
||||
</nodes>
|
||||
<notes />
|
||||
<edges />
|
||||
<settings layout="Hierarchic Group" zoom="1.0" x="56.0" y="54.0" />
|
||||
<SelectedNodes />
|
||||
<Categories />
|
||||
<SCOPE>All</SCOPE>
|
||||
<VISIBILITY>private</VISIBILITY>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/loanShark.java">
|
||||
<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="858">
|
||||
<caret line="64" column="5" selection-start-line="64" selection-start-column="5" selection-end-line="64" selection-end-column="5" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/Bank.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="535">
|
||||
<caret line="68" column="6" selection-start-line="68" selection-start-column="6" selection-end-line="68" 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="402">
|
||||
<caret line="81" column="63" selection-start-line="81" selection-start-column="63" selection-end-line="81" selection-end-column="63" />
|
||||
<folding>
|
||||
<element signature="e#1266#1267#0" expanded="true" />
|
||||
<element signature="e#1299#1300#0" expanded="true" />
|
||||
<element signature="e#1594#1595#0" expanded="true" />
|
||||
<element signature="e#1626#1627#0" expanded="true" />
|
||||
<element signature="e#1868#1869#0" expanded="true" />
|
||||
<element signature="e#1900#1901#0" expanded="true" />
|
||||
<element signature="e#2066#2067#0" expanded="true" />
|
||||
<element signature="e#2101#2102#0" expanded="true" />
|
||||
</folding>
|
||||
<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="240">
|
||||
<caret line="16" column="19" selection-start-line="16" selection-end-line="17" />
|
||||
<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/Warehouse.java">
|
||||
<entry file="file://$PROJECT_DIR$/src/Bank.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="132">
|
||||
<caret line="35" column="2" selection-start-line="35" selection-start-column="2" selection-end-line="40" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/Player.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="325">
|
||||
<caret line="222" column="47" lean-forward="true" selection-start-line="222" selection-start-column="47" selection-end-line="222" selection-end-column="47" />
|
||||
<folding>
|
||||
<element signature="e#1280#1281#0" expanded="true" />
|
||||
<element signature="e#1313#1314#0" expanded="true" />
|
||||
<element signature="e#1559#1560#0" expanded="true" />
|
||||
<element signature="e#1588#1589#0" expanded="true" />
|
||||
<element signature="e#1733#1734#0" expanded="true" />
|
||||
<element signature="e#1760#1761#0" expanded="true" />
|
||||
<element signature="e#1800#1801#0" expanded="true" />
|
||||
<element signature="e#1832#1833#0" expanded="true" />
|
||||
<element signature="e#1858#1859#0" expanded="true" />
|
||||
<element signature="e#1883#1884#0" expanded="true" />
|
||||
<element signature="e#1974#1975#0" expanded="true" />
|
||||
<element signature="e#2001#2002#0" expanded="true" />
|
||||
<element signature="e#2138#2139#0" expanded="true" />
|
||||
<element signature="e#2166#2167#0" expanded="true" />
|
||||
<element signature="e#2312#2313#0" expanded="true" />
|
||||
<element signature="e#2344#2345#0" expanded="true" />
|
||||
<element signature="e#2509#2510#0" expanded="true" />
|
||||
<element signature="e#2540#2541#0" expanded="true" />
|
||||
<element signature="e#2703#2704#0" expanded="true" />
|
||||
<element signature="e#2737#2738#0" expanded="true" />
|
||||
<element signature="e#2912#2913#0" expanded="true" />
|
||||
<element signature="e#2943#2944#0" expanded="true" />
|
||||
<element signature="e#3103#3104#0" expanded="true" />
|
||||
<element signature="e#3134#3135#0" expanded="true" />
|
||||
<element signature="e#3290#3291#0" expanded="true" />
|
||||
<element signature="e#3317#3318#0" expanded="true" />
|
||||
<element signature="e#3461#3462#0" expanded="true" />
|
||||
<element signature="e#3488#3489#0" expanded="true" />
|
||||
</folding>
|
||||
<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/ShipWarfare.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2923">
|
||||
<caret line="199" column="24" lean-forward="true" selection-start-line="199" selection-start-column="24" selection-end-line="199" selection-end-column="24" />
|
||||
<state relative-caret-position="17">
|
||||
<caret line="353" column="11" selection-start-line="353" selection-start-column="11" selection-end-line="353" selection-end-column="11" />
|
||||
<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="-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">
|
||||
<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/main.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="184">
|
||||
<caret line="42" column="62" selection-start-line="42" selection-start-column="62" selection-end-line="42" selection-end-column="62" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/Travel.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="27">
|
||||
<caret line="125" column="63" selection-start-line="125" selection-start-column="63" selection-end-line="125" selection-end-column="63" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
@@ -739,7 +603,7 @@
|
||||
</state>
|
||||
<state key="JdkListConfigurable.UI">
|
||||
<settings>
|
||||
<last-edited>1.8.0_201</last-edited>
|
||||
<last-edited>1.8</last-edited>
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
@@ -773,6 +637,17 @@
|
||||
</splitter-proportions>
|
||||
</settings>
|
||||
</state>
|
||||
<state key="ScopeChooserConfigurable.UI">
|
||||
<settings>
|
||||
<splitter-proportions>
|
||||
<option name="proportions">
|
||||
<list>
|
||||
<option value="0.2" />
|
||||
</list>
|
||||
</option>
|
||||
</splitter-proportions>
|
||||
</settings>
|
||||
</state>
|
||||
</states>
|
||||
</component>
|
||||
</project>
|
||||
@@ -124,7 +124,7 @@ public class Travel {
|
||||
/**
|
||||
* To use the peasant fleet class while still maintaining encapsulation we have to create a ShipWarefare object and
|
||||
* run the method from there. After the method has been run we can update the player object in this class.
|
||||
*
|
||||
* @throws Exception throws Exception so that we can use the time library to make the player if we want to.
|
||||
**/
|
||||
public void peasantFleet() throws Exception {
|
||||
ShipWarfare attackShip = new ShipWarfare(player);
|
||||
@@ -135,7 +135,7 @@ public class Travel {
|
||||
/**
|
||||
* To use the litty fleet class while still maintaining encapsulation we have to create a ShipWarefare object and
|
||||
* run the method from there. After the method has been run we can update the player object in this class.
|
||||
*
|
||||
* @throws Exception throws Exception so that we can use the time library to make the player if we want to.
|
||||
**/
|
||||
public void littyFleet() throws Exception {
|
||||
ShipWarfare attackShip = new ShipWarfare(player);
|
||||
|
||||
@@ -40,6 +40,7 @@ public class main {
|
||||
/**
|
||||
* Updates main class with player data and starts the game.
|
||||
* The game will only run as long as the player has not retired or has been destroyed.
|
||||
* @param args Just the console for the player to look at.
|
||||
*/
|
||||
public static void main(String[] args) {
|
||||
main main = new main();
|
||||
|
||||
Reference in New Issue
Block a user