Made
This commit is contained in:
2
.idea/encodings.xml
generated
2
.idea/encodings.xml
generated
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="Encoding">
|
<component name="Encoding" addBOMForNewFiles="with NO BOM">
|
||||||
<file url="file://$PROJECT_DIR$/src/saves/playerSave.txt" charset="windows-1252" />
|
<file url="file://$PROJECT_DIR$/src/saves/playerSave.txt" charset="windows-1252" />
|
||||||
<file url="PROJECT" charset="UTF-8" />
|
<file url="PROJECT" charset="UTF-8" />
|
||||||
</component>
|
</component>
|
||||||
|
|||||||
11
.idea/libraries/hamcrest_core_1_3.xml
generated
Normal file
11
.idea/libraries/hamcrest_core_1_3.xml
generated
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
<component name="libraryTable">
|
||||||
|
<library name="hamcrest-core-1.3">
|
||||||
|
<CLASSES>
|
||||||
|
<root url="jar://$PROJECT_DIR$/src/hamcrest-core-1.3.jar!/" />
|
||||||
|
<root url="jar://$PROJECT_DIR$/src/jfxrt.jar!/" />
|
||||||
|
<root url="jar://$PROJECT_DIR$/src/junit-4.12.jar!/" />
|
||||||
|
</CLASSES>
|
||||||
|
<JAVADOC />
|
||||||
|
<SOURCES />
|
||||||
|
</library>
|
||||||
|
</component>
|
||||||
476
.idea/workspace.xml
generated
476
.idea/workspace.xml
generated
@@ -1,48 +1,98 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="BookmarkManager">
|
|
||||||
<bookmark url="file://$PROJECT_DIR$/src/LoanSharkGUI.java" line="66" />
|
|
||||||
</component>
|
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="Made">
|
<list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="Made">
|
||||||
<change afterPath="$PROJECT_DIR$/.idea/cssdialects.xml" afterDir="false" />
|
<change afterPath="$PROJECT_DIR$/.idea/libraries/hamcrest_core_1_3.xml" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/src/BankText.java" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/src/TravelText.java" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/src/WarehouseText.java" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/src/loanSharkText.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" 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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/FileSaving.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/FileSaving.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/ShipWarfareGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ShipWarfareGUI.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/TaipanShopGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TaipanShopGUI.java" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/src/TravelGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TravelGUI.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/saves/playerSave.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src/saves/playerSave.txt" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/saves/playerSave.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src/saves/playerSave.txt" afterDir="false" />
|
||||||
</list>
|
</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="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="DefaultGradleProjectSettings">
|
|
||||||
<option name="isMigrated" value="true" />
|
|
||||||
</component>
|
|
||||||
<component name="FileEditorManager">
|
<component name="FileEditorManager">
|
||||||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||||
<file pinned="false" current-in-tab="false">
|
<file pinned="false" current-in-tab="false">
|
||||||
<entry file="file://$PROJECT_DIR$/src/MainGUI.java">
|
<entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="221">
|
<state relative-caret-position="442">
|
||||||
<caret line="13" column="14" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" />
|
<caret line="176" column="31" lean-forward="true" selection-start-line="176" selection-start-column="31" selection-end-line="176" selection-end-column="31" />
|
||||||
<folding>
|
<folding>
|
||||||
|
<element signature="n#!!doc" expanded="true" />
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
|
<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="method#disaster#0;class#TravelGUI#0" />
|
||||||
|
<element signature="docComment;method#getStringLocation#0;class#TravelGUI#0" />
|
||||||
|
<element signature="method#getStringLocation#0;class#TravelGUI#0" />
|
||||||
|
<element signature="docComment;method#shipStatusString#0;class#TravelGUI#0" />
|
||||||
|
<element signature="method#shipStatusString#0;class#TravelGUI#0" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
</file>
|
</file>
|
||||||
<file pinned="false" current-in-tab="true">
|
<file pinned="false" current-in-tab="true">
|
||||||
<entry file="file://$PROJECT_DIR$/src/FileSaving.java">
|
<entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="646">
|
<state relative-caret-position="185">
|
||||||
<caret line="38" column="24" lean-forward="true" selection-start-line="38" selection-start-column="24" selection-end-line="38" selection-end-column="24" />
|
<caret line="465" column="38" lean-forward="true" selection-start-line="465" selection-start-column="38" selection-end-line="465" selection-end-column="38" />
|
||||||
|
<folding>
|
||||||
|
<element signature="docComment;method#TaipanShopGUI#0;class#TaipanShopGUI#0" />
|
||||||
|
<element signature="method#TaipanShopGUI#0;class#TaipanShopGUI#0" />
|
||||||
|
<element signature="docComment;method#retire#0;class#TaipanShopGUI#0" />
|
||||||
|
<element signature="method#retire#0;class#TaipanShopGUI#0" />
|
||||||
|
<element signature="docComment;method#defaultTextOut#0;class#TaipanShopGUI#0" />
|
||||||
|
<element signature="method#defaultTextOut#0;class#TaipanShopGUI#0" />
|
||||||
|
<element signature="docComment;method#buttonSetup#0;class#TaipanShopGUI#0" />
|
||||||
|
<element signature="method#buttonSetup#0;class#TaipanShopGUI#0" />
|
||||||
|
<element signature="method#shop#0;class#TaipanShopGUI#0" />
|
||||||
|
<element signature="docComment;method#initializeShop#0;class#TaipanShopGUI#0" />
|
||||||
|
<element signature="class#16068:16656" />
|
||||||
|
<element signature="class#16894:17482" />
|
||||||
|
<element signature="class#17646:18088" />
|
||||||
|
<element signature="class#18418:18904" />
|
||||||
|
<element signature="class#19069:19536" />
|
||||||
|
<element signature="method#handle#0;class#19069:19536" />
|
||||||
|
<element signature="class#19773:20283" />
|
||||||
|
<element signature="class#20487:20841" />
|
||||||
|
<element signature="class#21134:22015" />
|
||||||
|
<element signature="class#22253:23127" />
|
||||||
|
<element signature="class#23289:24163" />
|
||||||
|
<element signature="method#handle#0;class#23289:24163" />
|
||||||
|
<element signature="class#24498:25411" />
|
||||||
|
<element signature="method#handle#0;class#24498:25411" />
|
||||||
|
<element signature="class#25615:26933" />
|
||||||
|
<element signature="method#handle#0;class#25615:26933" />
|
||||||
|
<element signature="e#31225#31481#1" />
|
||||||
|
<element signature="method#updateStage#0;class#TaipanShopGUI#0" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
</file>
|
||||||
|
<file pinned="false" current-in-tab="false">
|
||||||
|
<entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="1406">
|
||||||
|
<caret line="186" column="6" selection-start-line="186" selection-start-column="6" selection-end-line="186" selection-end-column="6" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
<element signature="method#setVisibilitiesAndTransition#0;class#ShipWarfareGUI#0" />
|
||||||
|
<element signature="docComment;method#initializeShip#0;class#ShipWarfareGUI#0" />
|
||||||
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
@@ -59,89 +109,33 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="FindInProjectRecents">
|
<component name="FindInProjectRecents">
|
||||||
<findStrings>
|
<findStrings>
|
||||||
<find>runAwayOrLeft</find>
|
<find>updat</find>
|
||||||
<find>gunsLeftOrTaken</find>
|
|
||||||
<find>continueToFight</find>
|
|
||||||
<find>sellingItemLab</find>
|
|
||||||
<find>You can'</find>
|
|
||||||
<find>cannotAfford</find>
|
|
||||||
<find>warehouse</find>
|
|
||||||
<find>cargoButton</find>
|
|
||||||
<find>cargobutton</find>
|
|
||||||
<find>peasantShip</find>
|
|
||||||
<find>BorderPane</find>
|
|
||||||
<find>houseLabel</find>
|
|
||||||
<find>setGuns</find>
|
|
||||||
<find>for a gun</find>
|
|
||||||
<find>cannon</find>
|
|
||||||
<find>quitButton</find>
|
|
||||||
<find>textField</find>
|
|
||||||
<find>numberInput</find>
|
|
||||||
<find>shop</find>
|
|
||||||
<find>default</find>
|
|
||||||
<find>defaultButton</find>
|
|
||||||
<find>printSt</find>
|
|
||||||
<find>txtField</find>
|
|
||||||
<find>vBox</find>
|
|
||||||
<find>Would you like to pay</find>
|
|
||||||
<find>shipWa</find>
|
|
||||||
<find>attackingShips</find>
|
|
||||||
<find>random</find>
|
|
||||||
<find>cargo</find>
|
|
||||||
<find>Noot</find>
|
|
||||||
</findStrings>
|
</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>deposit</replace>
|
|
||||||
<replace>textOut.setText(" " +</replace>
|
|
||||||
<replace>borderPane</replace>
|
|
||||||
</replaceStrings>
|
|
||||||
</component>
|
</component>
|
||||||
<component name="Git.Settings">
|
<component name="Git.Settings">
|
||||||
<option name="UPDATE_TYPE" value="MERGE" />
|
<option name="UPDATE_TYPE" value="REBASE" />
|
||||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||||
</component>
|
</component>
|
||||||
<component name="IdeDocumentHistory">
|
<component name="IdeDocumentHistory">
|
||||||
<option name="CHANGED_PATHS">
|
<option name="CHANGED_PATHS">
|
||||||
<list>
|
<list>
|
||||||
<option value="$PROJECT_DIR$/src/Core.java" />
|
<option value="$PROJECT_DIR$/src/TravelText.java" />
|
||||||
<option value="$PROJECT_DIR$/src/Game.java" />
|
<option value="$PROJECT_DIR$/src/WarehouseText.java" />
|
||||||
<option value="$PROJECT_DIR$/src/Start.java" />
|
<option value="$PROJECT_DIR$/src/BankText.java" />
|
||||||
<option value="$PROJECT_DIR$/src/TaipanShop.java" />
|
<option value="$PROJECT_DIR$/src/loanSharkText.java" />
|
||||||
<option value="$PROJECT_DIR$/src/main.java" />
|
<option value="$PROJECT_DIR$/src/text/BankText.java" />
|
||||||
<option value="$PROJECT_DIR$/src/Travel.java" />
|
<option value="$PROJECT_DIR$/src/TaipanShopText.java" />
|
||||||
<option value="$PROJECT_DIR$/src/ShipWarfare.java" />
|
|
||||||
<option value="$PROJECT_DIR$/src/bankGUI.java" />
|
|
||||||
<option value="$PROJECT_DIR$/src/MainGUI.java" />
|
|
||||||
<option value="$PROJECT_DIR$/src/stylesheet.css" />
|
|
||||||
<option value="$PROJECT_DIR$/src/styleguide.css" />
|
|
||||||
<option value="$PROJECT_DIR$/src/BankGUI.java" />
|
|
||||||
<option value="$PROJECT_DIR$/src/GameEndGUI.java" />
|
|
||||||
<option value="$PROJECT_DIR$/src/LoanSharkGUI.java" />
|
|
||||||
<option value="$PROJECT_DIR$/src/Save.java" />
|
|
||||||
<option value="$PROJECT_DIR$/src/AnimationTesting.java" />
|
|
||||||
<option value="$PROJECT_DIR$/src/ShipWarfareGUI.java" />
|
<option value="$PROJECT_DIR$/src/ShipWarfareGUI.java" />
|
||||||
<option value="$PROJECT_DIR$/src/StartGUI.java" />
|
|
||||||
<option value="$PROJECT_DIR$/src/WarehouseGUI.java" />
|
|
||||||
<option value="$PROJECT_DIR$/src/TaipanShopGUI.java" />
|
<option value="$PROJECT_DIR$/src/TaipanShopGUI.java" />
|
||||||
<option value="$PROJECT_DIR$/src/TravelGUI.java" />
|
<option value="$PROJECT_DIR$/src/TravelGUI.java" />
|
||||||
<option value="$PROJECT_DIR$/src/Player.java" />
|
|
||||||
<option value="$PROJECT_DIR$/src/RandomEventGUI.java" />
|
|
||||||
<option value="$PROJECT_DIR$/src/FileSaving.java" />
|
|
||||||
<option value="$PROJECT_DIR$/src/HighScore.java" />
|
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectFrameBounds" extendedState="6">
|
<component name="ProjectFrameBounds" extendedState="6">
|
||||||
<option name="x" value="-8" />
|
<option name="x" value="106" />
|
||||||
<option name="y" value="-8" />
|
<option name="y" value="-13" />
|
||||||
<option name="width" value="1696" />
|
<option name="width" value="1111" />
|
||||||
<option name="height" value="1026" />
|
<option name="height" value="533" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
|
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
|
||||||
<ConfirmationsSetting value="2" id="Add" />
|
<ConfirmationsSetting value="2" id="Add" />
|
||||||
@@ -151,6 +145,7 @@
|
|||||||
<foldersAlwaysOnTop value="true" />
|
<foldersAlwaysOnTop value="true" />
|
||||||
</navigator>
|
</navigator>
|
||||||
<panes>
|
<panes>
|
||||||
|
<pane id="Scope" />
|
||||||
<pane id="PackagesPane" />
|
<pane id="PackagesPane" />
|
||||||
<pane id="ProjectPane">
|
<pane id="ProjectPane">
|
||||||
<subPane>
|
<subPane>
|
||||||
@@ -168,28 +163,20 @@
|
|||||||
<select />
|
<select />
|
||||||
</subPane>
|
</subPane>
|
||||||
</pane>
|
</pane>
|
||||||
<pane id="Scope" />
|
|
||||||
</panes>
|
</panes>
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent">
|
<component name="PropertiesComponent">
|
||||||
<property name="ChangesTree.GroupingKeys" value="" />
|
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1554585449403" />
|
||||||
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
|
||||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
||||||
<property name="aspect.path.notification.shown" value="true" />
|
|
||||||
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552292013744" />
|
|
||||||
<property name="extract.method.default.visibility" value="private" />
|
<property name="extract.method.default.visibility" value="private" />
|
||||||
<property name="last_opened_file_path" value="$USER_HOME$/Desktop/Demo 3" />
|
<property name="last_opened_file_path" value="$PROJECT_DIR$/src/junit-4.12.jar!/" />
|
||||||
<property name="list.type.of.created.stylesheet" value="CSS" />
|
|
||||||
<property name="nodejs_package_manager_path" value="npm" />
|
<property name="nodejs_package_manager_path" value="npm" />
|
||||||
<property name="project.structure.last.edited" value="Modules" />
|
<property name="project.structure.last.edited" value="Problems" />
|
||||||
<property name="project.structure.proportion" value="0.15" />
|
<property name="project.structure.proportion" value="0.0" />
|
||||||
<property name="project.structure.side.proportion" value="0.2" />
|
<property name="project.structure.side.proportion" value="0.2" />
|
||||||
<property name="run.code.analysis.last.selected.profile" value="pProject Default" />
|
|
||||||
<property name="settings.editor.selected.configurable" value="editing.templates" />
|
|
||||||
</component>
|
</component>
|
||||||
<component name="RecentsManager">
|
<component name="RecentsManager">
|
||||||
<key name="MoveFile.RECENT_KEYS">
|
<key name="CreateClassDialog.RecentsKey">
|
||||||
<recent name="C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone\src" />
|
<recent name="" />
|
||||||
</key>
|
</key>
|
||||||
</component>
|
</component>
|
||||||
<component name="RunDashboard">
|
<component name="RunDashboard">
|
||||||
@@ -257,9 +244,8 @@
|
|||||||
</list>
|
</list>
|
||||||
</recent_temporary>
|
</recent_temporary>
|
||||||
</component>
|
</component>
|
||||||
<component name="SvnConfiguration" cleanupOnStartRun="true">
|
<component name="SvnConfiguration">
|
||||||
<configuration>C:\Users\Harkamal Randhawa\AppData\Roaming\Subversion</configuration>
|
<configuration />
|
||||||
<supportedVersion>125</supportedVersion>
|
|
||||||
</component>
|
</component>
|
||||||
<component name="TaskManager">
|
<component name="TaskManager">
|
||||||
<task active="true" id="Default" summary="Default task">
|
<task active="true" id="Default" summary="Default task">
|
||||||
@@ -305,6 +291,7 @@
|
|||||||
<workItem from="1553309944652" duration="63685000" />
|
<workItem from="1553309944652" duration="63685000" />
|
||||||
<workItem from="1553661269531" duration="1969000" />
|
<workItem from="1553661269531" duration="1969000" />
|
||||||
<workItem from="1553965313291" duration="2578000" />
|
<workItem from="1553965313291" duration="2578000" />
|
||||||
|
<workItem from="1554580719911" duration="4636000" />
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00001" summary="This should fix the ShipWarfare file and bring it up to date with the rest of the file.">
|
<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>
|
<created>1550458470138</created>
|
||||||
@@ -649,17 +636,16 @@
|
|||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1553494120570</updated>
|
<updated>1553494120570</updated>
|
||||||
</task>
|
</task>
|
||||||
<option name="localTasksCounter" value="50" />
|
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="TimeTrackingManager">
|
<component name="TimeTrackingManager">
|
||||||
<option name="totallyTimeSpent" value="147501000" />
|
<option name="totallyTimeSpent" value="4582000" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ToolWindowManager">
|
<component name="ToolWindowManager">
|
||||||
<frame x="-8" y="-8" width="1696" height="1026" extended-state="6" />
|
<frame x="-8" y="-8" width="1696" height="1026" extended-state="6" />
|
||||||
<editor active="true" />
|
<editor active="true" />
|
||||||
<layout>
|
<layout>
|
||||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.12286063" />
|
<window_info content_ui="combo" id="Project" order="0" weight="0.12408313" />
|
||||||
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
||||||
<window_info id="Image Layers" order="2" />
|
<window_info id="Image Layers" order="2" />
|
||||||
<window_info id="Designer" order="3" />
|
<window_info id="Designer" order="3" />
|
||||||
@@ -670,7 +656,7 @@
|
|||||||
<window_info anchor="bottom" id="Duplicates" order="1" weight="0.50391936" />
|
<window_info anchor="bottom" id="Duplicates" order="1" weight="0.50391936" />
|
||||||
<window_info anchor="bottom" id="Message" order="2" />
|
<window_info anchor="bottom" id="Message" order="2" />
|
||||||
<window_info anchor="bottom" id="Find" order="3" weight="0.32922733" />
|
<window_info anchor="bottom" id="Find" order="3" weight="0.32922733" />
|
||||||
<window_info anchor="bottom" id="Run" order="4" sideWeight="0.49874055" weight="0.36954087" />
|
<window_info anchor="bottom" id="Run" order="4" sideWeight="0.49874055" weight="0.19484882" />
|
||||||
<window_info anchor="bottom" id="Debug" order="5" weight="0.39977604" />
|
<window_info anchor="bottom" id="Debug" order="5" weight="0.39977604" />
|
||||||
<window_info anchor="bottom" id="Cvs" order="6" weight="0.25" />
|
<window_info anchor="bottom" id="Cvs" order="6" weight="0.25" />
|
||||||
<window_info anchor="bottom" id="Inspection" order="7" weight="0.4" />
|
<window_info anchor="bottom" id="Inspection" order="7" weight="0.4" />
|
||||||
@@ -680,7 +666,7 @@
|
|||||||
<window_info anchor="bottom" id="Database Changes" order="11" />
|
<window_info anchor="bottom" id="Database Changes" order="11" />
|
||||||
<window_info anchor="bottom" id="Terminal" order="12" weight="0.32922733" />
|
<window_info anchor="bottom" id="Terminal" order="12" weight="0.32922733" />
|
||||||
<window_info anchor="bottom" id="Event Log" order="13" sideWeight="0.50125945" side_tool="true" weight="0.37058824" />
|
<window_info anchor="bottom" id="Event Log" order="13" sideWeight="0.50125945" side_tool="true" weight="0.37058824" />
|
||||||
<window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49938875" weight="0.3281075" />
|
<window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49938875" weight="0.18141097" />
|
||||||
<window_info anchor="bottom" id="Duplicate detector" order="15" weight="0.32922733" />
|
<window_info anchor="bottom" id="Duplicate detector" order="15" weight="0.32922733" />
|
||||||
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
<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" id="Ant Build" order="1" weight="0.25" />
|
||||||
@@ -693,7 +679,7 @@
|
|||||||
<window_info anchor="right" id="Palette	" order="8" />
|
<window_info anchor="right" id="Palette	" order="8" />
|
||||||
</layout>
|
</layout>
|
||||||
<layout-to-restore>
|
<layout-to-restore>
|
||||||
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.118581906" />
|
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.12408313" />
|
||||||
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
||||||
<window_info id="Image Layers" order="2" />
|
<window_info id="Image Layers" order="2" />
|
||||||
<window_info id="Designer" order="3" />
|
<window_info id="Designer" order="3" />
|
||||||
@@ -704,7 +690,7 @@
|
|||||||
<window_info anchor="bottom" id="Duplicates" order="1" weight="0.50391936" />
|
<window_info anchor="bottom" id="Duplicates" order="1" weight="0.50391936" />
|
||||||
<window_info anchor="bottom" id="Message" order="2" />
|
<window_info anchor="bottom" id="Message" order="2" />
|
||||||
<window_info anchor="bottom" id="Find" order="3" weight="0.32922733" />
|
<window_info anchor="bottom" id="Find" order="3" weight="0.32922733" />
|
||||||
<window_info anchor="bottom" id="Run" order="4" sideWeight="0.49874055" weight="0.36954087" />
|
<window_info anchor="bottom" id="Run" order="4" sideWeight="0.49874055" weight="0.19484882" />
|
||||||
<window_info anchor="bottom" id="Debug" order="5" weight="0.39977604" />
|
<window_info anchor="bottom" id="Debug" order="5" weight="0.39977604" />
|
||||||
<window_info anchor="bottom" id="Cvs" order="6" weight="0.25" />
|
<window_info anchor="bottom" id="Cvs" order="6" weight="0.25" />
|
||||||
<window_info anchor="bottom" id="Inspection" order="7" weight="0.4" />
|
<window_info anchor="bottom" id="Inspection" order="7" weight="0.4" />
|
||||||
@@ -714,7 +700,7 @@
|
|||||||
<window_info anchor="bottom" id="Database Changes" order="11" />
|
<window_info anchor="bottom" id="Database Changes" order="11" />
|
||||||
<window_info anchor="bottom" id="Terminal" order="12" weight="0.32922733" />
|
<window_info anchor="bottom" id="Terminal" order="12" weight="0.32922733" />
|
||||||
<window_info anchor="bottom" id="Event Log" order="13" sideWeight="0.50125945" side_tool="true" weight="0.37058824" />
|
<window_info anchor="bottom" id="Event Log" order="13" sideWeight="0.50125945" side_tool="true" weight="0.37058824" />
|
||||||
<window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49938875" weight="0.3281075" />
|
<window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49938875" weight="0.18141097" />
|
||||||
<window_info anchor="bottom" id="Duplicate detector" order="15" weight="0.32922733" />
|
<window_info anchor="bottom" id="Duplicate detector" order="15" weight="0.32922733" />
|
||||||
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
<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" id="Ant Build" order="1" weight="0.25" />
|
||||||
@@ -727,19 +713,6 @@
|
|||||||
<window_info anchor="right" id="Palette	" order="8" />
|
<window_info anchor="right" id="Palette	" order="8" />
|
||||||
</layout-to-restore>
|
</layout-to-restore>
|
||||||
</component>
|
</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">
|
<component name="Vcs.Log.Tabs.Properties">
|
||||||
<option name="RECENT_FILTERS">
|
<option name="RECENT_FILTERS">
|
||||||
<map>
|
<map>
|
||||||
@@ -788,152 +761,33 @@
|
|||||||
<option name="LAST_COMMIT_MESSAGE" value="Pushed the fix for ship repair while 100 hp" />
|
<option name="LAST_COMMIT_MESSAGE" value="Pushed the fix for ship repair while 100 hp" />
|
||||||
</component>
|
</component>
|
||||||
<component name="editorHistoryManager">
|
<component name="editorHistoryManager">
|
||||||
<entry file="uml://JAVA/ShipWarfare" />
|
<entry file="file://$PROJECT_DIR$/src/FileSaving.java">
|
||||||
<entry file="uml://JAVA/TaipanShop" />
|
|
||||||
<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="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_201.jdk/Contents/Home/javafx-src.zip!/com/sun/glass/ui/InvokeLaterDispatcher.java" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/ShopGUI" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/Start.java" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/main.java" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/ShipWarfare.java" />
|
|
||||||
<entry file="uml://JAVA/TaipanShopGUI" />
|
|
||||||
<entry file="uml://JAVA/bankGUI" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/stylesheet.css" />
|
|
||||||
<entry file="jar://C:/Program Files/Java/jdk1.8.0_141/jre/lib/ext/jfxrt.jar!/com/sun/javafx/scene/control/skin/modena/blackOnWhite.css">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="272">
|
<state relative-caret-position="-34">
|
||||||
<caret line="41" column="41" selection-start-line="41" selection-start-column="41" selection-end-line="41" selection-end-column="41" />
|
<caret line="3" column="12" selection-start-line="3" selection-start-column="12" selection-end-line="3" selection-end-column="12" />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="jar://C:/Program Files/Java/jdk1.8.0_141/jre/lib/ext/jfxrt.jar!/com/sun/javafx/scene/control/skin/modena/modena.css">
|
<entry file="file://$PROJECT_DIR$/src/PlayerTest.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="272">
|
<state relative-caret-position="320">
|
||||||
<caret line="127" column="24" lean-forward="true" selection-start-line="127" selection-end-line="128" />
|
<caret line="23" column="14" selection-start-line="23" selection-start-column="14" selection-end-line="23" selection-end-column="14" />
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/styleguide.css">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="34">
|
|
||||||
<caret line="2" column="36" selection-start-line="2" selection-start-column="36" selection-end-line="2" selection-end-column="36" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/saves/playerSave.txt">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="17">
|
|
||||||
<caret line="1" column="101" selection-start-line="1" selection-start-column="101" selection-end-line="1" selection-end-column="101" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/GameEndGUI.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="437">
|
|
||||||
<caret line="101" selection-start-line="101" selection-end-line="101" />
|
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/AnimationTesting.java" />
|
<entry file="file://$PROJECT_DIR$/src/WarehouseText.java">
|
||||||
<entry file="uml://MODULES/mdl-TaipanClone" />
|
|
||||||
<entry file="uml://JAVA/AnimationTesting" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="239">
|
<state relative-caret-position="51">
|
||||||
<caret line="641" column="33" lean-forward="true" selection-start-line="641" selection-start-column="33" selection-end-line="641" selection-end-column="33" />
|
<caret line="3" column="31" selection-start-line="3" selection-start-column="31" selection-end-line="3" selection-end-column="31" />
|
||||||
<folding>
|
|
||||||
<element signature="imports" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="uml://JAVA/" />
|
|
||||||
<entry file="uml://JAVA/TravelGUI" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="6443">
|
|
||||||
<caret line="396" column="18" selection-start-line="396" selection-start-column="18" selection-end-line="396" selection-end-column="18" />
|
|
||||||
<folding>
|
|
||||||
<element signature="imports" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/BankGUI.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="1700">
|
|
||||||
<caret line="111" column="79" selection-start-line="111" selection-start-column="79" selection-end-line="111" selection-end-column="79" />
|
|
||||||
<folding>
|
|
||||||
<element signature="imports" 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="3094">
|
|
||||||
<caret line="191" selection-start-line="191" selection-end-line="198" selection-end-column="17" />
|
|
||||||
<folding>
|
|
||||||
<element signature="imports" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/LoanSharkGUI.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="255">
|
|
||||||
<caret line="26" selection-start-line="26" selection-end-line="29" selection-end-column="5" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/Player.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="1921">
|
|
||||||
<caret line="121" column="43" selection-start-line="121" selection-start-column="43" selection-end-line="121" selection-end-column="43" />
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/WarehouseGUI.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="119">
|
|
||||||
<caret line="14" selection-start-line="14" selection-end-line="14" />
|
|
||||||
<folding>
|
|
||||||
<element signature="imports" expanded="true" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
|
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
|
||||||
<state relative-caret-position="3264">
|
|
||||||
<caret line="215" column="73" selection-start-line="215" selection-start-column="73" selection-end-line="215" selection-end-column="73" />
|
|
||||||
<folding>
|
|
||||||
<element signature="docComment;method#initializeTravel#0;class#TravelGUI#0" />
|
|
||||||
<element signature="docComment;method#seaAtlas#0;class#TravelGUI#0" />
|
|
||||||
<element signature="docComment;method#randomEventSea#0;class#TravelGUI#0" />
|
|
||||||
<element signature="docComment;method#disaster#0;class#TravelGUI#0" />
|
|
||||||
<element signature="method#disaster#0;class#TravelGUI#0" />
|
|
||||||
<element signature="docComment;method#getStringLocation#0;class#TravelGUI#0" />
|
|
||||||
<element signature="method#getStringLocation#0;class#TravelGUI#0" />
|
|
||||||
<element signature="docComment;method#shipStatusString#0;class#TravelGUI#0" />
|
|
||||||
<element signature="method#shipStatusString#0;class#TravelGUI#0" />
|
|
||||||
<element signature="docComment;method#updateStage#0;class#TravelGUI#0" />
|
|
||||||
<element signature="method#updateStage#0;class#TravelGUI#0" />
|
|
||||||
</folding>
|
|
||||||
</state>
|
|
||||||
</provider>
|
|
||||||
</entry>
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/RandomEventGUI.java" />
|
|
||||||
<entry file="file://$PROJECT_DIR$/src/MainGUI.java">
|
<entry file="file://$PROJECT_DIR$/src/MainGUI.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="221">
|
<state relative-caret-position="204">
|
||||||
<caret line="13" column="14" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" />
|
<caret line="13" column="14" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" />
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
@@ -941,17 +795,104 @@
|
|||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/HighScore.java">
|
<entry file="file://$PROJECT_DIR$/src/BankText.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor" />
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/src/TaipanShopText.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="34">
|
<state relative-caret-position="918">
|
||||||
<caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
|
<caret line="58" column="19" selection-start-line="58" selection-start-column="19" selection-end-line="58" selection-end-column="19" />
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/FileSaving.java">
|
<entry file="file://$PROJECT_DIR$/src/loanSharkText.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state relative-caret-position="646">
|
<state relative-caret-position="119">
|
||||||
<caret line="38" column="24" lean-forward="true" selection-start-line="38" selection-start-column="24" selection-end-line="38" selection-end-column="24" />
|
<caret line="7" column="5" lean-forward="true" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/src/TravelText.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="153">
|
||||||
|
<caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/src/TaipanShopLogic.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="-1139">
|
||||||
|
<caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="1406">
|
||||||
|
<caret line="186" column="6" selection-start-line="186" selection-start-column="6" selection-end-line="186" selection-end-column="6" />
|
||||||
|
<folding>
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
<element signature="method#setVisibilitiesAndTransition#0;class#ShipWarfareGUI#0" />
|
||||||
|
<element signature="docComment;method#initializeShip#0;class#ShipWarfareGUI#0" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="442">
|
||||||
|
<caret line="176" column="31" lean-forward="true" selection-start-line="176" selection-start-column="31" selection-end-line="176" selection-end-column="31" />
|
||||||
|
<folding>
|
||||||
|
<element signature="n#!!doc" expanded="true" />
|
||||||
|
<element signature="imports" expanded="true" />
|
||||||
|
<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="method#disaster#0;class#TravelGUI#0" />
|
||||||
|
<element signature="docComment;method#getStringLocation#0;class#TravelGUI#0" />
|
||||||
|
<element signature="method#getStringLocation#0;class#TravelGUI#0" />
|
||||||
|
<element signature="docComment;method#shipStatusString#0;class#TravelGUI#0" />
|
||||||
|
<element signature="method#shipStatusString#0;class#TravelGUI#0" />
|
||||||
|
</folding>
|
||||||
|
</state>
|
||||||
|
</provider>
|
||||||
|
</entry>
|
||||||
|
<entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
|
||||||
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
|
<state relative-caret-position="185">
|
||||||
|
<caret line="465" column="38" lean-forward="true" selection-start-line="465" selection-start-column="38" selection-end-line="465" selection-end-column="38" />
|
||||||
|
<folding>
|
||||||
|
<element signature="docComment;method#TaipanShopGUI#0;class#TaipanShopGUI#0" />
|
||||||
|
<element signature="method#TaipanShopGUI#0;class#TaipanShopGUI#0" />
|
||||||
|
<element signature="docComment;method#retire#0;class#TaipanShopGUI#0" />
|
||||||
|
<element signature="method#retire#0;class#TaipanShopGUI#0" />
|
||||||
|
<element signature="docComment;method#defaultTextOut#0;class#TaipanShopGUI#0" />
|
||||||
|
<element signature="method#defaultTextOut#0;class#TaipanShopGUI#0" />
|
||||||
|
<element signature="docComment;method#buttonSetup#0;class#TaipanShopGUI#0" />
|
||||||
|
<element signature="method#buttonSetup#0;class#TaipanShopGUI#0" />
|
||||||
|
<element signature="method#shop#0;class#TaipanShopGUI#0" />
|
||||||
|
<element signature="docComment;method#initializeShop#0;class#TaipanShopGUI#0" />
|
||||||
|
<element signature="class#16068:16656" />
|
||||||
|
<element signature="class#16894:17482" />
|
||||||
|
<element signature="class#17646:18088" />
|
||||||
|
<element signature="class#18418:18904" />
|
||||||
|
<element signature="class#19069:19536" />
|
||||||
|
<element signature="method#handle#0;class#19069:19536" />
|
||||||
|
<element signature="class#19773:20283" />
|
||||||
|
<element signature="class#20487:20841" />
|
||||||
|
<element signature="class#21134:22015" />
|
||||||
|
<element signature="class#22253:23127" />
|
||||||
|
<element signature="class#23289:24163" />
|
||||||
|
<element signature="method#handle#0;class#23289:24163" />
|
||||||
|
<element signature="class#24498:25411" />
|
||||||
|
<element signature="method#handle#0;class#24498:25411" />
|
||||||
|
<element signature="class#25615:26933" />
|
||||||
|
<element signature="method#handle#0;class#25615:26933" />
|
||||||
|
<element signature="e#31225#31481#1" />
|
||||||
|
<element signature="method#updateStage#0;class#TaipanShopGUI#0" />
|
||||||
|
</folding>
|
||||||
</state>
|
</state>
|
||||||
</provider>
|
</provider>
|
||||||
</entry>
|
</entry>
|
||||||
@@ -995,7 +936,7 @@
|
|||||||
</state>
|
</state>
|
||||||
<state key="JdkListConfigurable.UI">
|
<state key="JdkListConfigurable.UI">
|
||||||
<settings>
|
<settings>
|
||||||
<last-edited>1.8.0_201</last-edited>
|
<last-edited>1.8</last-edited>
|
||||||
<splitter-proportions>
|
<splitter-proportions>
|
||||||
<option name="proportions">
|
<option name="proportions">
|
||||||
<list>
|
<list>
|
||||||
@@ -1012,6 +953,7 @@
|
|||||||
<option name="proportions">
|
<option name="proportions">
|
||||||
<list>
|
<list>
|
||||||
<option value="0.2" />
|
<option value="0.2" />
|
||||||
|
<option value="0.6" />
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
</splitter-proportions>
|
</splitter-proportions>
|
||||||
@@ -1019,17 +961,7 @@
|
|||||||
</state>
|
</state>
|
||||||
<state key="ProjectLibrariesConfigurable.UI">
|
<state key="ProjectLibrariesConfigurable.UI">
|
||||||
<settings>
|
<settings>
|
||||||
<splitter-proportions>
|
<last-edited>hamcrest-core-1.3</last-edited>
|
||||||
<option name="proportions">
|
|
||||||
<list>
|
|
||||||
<option value="0.2" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</splitter-proportions>
|
|
||||||
</settings>
|
|
||||||
</state>
|
|
||||||
<state key="ScopeChooserConfigurable.UI">
|
|
||||||
<settings>
|
|
||||||
<splitter-proportions>
|
<splitter-proportions>
|
||||||
<option name="proportions">
|
<option name="proportions">
|
||||||
<list>
|
<list>
|
||||||
|
|||||||
9
src/BankText.java
Normal file
9
src/BankText.java
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
public class BankText extends Player {
|
||||||
|
public BankText(Player player) {
|
||||||
|
Player playerDummy = new Player(player);
|
||||||
|
setPlayer(playerDummy);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void bank() {
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -19,6 +19,7 @@ import java.io.FileInputStream;
|
|||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
import java.util.concurrent.ExecutionException;
|
import java.util.concurrent.ExecutionException;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 2019-03-10 (Edited on 2019-03-23)
|
* 2019-03-10 (Edited on 2019-03-23)
|
||||||
* Author: Haris Muhammad
|
* Author: Haris Muhammad
|
||||||
@@ -29,7 +30,7 @@ import java.util.concurrent.ExecutionException;
|
|||||||
public class ShipWarfareGUI extends Player {
|
public class ShipWarfareGUI extends Player {
|
||||||
|
|
||||||
private ShipWarfareGUI ship;
|
private ShipWarfareGUI ship;
|
||||||
private ShipWarfareGUILogic logic;
|
//private ShipWarfareGUILogic logic;
|
||||||
private Circle cannon;
|
private Circle cannon;
|
||||||
private VBox buttonBox;
|
private VBox buttonBox;
|
||||||
private HBox fightRunBox;
|
private HBox fightRunBox;
|
||||||
@@ -46,7 +47,6 @@ public class ShipWarfareGUI extends Player {
|
|||||||
private Label report;
|
private Label report;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private int timeCounter;
|
private int timeCounter;
|
||||||
|
|
||||||
|
|
||||||
@@ -70,9 +70,6 @@ public class ShipWarfareGUI extends Player {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets most of the labels invisible except for the "fight or run" label
|
* Sets most of the labels invisible except for the "fight or run" label
|
||||||
*/
|
*/
|
||||||
@@ -99,9 +96,6 @@ public class ShipWarfareGUI extends Player {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Player attacks enemy ships in an animation
|
* Player attacks enemy ships in an animation
|
||||||
*/
|
*/
|
||||||
@@ -160,6 +154,7 @@ public class ShipWarfareGUI extends Player {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
public boolean winOrLose(Stage stage) {
|
public boolean winOrLose(Stage stage) {
|
||||||
if (logic.destroyLittyShipsOrEscape() == 1) {
|
if (logic.destroyLittyShipsOrEscape() == 1) {
|
||||||
wipe();
|
wipe();
|
||||||
@@ -189,8 +184,7 @@ public class ShipWarfareGUI extends Player {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generaties ships and deploys logic for the shipwarfare
|
* Generaties ships and deploys logic for the shipwarfare
|
||||||
@@ -198,303 +192,7 @@ public class ShipWarfareGUI extends Player {
|
|||||||
* @param primaryStage sets up the stage to whcih the GUI may be based around
|
* @param primaryStage sets up the stage to whcih the GUI may be based around
|
||||||
* @throws Exception in case of interruptions withing the graphical interface
|
* @throws Exception in case of interruptions withing the graphical interface
|
||||||
*/
|
*/
|
||||||
public void initializeShip(Stage primaryStage) throws Exception {
|
/*
|
||||||
cannon.setLayoutX(beginningX);
|
public void initializeShip(Stage primaryStage) throws Exception
|
||||||
cannon.setLayoutY(beginningY);
|
|
||||||
logic.setNumOfLittyShips(logic.numOfShips());
|
|
||||||
|
|
||||||
Pane root = new Pane();
|
|
||||||
HBox usAgainstEnemyDivisor;
|
|
||||||
BorderPane centeringUserShipPane = new BorderPane();
|
|
||||||
Circle cannon;
|
|
||||||
BorderPane centeringLittyShipPane = new BorderPane();
|
|
||||||
BorderPane encompassingPane = new BorderPane();
|
|
||||||
usAgainstEnemyDivisor = new HBox();
|
|
||||||
cannon = new Circle();
|
|
||||||
this.cannon = cannon;
|
|
||||||
|
|
||||||
|
|
||||||
cannon.setVisible(false);
|
|
||||||
|
|
||||||
buttonBox = new VBox();
|
|
||||||
fightRunBox = new HBox();
|
|
||||||
fightButton = new Button();
|
|
||||||
runButton = new Button();
|
|
||||||
continueButton = new Button();
|
|
||||||
labelBox = new VBox();
|
|
||||||
title = new Label();
|
|
||||||
HPLeft = new Label();
|
|
||||||
gunsLeftOrTaken = new Label();
|
|
||||||
runAwayOrLeft = new Label();
|
|
||||||
shipsRemaining = new Label();
|
|
||||||
report = new Label();
|
|
||||||
|
|
||||||
title.setText(String.format("%d ships from Liu Yuen's Fleet are attacking, Would you like to fight or run?", numOfLittyShips));
|
|
||||||
|
|
||||||
|
|
||||||
fightButton.setText("Fight");
|
|
||||||
runButton.setText("Run");
|
|
||||||
continueButton.setText("Continue");
|
|
||||||
|
|
||||||
fightButton.setVisible(true);
|
|
||||||
runButton.setVisible(true);
|
|
||||||
continueButton.setVisible(false);
|
|
||||||
|
|
||||||
|
|
||||||
encompassingPane.setAlignment(labelBox, javafx.geometry.Pos.CENTER);
|
|
||||||
labelBox.setAlignment(javafx.geometry.Pos.CENTER);
|
|
||||||
labelBox.setPrefHeight(41.0);
|
|
||||||
labelBox.setPrefWidth(600.0);
|
|
||||||
labelBox.setSpacing(20.0);
|
|
||||||
|
|
||||||
labelBox.setPadding(new Insets(10.0, 0.0, 0.0, 0.0));
|
|
||||||
|
|
||||||
encompassingPane.setAlignment(buttonBox, javafx.geometry.Pos.CENTER);
|
|
||||||
buttonBox.setAlignment(javafx.geometry.Pos.TOP_CENTER);
|
|
||||||
|
|
||||||
|
|
||||||
fightRunBox.setAlignment(javafx.geometry.Pos.CENTER);
|
|
||||||
fightRunBox.setPrefHeight(100.0);
|
|
||||||
fightRunBox.setPrefWidth(200.0);
|
|
||||||
fightRunBox.setSpacing(10.0);
|
|
||||||
|
|
||||||
VBox.setMargin(continueButton, new Insets(0.0, 0.0, 20.0, 0.0));
|
|
||||||
|
|
||||||
|
|
||||||
root.getChildren().add(cannon);
|
|
||||||
|
|
||||||
encompassingPane.setPrefHeight(480);
|
|
||||||
encompassingPane.setPrefWidth(600);
|
|
||||||
|
|
||||||
|
|
||||||
usAgainstEnemyDivisor.setPrefHeight(0.0);
|
|
||||||
usAgainstEnemyDivisor.setPrefWidth(600.0);
|
|
||||||
|
|
||||||
centeringUserShipPane.setPrefHeight(200.0);
|
|
||||||
centeringUserShipPane.setPrefWidth(200.0);
|
|
||||||
|
|
||||||
Image ourShip;
|
|
||||||
Image enemyShip;
|
|
||||||
|
|
||||||
try {
|
|
||||||
ourShip = new Image(new FileInputStream("src/images/ourShip.png"));
|
|
||||||
enemyShip = new Image(new FileInputStream("src/images/enemyShip.png"));
|
|
||||||
|
|
||||||
} catch (Exception e) {
|
|
||||||
ourShip = new Image(new FileInputStream("images/ourShip.png"));
|
|
||||||
enemyShip = new Image(new FileInputStream("images/enemyShip.png"));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//Setting the image view
|
|
||||||
ImageView userShip = new ImageView(ourShip);
|
|
||||||
ImageView littyShip = new ImageView(enemyShip);
|
|
||||||
|
|
||||||
BorderPane.setAlignment(userShip, javafx.geometry.Pos.CENTER);
|
|
||||||
userShip.setFitHeight(150.0);
|
|
||||||
userShip.setFitWidth(248.0);
|
|
||||||
userShip.setPickOnBounds(true);
|
|
||||||
userShip.setPreserveRatio(true);
|
|
||||||
centeringUserShipPane.setCenter(userShip);
|
|
||||||
|
|
||||||
BorderPane.setAlignment(buttonBox, javafx.geometry.Pos.CENTER);
|
|
||||||
buttonBox.setAlignment(javafx.geometry.Pos.TOP_CENTER);
|
|
||||||
|
|
||||||
usAgainstEnemyDivisor.setTranslateY(-20.0);
|
|
||||||
|
|
||||||
cannon.setRadius(10.0);
|
|
||||||
cannon.setStroke(javafx.scene.paint.Color.BLACK);
|
|
||||||
cannon.setStrokeType(javafx.scene.shape.StrokeType.INSIDE);
|
|
||||||
centeringUserShipPane.setRight(cannon);
|
|
||||||
|
|
||||||
centeringLittyShipPane.setPrefHeight(200.0);
|
|
||||||
centeringLittyShipPane.setPrefWidth(200.0);
|
|
||||||
centeringLittyShipPane.setOpaqueInsets(new Insets(0.0));
|
|
||||||
HBox.setMargin(centeringLittyShipPane, new Insets(0.0, 0.0, 0.0, 200.0));
|
|
||||||
|
|
||||||
encompassingPane.setAlignment(littyShip, javafx.geometry.Pos.CENTER);
|
|
||||||
littyShip.setFitHeight(165.0);
|
|
||||||
littyShip.setFitWidth(180.0);
|
|
||||||
littyShip.setPickOnBounds(true);
|
|
||||||
littyShip.setPreserveRatio(true);
|
|
||||||
encompassingPane.setMargin(littyShip, new Insets(0.0, 0.0, 20.0, 0.0));
|
|
||||||
centeringLittyShipPane.setCenter(littyShip);
|
|
||||||
|
|
||||||
usAgainstEnemyDivisor.getChildren().add(centeringUserShipPane);
|
|
||||||
usAgainstEnemyDivisor.getChildren().add(centeringLittyShipPane);
|
|
||||||
fightRunBox.getChildren().add(fightButton);
|
|
||||||
fightRunBox.getChildren().add(continueButton);
|
|
||||||
fightRunBox.getChildren().add(runButton);
|
|
||||||
buttonBox.getChildren().add(fightRunBox);
|
|
||||||
labelBox.getChildren().add(title);
|
|
||||||
labelBox.getChildren().add(HPLeft);
|
|
||||||
labelBox.getChildren().add(gunsLeftOrTaken);
|
|
||||||
labelBox.getChildren().add(runAwayOrLeft);
|
|
||||||
labelBox.getChildren().add(shipsRemaining);
|
|
||||||
labelBox.getChildren().add(report);
|
|
||||||
|
|
||||||
encompassingPane.setTop(labelBox);
|
|
||||||
encompassingPane.setCenter(usAgainstEnemyDivisor);
|
|
||||||
|
|
||||||
encompassingPane.setBottom(buttonBox);
|
|
||||||
|
|
||||||
root.getChildren().addAll(encompassingPane, cannon);
|
|
||||||
|
|
||||||
Scene scene = new Scene(root, 600, 480);
|
|
||||||
root.getStylesheets().add("styleguide.css");
|
|
||||||
|
|
||||||
primaryStage.setResizable(false);
|
|
||||||
|
|
||||||
primaryStage.setTitle("Ship Warfare");
|
|
||||||
primaryStage.setScene(scene);
|
|
||||||
primaryStage.show();
|
|
||||||
continueButton.setOnAction(new EventHandler<ActionEvent>() {
|
|
||||||
@Override
|
|
||||||
/**
|
|
||||||
* Continue Button, engages in run logic and graphical interface
|
|
||||||
* @param event, once button is clicked, executes graphical information
|
|
||||||
*/
|
*/
|
||||||
public void handle(ActionEvent event) {
|
|
||||||
shotsFired.stop();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Switches to Taipan Shop scene
|
|
||||||
*/
|
|
||||||
|
|
||||||
TaipanShopGUI shop = new TaipanShopGUI(getPlayer());
|
|
||||||
shop.initializeShop(primaryStage);
|
|
||||||
primaryStage.show();
|
|
||||||
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
//Flee
|
|
||||||
runButton.setOnAction(new EventHandler<ActionEvent>() {
|
|
||||||
@Override
|
|
||||||
/**
|
|
||||||
* Run Button, engages in run logic and graphical interface
|
|
||||||
* @param event, once button is clicked, executes graphical information
|
|
||||||
*/
|
|
||||||
public void handle(ActionEvent event) {
|
|
||||||
report.setVisible(true);
|
|
||||||
title.setVisible(true);
|
|
||||||
shipsRemaining.setVisible(true);
|
|
||||||
gunsLeftOrTaken.setVisible(true);
|
|
||||||
|
|
||||||
title.setText("Ayy captain we will try to run!");
|
|
||||||
report.setText("Epic");
|
|
||||||
counter++;
|
|
||||||
|
|
||||||
if (logic.runFromShips() == false) {
|
|
||||||
report.setText(("Couldn't run away"));
|
|
||||||
try {
|
|
||||||
winOrLose = destroyLittyShipsOrEscape(primaryStage);
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
if (winOrLose == true) {
|
|
||||||
report.setVisible(true);
|
|
||||||
title.setVisible(true);
|
|
||||||
shipsRemaining.setVisible(true);
|
|
||||||
gunsLeftOrTaken.setVisible(true);
|
|
||||||
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
|
|
||||||
report.setText("Phew! Got away safely");
|
|
||||||
setVisibilitiesAndTransition(primaryStage);
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
//Fight
|
|
||||||
fightButton.setOnAction(new EventHandler<ActionEvent>() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
/**
|
|
||||||
* Fight Button, engages in fight logic and graphical interface
|
|
||||||
* @param event, once button is clicked, executes graphical information
|
|
||||||
*/
|
|
||||||
public void handle(ActionEvent event) {
|
|
||||||
report.setVisible(false);
|
|
||||||
runAwayOrLeft.setVisible(false);
|
|
||||||
shipsRemaining.setVisible(false);
|
|
||||||
HPLeft.setVisible(false);
|
|
||||||
gunsLeftOrTaken.setVisible(false);
|
|
||||||
fightButton.setVisible(false);
|
|
||||||
runButton.setVisible(false);
|
|
||||||
|
|
||||||
try {
|
|
||||||
winOrLose = destroyLittyShipsOrEscape(primaryStage);
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
counter++;
|
|
||||||
|
|
||||||
cannon.setVisible(true);
|
|
||||||
cannon.setLayoutX(beginningX);
|
|
||||||
cannon.setLayoutY(beginningY);
|
|
||||||
|
|
||||||
if (counter >= 1) {
|
|
||||||
title.setVisible(false);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
playerShoots(getGuns());
|
|
||||||
|
|
||||||
shotsFired.setOnFinished(new EventHandler<ActionEvent>() {
|
|
||||||
@Override
|
|
||||||
/**
|
|
||||||
* When the user is completed their volley this information will be accessed
|
|
||||||
* @param event, once the shots fired transition is completed, execute graphical information
|
|
||||||
*/
|
|
||||||
public void handle(ActionEvent event) {
|
|
||||||
shotsFired.stop();
|
|
||||||
if (!winOrLose) {
|
|
||||||
shipsRetaliate();
|
|
||||||
} else {
|
|
||||||
report.setVisible(true);
|
|
||||||
continueButton.setVisible(true);
|
|
||||||
usAgainstEnemyDivisor.setVisible(false);
|
|
||||||
cannon.setVisible(false);
|
|
||||||
shotsFired.stop();
|
|
||||||
|
|
||||||
}
|
|
||||||
enemyShots.setOnFinished(new EventHandler<ActionEvent>() {
|
|
||||||
@Override
|
|
||||||
/**
|
|
||||||
* When the user is completed their volley, this information will be accessed
|
|
||||||
* @param event, once the enemy shots transition is completed, execute graphical information
|
|
||||||
*/
|
|
||||||
public void handle(ActionEvent event) {
|
|
||||||
fightButton.setVisible(true);
|
|
||||||
runButton.setVisible(true);
|
|
||||||
report.setVisible(true);
|
|
||||||
cannon.setVisible(false);
|
|
||||||
runAwayOrLeft.setVisible(true);
|
|
||||||
gunsLeftOrTaken.setVisible(true);
|
|
||||||
shipsRemaining.setVisible(true);
|
|
||||||
HPLeft.setVisible(true);
|
|
||||||
gunsLeftOrTaken.setVisible(true);
|
|
||||||
|
|
||||||
if (winOrLose == true) {
|
|
||||||
usAgainstEnemyDivisor.setVisible(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -14,7 +14,9 @@ import javafx.scene.control.TextField;
|
|||||||
import javafx.scene.input.KeyCode;
|
import javafx.scene.input.KeyCode;
|
||||||
import javafx.scene.input.KeyEvent;
|
import javafx.scene.input.KeyEvent;
|
||||||
import javafx.scene.layout.*;
|
import javafx.scene.layout.*;
|
||||||
|
import javafx.scene.paint.Color;
|
||||||
import javafx.scene.shape.Rectangle;
|
import javafx.scene.shape.Rectangle;
|
||||||
|
import javafx.scene.shape.StrokeType;
|
||||||
import javafx.scene.text.Font;
|
import javafx.scene.text.Font;
|
||||||
import javafx.stage.Stage;
|
import javafx.stage.Stage;
|
||||||
|
|
||||||
@@ -239,94 +241,6 @@ public class TaipanShopGUI extends Player{
|
|||||||
FileSaving saving = new FileSaving();
|
FileSaving saving = new FileSaving();
|
||||||
saving.saveFile(getPlayer());
|
saving.saveFile(getPlayer());
|
||||||
|
|
||||||
Font size14 = new Font(14.0);
|
|
||||||
Rectangle dialogueRectangle = new Rectangle();
|
|
||||||
dialogueRectangle.setFill(javafx.scene.paint.Color.WHITE);
|
|
||||||
dialogueRectangle.setHeight(180.0);
|
|
||||||
dialogueRectangle.setLayoutX(8.0);
|
|
||||||
dialogueRectangle.setLayoutY(294.0);
|
|
||||||
dialogueRectangle.setStroke(javafx.scene.paint.Color.BLACK);
|
|
||||||
dialogueRectangle.setStrokeType(javafx.scene.shape.StrokeType.INSIDE);
|
|
||||||
dialogueRectangle.setWidth(582.0);
|
|
||||||
|
|
||||||
Rectangle inventoryRectangle = new Rectangle();
|
|
||||||
inventoryRectangle.setFill(javafx.scene.paint.Color.WHITE);
|
|
||||||
inventoryRectangle.setHeight(108.0);
|
|
||||||
inventoryRectangle.setLayoutX(8.0);
|
|
||||||
inventoryRectangle.setLayoutY(147.0);
|
|
||||||
inventoryRectangle.setStroke(javafx.scene.paint.Color.BLACK);
|
|
||||||
inventoryRectangle.setStrokeType(javafx.scene.shape.StrokeType.INSIDE);
|
|
||||||
inventoryRectangle.setWidth(405.0);
|
|
||||||
|
|
||||||
Rectangle warehouseRectangle = new Rectangle();
|
|
||||||
warehouseRectangle.setFill(javafx.scene.paint.Color.WHITE);
|
|
||||||
warehouseRectangle.setHeight(108.0);
|
|
||||||
warehouseRectangle.setLayoutY(33.0);
|
|
||||||
warehouseRectangle.setLayoutX(8.0);
|
|
||||||
warehouseRectangle.setStroke(javafx.scene.paint.Color.BLACK);
|
|
||||||
warehouseRectangle.setStrokeType(javafx.scene.shape.StrokeType.INSIDE);
|
|
||||||
warehouseRectangle.setWidth(405.0);
|
|
||||||
|
|
||||||
AnchorPane anchorPane = new AnchorPane();
|
|
||||||
anchorPane.setPrefHeight(480.0);
|
|
||||||
anchorPane.setPrefWidth(600.0);
|
|
||||||
|
|
||||||
GridPane gridPane = new GridPane();
|
|
||||||
gridPane.setPrefHeight(480.0);
|
|
||||||
gridPane.setPrefWidth(600.0);
|
|
||||||
|
|
||||||
ColumnConstraints columnConstraints = new ColumnConstraints();
|
|
||||||
columnConstraints.setMaxWidth(590.0);
|
|
||||||
columnConstraints.setMinWidth(0.0);
|
|
||||||
columnConstraints.setPrefWidth(590.0);
|
|
||||||
|
|
||||||
RowConstraints rowConstraints = new RowConstraints();
|
|
||||||
rowConstraints.setMinHeight(20.0);
|
|
||||||
rowConstraints.setPrefHeight(20.0);
|
|
||||||
|
|
||||||
RowConstraints rowConstraints0 = new RowConstraints();
|
|
||||||
rowConstraints0.setMaxHeight(122.0);
|
|
||||||
rowConstraints0.setMinHeight(10.0);
|
|
||||||
rowConstraints0.setPrefHeight(117.0);
|
|
||||||
|
|
||||||
RowConstraints rowConstraints1 = new RowConstraints();
|
|
||||||
rowConstraints1.setMaxHeight(163.0);
|
|
||||||
rowConstraints1.setMinHeight(10.0);
|
|
||||||
rowConstraints1.setPrefHeight(112.0);
|
|
||||||
|
|
||||||
RowConstraints rowConstraints2 = new RowConstraints();
|
|
||||||
rowConstraints2.setMaxHeight(126.0);
|
|
||||||
rowConstraints2.setMinHeight(0.0);
|
|
||||||
rowConstraints2.setPrefHeight(42.0);
|
|
||||||
|
|
||||||
RowConstraints rowConstraints3 = new RowConstraints();
|
|
||||||
rowConstraints3.setMaxHeight(269.0);
|
|
||||||
rowConstraints3.setMinHeight(10.0);
|
|
||||||
rowConstraints3.setPrefHeight(118.0);
|
|
||||||
|
|
||||||
RowConstraints rowConstraints4 = new RowConstraints();
|
|
||||||
rowConstraints4.setMaxHeight(179.0);
|
|
||||||
rowConstraints4.setMinHeight(10.0);
|
|
||||||
rowConstraints4.setPrefHeight(52.0);
|
|
||||||
|
|
||||||
gridPane.setPadding(new Insets(10.0, 10.0, 10.0, 0.0));
|
|
||||||
|
|
||||||
HBox hBox = new HBox();
|
|
||||||
GridPane.setRowIndex(hBox, 1);
|
|
||||||
hBox.setPrefHeight(100.0);
|
|
||||||
hBox.setPrefWidth(200.0);
|
|
||||||
|
|
||||||
HBox hBox0 = new HBox();
|
|
||||||
GridPane.setRowIndex(hBox0, 2);
|
|
||||||
hBox0.setPrefHeight(100.0);
|
|
||||||
hBox0.setPrefWidth(200.0);
|
|
||||||
|
|
||||||
FlowPane flowPane = new FlowPane();
|
|
||||||
GridPane.setRowIndex(flowPane, 5);
|
|
||||||
flowPane.setAlignment(javafx.geometry.Pos.CENTER);
|
|
||||||
flowPane.setHgap(5.0);
|
|
||||||
flowPane.setPrefHeight(200.0);
|
|
||||||
flowPane.setPrefWidth(200.0);
|
|
||||||
|
|
||||||
buyButton.setMnemonicParsing(false);
|
buyButton.setMnemonicParsing(false);
|
||||||
buyButton.setPrefHeight(25.0);
|
buyButton.setPrefHeight(25.0);
|
||||||
@@ -603,19 +517,129 @@ public class TaipanShopGUI extends Player{
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
updateStage();
|
updateStage(firm,wItemsText,wItemSpaceText,locationText,gunsText,inventoryText,inventoryHeldText,shipStatusText,cashText,bankText);
|
||||||
|
|
||||||
buttonSetup("reset");
|
buttonSetup("reset");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
stage.setTitle("Shop");
|
||||||
|
stage.setResizable(false);
|
||||||
|
Scene root = new Scene(declareStage(), 600, 480);
|
||||||
|
stage.setScene(root);
|
||||||
|
|
||||||
|
// general updates to the buttons, user stats/inventory, and text.
|
||||||
|
buttonSetup("reset");
|
||||||
|
if(getIsPriceChanged() == 0 || getIsPriceChanged() == 2){
|
||||||
|
TaipanShopLogic logic = new TaipanShopLogic(getPlayer());
|
||||||
|
String temp = logic.updatePrices();
|
||||||
|
setPlayer(logic.getPlayer());
|
||||||
|
defaultTextOut();
|
||||||
|
textOut.setText(temp + textOut.getText());
|
||||||
|
}
|
||||||
|
//defaultTextOut();
|
||||||
|
updateStage(firm,wItemsText,wItemSpaceText,locationText,gunsText,inventoryText,inventoryHeldText,shipStatusText,cashText,bankText);
|
||||||
|
}
|
||||||
|
|
||||||
|
public AnchorPane declareStage() {
|
||||||
|
//Declaring all the elements required for the information on screen
|
||||||
|
Rectangle dialogueRectangle = new Rectangle();
|
||||||
|
Rectangle inventoryRectangle = new Rectangle();
|
||||||
|
Rectangle warehouseRectangle = new Rectangle();
|
||||||
|
AnchorPane anchorPane = new AnchorPane();
|
||||||
|
GridPane gridPane = new GridPane();
|
||||||
|
ColumnConstraints columnConstraints = new ColumnConstraints();
|
||||||
|
RowConstraints rowConstraints = new RowConstraints();
|
||||||
|
RowConstraints rowConstraints0 = new RowConstraints();
|
||||||
|
RowConstraints rowConstraints1 = new RowConstraints();
|
||||||
|
RowConstraints rowConstraints2 = new RowConstraints();
|
||||||
|
RowConstraints rowConstraints3 = new RowConstraints();
|
||||||
|
RowConstraints rowConstraints4 = new RowConstraints();
|
||||||
|
HBox hBox = new HBox();
|
||||||
|
HBox hBox0 = new HBox();
|
||||||
|
FlowPane flowPane = new FlowPane();
|
||||||
|
Font size14 = new Font(14.0);
|
||||||
|
Label warehouseText = new Label();
|
||||||
|
|
||||||
|
dialogueRectangle.setFill(Color.WHITE);
|
||||||
|
dialogueRectangle.setHeight(180.0);
|
||||||
|
dialogueRectangle.setLayoutX(8.0);
|
||||||
|
dialogueRectangle.setLayoutY(294.0);
|
||||||
|
dialogueRectangle.setStroke(Color.BLACK);
|
||||||
|
dialogueRectangle.setStrokeType(StrokeType.INSIDE);
|
||||||
|
dialogueRectangle.setWidth(582.0);
|
||||||
|
|
||||||
|
inventoryRectangle.setFill(Color.WHITE);
|
||||||
|
inventoryRectangle.setHeight(108.0);
|
||||||
|
inventoryRectangle.setLayoutX(8.0);
|
||||||
|
inventoryRectangle.setLayoutY(147.0);
|
||||||
|
inventoryRectangle.setStroke(Color.BLACK);
|
||||||
|
inventoryRectangle.setStrokeType(StrokeType.INSIDE);
|
||||||
|
inventoryRectangle.setWidth(405.0);
|
||||||
|
|
||||||
|
warehouseRectangle.setFill(Color.WHITE);
|
||||||
|
warehouseRectangle.setHeight(108.0);
|
||||||
|
warehouseRectangle.setLayoutY(33.0);
|
||||||
|
warehouseRectangle.setLayoutX(8.0);
|
||||||
|
warehouseRectangle.setStroke(Color.BLACK);
|
||||||
|
warehouseRectangle.setStrokeType(StrokeType.INSIDE);
|
||||||
|
warehouseRectangle.setWidth(405.0);
|
||||||
|
|
||||||
|
anchorPane.setPrefHeight(480.0);
|
||||||
|
anchorPane.setPrefWidth(600.0);
|
||||||
|
|
||||||
|
gridPane.setPrefHeight(480.0);
|
||||||
|
gridPane.setPrefWidth(600.0);
|
||||||
|
|
||||||
|
columnConstraints.setMaxWidth(590.0);
|
||||||
|
columnConstraints.setMinWidth(0.0);
|
||||||
|
columnConstraints.setPrefWidth(590.0);
|
||||||
|
|
||||||
|
rowConstraints.setMinHeight(20.0);
|
||||||
|
rowConstraints.setPrefHeight(20.0);
|
||||||
|
|
||||||
|
rowConstraints0.setMaxHeight(122.0);
|
||||||
|
rowConstraints0.setMinHeight(10.0);
|
||||||
|
rowConstraints0.setPrefHeight(117.0);
|
||||||
|
|
||||||
|
rowConstraints1.setMaxHeight(163.0);
|
||||||
|
rowConstraints1.setMinHeight(10.0);
|
||||||
|
rowConstraints1.setPrefHeight(112.0);
|
||||||
|
|
||||||
|
rowConstraints2.setMaxHeight(126.0);
|
||||||
|
rowConstraints2.setMinHeight(0.0);
|
||||||
|
rowConstraints2.setPrefHeight(42.0);
|
||||||
|
|
||||||
|
rowConstraints3.setMaxHeight(269.0);
|
||||||
|
rowConstraints3.setMinHeight(10.0);
|
||||||
|
rowConstraints3.setPrefHeight(118.0);
|
||||||
|
|
||||||
|
rowConstraints4.setMaxHeight(179.0);
|
||||||
|
rowConstraints4.setMinHeight(10.0);
|
||||||
|
rowConstraints4.setPrefHeight(52.0);
|
||||||
|
|
||||||
|
gridPane.setPadding(new Insets(10.0, 10.0, 10.0, 0.0));
|
||||||
|
|
||||||
|
GridPane.setRowIndex(hBox, 1);
|
||||||
|
hBox.setPrefHeight(100.0);
|
||||||
|
hBox.setPrefWidth(200.0);
|
||||||
|
|
||||||
|
GridPane.setRowIndex(hBox0, 2);
|
||||||
|
hBox0.setPrefHeight(100.0);
|
||||||
|
hBox0.setPrefWidth(200.0);
|
||||||
|
|
||||||
|
GridPane.setRowIndex(flowPane, 5);
|
||||||
|
flowPane.setAlignment(Pos.CENTER);
|
||||||
|
flowPane.setHgap(5.0);
|
||||||
|
flowPane.setPrefHeight(200.0);
|
||||||
|
flowPane.setPrefWidth(200.0);
|
||||||
|
|
||||||
firm.setAlignment(Pos.CENTER);
|
firm.setAlignment(Pos.CENTER);
|
||||||
firm.setPrefHeight(27.0);
|
firm.setPrefHeight(27.0);
|
||||||
firm.setPrefWidth(632.0);
|
firm.setPrefWidth(632.0);
|
||||||
firm.setFont(new Font(18.0));
|
firm.setFont(new Font(18.0));
|
||||||
|
|
||||||
Label warehouseText = new Label();
|
|
||||||
warehouseText.setAlignment(Pos.CENTER);
|
warehouseText.setAlignment(Pos.CENTER);
|
||||||
warehouseText.setPrefHeight(108.0);
|
warehouseText.setPrefHeight(108.0);
|
||||||
warehouseText.setPrefWidth(100.0);
|
warehouseText.setPrefWidth(100.0);
|
||||||
@@ -674,7 +698,7 @@ public class TaipanShopGUI extends Player{
|
|||||||
textOut.setContentDisplay(javafx.scene.control.ContentDisplay.TOP);
|
textOut.setContentDisplay(javafx.scene.control.ContentDisplay.TOP);
|
||||||
textOut.setPrefHeight(163.0);
|
textOut.setPrefHeight(163.0);
|
||||||
textOut.setPrefWidth(583.0);
|
textOut.setPrefWidth(583.0);
|
||||||
defaultTextOut();
|
//defaultTextOut();
|
||||||
textOut.setFont(size14);
|
textOut.setFont(size14);
|
||||||
|
|
||||||
anchorPane.getChildren().addAll(dialogueRectangle, inventoryRectangle, warehouseRectangle);
|
anchorPane.getChildren().addAll(dialogueRectangle, inventoryRectangle, warehouseRectangle);
|
||||||
@@ -683,7 +707,7 @@ public class TaipanShopGUI extends Player{
|
|||||||
|
|
||||||
hBox0.getChildren().addAll(inventoryText, inventoryHeldText, gunsText, shipStatusText);
|
hBox0.getChildren().addAll(inventoryText, inventoryHeldText, gunsText, shipStatusText);
|
||||||
|
|
||||||
flowPane.getChildren().addAll(buyButton, sellButton, bankButton, cargoButton, loanButton, quitButton, retireButton, opiumButton, silkButton, armsButton, generalButton, numberInput);
|
//flowPane.getChildren().addAll(buyButton, sellButton, bankButton, cargoButton, loanButton, quitButton, retireButton, opiumButton, silkButton, armsButton, generalButton, numberInput);
|
||||||
|
|
||||||
gridPane.getColumnConstraints().add(columnConstraints);
|
gridPane.getColumnConstraints().add(columnConstraints);
|
||||||
gridPane.getRowConstraints().addAll(rowConstraints, rowConstraints0, rowConstraints1, rowConstraints2, rowConstraints3, rowConstraints4);
|
gridPane.getRowConstraints().addAll(rowConstraints, rowConstraints0, rowConstraints1, rowConstraints2, rowConstraints3, rowConstraints4);
|
||||||
@@ -691,42 +715,13 @@ public class TaipanShopGUI extends Player{
|
|||||||
|
|
||||||
anchorPane.getChildren().add(gridPane);
|
anchorPane.getChildren().add(gridPane);
|
||||||
|
|
||||||
Scene root = new Scene(anchorPane, 600, 480);
|
return anchorPane;
|
||||||
|
|
||||||
root.getStylesheets().add("styleguide.css");
|
|
||||||
stage.setTitle("Shop");
|
|
||||||
stage.setResizable(false);
|
|
||||||
stage.setScene(root);
|
|
||||||
buyButton.setFocusTraversable(false);
|
|
||||||
sellButton.setFocusTraversable(false);
|
|
||||||
bankButton.setFocusTraversable(false);
|
|
||||||
loanButton.setFocusTraversable(false);
|
|
||||||
generalButton.setFocusTraversable(false);
|
|
||||||
armsButton.setFocusTraversable(false);
|
|
||||||
silkButton.setFocusTraversable(false);
|
|
||||||
opiumButton.setFocusTraversable(false);
|
|
||||||
sellButton.setFocusTraversable(false);
|
|
||||||
retireButton.setFocusTraversable(false);
|
|
||||||
cargoButton.setFocusTraversable(false);
|
|
||||||
quitButton.setFocusTraversable(false);
|
|
||||||
|
|
||||||
// general updates to the buttons, user stats/inventory, and text.
|
|
||||||
buttonSetup("reset");
|
|
||||||
if(getIsPriceChanged() == 0 || getIsPriceChanged() == 2){
|
|
||||||
TaipanShopLogic logic = new TaipanShopLogic(getPlayer());
|
|
||||||
String temp = logic.updatePrices();
|
|
||||||
setPlayer(logic.getPlayer());
|
|
||||||
defaultTextOut();
|
|
||||||
textOut.setText(temp + textOut.getText());
|
|
||||||
}
|
|
||||||
//defaultTextOut();
|
|
||||||
updateStage();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* updates the text associated with the user's inventory.
|
* updates the text associated with the user's inventory.
|
||||||
*/
|
*/
|
||||||
public void updateStage() {
|
public void updateStage(Label firm, Label wItemsText, Label wItemSpaceText, Label locationText, Label gunsText, Label inventoryText, Label inventoryHeldText, Label shipStatusText, Label cashText, Label bankText) {
|
||||||
TaipanShopLogic logic = new TaipanShopLogic(getPlayer());
|
TaipanShopLogic logic = new TaipanShopLogic(getPlayer());
|
||||||
firm.setText(String.format("Firm: %s, %s", getName(), logic.getStringLocation()));
|
firm.setText(String.format("Firm: %s, %s", getName(), logic.getStringLocation()));
|
||||||
wItemsText.setText(String.format("\n %d\n %d\n %d\n %d", getwOpium(), getwSilk(), getwArms(), getwGeneral()));
|
wItemsText.setText(String.format("\n %d\n %d\n %d\n %d", getwOpium(), getwSilk(), getwArms(), getwGeneral()));
|
||||||
@@ -745,5 +740,4 @@ public class TaipanShopGUI extends Player{
|
|||||||
cashText.setText(String.format(" Cash: $%,d", getMoney()));
|
cashText.setText(String.format(" Cash: $%,d", getMoney()));
|
||||||
bankText.setText(String.format("Bank: $%,d", getBank()));
|
bankText.setText(String.format("Bank: $%,d", getBank()));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ import javafx.scene.control.Button;
|
|||||||
import javafx.scene.control.TextField;
|
import javafx.scene.control.TextField;
|
||||||
import javafx.scene.input.KeyCode;
|
import javafx.scene.input.KeyCode;
|
||||||
import javafx.scene.layout.*;
|
import javafx.scene.layout.*;
|
||||||
|
import javafx.scene.paint.Color;
|
||||||
|
import javafx.scene.shape.StrokeType;
|
||||||
import javafx.stage.Stage;
|
import javafx.stage.Stage;
|
||||||
import javafx.geometry.Insets;
|
import javafx.geometry.Insets;
|
||||||
import javafx.scene.control.Label;
|
import javafx.scene.control.Label;
|
||||||
@@ -61,96 +63,9 @@ public class TravelGUI extends Player{
|
|||||||
*/
|
*/
|
||||||
public Stage initializeTravel(Stage stage) {
|
public Stage initializeTravel(Stage stage) {
|
||||||
//Updates the stage for the first-time you read it
|
//Updates the stage for the first-time you read it
|
||||||
updateStage();
|
shop.updateStage(firm,wItemsText,wItemSpaceText,locationText,gunsText,inventoryText,inventoryHeldText,shipStatusText,cashText,bankText);
|
||||||
|
|
||||||
Font size14 = new Font(14.0);
|
shop.declareStage();
|
||||||
Rectangle dialogueRectangle = new Rectangle();
|
|
||||||
dialogueRectangle.setFill(javafx.scene.paint.Color.WHITE);
|
|
||||||
dialogueRectangle.setHeight(180.0);
|
|
||||||
dialogueRectangle.setLayoutX(8.0);
|
|
||||||
dialogueRectangle.setLayoutY(294.0);
|
|
||||||
dialogueRectangle.setStroke(javafx.scene.paint.Color.BLACK);
|
|
||||||
dialogueRectangle.setStrokeType(javafx.scene.shape.StrokeType.INSIDE);
|
|
||||||
dialogueRectangle.setWidth(582.0);
|
|
||||||
|
|
||||||
Rectangle inventoryRectangle = new Rectangle();
|
|
||||||
inventoryRectangle.setFill(javafx.scene.paint.Color.WHITE);
|
|
||||||
inventoryRectangle.setHeight(108.0);
|
|
||||||
inventoryRectangle.setLayoutX(8.0);
|
|
||||||
inventoryRectangle.setLayoutY(147.0);
|
|
||||||
inventoryRectangle.setStroke(javafx.scene.paint.Color.BLACK);
|
|
||||||
inventoryRectangle.setStrokeType(javafx.scene.shape.StrokeType.INSIDE);
|
|
||||||
inventoryRectangle.setWidth(405.0);
|
|
||||||
|
|
||||||
Rectangle warehouseRectangle = new Rectangle();
|
|
||||||
warehouseRectangle.setFill(javafx.scene.paint.Color.WHITE);
|
|
||||||
warehouseRectangle.setHeight(108.0);
|
|
||||||
warehouseRectangle.setLayoutY(33.0);
|
|
||||||
warehouseRectangle.setLayoutX(8.0);
|
|
||||||
warehouseRectangle.setStroke(javafx.scene.paint.Color.BLACK);
|
|
||||||
warehouseRectangle.setStrokeType(javafx.scene.shape.StrokeType.INSIDE);
|
|
||||||
warehouseRectangle.setWidth(405.0);
|
|
||||||
|
|
||||||
AnchorPane anchorPane = new AnchorPane();
|
|
||||||
anchorPane.setPrefHeight(480.0);
|
|
||||||
anchorPane.setPrefWidth(600.0);
|
|
||||||
|
|
||||||
GridPane gridPane = new GridPane();
|
|
||||||
gridPane.setPrefHeight(480.0);
|
|
||||||
gridPane.setPrefWidth(600.0);
|
|
||||||
|
|
||||||
ColumnConstraints columnConstraints = new ColumnConstraints();
|
|
||||||
columnConstraints.setMaxWidth(590.0);
|
|
||||||
columnConstraints.setMinWidth(0.0);
|
|
||||||
columnConstraints.setPrefWidth(590.0);
|
|
||||||
|
|
||||||
RowConstraints rowConstraints = new RowConstraints();
|
|
||||||
rowConstraints.setMinHeight(20.0);
|
|
||||||
rowConstraints.setPrefHeight(20.0);
|
|
||||||
|
|
||||||
RowConstraints rowConstraints0 = new RowConstraints();
|
|
||||||
rowConstraints0.setMaxHeight(122.0);
|
|
||||||
rowConstraints0.setMinHeight(10.0);
|
|
||||||
rowConstraints0.setPrefHeight(117.0);
|
|
||||||
|
|
||||||
RowConstraints rowConstraints1 = new RowConstraints();
|
|
||||||
rowConstraints1.setMaxHeight(163.0);
|
|
||||||
rowConstraints1.setMinHeight(10.0);
|
|
||||||
rowConstraints1.setPrefHeight(112.0);
|
|
||||||
|
|
||||||
RowConstraints rowConstraints2 = new RowConstraints();
|
|
||||||
rowConstraints2.setMaxHeight(126.0);
|
|
||||||
rowConstraints2.setMinHeight(0.0);
|
|
||||||
rowConstraints2.setPrefHeight(42.0);
|
|
||||||
|
|
||||||
RowConstraints rowConstraints3 = new RowConstraints();
|
|
||||||
rowConstraints3.setMaxHeight(269.0);
|
|
||||||
rowConstraints3.setMinHeight(10.0);
|
|
||||||
rowConstraints3.setPrefHeight(118.0);
|
|
||||||
|
|
||||||
RowConstraints rowConstraints4 = new RowConstraints();
|
|
||||||
rowConstraints4.setMaxHeight(179.0);
|
|
||||||
rowConstraints4.setMinHeight(10.0);
|
|
||||||
rowConstraints4.setPrefHeight(52.0);
|
|
||||||
|
|
||||||
gridPane.setPadding(new Insets(10.0, 10.0, 10.0, 0.0));
|
|
||||||
|
|
||||||
HBox hBox = new HBox();
|
|
||||||
GridPane.setRowIndex(hBox, 1);
|
|
||||||
hBox.setPrefHeight(100.0);
|
|
||||||
hBox.setPrefWidth(200.0);
|
|
||||||
|
|
||||||
HBox hBox0 = new HBox();
|
|
||||||
GridPane.setRowIndex(hBox0, 2);
|
|
||||||
hBox0.setPrefHeight(100.0);
|
|
||||||
hBox0.setPrefWidth(200.0);
|
|
||||||
|
|
||||||
FlowPane flowPane = new FlowPane();
|
|
||||||
GridPane.setRowIndex(flowPane, 5);
|
|
||||||
flowPane.setAlignment(javafx.geometry.Pos.CENTER);
|
|
||||||
flowPane.setHgap(5.0);
|
|
||||||
flowPane.setPrefHeight(200.0);
|
|
||||||
flowPane.setPrefWidth(200.0);
|
|
||||||
|
|
||||||
//Creating the continue and quit buttons
|
//Creating the continue and quit buttons
|
||||||
quitButton.setPrefHeight(25.0);
|
quitButton.setPrefHeight(25.0);
|
||||||
@@ -176,7 +91,7 @@ public class TravelGUI extends Player{
|
|||||||
if(peasantShipScene && getAttackingShips()){
|
if(peasantShipScene && getAttackingShips()){
|
||||||
ShipWarfareGUI ship = new ShipWarfareGUI(getPlayer());
|
ShipWarfareGUI ship = new ShipWarfareGUI(getPlayer());
|
||||||
try {
|
try {
|
||||||
ship.initializeShip(stage);
|
//ship.initializeShip(stage);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
@@ -257,88 +172,7 @@ public class TravelGUI extends Player{
|
|||||||
firm.setPrefWidth(632.0);
|
firm.setPrefWidth(632.0);
|
||||||
firm.setFont(new Font(18.0));
|
firm.setFont(new Font(18.0));
|
||||||
|
|
||||||
Label warehouseText = new Label();
|
Scene root = new Scene(shop.declareStage(), 600, 480);
|
||||||
warehouseText.setAlignment(Pos.CENTER);
|
|
||||||
warehouseText.setPrefHeight(108.0);
|
|
||||||
warehouseText.setPrefWidth(100.0);
|
|
||||||
warehouseText.setText(" Warehouse\n\tOpium\n\tSilk\n\tArms\n\tGeneral");
|
|
||||||
warehouseText.setFont(size14);
|
|
||||||
|
|
||||||
wItemsText.setAlignment(Pos.CENTER);
|
|
||||||
wItemsText.setPrefWidth(100.0);
|
|
||||||
wItemsText.setPrefHeight(108.0);
|
|
||||||
wItemsText.setFont(size14);
|
|
||||||
|
|
||||||
wItemSpaceText.setPrefHeight(108.0);
|
|
||||||
wItemSpaceText.setPrefWidth(210.0);
|
|
||||||
wItemSpaceText.setFont(size14);
|
|
||||||
|
|
||||||
locationText.setAlignment(Pos.BOTTOM_RIGHT);
|
|
||||||
locationText.setPrefHeight(106.0);
|
|
||||||
locationText.setPrefWidth(140.0);
|
|
||||||
locationText.setTextAlignment(javafx.scene.text.TextAlignment.CENTER);
|
|
||||||
locationText.setFont(size14);
|
|
||||||
|
|
||||||
inventoryText.setAlignment(Pos.CENTER);
|
|
||||||
inventoryText.setPrefWidth(110.0);
|
|
||||||
inventoryText.setPrefHeight(108.0);
|
|
||||||
inventoryText.setFont(size14);
|
|
||||||
|
|
||||||
inventoryHeldText.setAlignment(Pos.CENTER);
|
|
||||||
inventoryHeldText.setPrefHeight(108.0);
|
|
||||||
inventoryHeldText.setPrefWidth(100.0);
|
|
||||||
inventoryHeldText.setFont(size14);
|
|
||||||
|
|
||||||
gunsText.setPrefHeight(108.0);
|
|
||||||
gunsText.setPrefWidth(212.0);
|
|
||||||
gunsText.setAlignment(Pos.CENTER_LEFT);
|
|
||||||
gunsText.setFont(size14);
|
|
||||||
|
|
||||||
shipStatusText.setAlignment(Pos.TOP_CENTER);
|
|
||||||
shipStatusText.setContentDisplay(javafx.scene.control.ContentDisplay.CENTER);
|
|
||||||
shipStatusText.setPrefHeight(110.0);
|
|
||||||
shipStatusText.setPrefWidth(200.0);
|
|
||||||
shipStatusText.setTextAlignment(javafx.scene.text.TextAlignment.CENTER);
|
|
||||||
shipStatusText.setFont(size14);
|
|
||||||
|
|
||||||
GridPane.setRowIndex(cashText, 3);
|
|
||||||
cashText.setPrefHeight(17.0);
|
|
||||||
cashText.setPrefWidth(209.0);
|
|
||||||
cashText.setFont(size14);
|
|
||||||
|
|
||||||
GridPane.setHalignment(bankText, javafx.geometry.HPos.CENTER);
|
|
||||||
GridPane.setRowIndex(bankText, 3);
|
|
||||||
bankText.setAlignment(Pos.CENTER);
|
|
||||||
bankText.setPrefHeight(20.0);
|
|
||||||
bankText.setPrefWidth(264.0);
|
|
||||||
bankText.setFont(size14);
|
|
||||||
|
|
||||||
GridPane.setRowIndex(textOut, 4);
|
|
||||||
textOut.setAlignment(Pos.TOP_LEFT);
|
|
||||||
textOut.setContentDisplay(javafx.scene.control.ContentDisplay.TOP);
|
|
||||||
textOut.setPrefHeight(163.0);
|
|
||||||
textOut.setPrefWidth(583.0);
|
|
||||||
textOut.setText(" Taipan, do you wish to go to:\n\n 1) Hong Kong, 2) Shanghai, 3) Nagasaki, 4) Saigon,\n 5) Manila, 6) Singapore, or 7) Batavia?\n After typing the number you want to go to press 'Enter' or 'Z'");
|
|
||||||
textOut.setFont(size14);
|
|
||||||
|
|
||||||
//Added all the nodes into a single scene
|
|
||||||
anchorPane.getChildren().addAll(dialogueRectangle, inventoryRectangle, warehouseRectangle);
|
|
||||||
|
|
||||||
hBox.getChildren().addAll(warehouseText, wItemsText, wItemSpaceText, locationText);
|
|
||||||
|
|
||||||
hBox0.getChildren().addAll(inventoryText, inventoryHeldText, gunsText, shipStatusText);
|
|
||||||
|
|
||||||
numberInput.requestFocus();
|
|
||||||
flowPane.getChildren().addAll(numberInput, quitButton, continueButton);
|
|
||||||
|
|
||||||
gridPane.getColumnConstraints().add(columnConstraints);
|
|
||||||
gridPane.getRowConstraints().addAll(rowConstraints, rowConstraints0, rowConstraints1, rowConstraints2, rowConstraints3, rowConstraints4);
|
|
||||||
gridPane.getChildren().addAll(firm, hBox, hBox0, cashText, bankText, textOut, flowPane);
|
|
||||||
|
|
||||||
anchorPane.getChildren().add(gridPane);
|
|
||||||
|
|
||||||
Scene root = new Scene(anchorPane, 600, 480);
|
|
||||||
root.getStylesheets().add("styleguide.css");
|
|
||||||
|
|
||||||
stage.setTitle("Travel");
|
stage.setTitle("Travel");
|
||||||
stage.setResizable(false);
|
stage.setResizable(false);
|
||||||
@@ -481,26 +315,4 @@ public class TravelGUI extends Player{
|
|||||||
}
|
}
|
||||||
return shipStatus;
|
return shipStatus;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* updates the text associated with the user's inventory.
|
|
||||||
*/
|
|
||||||
public void updateStage(){
|
|
||||||
firm.setText(String.format("Firm: %s, %s", getName(), getStringLocation()));
|
|
||||||
wItemsText.setText(String.format("\n %d\n %d\n %d\n %d", getwOpium(), getwSilk(), getwArms(), getwGeneral()));
|
|
||||||
int itemsInWarehouse = getwOpium()+getwGeneral()+getwArms()+getwSilk();
|
|
||||||
wItemSpaceText.setText(String.format("\n\t\tIn use:\n\t\t %d \n\t\tVacant:\n\t\t %d", itemsInWarehouse, (10000-itemsInWarehouse)));
|
|
||||||
locationText.setText(String.format("Location\n%s", getStringLocation()));
|
|
||||||
int itemsInInventory = getCargoSpace()-getSilkHeld()-getOpiumHeld()-getGeneralHeld()-getArmsHeld()-10*getGuns();
|
|
||||||
if(itemsInInventory < 0){
|
|
||||||
inventoryText.setText(" Overloaded\n\t Opium\n\t Silk\n\t Arms\n\t General");
|
|
||||||
}else{
|
|
||||||
inventoryText.setText(String.format(" Hold %d\n\t Opium\n\t Silk\n\t Arms\n\t General", itemsInInventory));
|
|
||||||
}
|
|
||||||
gunsText.setText(String.format("Guns %d\n\n\n\n ", getGuns()));
|
|
||||||
inventoryHeldText.setText(String.format("\n %d\n %d\n %d\n %d", getOpiumHeld(), getSilkHeld(), getArmsHeld(), getGeneralHeld()));
|
|
||||||
shipStatusText.setText(String.format("\tDebt\n\t%d\n\n\tShip status\n\t%s: %d", getDebt(), shipStatusString(), getHP()));
|
|
||||||
cashText.setText(String.format(" Cash: $%,d", getMoney()));
|
|
||||||
bankText.setText(String.format("Bank: $%,d", getBank()));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
9
src/TravelText.java
Normal file
9
src/TravelText.java
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
public class TravelText extends Player{
|
||||||
|
public TravelText(Player player) {
|
||||||
|
Player playerDummy = new Player(player);
|
||||||
|
setPlayer(playerDummy);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void travelTo() {
|
||||||
|
}
|
||||||
|
}
|
||||||
9
src/WarehouseText.java
Normal file
9
src/WarehouseText.java
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
public class WarehouseText extends Player {
|
||||||
|
public WarehouseText(Player player) {
|
||||||
|
Player playerDummy = new Player(player);
|
||||||
|
setPlayer(playerDummy);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void changeWarehouse() {
|
||||||
|
}
|
||||||
|
}
|
||||||
9
src/loanSharkText.java
Normal file
9
src/loanSharkText.java
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
public class loanSharkText extends Player{
|
||||||
|
public loanSharkText(Player player) {
|
||||||
|
Player playerDummy = new Player(player);
|
||||||
|
setPlayer(playerDummy);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void loanMoney() {
|
||||||
|
}
|
||||||
|
}
|
||||||
Binary file not shown.
Reference in New Issue
Block a user