diff --git a/.idea/misc.xml b/.idea/misc.xml
index fa20b13..c496ad9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,7 +9,7 @@
-
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9b8e6b8..1055077 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,11 +1,11 @@
-
+
+
-
-
+
@@ -19,28 +19,40 @@
-
+
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -48,30 +60,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -87,6 +77,11 @@
+ numOfLittyShips
+ delay
+ Hp
+ shipwarfare
+ destroyPeasa
destr
destro
hitco
@@ -112,11 +107,6 @@
continue
cashTex
cashTe
- 10000
- too
- shipstatusstr
- shipstatus
- itemsInInventory
HP
@@ -128,7 +118,7 @@
-
+
@@ -141,19 +131,18 @@
-
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -161,7 +150,6 @@
-
@@ -179,16 +167,17 @@
+
-
+
-
+
@@ -299,7 +288,8 @@
-
+
+
1550458470138
@@ -525,24 +515,24 @@
1552269681200
-
- 1552276190903
+
+ 1552270321401
- 1552276190903
+ 1552270321402
-
+
-
+
-
+
@@ -551,7 +541,7 @@
-
+
@@ -663,8 +653,8 @@
-
-
+
+
@@ -706,130 +696,86 @@
-
+
+
+
+
-
-
+
+
+
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -890,7 +836,6 @@
diff --git a/TaipanClone.iml b/TaipanClone.iml
index d5c0743..a860761 100644
--- a/TaipanClone.iml
+++ b/TaipanClone.iml
@@ -5,8 +5,7 @@
-
+
-
-
+
\ No newline at end of file
diff --git a/src/ShipWarfareGUI.java b/src/ShipWarfareGUI.java
index 44fe25b..5dac988 100644
--- a/src/ShipWarfareGUI.java
+++ b/src/ShipWarfareGUI.java
@@ -250,7 +250,10 @@ public class ShipWarfareGUI {
player.setGuns(player.getGuns() - 1);
gunFrustration = true;
} else {
- player.setHP(player.getHP() - (1 + randomValue.nextInt(10)));
+ if (numOfPeasantShips>0) {
+ player.setHP(player.getHP() - (1 + randomValue.nextInt(10)));
+
+ }
}
if (player.getHP() <= 0) {
exitValue = 2;
@@ -290,6 +293,12 @@ public class ShipWarfareGUI {
return false;
}
+ /**
+ * Sets up the graphical part of ShipWarfare
+ * @param stage sets the stage to which we will execute the scene of the ShipWarfare class
+ * @return
+ */
+
public Stage initializeShip(Stage stage){
setNumOfPeasantShips(numOfShips());