943 lines
42 KiB
XML
943 lines
42 KiB
XML
<?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="">
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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" />
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
</component>
|
|
<component name="FileEditorManager">
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
<file pinned="false" current-in-tab="true">
|
|
<entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="210">
|
|
<caret line="14" column="26" selection-start-line="14" selection-start-column="26" selection-end-line="14" selection-end-column="26" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
</file>
|
|
<file pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/src/GameEndGUI.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="30">
|
|
<caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
</file>
|
|
<file pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="6750">
|
|
<caret line="450" column="35" lean-forward="true" selection-start-line="450" selection-start-column="35" selection-end-line="450" selection-end-column="35" />
|
|
<folding>
|
|
<element signature="n#!!doc" expanded="true" />
|
|
<element signature="imports" expanded="true" />
|
|
<element signature="e#3406#3407#0" expanded="true" />
|
|
<element signature="e#3439#3440#0" expanded="true" />
|
|
<element signature="e#3950#3951#0" expanded="true" />
|
|
<element signature="e#3982#3983#0" expanded="true" />
|
|
<element signature="e#4485#4486#0" expanded="true" />
|
|
<element signature="e#4517#4518#0" expanded="true" />
|
|
<element signature="e#5038#5039#0" expanded="true" />
|
|
<element signature="e#5073#5074#0" expanded="true" />
|
|
<element signature="e#25255#25256#0" expanded="true" />
|
|
<element signature="e#25300#25301#0" expanded="true" />
|
|
</folding>
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
</file>
|
|
<file pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/src/StartGUI.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="30">
|
|
<caret line="10" selection-start-line="10" selection-end-line="15" selection-end-column="2" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
</file>
|
|
</leaf>
|
|
</component>
|
|
<component name="FileTemplateManagerImpl">
|
|
<option name="RECENT_TEMPLATES">
|
|
<list>
|
|
<option value="Class" />
|
|
</list>
|
|
</option>
|
|
</component>
|
|
<component name="FindInProjectRecents">
|
|
<findStrings>
|
|
<find>destr</find>
|
|
<find>destro</find>
|
|
<find>hitco</find>
|
|
<find>game</find>
|
|
<find>numOf</find>
|
|
<find>mis</find>
|
|
<find>exitValue</find>
|
|
<find>getGuns</find>
|
|
<find>frustRat</find>
|
|
<find>counter++</find>
|
|
<find>setMone</find>
|
|
<find>setNum</find>
|
|
<find>We survive</find>
|
|
<find>total of</find>
|
|
<find>int numOfShips</find>
|
|
<find>runFromShips()</find>
|
|
<find>dang it!</find>
|
|
<find>dang it</find>
|
|
<find>destroy</find>
|
|
<find>destroyPeas</find>
|
|
<find>cash</find>
|
|
<find>op</find>
|
|
<find>continue</find>
|
|
<find>cashTex</find>
|
|
<find>cashTe</find>
|
|
<find>run</find>
|
|
<find>loan</find>
|
|
<find>get loa</find>
|
|
<find>warehouse</find>
|
|
<find>warehouse\n</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_TYPE" value="REBASE" />
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
</component>
|
|
<component name="IdeDocumentHistory">
|
|
<option name="CHANGED_PATHS">
|
|
<list>
|
|
<option value="$PROJECT_DIR$/src/Core.java" />
|
|
<option value="$PROJECT_DIR$/src/Game.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/ShipWarfare.java" />
|
|
<option value="$PROJECT_DIR$/src/TravelGUI.java" />
|
|
<option value="$PROJECT_DIR$/src/Player.java" />
|
|
<option value="$PROJECT_DIR$/src/TaipanShopGUI.java" />
|
|
<option value="$PROJECT_DIR$/src/StartGUI.java" />
|
|
<option value="$PROJECT_DIR$/src/ShipWarfareGUI.java" />
|
|
</list>
|
|
</option>
|
|
</component>
|
|
<component name="ProjectFrameBounds">
|
|
<option name="x" value="6" />
|
|
<option name="y" value="26" />
|
|
<option name="width" value="1189" />
|
|
<option name="height" value="652" />
|
|
</component>
|
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
|
<component name="ProjectView">
|
|
<navigator proportions="" version="1">
|
|
<foldersAlwaysOnTop value="true" />
|
|
</navigator>
|
|
<panes>
|
|
<pane id="ProjectPane">
|
|
<subPane>
|
|
<expand>
|
|
<path>
|
|
<item name="TaipanClone" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="TaipanClone" type="462c0819:PsiDirectoryNode" />
|
|
</path>
|
|
<path>
|
|
<item name="TaipanClone" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="TaipanClone" type="462c0819:PsiDirectoryNode" />
|
|
<item name="src" type="462c0819:PsiDirectoryNode" />
|
|
</path>
|
|
</expand>
|
|
<select />
|
|
</subPane>
|
|
</pane>
|
|
<pane id="Scope" />
|
|
<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="1552351596289" />
|
|
<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="Modules" />
|
|
<property name="project.structure.proportion" value="0.15" />
|
|
<property name="project.structure.side.proportion" value="0.2" />
|
|
<property name="settings.editor.selected.configurable" value="editing.templates" />
|
|
</component>
|
|
<component name="RunDashboard">
|
|
<option name="ruleStates">
|
|
<list>
|
|
<RuleState>
|
|
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
|
|
</RuleState>
|
|
<RuleState>
|
|
<option name="name" value="StatusDashboardGroupingRule" />
|
|
</RuleState>
|
|
</list>
|
|
</option>
|
|
</component>
|
|
<component name="RunManager" selected="Application.MainGUI">
|
|
<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" />
|
|
</method>
|
|
</configuration>
|
|
<configuration name="MainGUI" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
|
<option name="MAIN_CLASS_NAME" value="MainGUI" />
|
|
<module name="TaipanClone" />
|
|
<method v="2">
|
|
<option name="Make" enabled="true" />
|
|
</method>
|
|
</configuration>
|
|
<configuration name="ShipWarfareGUI" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
|
<option name="MAIN_CLASS_NAME" value="ShipWarfareGUI" />
|
|
<module name="TaipanClone" />
|
|
<method v="2">
|
|
<option name="Make" enabled="true" />
|
|
</method>
|
|
</configuration>
|
|
<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="main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
|
<option name="MAIN_CLASS_NAME" value="main" />
|
|
<module name="TaipanClone" />
|
|
<method v="2">
|
|
<option name="Make" enabled="true" />
|
|
</method>
|
|
</configuration>
|
|
<list>
|
|
<item itemvalue="Application.TaipanShop" />
|
|
<item itemvalue="Application.Game" />
|
|
<item itemvalue="Application.main" />
|
|
<item itemvalue="Application.ShipWarfareGUI" />
|
|
<item itemvalue="Application.MainGUI" />
|
|
</list>
|
|
<recent_temporary>
|
|
<list>
|
|
<item itemvalue="Application.MainGUI" />
|
|
<item itemvalue="Application.ShipWarfareGUI" />
|
|
<item itemvalue="Application.main" />
|
|
<item itemvalue="Application.TaipanShop" />
|
|
<item itemvalue="Application.Game" />
|
|
</list>
|
|
</recent_temporary>
|
|
</component>
|
|
<component name="SvnConfiguration" cleanupOnStartRun="true">
|
|
<configuration>C:\Users\Harkamal Randhawa\AppData\Roaming\Subversion</configuration>
|
|
<supportedVersion>125</supportedVersion>
|
|
</component>
|
|
<component name="TaskManager">
|
|
<task active="true" id="Default" summary="Default task">
|
|
<changelist id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="" />
|
|
<created>1550454898506</created>
|
|
<option name="number" value="Default" />
|
|
<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="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" />
|
|
<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" />
|
|
<workItem from="1552187010251" duration="1043000" />
|
|
<workItem from="1552195875453" duration="55000" />
|
|
<workItem from="1552195941602" duration="33000" />
|
|
<workItem from="1552195980542" duration="513000" />
|
|
<workItem from="1552197114688" duration="110000" />
|
|
<workItem from="1552198897279" duration="7000" />
|
|
<workItem from="1552199842131" duration="998000" />
|
|
<workItem from="1552201459117" duration="275000" />
|
|
<workItem from="1552203562938" duration="2174000" />
|
|
<workItem from="1552207404121" duration="54000" />
|
|
<workItem from="1552210170594" duration="72000" />
|
|
<workItem from="1552238757321" duration="742000" />
|
|
<workItem from="1552240770629" duration="40000" />
|
|
<workItem from="1552241394045" duration="178000" />
|
|
<workItem from="1552254283748" duration="9473000" />
|
|
<workItem from="1552277298937" duration="10904000" />
|
|
</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>
|
|
<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>1550540282400</updated>
|
|
</task>
|
|
<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>1550540820542</updated>
|
|
</task>
|
|
<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>1550541406597</updated>
|
|
</task>
|
|
<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>1550541751914</updated>
|
|
</task>
|
|
<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>1550543764971</updated>
|
|
</task>
|
|
<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>1550575512841</updated>
|
|
</task>
|
|
<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>1550623749854</updated>
|
|
</task>
|
|
<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>1550628232136</updated>
|
|
</task>
|
|
<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>1550879092914</updated>
|
|
</task>
|
|
<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>1551162699319</updated>
|
|
</task>
|
|
<task id="LOCAL-00012" summary="Added time stuff to Shipwarfare GUI">
|
|
<created>1552168801248</created>
|
|
<option name="number" value="00012" />
|
|
<option name="presentableId" value="LOCAL-00012" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552168801248</updated>
|
|
</task>
|
|
<task id="LOCAL-00013" summary="Notified of getting attacked">
|
|
<created>1552172956109</created>
|
|
<option name="number" value="00013" />
|
|
<option name="presentableId" value="LOCAL-00013" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552172956109</updated>
|
|
</task>
|
|
<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>
|
|
<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>
|
|
<task id="LOCAL-00018" summary="Please find error">
|
|
<created>1552187032139</created>
|
|
<option name="number" value="00018" />
|
|
<option name="presentableId" value="LOCAL-00018" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552187032139</updated>
|
|
</task>
|
|
<task id="LOCAL-00019" summary="Super broken but fight button is in progress for shipwarfare">
|
|
<created>1552195966566</created>
|
|
<option name="number" value="00019" />
|
|
<option name="presentableId" value="LOCAL-00019" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552195966566</updated>
|
|
</task>
|
|
<task id="LOCAL-00020" summary="Forces you to fight in ShipWarfareGUI unfortunately">
|
|
<created>1552197150577</created>
|
|
<option name="number" value="00020" />
|
|
<option name="presentableId" value="LOCAL-00020" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552197150577</updated>
|
|
</task>
|
|
<task id="LOCAL-00021" summary="ShipWarfare fight button coming along nicely">
|
|
<created>1552200771732</created>
|
|
<option name="number" value="00021" />
|
|
<option name="presentableId" value="LOCAL-00021" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552200771732</updated>
|
|
</task>
|
|
<task id="LOCAL-00022" summary="Shipwarfare fight button GUI almost complete">
|
|
<created>1552203599900</created>
|
|
<option name="number" value="00022" />
|
|
<option name="presentableId" value="LOCAL-00022" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552203599900</updated>
|
|
</task>
|
|
<task id="LOCAL-00023" summary="Fixed numOfShips method for ShipWarfareGUI">
|
|
<created>1552205678080</created>
|
|
<option name="number" value="00023" />
|
|
<option name="presentableId" value="LOCAL-00023" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552205678080</updated>
|
|
</task>
|
|
<task id="LOCAL-00024" summary="Fixed the loot system a bit">
|
|
<created>1552207442784</created>
|
|
<option name="number" value="00024" />
|
|
<option name="presentableId" value="LOCAL-00024" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552207442785</updated>
|
|
</task>
|
|
<task id="LOCAL-00025" summary="Completely ruined shipWarfare with a previous edit, fixed it and added a better loot feature for peasant ships">
|
|
<created>1552210228514</created>
|
|
<option name="number" value="00025" />
|
|
<option name="presentableId" value="LOCAL-00025" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552210228514</updated>
|
|
</task>
|
|
<task id="LOCAL-00026" summary="Basic functionality of buttons completed, think all I have to do now is to find a way to break the code when the user wins, loses or runs away.">
|
|
<created>1552238814974</created>
|
|
<option name="number" value="00026" />
|
|
<option name="presentableId" value="LOCAL-00026" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552238814974</updated>
|
|
</task>
|
|
<task id="LOCAL-00027" summary="Fixed probability of ships running away">
|
|
<created>1552240801199</created>
|
|
<option name="number" value="00027" />
|
|
<option name="presentableId" value="LOCAL-00027" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552240801199</updated>
|
|
</task>
|
|
<task id="LOCAL-00028" summary="Fined minor bugs in shipwarfareGUI including the "gun frustration" variable">
|
|
<created>1552241433802</created>
|
|
<option name="number" value="00028" />
|
|
<option name="presentableId" value="LOCAL-00028" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552241433802</updated>
|
|
</task>
|
|
<task id="LOCAL-00029" summary="Just checking">
|
|
<created>1552254331758</created>
|
|
<option name="number" value="00029" />
|
|
<option name="presentableId" value="LOCAL-00029" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552254331759</updated>
|
|
</task>
|
|
<task id="LOCAL-00030" summary="A lot of errors but easily fixable SHipwarfareGUI">
|
|
<created>1552268490741</created>
|
|
<option name="number" value="00030" />
|
|
<option name="presentableId" value="LOCAL-00030" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552268490741</updated>
|
|
</task>
|
|
<task id="LOCAL-00031" summary="Completed SHipWarfareGUI">
|
|
<created>1552269636545</created>
|
|
<option name="number" value="00031" />
|
|
<option name="presentableId" value="LOCAL-00031" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552269636545</updated>
|
|
</task>
|
|
<task id="LOCAL-00032" summary="Completed ShipWarfareGUI">
|
|
<created>1552269681200</created>
|
|
<option name="number" value="00032" />
|
|
<option name="presentableId" value="LOCAL-00032" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552269681200</updated>
|
|
</task>
|
|
<task id="LOCAL-00033" summary="Probably should upload">
|
|
<created>1552270321401</created>
|
|
<option name="number" value="00033" />
|
|
<option name="presentableId" value="LOCAL-00033" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552270321402</updated>
|
|
</task>
|
|
<task id="LOCAL-00034" summary="Fixed ShipWarfare bug about one-shotting.">
|
|
<created>1552279406065</created>
|
|
<option name="number" value="00034" />
|
|
<option name="presentableId" value="LOCAL-00034" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552279406066</updated>
|
|
</task>
|
|
<task id="LOCAL-00035" summary="Completed javadocs for shipwarfare GUI">
|
|
<created>1552280311398</created>
|
|
<option name="number" value="00035" />
|
|
<option name="presentableId" value="LOCAL-00035" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552280311399</updated>
|
|
</task>
|
|
<task id="LOCAL-00036" summary="Added to my javadocs a bit">
|
|
<created>1552280610787</created>
|
|
<option name="number" value="00036" />
|
|
<option name="presentableId" value="LOCAL-00036" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552280610787</updated>
|
|
</task>
|
|
<task id="LOCAL-00037" summary="Changed one line of text in shipwarfare GUI">
|
|
<created>1552282957716</created>
|
|
<option name="number" value="00037" />
|
|
<option name="presentableId" value="LOCAL-00037" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552282957716</updated>
|
|
</task>
|
|
<task id="LOCAL-00038" summary="Fixed output for start and TaipanShop GUI">
|
|
<created>1552328825548</created>
|
|
<option name="number" value="00038" />
|
|
<option name="presentableId" value="LOCAL-00038" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552328825548</updated>
|
|
</task>
|
|
<task id="LOCAL-00039" summary="Added JavaDocs for ShipWarfare">
|
|
<created>1552339973224</created>
|
|
<option name="number" value="00039" />
|
|
<option name="presentableId" value="LOCAL-00039" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1552339973224</updated>
|
|
</task>
|
|
<option name="localTasksCounter" value="40" />
|
|
<servers />
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<option name="totallyTimeSpent" value="83977000" />
|
|
</component>
|
|
<component name="ToolWindowManager">
|
|
<frame x="6" y="26" width="1189" height="652" extended-state="0" />
|
|
<editor active="true" />
|
|
<layout>
|
|
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2798605" />
|
|
<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.9357143" />
|
|
<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.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" />
|
|
<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>
|
|
<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" />
|
|
</component>
|
|
<component name="Vcs.Log.History.Properties">
|
|
<option name="COLUMN_ORDER">
|
|
<list>
|
|
<option value="0" />
|
|
<option value="2" />
|
|
<option value="3" />
|
|
<option value="1" />
|
|
</list>
|
|
</option>
|
|
</component>
|
|
<component name="Vcs.Log.Tabs.Properties">
|
|
<option name="RECENT_FILTERS">
|
|
<map>
|
|
<entry key="Branch">
|
|
<value>
|
|
<list />
|
|
</value>
|
|
</entry>
|
|
<entry key="User">
|
|
<value>
|
|
<list />
|
|
</value>
|
|
</entry>
|
|
</map>
|
|
</option>
|
|
</component>
|
|
<component name="VcsManagerConfiguration">
|
|
<ignored-roots>
|
|
<path value="$PROJECT_DIR$" />
|
|
</ignored-roots>
|
|
<MESSAGE value="Missed one statement that I needed to encapsulate" />
|
|
<MESSAGE value="Messed up player by setting money to 1000" />
|
|
<MESSAGE value="Please find error" />
|
|
<MESSAGE value="Super broken but fight button is in progress for shipwarfare" />
|
|
<MESSAGE value="Forces you to fight in ShipWarfareGUI unfortunately" />
|
|
<MESSAGE value="ShipWarfare fight button coming along nicely" />
|
|
<MESSAGE value="Shipwarfare fight button GUI almost complete" />
|
|
<MESSAGE value="Fixed numOfShips method for ShipWarfareGUI" />
|
|
<MESSAGE value="Fixed the loot system a bit" />
|
|
<MESSAGE value="Completely ruined shipWarfare with a previous edit, fixed it and added a better loot feature for peasant ships" />
|
|
<MESSAGE value="Basic functionality of buttons completed, think all I have to do now is to find a way to break the code when the user wins, loses or runs away." />
|
|
<MESSAGE value="Fixed probability of ships running away" />
|
|
<MESSAGE value="Fined minor bugs in shipwarfareGUI" />
|
|
<MESSAGE value="Fined minor bugs in shipwarfareGUI including the "gun frustration" variable" />
|
|
<MESSAGE value="Just checking" />
|
|
<MESSAGE value="A lot of errors but easily fixable SHipwarfareGUI" />
|
|
<MESSAGE value="Completed SHipWarfareGUI" />
|
|
<MESSAGE value="Completed ShipWarfareGUI" />
|
|
<MESSAGE value="Probably should upload" />
|
|
<MESSAGE value="Fixed ShipWarfare bug about one-shotting." />
|
|
<MESSAGE value="Completed javadocs for shipwarfare GUI" />
|
|
<MESSAGE value="Added to my javadocs a bit" />
|
|
<MESSAGE value="Changed one line of text in shipwarfare GUI" />
|
|
<MESSAGE value="Fixed output for start and TaipanShop GUI" />
|
|
<MESSAGE value="Added JavaDocs for ShipWarfare" />
|
|
<option name="LAST_COMMIT_MESSAGE" value="Added JavaDocs for ShipWarfare" />
|
|
</component>
|
|
<component name="editorHistoryManager">
|
|
<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="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/Game.java" />
|
|
<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">
|
|
<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>
|
|
<entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_201.jdk/Contents/Home/javafx-src.zip!/com/sun/glass/ui/InvokeLaterDispatcher.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="140">
|
|
<caret line="110" column="19" selection-start-line="110" selection-start-column="19" selection-end-line="110" selection-end-column="19" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/src/ShopGUI" />
|
|
<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="195">
|
|
<caret line="13" column="5" lean-forward="true" selection-start-line="13" selection-start-column="5" selection-end-line="13" selection-end-column="5" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="-1074">
|
|
<caret line="17" column="35" selection-start-line="17" selection-start-column="35" selection-end-line="17" selection-end-column="35" />
|
|
<folding>
|
|
<element signature="imports" expanded="true" />
|
|
</folding>
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/src/MainGUI.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="780">
|
|
<caret line="55" column="28" selection-start-line="53" selection-start-column="7" selection-end-line="55" selection-end-column="28" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="6615">
|
|
<caret line="465" column="42" selection-start-line="465" selection-start-column="42" selection-end-line="465" selection-end-column="42" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/src/Player.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state>
|
|
<caret column="5" lean-forward="true" selection-start-column="5" selection-end-column="5" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/src/WarehouseGUI.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="-1968">
|
|
<caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/src/GameEndGUI.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="30">
|
|
<caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="6750">
|
|
<caret line="450" column="35" lean-forward="true" selection-start-line="450" selection-start-column="35" selection-end-line="450" selection-end-column="35" />
|
|
<folding>
|
|
<element signature="n#!!doc" expanded="true" />
|
|
<element signature="imports" expanded="true" />
|
|
<element signature="e#3406#3407#0" expanded="true" />
|
|
<element signature="e#3439#3440#0" expanded="true" />
|
|
<element signature="e#3950#3951#0" expanded="true" />
|
|
<element signature="e#3982#3983#0" expanded="true" />
|
|
<element signature="e#4485#4486#0" expanded="true" />
|
|
<element signature="e#4517#4518#0" expanded="true" />
|
|
<element signature="e#5038#5039#0" expanded="true" />
|
|
<element signature="e#5073#5074#0" expanded="true" />
|
|
<element signature="e#25255#25256#0" expanded="true" />
|
|
<element signature="e#25300#25301#0" expanded="true" />
|
|
</folding>
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/src/StartGUI.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="30">
|
|
<caret line="10" selection-start-line="10" selection-end-line="15" selection-end-column="2" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="210">
|
|
<caret line="14" column="26" selection-start-line="14" selection-start-column="26" selection-end-line="14" selection-end-column="26" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
</component>
|
|
<component name="masterDetails">
|
|
<states>
|
|
<state key="ArtifactsStructureConfigurable.UI">
|
|
<settings>
|
|
<artifact-editor />
|
|
<splitter-proportions>
|
|
<option name="proportions">
|
|
<list>
|
|
<option value="0.2" />
|
|
</list>
|
|
</option>
|
|
</splitter-proportions>
|
|
</settings>
|
|
</state>
|
|
<state key="FacetStructureConfigurable.UI">
|
|
<settings>
|
|
<last-edited>No facets are configured</last-edited>
|
|
<splitter-proportions>
|
|
<option name="proportions">
|
|
<list>
|
|
<option value="0.2" />
|
|
</list>
|
|
</option>
|
|
</splitter-proportions>
|
|
</settings>
|
|
</state>
|
|
<state key="GlobalLibrariesConfigurable.UI">
|
|
<settings>
|
|
<splitter-proportions>
|
|
<option name="proportions">
|
|
<list>
|
|
<option value="0.2" />
|
|
</list>
|
|
</option>
|
|
</splitter-proportions>
|
|
</settings>
|
|
</state>
|
|
<state key="JdkListConfigurable.UI">
|
|
<settings>
|
|
<last-edited>1.8.0_201</last-edited>
|
|
<splitter-proportions>
|
|
<option name="proportions">
|
|
<list>
|
|
<option value="0.2" />
|
|
</list>
|
|
</option>
|
|
</splitter-proportions>
|
|
</settings>
|
|
</state>
|
|
<state key="ModuleStructureConfigurable.UI">
|
|
<settings>
|
|
<last-edited>TaipanClone</last-edited>
|
|
<splitter-proportions>
|
|
<option name="proportions">
|
|
<list>
|
|
<option value="0.2" />
|
|
</list>
|
|
</option>
|
|
</splitter-proportions>
|
|
</settings>
|
|
</state>
|
|
<state key="ProjectLibrariesConfigurable.UI">
|
|
<settings>
|
|
<splitter-proportions>
|
|
<option name="proportions">
|
|
<list>
|
|
<option value="0.2" />
|
|
</list>
|
|
</option>
|
|
</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> |