diff --git a/.idea/cssdialects.xml b/.idea/cssdialects.xml
new file mode 100644
index 0000000..c60d418
--- /dev/null
+++ b/.idea/cssdialects.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index ada92a5..aa446f1 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,7 @@
-
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c496ad9..29ec0d7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e531918..5732e5c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,9 +1,15 @@
+
+
+
-
+
+
+
+
-
+
@@ -15,29 +21,28 @@
+
+
+
-
-
+
+
-
-
+
-
+
-
-
-
-
-
+
+
@@ -47,43 +52,43 @@
- continueButton
- continueButton.setV
- .setText
- .setVisi
- taipanSH
- runButton.setOn
- runButton.se
- setVis
- counter
- stage
- run
- flee
- runFrom
- report
- report.setVisible
- fightButton
- PlayerSh
- andT
- dest
- shotsFired
- duration
- shop()
- dang i
- playerS
- cowards
- playerShoots
- playerSh
- getGuns
- !
- earned
+ runAwayOrLeft
+ gunsLeftOrTaken
+ continueToFight
+ sellingItemLab
+ You can'
+ cannotAfford
+ warehouse
+ cargoButton
+ cargobutton
+ peasantShip
+ BorderPane
+ houseLabel
+ setGuns
+ for a gun
+ cannon
+ quitButton
+ textField
+ numberInput
+ shop
+ default
+ defaultButton
+ printSt
+ txtField
+ vBox
+ Would you like to pay
+ shipWa
+ attackingShips
+ random
+ cargo
+ Noot
HP
@@ -92,19 +97,13 @@
shipWarfare.getHowMuchRun()
shipWarfare.isUserAttacks()
shipWarfare.getNumOfPeasantShips()
- attackImage
- shipsAttacking
- shipsApproachingGIF
- centeringLittyShipPane
- numOfLittyShips
- startingLitty
- littyShip
- whenfinished
- whenFinished
+ deposit
+ textOut.setText(" " +
+ borderPane
-
+
@@ -117,26 +116,42 @@
-
-
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
-
+
@@ -149,36 +164,32 @@
-
-
-
-
-
-
-
+
-
-
-
+
+
+
+
+
+
-
-
+
@@ -194,15 +205,15 @@
-
-
+
+
-
-
+
+
@@ -231,17 +242,18 @@
+
-
+
-
+
@@ -287,28 +299,89 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 1550458470138
+
+
+
+ 1550458470138
+
+
+ 1550540282400
+
+
+
+ 1550540282400
+
+
+ 1550540820542
+
+
+
+ 1550540820542
+
+
+ 1550541406597
+
+
+
+ 1550541406597
+
+
+ 1550541751914
+
+
+
+ 1550541751914
+
+
+ 1550543764970
+
+
+
+ 1550543764971
+
+
+ 1550575512841
+
+
+
+ 1550575512841
+
+
+ 1550623749854
+
+
+
+ 1550623749854
+
+
+ 1550628232136
+
+
+
+ 1550628232136
+
+
+ 1550879092914
+
+
+
+ 1550879092914
+
+
+ 1551162699319
+
+
+
+ 1551162699319
1552168801248
@@ -478,212 +551,137 @@
1552280311399
-
- 1552280610787
+
+ 1552291526354
- 1552280610787
+ 1552291526354
-
- 1552282957716
+
+ 1552291930927
- 1552282957716
+ 1552291930927
-
- 1552328825548
+
+ 1553317292291
- 1552328825548
+ 1553317292291
-
- 1552339973224
+
+ 1553333862860
- 1552339973224
+ 1553333862860
-
- 1552351619924
+
+ 1553386388417
- 1552351619924
+ 1553386388417
-
- 1553060094595
+
+ 1553386560208
- 1553060094595
+ 1553386560208
-
- 1553060976358
+
+ 1553389478439
- 1553060976358
+ 1553389478440
-
- 1553061205759
+
+ 1553465550904
- 1553061205759
+ 1553465550904
-
- 1553124112040
+
+ 1553476314578
- 1553124112040
+ 1553476314578
-
- 1553193939606
+
+ 1553480113870
- 1553193939606
+ 1553480113870
-
- 1553387960582
+
+ 1553486869684
- 1553387960582
+ 1553486869684
-
- 1553389067767
+
+ 1553487676090
- 1553389067767
+ 1553487676090
-
- 1553390319733
+
+ 1553491865868
- 1553390319734
+ 1553491865869
-
- 1553390384762
+
+ 1553494120569
- 1553390384762
+ 1553494120570
-
- 1553400771267
-
-
-
- 1553400771272
-
-
- 1553476072174
-
-
-
- 1553476072175
-
-
- 1553478643204
-
-
-
- 1553478643204
-
-
- 1553482933744
-
-
-
- 1553482933744
-
-
- 1553484357669
-
-
-
- 1553484357670
-
-
- 1553485725159
-
-
-
- 1553485725159
-
-
- 1553486334208
-
-
-
- 1553486334209
-
-
- 1553533396273
-
-
-
- 1553533396273
-
-
- 1553533600087
-
-
-
- 1553533600087
-
-
- 1553542511809
-
-
-
- 1553542511809
-
-
- 1553560337526
-
-
-
- 1553560337526
-
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -695,27 +693,29 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -760,201 +760,201 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- JAVA
- ShipWarfare
-
- ShipWarfare
- Player
-
-
-
-
-
-
- Project Files
- private
-
-
-
-
-
-
- JAVA
- TaipanShop
-
- TaipanShop
- Player
-
-
-
-
-
-
- All
- private
-
-
-
+
+
-
-
-
-
-
-
-
+
-
+
+
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/FileSaving.java b/src/FileSaving.java
index 60055f8..9956f63 100644
--- a/src/FileSaving.java
+++ b/src/FileSaving.java
@@ -1,7 +1,7 @@
import java.io.*;
/**
* 2019-03-10 (Edited on 2019-03-19)
- * Authors:
+ * Authors:
* FileSaving Class allows the user to save the current status of the game and to continue from where they left off.
*/
@@ -37,6 +37,10 @@ public class FileSaving extends Player implements Serializable {
}
}
+ /**
+ * Saves the file of type player which contains all the player instances
+ * @param player The player object being saved
+ */
public boolean saveFile(Player player){
try{
FileOutputStream out = new FileOutputStream(new File("src/saves/playerSave.txt"));
@@ -64,6 +68,4 @@ public class FileSaving extends Player implements Serializable {
}
}
}
-
-
}
diff --git a/src/saves/playerSave.txt b/src/saves/playerSave.txt
index 2d1ed89..26ef535 100644
Binary files a/src/saves/playerSave.txt and b/src/saves/playerSave.txt differ