Finished TravelGUI and StartGUI
This commit is contained in:
643
.idea/workspace.xml
generated
643
.idea/workspace.xml
generated
@@ -1,12 +1,19 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="BookmarkManager">
|
||||
<bookmark url="file://$PROJECT_DIR$/src/ShipWarfareGUI.java" line="590" />
|
||||
</component>
|
||||
<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="Added some logic to ShipWarfareGUI">
|
||||
<change afterPath="$PROJECT_DIR$/src/StartGUI.java" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/src/TravelGUI.java" afterDir="false" />
|
||||
<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$/out/production/TaipanClone/ShipWarfare.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/TaipanClone/ShipWarfare.class" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/src/ShopGUI" beforeDir="false" afterPath="$PROJECT_DIR$/src/ShopGUI.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" />
|
||||
@@ -16,36 +23,92 @@
|
||||
<component name="FileEditorManager">
|
||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
|
||||
<entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="5025">
|
||||
<caret line="353" column="100" selection-end-line="503" />
|
||||
<state relative-caret-position="279">
|
||||
<caret line="682" selection-start-line="682" selection-end-line="682" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#763#794#0" expanded="true" />
|
||||
<element signature="e#1208#1209#0" expanded="true" />
|
||||
<element signature="e#1236#1237#0" expanded="true" />
|
||||
<element signature="e#17682#17683#0" expanded="true" />
|
||||
<element signature="e#17720#17721#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
|
||||
<entry file="file://$PROJECT_DIR$/src/ShopGUI.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2580">
|
||||
<caret line="172" column="5" selection-start-line="172" selection-start-column="5" selection-end-line="172" selection-end-column="5" />
|
||||
<state relative-caret-position="117">
|
||||
<caret line="458" selection-start-line="458" selection-end-line="466" selection-end-column="11" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#1150#1151#0" expanded="true" />
|
||||
<element signature="e#1178#1179#0" expanded="true" />
|
||||
<element signature="e#1879#2020#0" />
|
||||
<element signature="e#2026#2140#0" />
|
||||
<element signature="e#2026#2268#0" />
|
||||
<element signature="e#2274#2524#0" />
|
||||
<element signature="e#2274#2657#0" />
|
||||
<element signature="e#2663#2887#0" />
|
||||
<element signature="e#2663#3001#0" />
|
||||
<element signature="e#3007#3133#0" />
|
||||
<element signature="e#3205#3412#0" />
|
||||
<element signature="e#3205#3546#0" />
|
||||
<element signature="e#3552#3676#0" />
|
||||
<element signature="e#3746#3950#0" />
|
||||
<element signature="e#3746#4079#0" />
|
||||
<element signature="e#4022#4073#1" />
|
||||
<element signature="e#4085#4209#0" />
|
||||
<element signature="e#4279#4483#0" />
|
||||
<element signature="e#4279#4612#0" />
|
||||
<element signature="e#4618#4757#0" />
|
||||
<element signature="e#4833#5046#0" />
|
||||
<element signature="e#4833#5190#0" />
|
||||
<element signature="e#5196#5297#0" />
|
||||
<element signature="e#5196#7354#0" />
|
||||
<element signature="e#10976#16179#0" />
|
||||
<element signature="e#11276#11422#1" />
|
||||
<element signature="e#11480#11600#1" />
|
||||
<element signature="e#11645#11797#1" />
|
||||
<element signature="e#12094#12214#1" />
|
||||
<element signature="e#12258#12409#1" />
|
||||
<element signature="e#12704#12824#1" />
|
||||
<element signature="e#12867#13018#1" />
|
||||
<element signature="e#13325#13445#1" />
|
||||
<element signature="e#13704#16173#1" />
|
||||
<element signature="e#13801#13949#1" />
|
||||
<element signature="e#14007#14138#1" />
|
||||
<element signature="e#14183#14336#1" />
|
||||
<element signature="e#14624#14755#1" />
|
||||
<element signature="e#14799#14951#1" />
|
||||
<element signature="e#15237#15368#1" />
|
||||
<element signature="class#20468:20804" />
|
||||
<element signature="class#20968:21155" />
|
||||
<element signature="class#21497:21689" />
|
||||
<element signature="class#21854:22047" />
|
||||
<element signature="class#22296:22485" />
|
||||
<element signature="class#22689:22842" />
|
||||
<element signature="class#23135:23794" />
|
||||
<element signature="class#24032:24686" />
|
||||
<element signature="class#24848:25502" />
|
||||
<element signature="class#25837:26512" />
|
||||
<element signature="e#31300#31833#0" />
|
||||
<element signature="e#31843#32457#0" />
|
||||
<element signature="e#32467#34046#0" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/src/main.java">
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/Travel.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="135">
|
||||
<caret line="9" column="4" selection-end-line="55" />
|
||||
<state relative-caret-position="1564">
|
||||
<caret line="95" column="19" selection-start-line="95" selection-start-column="19" selection-end-line="95" selection-end-column="19" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -53,22 +116,64 @@
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/Start.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="15">
|
||||
<caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
|
||||
<state relative-caret-position="51">
|
||||
<caret line="3" selection-start-line="3" selection-end-line="35" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/ShopGUI">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
<entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2567">
|
||||
<caret line="174" column="38" selection-start-line="174" selection-start-column="23" selection-end-line="174" selection-end-column="38" />
|
||||
<folding>
|
||||
<element signature="e#1244#1245#0" expanded="true" />
|
||||
<element signature="e#1272#1273#0" expanded="true" />
|
||||
<element signature="e#2274#2657#0" />
|
||||
<element signature="e#2663#3001#0" />
|
||||
<element signature="e#6546#8362#1" />
|
||||
<element signature="docComment;method#seaAtlas#0;class#TravelGUI#0" />
|
||||
<element signature="method#seaAtlas#0;class#TravelGUI#0" />
|
||||
<element signature="docComment;method#randomEventSea#0;class#TravelGUI#0" />
|
||||
<element signature="method#randomEventSea#0;class#TravelGUI#0" />
|
||||
<element signature="docComment;method#disaster#0;class#TravelGUI#0" />
|
||||
<element signature="e#31300#31833#0" />
|
||||
<element signature="e#31843#32457#0" />
|
||||
<element signature="e#32467#34046#0" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/src/StartGUI.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="230">
|
||||
<caret line="147" column="20" selection-start-line="147" selection-start-column="20" selection-end-line="147" selection-end-column="20" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#639#640#0" expanded="true" />
|
||||
<element signature="e#667#668#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<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="135">
|
||||
<caret line="9" column="32" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
|
||||
<state relative-caret-position="-1934">
|
||||
<caret line="56" column="5" selection-start-line="56" selection-start-column="5" selection-end-line="56" selection-end-column="5" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/main.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-421">
|
||||
<caret line="2" column="41" selection-start-line="2" selection-start-column="41" selection-end-line="2" selection-end-column="41" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
@@ -78,54 +183,55 @@
|
||||
<component name="FileTemplateManagerImpl">
|
||||
<option name="RECENT_TEMPLATES">
|
||||
<list>
|
||||
<option value="JavaFXApplication" />
|
||||
<option value="Class" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="FindInProjectRecents">
|
||||
<findStrings>
|
||||
<find>GetGuns</find>
|
||||
<find>set</find>
|
||||
<find>TaipanShop</find>
|
||||
<find>shop()</find>
|
||||
<find>shop</find>
|
||||
<find>being</find>
|
||||
<find>label0</find>
|
||||
<find>hBox</find>
|
||||
<find><</find>
|
||||
<find>winO</find>
|
||||
<find>destroy</find>
|
||||
<find>get</find>
|
||||
<find>user</find>
|
||||
<find>setNumOfP</find>
|
||||
<find>setUs</find>
|
||||
<find>starting</find>
|
||||
<find>destro</find>
|
||||
<find>numOfpeasantShips</find>
|
||||
<find>startingPeasantShips</find>
|
||||
<find>startingLittyShips</find>
|
||||
<find>howMuchRun</find>
|
||||
<find>pirateName</find>
|
||||
<find>player</find>
|
||||
<find>numOfPeasantShips</find>
|
||||
<find>peasant</find>
|
||||
<find>litty</find>
|
||||
<find>userAttacks</find>
|
||||
<find>numOfLittyShips</find>
|
||||
<find>delay</find>
|
||||
<find>Hp</find>
|
||||
<find>setVisible</find>
|
||||
<find>button</find>
|
||||
<find>textField</find>
|
||||
<find>quitButton</find>
|
||||
<find>initial</find>
|
||||
<find>Text</find>
|
||||
<find>TextField</find>
|
||||
<find>setTe</find>
|
||||
<find>number</find>
|
||||
<find>textOut</find>
|
||||
<find>text</find>
|
||||
<find>//</find>
|
||||
<find>defaultTextOut</find>
|
||||
<find>getText</find>
|
||||
<find>numberInput</find>
|
||||
<find>handle</find>
|
||||
<find>event</find>
|
||||
<find>System.out.println(</find>
|
||||
<find>Where</find>
|
||||
<find>sea</find>
|
||||
<find>hon</find>
|
||||
<find>setVis</find>
|
||||
<find>Tex</find>
|
||||
<find>VBox</find>
|
||||
<find>ToggleGroup</find>
|
||||
<find>field</find>
|
||||
<find>startButton</find>
|
||||
<find>visib</find>
|
||||
<find>random</find>
|
||||
<find>quit</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>
|
||||
<replace>//delayForSeconds</replace>
|
||||
<replace>textOut.setText(" " +</replace>
|
||||
<replace>textOut.setText(" " +</replace>
|
||||
</replaceStrings>
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
<option name="UPDATE_TYPE" value="REBASE" />
|
||||
<option name="UPDATE_TYPE" value="MERGE" />
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="IdeDocumentHistory">
|
||||
@@ -133,29 +239,36 @@
|
||||
<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/ShipWarfareGUI.java" />
|
||||
<option value="$PROJECT_DIR$/src/Player.java" />
|
||||
<option value="$PROJECT_DIR$/src/TaipanShop.java" />
|
||||
<option value="$PROJECT_DIR$/src/Travel.java" />
|
||||
<option value="$PROJECT_DIR$/src/GUI.java" />
|
||||
<option value="$PROJECT_DIR$/src/fxmlControllers/shipFXML.java" />
|
||||
<option value="$PROJECT_DIR$/src/ShipWarfareGUI.fxml" />
|
||||
<option value="$PROJECT_DIR$/src/ShipWarfare.java" />
|
||||
<option value="$PROJECT_DIR$/src/ShipWarfareGUI.java" />
|
||||
<option value="$PROJECT_DIR$/src/main.java" />
|
||||
<option value="$PROJECT_DIR$/src/Start.java" />
|
||||
<option value="$PROJECT_DIR$/src/ShopGUI.java" />
|
||||
<option value="$PROJECT_DIR$/src/TravelGUI.java" />
|
||||
<option value="$PROJECT_DIR$/src/StartGUI.java" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectFrameBounds">
|
||||
<option name="x" value="48" />
|
||||
<option name="y" value="23" />
|
||||
<option name="width" value="1189" />
|
||||
<option name="height" value="652" />
|
||||
<component name="ProjectFrameBounds" extendedState="6">
|
||||
<option name="x" value="2279" />
|
||||
<option name="y" value="264" />
|
||||
<option name="width" value="854" />
|
||||
<option name="height" value="505" />
|
||||
</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="ProjectPane">
|
||||
<subPane>
|
||||
<expand>
|
||||
@@ -172,6 +285,7 @@
|
||||
<select />
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="Scope" />
|
||||
<pane id="PackagesPane" />
|
||||
</panes>
|
||||
</component>
|
||||
@@ -179,9 +293,10 @@
|
||||
<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="1552182988336" />
|
||||
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552199149371" />
|
||||
<property name="extract.method.default.visibility" value="private" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/../GitHub/Cpsc233" />
|
||||
<property name="last_opened_file_path" value="$USER_HOME$/Documents/GitHub/Cpsc233" />
|
||||
<property name="nodejs_package_manager_path" value="npm" />
|
||||
<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" />
|
||||
@@ -199,16 +314,9 @@
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunManager" selected="Application.main">
|
||||
<configuration name="Game" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="Game" />
|
||||
<module name="TaipanClone" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="ShipWarfare" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="ShipWarfare" />
|
||||
<component name="RunManager" selected="Application.StartGUI">
|
||||
<configuration name="GUI" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="GUI" />
|
||||
<module name="TaipanClone" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
@@ -221,34 +329,41 @@
|
||||
<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" />
|
||||
<configuration name="ShopGUI" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="ShopGUI" />
|
||||
<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" />
|
||||
<configuration name="StartGUI" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="StartGUI" />
|
||||
<module name="TaipanClone" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="TravelGUI" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
|
||||
<option name="MAIN_CLASS_NAME" value="TravelGUI" />
|
||||
<module name="TaipanClone" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<list>
|
||||
<item itemvalue="Application.ShipWarfare" />
|
||||
<item itemvalue="Application.TaipanShop" />
|
||||
<item itemvalue="Application.Game" />
|
||||
<item itemvalue="Application.main" />
|
||||
<item itemvalue="Application.ShopGUI" />
|
||||
<item itemvalue="Application.ShipWarfareGUI" />
|
||||
<item itemvalue="Application.GUI" />
|
||||
<item itemvalue="Application.TravelGUI" />
|
||||
<item itemvalue="Application.StartGUI" />
|
||||
</list>
|
||||
<recent_temporary>
|
||||
<list>
|
||||
<item itemvalue="Application.main" />
|
||||
<item itemvalue="Application.StartGUI" />
|
||||
<item itemvalue="Application.TravelGUI" />
|
||||
<item itemvalue="Application.ShopGUI" />
|
||||
<item itemvalue="Application.ShipWarfareGUI" />
|
||||
<item itemvalue="Application.TaipanShop" />
|
||||
<item itemvalue="Application.Game" />
|
||||
<item itemvalue="Application.ShipWarfare" />
|
||||
<item itemvalue="Application.GUI" />
|
||||
</list>
|
||||
</recent_temporary>
|
||||
</component>
|
||||
@@ -273,12 +388,11 @@
|
||||
<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="1551158469442" duration="5961000" />
|
||||
<workItem from="1551516759745" duration="56000" />
|
||||
<workItem from="1552008296567" duration="595000" />
|
||||
<workItem from="1552080169924" duration="15810000" />
|
||||
<workItem from="1552165217689" duration="26528000" />
|
||||
</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>
|
||||
@@ -357,59 +471,52 @@
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1551162699319</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00012" summary="Added time stuff to Shipwarfare GUI">
|
||||
<created>1552168801248</created>
|
||||
<task id="LOCAL-00012" summary="Fixed some little problems with documenting.">
|
||||
<created>1551163347576</created>
|
||||
<option name="number" value="00012" />
|
||||
<option name="presentableId" value="LOCAL-00012" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1552168801248</updated>
|
||||
<updated>1551163347576</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00013" summary="Notified of getting attacked">
|
||||
<created>1552172956109</created>
|
||||
<task id="LOCAL-00013" summary="Fixed some little problems with documenting.">
|
||||
<created>1551163654726</created>
|
||||
<option name="number" value="00013" />
|
||||
<option name="presentableId" value="LOCAL-00013" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1552172956109</updated>
|
||||
<updated>1551163654726</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00014" summary="Added fight stuff">
|
||||
<created>1552173216531</created>
|
||||
<task id="LOCAL-00014" summary="Basic layout for ShipwarefareGUI.">
|
||||
<created>1552166044309</created>
|
||||
<option name="number" value="00014" />
|
||||
<option name="presentableId" value="LOCAL-00014" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1552173216532</updated>
|
||||
<updated>1552166044309</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00015" summary="Made ShipWarfare easier to access by ShipWarfareGUI">
|
||||
<created>1552181324520</created>
|
||||
<task id="LOCAL-00015" summary="Added basic functionality with KahootChampion">
|
||||
<created>1552166883461</created>
|
||||
<option name="number" value="00015" />
|
||||
<option name="presentableId" value="LOCAL-00015" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1552181324520</updated>
|
||||
<updated>1552166883461</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00016" summary="Missed one statement that I needed to encapsulate">
|
||||
<created>1552181613507</created>
|
||||
<task id="LOCAL-00016" summary="Added some logic to ShipWarfareGUI">
|
||||
<created>1552167207982</created>
|
||||
<option name="number" value="00016" />
|
||||
<option name="presentableId" value="LOCAL-00016" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1552181613507</updated>
|
||||
<updated>1552167207982</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00017" summary="Messed up player by setting money to 1000">
|
||||
<created>1552181667375</created>
|
||||
<option name="number" value="00017" />
|
||||
<option name="presentableId" value="LOCAL-00017" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1552181667376</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="18" />
|
||||
<option name="localTasksCounter" value="17" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="57306000" />
|
||||
<option name="totallyTimeSpent" value="86614000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="48" y="23" width="1189" height="652" extended-state="0" />
|
||||
<frame x="1672" y="264" width="1376" height="744" extended-state="6" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21621622" />
|
||||
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.16945289" />
|
||||
<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" />
|
||||
@@ -418,7 +525,7 @@
|
||||
<window_info id="Favorites" order="6" side_tool="true" />
|
||||
<window_info anchor="bottom" id="Message" order="0" />
|
||||
<window_info anchor="bottom" id="Find" order="1" weight="0.32922733" />
|
||||
<window_info anchor="bottom" id="Run" order="2" weight="0.4482143" />
|
||||
<window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.49924013" visible="true" weight="0.049099836" />
|
||||
<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" />
|
||||
@@ -427,8 +534,8 @@
|
||||
<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="Event Log" order="11" sideWeight="0.5007599" side_tool="true" weight="0.54664487" />
|
||||
<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" />
|
||||
@@ -486,22 +593,6 @@
|
||||
</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$" />
|
||||
@@ -517,14 +608,11 @@
|
||||
<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." />
|
||||
<MESSAGE value="Added time stuff to Shipwarfare GUI" />
|
||||
<MESSAGE value="Nitified of getting attacked" />
|
||||
<MESSAGE value="Notified of getting attacked" />
|
||||
<MESSAGE value="Added fight stuff" />
|
||||
<MESSAGE value="Made ShipWarfare easier to access by ShipWarfareGUI" />
|
||||
<MESSAGE value="Missed one statement that I needed to encapsulate" />
|
||||
<MESSAGE value="Messed up player by setting money to 1000" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Messed up player by setting money to 1000" />
|
||||
<MESSAGE value="Fixed some little problems with documenting." />
|
||||
<MESSAGE value="Basic layout for ShipwarefareGUI." />
|
||||
<MESSAGE value="Added basic functionality with KahootChampion" />
|
||||
<MESSAGE value="Added some logic to ShipWarfareGUI" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Added some logic to ShipWarfareGUI" />
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
<entry file="uml://JAVA/ShipWarfare">
|
||||
@@ -566,62 +654,247 @@
|
||||
</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">
|
||||
<entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/Bank.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" />
|
||||
<state relative-caret-position="17">
|
||||
<caret line="7" column="6" 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/Warehouse.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="34">
|
||||
<caret line="2" column="3" selection-start-line="2" selection-start-column="3" selection-end-line="2" selection-end-column="3" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/ShipWarfareGUIBase.java" />
|
||||
<entry file="file://$PROJECT_DIR$/src/TaipanShop.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="525">
|
||||
<caret line="715" column="22" selection-start-line="715" selection-start-column="12" selection-end-line="715" selection-end-column="22" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="jar://C:/Program Files/Java/jdk1.8.0_141/javafx-src.zip!/javafx/application/Application.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="199">
|
||||
<caret line="253" selection-start-line="253" selection-end-line="253" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$USER_HOME$/Desktop/Shiv, Alex, Jovan and, Harkamal Final Project/Pandit/src/pandit/Battle.fxml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="221">
|
||||
<caret line="13" column="54" selection-start-line="13" selection-end-line="14" />
|
||||
</state>
|
||||
</provider>
|
||||
<provider editor-type-id="JavaFX-Scene-Builder" />
|
||||
</entry>
|
||||
<entry file="file://$USER_HOME$/Desktop/Shiv, Alex, Jovan and, Harkamal Final Project/Pandit/src/pandit/DialogueJHare.fxml">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
<provider editor-type-id="JavaFX-Scene-Builder" />
|
||||
</entry>
|
||||
<entry file="file://$USER_HOME$/Desktop/Shiv, Alex, Jovan and, Harkamal Final Project/Pandit/src/pandit/DialogueLRam.fxml">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
<provider editor-type-id="JavaFX-Scene-Builder" />
|
||||
</entry>
|
||||
<entry file="file://$USER_HOME$/Desktop/Shiv, Alex, Jovan and, Harkamal Final Project/Pandit/src/fxmlController/Dialogue0Controller.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state>
|
||||
<folding>
|
||||
<element signature="method#handleButtonNext#0;class#Dialogue0Controller#0" />
|
||||
<element signature="method#dialogue#0;class#Dialogue0Controller#0" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$USER_HOME$/Desktop/Shiv, Alex, Jovan and, Harkamal Final Project/Pandit/src/pandit/DialogueLJi.fxml">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="289">
|
||||
<caret line="17" column="15" lean-forward="true" selection-start-line="17" selection-start-column="15" selection-end-line="17" selection-end-column="15" />
|
||||
</state>
|
||||
</provider>
|
||||
<provider editor-type-id="JavaFX-Scene-Builder" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.fxml" />
|
||||
<entry file="file://$PROJECT_DIR$/src/GUI.java" />
|
||||
<entry file="file://$PROJECT_DIR$/src/fxmlControllers/shopFXML.java" />
|
||||
<entry file="file://$PROJECT_DIR$/src/fxmlControllers/shipFXML.java" />
|
||||
<entry file="file://$PROJECT_DIR$/src/ShopGUI.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="5508">
|
||||
<caret line="324" column="43" selection-start-line="324" selection-start-column="43" selection-end-line="324" selection-end-column="43" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="5025">
|
||||
<caret line="353" column="100" selection-end-line="503" />
|
||||
<state relative-caret-position="-986">
|
||||
<caret line="22" column="34" lean-forward="true" selection-start-line="22" selection-start-column="34" selection-end-line="22" selection-end-column="34" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
|
||||
<entry file="jar://C:/Program Files/Java/jdk1.8.0_141/javafx-src.zip!/javafx/event/EventHandler.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2580">
|
||||
<caret line="172" column="5" selection-start-line="172" selection-start-column="5" selection-end-line="172" selection-end-column="5" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#1150#1151#0" expanded="true" />
|
||||
<element signature="e#1178#1179#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/ShopGUI">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/Player.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="135">
|
||||
<caret line="9" column="32" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/Start.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="15">
|
||||
<caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
|
||||
<state relative-caret-position="357">
|
||||
<caret line="44" column="9" selection-start-line="44" selection-start-column="9" selection-end-line="44" selection-end-column="9" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/main.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="135">
|
||||
<caret line="9" column="4" selection-end-line="55" />
|
||||
<state relative-caret-position="-421">
|
||||
<caret line="2" column="41" selection-start-line="2" selection-start-column="41" selection-end-line="2" selection-end-column="41" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/Player.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-1934">
|
||||
<caret line="56" column="5" selection-start-line="56" selection-start-column="5" selection-end-line="56" selection-end-column="5" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="279">
|
||||
<caret line="682" selection-start-line="682" selection-end-line="682" />
|
||||
<folding>
|
||||
<element signature="e#763#794#0" expanded="true" />
|
||||
<element signature="e#1208#1209#0" expanded="true" />
|
||||
<element signature="e#1236#1237#0" expanded="true" />
|
||||
<element signature="e#17682#17683#0" expanded="true" />
|
||||
<element signature="e#17720#17721#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/ShopGUI.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="117">
|
||||
<caret line="458" selection-start-line="458" selection-end-line="466" selection-end-column="11" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#1879#2020#0" />
|
||||
<element signature="e#2026#2140#0" />
|
||||
<element signature="e#2026#2268#0" />
|
||||
<element signature="e#2274#2524#0" />
|
||||
<element signature="e#2274#2657#0" />
|
||||
<element signature="e#2663#2887#0" />
|
||||
<element signature="e#2663#3001#0" />
|
||||
<element signature="e#3007#3133#0" />
|
||||
<element signature="e#3205#3412#0" />
|
||||
<element signature="e#3205#3546#0" />
|
||||
<element signature="e#3552#3676#0" />
|
||||
<element signature="e#3746#3950#0" />
|
||||
<element signature="e#3746#4079#0" />
|
||||
<element signature="e#4022#4073#1" />
|
||||
<element signature="e#4085#4209#0" />
|
||||
<element signature="e#4279#4483#0" />
|
||||
<element signature="e#4279#4612#0" />
|
||||
<element signature="e#4618#4757#0" />
|
||||
<element signature="e#4833#5046#0" />
|
||||
<element signature="e#4833#5190#0" />
|
||||
<element signature="e#5196#5297#0" />
|
||||
<element signature="e#5196#7354#0" />
|
||||
<element signature="e#10976#16179#0" />
|
||||
<element signature="e#11276#11422#1" />
|
||||
<element signature="e#11480#11600#1" />
|
||||
<element signature="e#11645#11797#1" />
|
||||
<element signature="e#12094#12214#1" />
|
||||
<element signature="e#12258#12409#1" />
|
||||
<element signature="e#12704#12824#1" />
|
||||
<element signature="e#12867#13018#1" />
|
||||
<element signature="e#13325#13445#1" />
|
||||
<element signature="e#13704#16173#1" />
|
||||
<element signature="e#13801#13949#1" />
|
||||
<element signature="e#14007#14138#1" />
|
||||
<element signature="e#14183#14336#1" />
|
||||
<element signature="e#14624#14755#1" />
|
||||
<element signature="e#14799#14951#1" />
|
||||
<element signature="e#15237#15368#1" />
|
||||
<element signature="class#20468:20804" />
|
||||
<element signature="class#20968:21155" />
|
||||
<element signature="class#21497:21689" />
|
||||
<element signature="class#21854:22047" />
|
||||
<element signature="class#22296:22485" />
|
||||
<element signature="class#22689:22842" />
|
||||
<element signature="class#23135:23794" />
|
||||
<element signature="class#24032:24686" />
|
||||
<element signature="class#24848:25502" />
|
||||
<element signature="class#25837:26512" />
|
||||
<element signature="e#31300#31833#0" />
|
||||
<element signature="e#31843#32457#0" />
|
||||
<element signature="e#32467#34046#0" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/Travel.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1564">
|
||||
<caret line="95" column="19" selection-start-line="95" selection-start-column="19" selection-end-line="95" selection-end-column="19" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/Start.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="51">
|
||||
<caret line="3" selection-start-line="3" selection-end-line="35" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="jar://C:/Program Files/Java/jdk1.8.0_141/javafx-src.zip!/com/sun/glass/ui/View.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="4262">
|
||||
<caret line="554" selection-start-line="554" selection-end-line="554" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="2567">
|
||||
<caret line="174" column="38" selection-start-line="174" selection-start-column="23" selection-end-line="174" selection-end-column="38" />
|
||||
<folding>
|
||||
<element signature="e#1244#1245#0" expanded="true" />
|
||||
<element signature="e#1272#1273#0" expanded="true" />
|
||||
<element signature="e#2274#2657#0" />
|
||||
<element signature="e#2663#3001#0" />
|
||||
<element signature="e#6546#8362#1" />
|
||||
<element signature="docComment;method#seaAtlas#0;class#TravelGUI#0" />
|
||||
<element signature="method#seaAtlas#0;class#TravelGUI#0" />
|
||||
<element signature="docComment;method#randomEventSea#0;class#TravelGUI#0" />
|
||||
<element signature="method#randomEventSea#0;class#TravelGUI#0" />
|
||||
<element signature="docComment;method#disaster#0;class#TravelGUI#0" />
|
||||
<element signature="e#31300#31833#0" />
|
||||
<element signature="e#31843#32457#0" />
|
||||
<element signature="e#32467#34046#0" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/StartGUI.java">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="230">
|
||||
<caret line="147" column="20" selection-start-line="147" selection-start-column="20" selection-end-line="147" selection-end-column="20" />
|
||||
<folding>
|
||||
<element signature="imports" expanded="true" />
|
||||
<element signature="e#639#640#0" expanded="true" />
|
||||
<element signature="e#667#668#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
||||
Reference in New Issue
Block a user