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

Compare commits

base: RecentRunner:3.0
Branches Tags
RecentRunner:master RecentRunner:legacy
RecentRunner:4.2 RecentRunner:4.1 RecentRunner:4.0 RecentRunner:3.1 RecentRunner:3.0 RecentRunner:2.0 RecentRunner:2.1 RecentRunner:1.3 RecentRunner:1.2 RecentRunner:1.1 RecentRunner:1.0
...
compare: RecentRunner:3.1
Branches Tags
RecentRunner:master RecentRunner:legacy
RecentRunner:4.2 RecentRunner:4.1 RecentRunner:4.0 RecentRunner:3.1 RecentRunner:3.0 RecentRunner:2.0 RecentRunner:2.1 RecentRunner:1.3 RecentRunner:1.2 RecentRunner:1.1 RecentRunner:1.0

23 Commits
3.0 ... 3.1

Author SHA1 Message Date
Solargale
b39ddffcf8 Fixed demo 3 2019-03-25 13:43:36 -06:00
KahootChampion
7e9ba348b2 Ship Warfare "dang it" issue fixed 2019-03-25 13:35:11 -06:00
Solargale
a96de93b13 Added libraries to the file 2019-03-25 13:31:01 -06:00
Solargale
4cf4bc3cb9 Merge remote-tracking branch 'origin/master' 2019-03-25 13:26:20 -06:00
Solargale
55214ce652 Made it so that randomEventGUI looks normal on Linux 2019-03-25 13:26:01 -06:00
Vikramb987
19134408a8 Update FileSaving.java 
changes to how we deal with saving when it comes to the terminal
 2019-03-25 13:18:16 -06:00
Vikramb987
77e43f0fd2 Update TaipanShopGUI.java 
saving changes
 2019-03-25 13:17:43 -06:00
Solargale
69a4f121c5 Demo 3 
Added part with jar files and test file
 2019-03-25 13:17:13 -06:00
Vikramb987
1d970b201c Update BankGUI.java 
changed some text.
 2019-03-25 13:07:03 -06:00
Vikramb987
fd921053d3 Update LoanSharkGUI.java 
changed some text
 2019-03-25 13:01:16 -06:00
Vikramb987
283e51c375 Update TravelGUI.java 
fixed formatting
 2019-03-25 12:52:53 -06:00
Vikramb987
db0d8ec2db Update TaipanShopGUI.java 
fixed formatting
 2019-03-25 12:51:59 -06:00
Vikramb987
45d6d794f9 Update ShipWarfareGUI.java 
added title
 2019-03-25 12:49:43 -06:00
Solargale
dc28fb504d Finished PlayerTest 2019-03-25 12:48:13 -06:00
Solargale
5a43adf7ad Merge remote-tracking branch 'origin/master' 2019-03-25 12:29:56 -06:00
Solargale
290dce81db Player Test 2019-03-25 12:28:51 -06:00
Vikramb987
6e43912b2e Update ShipWarfareGUI.java 
fixed error with terminal
 2019-03-25 12:25:59 -06:00
Vikramb987
3ac1087741 Update TravelGUI.java 
epicchanges
 2019-03-25 12:19:05 -06:00
Vikramb987
c008a68166 Update TaipanShopGUI.java 
epic final changes boi
 2019-03-25 12:18:11 -06:00
Vikramb987
85b2043ebf Update TaipanShopGUI.java 
fixed some formatting
 2019-03-25 12:14:34 -06:00
KahootChampion
61f88c0a86 Completed ShipWarfareGUI 2019-03-25 11:06:39 -06:00
KahootChampion
5caca9c9e3 Fixed silk issue 2019-03-25 11:03:16 -06:00
Solargale
24cb7ea70e Pushed the fix for ship repair while 100 hp 2019-03-25 00:08:40 -06:00
15 changed files with 831 additions and 203 deletions
Expand all files Collapse all files

436
.idea/workspace.xml generated
View File

@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="Made the fight gif runnable by everyone hopefully">
<change afterPath="$PROJECT_DIR$/src/ShipsRunning.gif" afterDir="false" />
<list default="true" id="3114a2b9-4919-4fdf-8fd9-d03b60109ce4" name="Default Changelist" comment="Completed ShipWarfareGUI">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/ShipWarfareGUI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ShipWarfareGUI.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/saves/playerSave.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src/saves/playerSave.txt" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<ignored path="C:\Users\Harkamal Randhawa\IdeaProjects\TaipanClone\.idea\shelf/" />
@@ -20,8 +19,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="99">
<caret line="466" column="51" lean-forward="true" selection-start-line="466" selection-start-column="51" selection-end-line="466" selection-end-column="51" />
<state relative-caret-position="-1380">
<caret line="341" column="35" lean-forward="true" selection-start-line="341" selection-start-column="35" selection-end-line="341" selection-end-column="35" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@@ -30,20 +29,44 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/ShipsRunning.gif">
<provider selected="true" editor-type-id="images" />
<entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="291">
<caret line="277" column="43" selection-start-line="277" selection-start-column="43" selection-end-line="277" selection-end-column="43" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/ShipsAttacking.gif">
<provider selected="true" editor-type-id="images" />
<entry file="file://$PROJECT_DIR$/src/MainGUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="356">
<caret line="28" selection-start-line="18" selection-start-column="4" selection-end-line="28" />
<folding>
<element signature="e#551#552#0" expanded="true" />
<element signature="e#579#580#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/GameEndGUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="750">
<caret line="56" column="24" selection-start-line="56" selection-start-column="24" selection-end-line="56" selection-end-column="24" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="251">
<caret line="180" column="18" selection-start-line="180" selection-start-column="18" selection-end-line="182" selection-end-column="17" />
<state relative-caret-position="313">
<caret line="188" column="11" selection-start-line="188" selection-start-column="11" selection-end-line="188" selection-end-column="11" />
</state>
</provider>
</entry>
@@ -54,41 +77,42 @@
<option name="RECENT_TEMPLATES">
<list>
<option value="Class" />
<option value="JavaFXApplication" />
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>initialize</find>
<find>gif</find>
<find>shipsRemainingGIF</find>
<find>initial</find>
<find>initializeS</find>
<find>ship</find>
<find>imageView</find>
<find>20</find>
<find>shipsAttackingGif.set</find>
<find>continueto</find>
<find>setprefwidth</find>
<find>setvisible(false)</find>
<find>chooseF</find>
<find>setPadd</find>
<find>setvisible</find>
<find>vbox.se</find>
<find>attacking</find>
<find>would</find>
<find>choosefightorrun.set</find>
<find>setpre</find>
<find>.setvis</find>
<find>durati</find>
<find>setText</find>
<find>setVisi</find>
<find>continue</find>
<find>userSh</find>
<find>continueButton</find>
<find>continueButton.setV</find>
<find>.setText</find>
<find>.setVisi</find>
<find>taipanSH</find>
<find>runButton.setOn</find>
<find>runButton.se</find>
<find>setVis</find>
<find>counter</find>
<find>stage</find>
<find>run</find>
<find>setvisi</find>
<find>fightand</find>
<find>shipWarfa</find>
<find>imageview</find>
<find>image</find>
<find>shipsAttack</find>
<find>shipsAttackingOr</find>
<find>ships</find>
<find>shipw</find>
<find>flee</find>
<find>runFrom</find>
<find>report</find>
<find>report.setVisible</find>
<find>playerSh</find>
<find>fightButton</find>
<find>PlayerSh</find>
<find>andT</find>
<find>dest</find>
<find>playerShoots</find>
<find>shotsFired</find>
<find>duration</find>
<find>shop()</find>
</findStrings>
<replaceStrings>
<replace>HP</replace>
@@ -100,6 +124,12 @@
<replace>attackImage</replace>
<replace>shipsAttacking</replace>
<replace>shipsApproachingGIF</replace>
<replace>centeringLittyShipPane</replace>
<replace>numOfLittyShips</replace>
<replace>startingLitty</replace>
<replace>littyShip</replace>
<replace>whenfinished</replace>
<replace>whenFinished</replace>
</replaceStrings>
</component>
<component name="Git.Settings">
@@ -116,11 +146,12 @@
<option value="$PROJECT_DIR$/src/main.java" />
<option value="$PROJECT_DIR$/src/Travel.java" />
<option value="$PROJECT_DIR$/src/ShipWarfare.java" />
<option value="$PROJECT_DIR$/src/TaipanShopGUI.java" />
<option value="$PROJECT_DIR$/src/StartGUI.java" />
<option value="$PROJECT_DIR$/src/Player.java" />
<option value="$PROJECT_DIR$/src/AnimationTesting.java" />
<option value="$PROJECT_DIR$/src/TravelGUI.java" />
<option value="$PROJECT_DIR$/src/ShipWarfareGUI.java" />
<option value="$PROJECT_DIR$/src/TaipanShopGUI.java" />
</list>
</option>
</component>
@@ -135,7 +166,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -148,18 +178,25 @@
<item name="TaipanClone" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="TaipanClone" type="b2602c69:ProjectViewProjectNode" />
<item name="TaipanClone" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="images" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="ChangesTree.GroupingKeys" value="" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1552534669451" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1553533565975" />
<property name="extract.method.default.visibility" value="public" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../GitHub/Cpsc233" />
<property name="project.structure.last.edited" value="Modules" />
@@ -169,6 +206,7 @@
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/src/images" />
<recent name="$PROJECT_DIR$/src" />
</key>
</component>
@@ -185,15 +223,15 @@
</option>
</component>
<component name="RunManager" selected="Application.MainGUI">
<configuration name="Game" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Game" />
<configuration name="MainGUI" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="MainGUI" />
<module name="TaipanClone" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="MainGUI" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="MainGUI" />
<configuration name="ShipWarfareGUI" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="ShipWarfareGUI" />
<module name="TaipanClone" />
<method v="2">
<option name="Make" enabled="true" />
@@ -222,18 +260,18 @@
</configuration>
<list>
<item itemvalue="Application.TaipanShop" />
<item itemvalue="Application.Game" />
<item itemvalue="Application.main" />
<item itemvalue="Application.ShipWarfareGUI" />
<item itemvalue="Application.MainGUI" />
<item itemvalue="Application.ShipWarfareGUI" />
</list>
<recent_temporary>
<list>
<item itemvalue="Application.MainGUI" />
<item itemvalue="Application.ShipWarfareGUI" />
<item itemvalue="Application.ShipWarfareGUI" />
<item itemvalue="Application.main" />
<item itemvalue="Application.TaipanShop" />
<item itemvalue="Application.Game" />
</list>
</recent_temporary>
</component>
@@ -288,63 +326,17 @@
<workItem from="1553047073421" duration="2245000" />
<workItem from="1553050110780" duration="21000" />
<workItem from="1553051761247" duration="104000" />
<workItem from="1553051882218" duration="9623000" />
</task>
<task id="LOCAL-00001" summary="This should fix the ShipWarfare file and bring it up to date with the rest of the file.">
<created>1550458470138</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1550458470138</updated>
</task>
<task id="LOCAL-00002" summary="Created Core class">
<created>1550540282400</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1550540282400</updated>
</task>
<task id="LOCAL-00003" summary="Created Player class">
<created>1550540820542</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1550540820542</updated>
</task>
<task id="LOCAL-00004" summary="Created Player class">
<created>1550541406597</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1550541406597</updated>
</task>
<task id="LOCAL-00005" summary="Fixed the setters to be greater than 0">
<created>1550541751914</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1550541751914</updated>
</task>
<task id="LOCAL-00006" summary="Created Player class">
<created>1550543764970</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1550543764971</updated>
</task>
<task id="LOCAL-00007" summary="Added some stuff for the Travel Class">
<created>1550575512841</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1550575512841</updated>
</task>
<task id="LOCAL-00008" summary="Added disasters as well as removing a bug from the flee method in Haris's code">
<created>1550623749854</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1550623749854</updated>
<workItem from="1553051882218" duration="12177000" />
<workItem from="1553369996499" duration="3948000" />
<workItem from="1553376520648" duration="32000" />
<workItem from="1553383476219" duration="1349000" />
<workItem from="1553386923955" duration="4000" />
<workItem from="1553387088425" duration="330000" />
<workItem from="1553387443301" duration="11000" />
<workItem from="1553387530005" duration="22322000" />
<workItem from="1553444493182" duration="159000" />
<workItem from="1553444769737" duration="82000" />
<workItem from="1553444880371" duration="34292000" />
</task>
<task id="LOCAL-00009" summary="Fixed a bunch of stuff inside of Travel, but also discovered a MASSIVE problem with our code">
<created>1550628232136</created>
@@ -591,17 +583,115 @@
<option name="project" value="LOCAL" />
<updated>1553061205759</updated>
</task>
<option name="localTasksCounter" value="44" />
<task id="LOCAL-00044" summary="Ayy added all the gifs needed.">
<created>1553124112040</created>
<option name="number" value="00044" />
<option name="presentableId" value="LOCAL-00044" />
<option name="project" value="LOCAL" />
<updated>1553124112040</updated>
</task>
<task id="LOCAL-00045" summary="Maybe this is whack idk">
<created>1553193939606</created>
<option name="number" value="00045" />
<option name="presentableId" value="LOCAL-00045" />
<option name="project" value="LOCAL" />
<updated>1553193939606</updated>
</task>
<task id="LOCAL-00046" summary="Litty Animation Practice">
<created>1553387960582</created>
<option name="number" value="00046" />
<option name="presentableId" value="LOCAL-00046" />
<option name="project" value="LOCAL" />
<updated>1553387960582</updated>
</task>
<task id="LOCAL-00047" summary="Added gifs back">
<created>1553389067767</created>
<option name="number" value="00047" />
<option name="presentableId" value="LOCAL-00047" />
<option name="project" value="LOCAL" />
<updated>1553389067767</updated>
</task>
<task id="LOCAL-00048" summary="Added method for animation">
<created>1553390319733</created>
<option name="number" value="00048" />
<option name="presentableId" value="LOCAL-00048" />
<option name="project" value="LOCAL" />
<updated>1553390319734</updated>
</task>
<task id="LOCAL-00049" summary="Litty Animation Practice littier">
<created>1553390384762</created>
<option name="number" value="00049" />
<option name="presentableId" value="LOCAL-00049" />
<option name="project" value="LOCAL" />
<updated>1553390384762</updated>
</task>
<task id="LOCAL-00050" summary="Sep up the scene which will be used for animation">
<created>1553400771267</created>
<option name="number" value="00050" />
<option name="presentableId" value="LOCAL-00050" />
<option name="project" value="LOCAL" />
<updated>1553400771272</updated>
</task>
<task id="LOCAL-00051" summary="Made fight button basically functional for AnimationTesting">
<created>1553476072174</created>
<option name="number" value="00051" />
<option name="presentableId" value="LOCAL-00051" />
<option name="project" value="LOCAL" />
<updated>1553476072175</updated>
</task>
<task id="LOCAL-00052" summary="changed some stuff related to the fight button animation">
<created>1553478643204</created>
<option name="number" value="00052" />
<option name="presentableId" value="LOCAL-00052" />
<option name="project" value="LOCAL" />
<updated>1553478643204</updated>
</task>
<task id="LOCAL-00053" summary="Small error in animation whcih shoots even if no guns must fix that">
<created>1553482933744</created>
<option name="number" value="00053" />
<option name="presentableId" value="LOCAL-00053" />
<option name="project" value="LOCAL" />
<updated>1553482933744</updated>
</task>
<task id="LOCAL-00054" summary="Fixed the issue where the ship shot with no guns">
<created>1553484357669</created>
<option name="number" value="00054" />
<option name="presentableId" value="LOCAL-00054" />
<option name="project" value="LOCAL" />
<updated>1553484357670</updated>
</task>
<task id="LOCAL-00055" summary="ShipWarfare javaDocs completed">
<created>1553485725159</created>
<option name="number" value="00055" />
<option name="presentableId" value="LOCAL-00055" />
<option name="project" value="LOCAL" />
<updated>1553485725159</updated>
</task>
<task id="LOCAL-00056" summary="Completed ShipWarfareGUI">
<created>1553486334208</created>
<option name="number" value="00056" />
<option name="presentableId" value="LOCAL-00056" />
<option name="project" value="LOCAL" />
<updated>1553486334209</updated>
</task>
<task id="LOCAL-00057" summary="Fixed silk issue">
<created>1553533396273</created>
<option name="number" value="00057" />
<option name="presentableId" value="LOCAL-00057" />
<option name="project" value="LOCAL" />
<updated>1553533396273</updated>
</task>
<option name="localTasksCounter" value="58" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="99878000" />
<option name="totallyTimeSpent" value="164961000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1189" height="652" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.32519618" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2205754" />
<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" />
@@ -610,7 +700,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.9357143" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.22678572" />
<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" />
@@ -698,21 +788,7 @@
<ignored-roots>
<path value="$PROJECT_DIR$" />
</ignored-roots>
<MESSAGE value="Super broken but fight button is in progress for shipwarfare" />
<MESSAGE value="Forces you to fight in ShipWarfareGUI unfortunately" />
<MESSAGE value="ShipWarfare fight button coming along nicely" />
<MESSAGE value="Shipwarfare fight button GUI almost complete" />
<MESSAGE value="Fixed numOfShips method for ShipWarfareGUI" />
<MESSAGE value="Fixed the loot system a bit" />
<MESSAGE value="Completely ruined shipWarfare with a previous edit, fixed it and added a better loot feature for peasant ships" />
<MESSAGE value="Basic functionality of buttons completed, think all I have to do now is to find a way to break the code when the user wins, loses or runs away." />
<MESSAGE value="Fixed probability of ships running away" />
<MESSAGE value="Fined minor bugs in shipwarfareGUI" />
<MESSAGE value="Fined minor bugs in shipwarfareGUI including the &quot;gun frustration&quot; variable" />
<MESSAGE value="Just checking" />
<MESSAGE value="A lot of errors but easily fixable SHipwarfareGUI" />
<MESSAGE value="Completed SHipWarfareGUI" />
<MESSAGE value="Completed ShipWarfareGUI" />
<MESSAGE value="Probably should upload" />
<MESSAGE value="Fixed ShipWarfare bug about one-shotting." />
<MESSAGE value="Completed javadocs for shipwarfare GUI" />
@@ -723,7 +799,21 @@
<MESSAGE value="wrote javadocs for authorname" />
<MESSAGE value="Added fight Button gif. Might not work on your computers yet though... I inputed my own local documents folder as the library temporarily." />
<MESSAGE value="Made the fight gif runnable by everyone hopefully" />
<option name="LAST_COMMIT_MESSAGE" value="Made the fight gif runnable by everyone hopefully" />
<MESSAGE value="Ayy added all the gifs needed." />
<MESSAGE value="Maybe this is whack idk" />
<MESSAGE value="Litty Animation Practice" />
<MESSAGE value="Added gifs back" />
<MESSAGE value="Added method for animation" />
<MESSAGE value="Litty Animation Practice littier" />
<MESSAGE value="Sep up the scene which will be used for animation" />
<MESSAGE value="Made fight button basically functional for AnimationTesting" />
<MESSAGE value="changed some stuff related to the fight button animation" />
<MESSAGE value="Small error in animation whcih shoots even if no guns must fix that" />
<MESSAGE value="Fixed the issue where the ship shot with no guns" />
<MESSAGE value="ShipWarfare javaDocs completed" />
<MESSAGE value="Completed ShipWarfareGUI" />
<MESSAGE value="Fixed silk issue" />
<option name="LAST_COMMIT_MESSAGE" value="Fixed silk issue" />
</component>
<component name="editorHistoryManager">
<entry file="uml://JAVA/ShipWarfare">
@@ -794,13 +884,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/GameEndGUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/LoanSharkGUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
@@ -815,28 +898,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/MainGUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="11" lean-forward="true" selection-start-line="11" selection-end-line="11" />
<folding>
<element signature="e#551#552#0" expanded="true" />
<element signature="e#579#580#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Ships Approaching.gif" />
<entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4902">
<caret line="370" column="35" selection-start-line="370" selection-start-column="35" selection-end-line="370" selection-end-column="35" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Player.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
@@ -844,23 +906,77 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/ShipsAttacking.gif">
<entry file="file://$PROJECT_DIR$/src/ShipsRunning.gif" />
<entry file="file://$PROJECT_DIR$/src/images/ShipsRunning.gif">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/src/ShipsRunning.gif">
<entry file="file://$PROJECT_DIR$/src/images/ShipsAttacking.gif">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/src/TravelGUI.java">
<entry file="file://$PROJECT_DIR$/src/FinalShipWarfareGUI.java" />
<entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_201.jdk/Contents/Home/javafx-src.zip!/javafx/application/Application.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="251">
<caret line="180" column="18" selection-start-line="180" selection-start-column="18" selection-end-line="182" selection-end-column="17" />
<state relative-caret-position="842">
<caret line="145" column="7" lean-forward="true" selection-start-line="145" selection-start-column="7" selection-end-line="145" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_201.jdk/Contents/Home/javafx-src.zip!/javafx/event/EventHandler.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="298">
<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/GameEndGUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="750">
<caret line="56" column="24" selection-start-line="56" selection-start-column="24" selection-end-line="56" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/MainGUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="356">
<caret line="28" selection-start-line="18" selection-start-column="4" selection-end-line="28" />
<folding>
<element signature="e#551#552#0" expanded="true" />
<element signature="e#579#580#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="99">
<caret line="466" column="51" lean-forward="true" selection-start-line="466" selection-start-column="51" selection-end-line="466" selection-end-column="51" />
<state relative-caret-position="104">
<caret line="156" column="7" lean-forward="true" selection-start-line="152" selection-start-column="4" selection-end-line="156" selection-end-column="7" />
<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="313">
<caret line="188" column="11" selection-start-line="188" selection-start-column="11" selection-end-line="188" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/TaipanShopGUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="291">
<caret line="277" column="43" selection-start-line="277" selection-start-column="43" selection-end-line="277" selection-end-column="43" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/ShipWarfareGUI.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1380">
<caret line="341" column="35" lean-forward="true" selection-start-line="341" selection-start-column="35" selection-end-line="341" selection-end-column="35" />
<folding>
<element signature="imports" expanded="true" />
</folding>

11
README.md
View File

@@ -2,9 +2,16 @@
Computer Science 233 project, Winter 2019
How to run:
If you are using intellij, extract "TaipanClone-master.zip", and open the "TaipanClone-master" folder in intellij. Also set up the SDK. Then, run MainGUI.java.
If you are using intellij, extract "TaipanClone-master.zip", and open the "TaipanClone-master" folder in intellij. Also set up the SDK.
If you are using the command line, extract "TaipanClone-master.zip", and open the "TaipanClone-master" folder. Open your terminal and change its directory to the "src" folder within "TaipanClone-master" folder. Then, type in "javac *.java", this compiles all the necessary files. Now, run MainGUI.java using "java MainGUI".
Place jfxt.jar, hamcrest-core-1.3.jar and junit-4.12.jar into the src folder
Then, run MainGUI.java.
If you are using the command line, extract "TaipanClone-master.zip", and open the "TaipanClone-master" folder. Open your terminal and change its directory to the "src" folder within "TaipanClone-master" folder.
Then, type in "javac -cp .:junit-4.12.jar:hamcrest-core-1.3.jar *.java", this compiles all the necessary files. Now, run MainGUI.java using "java MainGUI".
To run the test file PlayerTest.java, type in "javac -cp .:junit-4.12.jar:hamcrest-core-1.3.jar *.java", this compiles all the necessary files. Now, run PlayerTest.java using "java PlayerTest".
Additional information:

11
TaipanClone.iml
View File

@@ -7,5 +7,16 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library name="JUnit4">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="hamcrest-core-1.3" level="project" />
</component>
</module>

24
src/BankGUI.java
View File

@@ -47,9 +47,9 @@ public class BankGUI extends Player{
VBox vbx1 = new VBox(30);
Label l1 = new Label("Player: " + getName());
Label l2 = new Label("Current Balance: " + getBank());
Label l2 = new Label("Balance: " + getBank());
Label l3 = new Label("Enter Amount: ");
Label l4 = new Label("Current cash: " + getMoney());
Label l4 = new Label("Cash: " + getMoney());
Label l5 = new Label(" ");
Button b1 = new Button("Withdraw");
@@ -100,20 +100,20 @@ public class BankGUI extends Player{
try {
int withdraw = Integer.parseInt(txtField1.getText());
if(withdraw < 0){
l5.setText("Come on " + getName() + " are you trying to fool me??? \n No negative Numbers Please");
l5.setText("Come on " + getName() + ", are you trying to fool me?\nNo negative numbers please!");
}
else if (withdraw <= getBank()) {
setMoney(withdraw + getMoney());
setBank(getBank() - withdraw);
}
else {
l5.setText("Sorry you cannot withdraw that much");
l5.setText("Sorry, you can not withdraw that much.");
}
l2.setText("Current Balance: " + getBank());
l4.setText("Current cash: " + getMoney());
l2.setText("Balance: " + getBank());
l4.setText("Cash: " + getMoney());
}
catch (Exception e) {
l5.setText("Please enter a valid value");
l5.setText("Please enter a valid response.");
}
}
}
@@ -130,20 +130,20 @@ public class BankGUI extends Player{
try {
int deposit = Integer.parseInt(txtField1.getText());
if(deposit < 0){
l5.setText("Nice Try!!! No negative Numbers Please");
l5.setText("Nice try! You can not enter negative numbers.");
}
else if (deposit <= getMoney()) {
setBank(deposit + getBank());
setMoney(getMoney() - deposit);
} else {
l5.setText("Sorry you cannot deposit that much.$");
l5.setText("Sorry, you can not deposit that much.");
}
l2.setText("Current Balance: " + getBank());
l4.setText("Current cash: " + getMoney());
l2.setText("Balance: " + getBank());
l4.setText("Cash: " + getMoney());
}
catch (Exception e) {
l5.setText("Please enter a valid value");
l5.setText("Please enter a valid response.");
}
}
}

22
src/FileSaving.java
View File

@@ -13,6 +13,7 @@ public class FileSaving extends Player implements Serializable {
* @return player
*/
public Player loadFile() {
try {
InputStream in = new FileInputStream(new File("src/saves/playerSave.txt"));
ObjectInputStream inObject = new ObjectInputStream(in);
@@ -22,9 +23,19 @@ public class FileSaving extends Player implements Serializable {
return player;
}
catch (Exception e) {
try {
InputStream in = new FileInputStream(new File("saves/playerSave.txt"));
ObjectInputStream inObject = new ObjectInputStream(in);
Player player = (Player) inObject.readObject();
in.close();
inObject.close();
return player;
}
catch(Exception e2){
return null;
}
}
}
public boolean saveFile(Player player){
try{
@@ -39,9 +50,20 @@ public class FileSaving extends Player implements Serializable {
return true;
}
catch (Exception e) {
try {
FileOutputStream out = new FileOutputStream(new File("saves/playerSave.txt"));
ObjectOutputStream outObject = new ObjectOutputStream(out);
outObject.writeObject(player);
out.close();
outObject.close();
return true;
}
catch(Exception e2){
return false;
}
}
}
}

12
src/LoanSharkGUI.java
View File

@@ -50,8 +50,8 @@ public class LoanSharkGUI extends Player {
//Declaring all Variables
Label l1 = new Label("Player: " + getName());
Label l2 = new Label("Current Debt " + getDebt());
Label l4 = new Label("Current cash: " + getMoney());
Label l2 = new Label("Debt " + getDebt());
Label l4 = new Label("Cash: " + getMoney());
Label l3 = new Label("Enter Amount: ");
Label l5 = new Label(" ");
@@ -98,7 +98,7 @@ public class LoanSharkGUI extends Player {
if (loanAsk <= 2 * (getMoney() - getDebt()) && loanAsk >= 0) {
setDebt(getDebt() + loanAsk);
setMoney(getMoney() + loanAsk);
l4.setText("Current cash: " + getMoney());
l4.setText("Cash: " + getMoney());
} else if (loanAsk < 0) {
l5.setText("Sorry you cannot enter negative numbers");
}
@@ -126,18 +126,18 @@ public class LoanSharkGUI extends Player {
int returnAsk = Integer.parseInt(txtField1.getText());
if (returnAsk > getDebt()) {
l5.setText("You dont need to return that much");
l5.setText("You do not need to return that much.");
}
else if (returnAsk <= getDebt() && returnAsk >= 0 && getMoney() >= returnAsk) {
setDebt(getDebt() - returnAsk);
setMoney(getMoney() - returnAsk);
l4.setText("Current cash: " + getMoney());
l4.setText("Cash: " + getMoney());
}
else if(getMoney() < returnAsk) {
l5.setText("Look " + getName() + ", you are being cheap!");
}
else {
l5.setText("Sorry you cannot return a negative amount");
l5.setText("Sorry, you can not return a negative amount!");
}
l2.setText("Debt: " + getDebt());
}

454
src/PlayerTest.java Normal file
View File

@@ -0,0 +1,454 @@
import static org.junit.Assert.*;
import org.junit.Test;
import java.io.*;
import static org.junit.Assert.*;
/**
* 2019-03-10
* Authors: Harkamal, Vikram, Haris, Siddhant, Nathan
* Player test, checks all the info about the player such as inventory, health, etc
*
*/
public class PlayerTest {
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getCargoSpace() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", 60, player.getCargoSpace());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setCargoSpace() {
Player player = new Player();
player.setCargoSpace(10);
assertEquals("The instance variable for the object does not line up with the rest of the class", 10, player.getCargoSpace());
}
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getAttackingShips() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", true, player.getAttackingShips());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setAttackingShips() {
Player player = new Player();
player.setAttackingShips(false);
assertEquals("The instance variable for the object does not line up with the rest of the class", false, player.getAttackingShips());
}
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getRetire() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", false, player.getRetire());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setRetire() {
Player player = new Player();
player.setRetire(true);
assertEquals("The instance variable for the object does not line up with the rest of the class", true, player.getRetire());
}
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getName() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", "Taipan", player.getName());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setName() {
Player player = new Player();
player.setName("a");
assertEquals("The instance variable for the object does not line up with the rest of the class", "a", player.getName());
}
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getHP() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", 100, player.getHP());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setHP() {
Player player = new Player();
player.setHP(1);
assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getHP());
}
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getBank() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getBank());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setBank() {
Player player = new Player();
player.setBank(1);
assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getBank());
}
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getMoney() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getMoney());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setMoney() {
Player player = new Player();
player.setMoney(1);
assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getMoney());
}
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getOpiumHeld() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getOpiumHeld());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setOpiumHeld() {
Player player = new Player();
player.setOpiumHeld(1);
assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getOpiumHeld());
}
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getSilkHeld() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getSilkHeld());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setSilkHeld() {
Player player = new Player();
player.setSilkHeld(1);
assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getSilkHeld());
}
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getGeneralHeld() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getGeneralHeld());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setGeneralHeld() {
Player player = new Player();
player.setGeneralHeld(1);
assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getGeneralHeld());
}
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getArmsHeld() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getArmsHeld());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setArmsHeld() {
Player player = new Player();
player.setArmsHeld(1);
assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getArmsHeld());
}
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getLocation() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getLocation());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setLocation() {
Player player = new Player();
player.setLocation(2);
assertEquals("The instance variable for the object does not line up with the rest of the class", 2, player.getLocation());
}
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getGuns() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", 5, player.getGuns());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setGuns() {
Player player = new Player();
player.setGuns(1);
assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getGuns());
}
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getDebt() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getDebt());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setDebt() {
Player player = new Player();
player.setDebt(1);
assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getDebt());
}
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getwOpium() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getwOpium());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setwOpium() {
Player player = new Player();
player.setwOpium(1);
assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getwOpium());
}
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getwSilk() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getwSilk());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setwSilk() {
Player player = new Player();
player.setwSilk(1);
assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getwSilk());
}
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getwGeneral() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getwGeneral());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setwGeneral() {
Player player = new Player();
player.setwGeneral(1);
assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getwGeneral());
}
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getwArms() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getwArms());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setwArms() {
Player player = new Player();
player.setwArms(1);
assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getwArms());
}
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getOpiumPrice() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", 16000, player.getOpiumPrice());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setOpiumPrice() {
Player player = new Player();
player.setOpiumPrice(1);
assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getOpiumPrice());
}
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getSilkPrice() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", 1600, player.getSilkPrice());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setSilkPrice() {
Player player = new Player();
player.setSilkPrice(1);
assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getSilkPrice());
}
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getArmsPrice() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", 160, player.getArmsPrice());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setArmsPrice() {
Player player = new Player();
player.setArmsPrice(1);
assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getArmsPrice());
}
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getGeneralPrice() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", 8, player.getGeneralPrice());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setGeneralPrice() {
Player player = new Player();
player.setGeneralPrice(1);
assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getGeneralPrice());
}
/**
* Test this getter method to see if it returns the default values if called.
*/
@Test
public void getIsPriceChanged() {
Player player = new Player();
assertEquals("The instance variable for the object does not line up with the rest of the class", 0, player.getIsPriceChanged());
}
/**
* Test this setter by changing the value of the instance variable and then seeing if the getter returns the same value
*/
@Test
public void setIsPriceChanged() {
Player player = new Player();
player.setIsPriceChanged(1);
assertEquals("The instance variable for the object does not line up with the rest of the class", 1, player.getIsPriceChanged());
}
}

4
src/RandomEventGUI.java
View File

@@ -146,9 +146,9 @@ public class RandomEventGUI extends Player{
break;
}
//Ship Repair
if (randGenNum == 3 && getHP() < 101) {
if (randGenNum == 3 && getHP() < 100) {
itemPrice = (int) ((100 - getPlayer().getHP()) * 10 + 10);
sellingItemLabel.setText("Mc Henry from the Hong Kong shipyard has arrived, would be willing to repair your ship for $" + itemPrice);
sellingItemLabel.setText("Mc Henry from the Hong Kong shipyard has arrived,\n would be willing to repair your ship for $" + itemPrice);
break;
}
else {

27
src/ShipWarfareGUI.java
View File

@@ -16,6 +16,7 @@ import javafx.stage.Stage;
import javafx.util.Duration;
import java.io.FileInputStream;
import java.util.Random;
import java.util.concurrent.ExecutionException;
/**
* 2019-03-10 (Edited on 2019-03-23)
@@ -265,6 +266,8 @@ public class ShipWarfareGUI extends Player {
}
if (gunFrustration == true) {
gunsLeftOrTaken.setText(String.format("Dang it! We only have %d guns left", getGuns()));
playerShoots(getGuns()+1);
} else {
gunsLeftOrTaken.setText(String.format("We still have %d guns left", getGuns()));
}
@@ -308,15 +311,15 @@ public class ShipWarfareGUI extends Player {
/**
* Player attacks enemy ships in an animation
*/
public void playerShoots() {
public void playerShoots(int amountOfShots) {
userAttacks=true;
shotsFired.setFromX(0);
shotsFired.setFromY(0);
shotsFired.setToX(endX);
shotsFired.setToY(endY);
shotsFired.setDuration(Duration.seconds(1));
shotsFired.setDuration(Duration.seconds(0.5));
if(getGuns()>0) {
shotsFired.setCycleCount(getGuns());
shotsFired.setCycleCount(amountOfShots);
}
else{
shotsFired.setCycleCount(0);
@@ -337,7 +340,7 @@ public class ShipWarfareGUI extends Player {
enemyShots.setFromY(0);
enemyShots.setToX(-30);
enemyShots.setToY(90);
enemyShots.setDuration(Duration.seconds(1));
enemyShots.setDuration(Duration.seconds(0.5));
enemyShots.setCycleCount(1);
enemyShots.setNode(cannon);
enemyShots.play();
@@ -445,8 +448,17 @@ public class ShipWarfareGUI extends Player {
centeringUserShipPane.setPrefHeight(200.0);
centeringUserShipPane.setPrefWidth(200.0);
Image ourShip = new Image(new FileInputStream("src/images/ourShip.png"));
Image enemyShip = new Image(new FileInputStream("src/images/enemyShip.png"));
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
@@ -508,6 +520,7 @@ public class ShipWarfareGUI extends Player {
primaryStage.setResizable(false);
primaryStage.setTitle("Ship Warfare");
primaryStage.setScene(scene);
primaryStage.show();
continueButton.setOnAction(new EventHandler<ActionEvent>() {
@@ -606,7 +619,7 @@ public class ShipWarfareGUI extends Player {
}
playerShoots();
playerShoots(getGuns());
shotsFired.setOnFinished(new EventHandler<ActionEvent>() {
@Override

17
src/TaipanShopGUI.java
View File

@@ -227,9 +227,9 @@ public class TaipanShopGUI extends Player{
textOut.setText(originalDialogue + "\n\t" + getName() + ", you can't afford that!");
} else if (opiumButton.getText().contains(".")) {
textOut.setText(originalDialogue + "\n\t" + getName() + ", how am I supposed to buy " + "'" + num + "'" + " Opium?");
} else if (silkButton.getText().contains(".") && num <= getMoney() / getOpiumPrice() && num >= 0) {
} else if (silkButton.getText().contains(".") && num <= getMoney() / getSilkPrice() && num >= 0) {
setSilkHeld(getSilkHeld() + num);
setMoney(getMoney() - num * getOpiumPrice());
setMoney(getMoney() - num * getSilkPrice());
} else if (num >= 0 && silkButton.getText().contains(".")) {
textOut.setText(originalDialogue + "\n\t" + getName() + ", you can't afford that!");
} else if (silkButton.getText().contains(".")) {
@@ -259,7 +259,7 @@ public class TaipanShopGUI extends Player{
textOut.setText(originalDialogue + "\n\t" + getName() + ", how am I supposed to sell " + "'" + num + "'" + " Opium?");
} else if (silkButton.getText().contains(".") && num <= getSilkHeld() && num >= 0) {
setSilkHeld(getSilkHeld() - num);
setMoney(getMoney() + num * getOpiumPrice());
setMoney(getMoney() + num * getSilkPrice());
} else if (num >= 0 && silkButton.getText().contains(".")) {
textOut.setText(originalDialogue + "\n\t" + getName() + ", you don't have that many to sell!");
} else if (silkButton.getText().contains(".")) {
@@ -492,6 +492,7 @@ public class TaipanShopGUI extends Player{
*/
@Override
public void handle(ActionEvent event) {
saving.saveFile(getPlayer());
setIsPriceChanged(1);
TravelGUI travelGUI = new TravelGUI(getPlayer());
travelGUI.initializeTravel(stage);
@@ -680,16 +681,18 @@ public class TaipanShopGUI extends Player{
wItemsText.setFont(size14);
wItemSpaceText.setPrefHeight(108.0);
wItemSpaceText.setPrefWidth(215.0);
wItemSpaceText.setPrefWidth(210.0);
wItemSpaceText.setFont(size14);
locationText.setAlignment(Pos.BOTTOM_CENTER);
locationText.setAlignment(Pos.BOTTOM_RIGHT);
locationText.setPrefHeight(106.0);
locationText.setPrefWidth(175.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);
@@ -705,7 +708,7 @@ public class TaipanShopGUI extends Player{
shipStatusText.setAlignment(Pos.TOP_CENTER);
shipStatusText.setContentDisplay(javafx.scene.control.ContentDisplay.CENTER);
shipStatusText.setPrefHeight(110.0);
shipStatusText.setPrefWidth(180.0);
shipStatusText.setPrefWidth(200.0);
shipStatusText.setTextAlignment(javafx.scene.text.TextAlignment.CENTER);
shipStatusText.setFont(size14);

12
src/TravelGUI.java
View File

@@ -270,16 +270,18 @@ public class TravelGUI extends Player{
wItemsText.setFont(size14);
wItemSpaceText.setPrefHeight(108.0);
wItemSpaceText.setPrefWidth(215.0);
wItemSpaceText.setPrefWidth(210.0);
wItemSpaceText.setFont(size14);
locationText.setAlignment(Pos.BOTTOM_CENTER);
locationText.setAlignment(Pos.BOTTOM_RIGHT);
locationText.setPrefHeight(106.0);
locationText.setPrefWidth(175.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);
@@ -295,7 +297,7 @@ public class TravelGUI extends Player{
shipStatusText.setAlignment(Pos.TOP_CENTER);
shipStatusText.setContentDisplay(javafx.scene.control.ContentDisplay.CENTER);
shipStatusText.setPrefHeight(110.0);
shipStatusText.setPrefWidth(180.0);
shipStatusText.setPrefWidth(200.0);
shipStatusText.setTextAlignment(javafx.scene.text.TextAlignment.CENTER);
shipStatusText.setFont(size14);
@@ -499,6 +501,6 @@ public class TravelGUI extends Player{
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()));
bankText.setText(String.format("Bank: $%,d", getBank()));
}
}

BIN
src/hamcrest-core-1.3.jar Normal file
View File

Binary file not shown.

BIN
src/jfxrt.jar Normal file
View File

Binary file not shown.

BIN
src/junit-4.12.jar Normal file
View File

Binary file not shown.

BIN
src/saves/playerSave.txt
View File

Binary file not shown.