From 42c4534f52a9486a1064ea983426f70e3c9091c2 Mon Sep 17 00:00:00 2001
From: KahootChampion
Date: Sun, 10 Mar 2019 12:00:00 -0600
Subject: [PATCH] Fixed probability of ships running away
---
.idea/workspace.xml | 64 +++++++++++--------
out/production/TaipanClone/ShipWarfare.class | Bin 8386 -> 7539 bytes
src/ShipWarfareGUI.java | 15 +++--
3 files changed, 46 insertions(+), 33 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1ce512f..25e98bd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,7 @@
-
+
@@ -15,7 +15,7 @@
-
+
@@ -27,13 +27,15 @@
-
+
-
-
+
+
+
+
@@ -77,9 +79,6 @@
- numOfpeasantShips
- startingPeasantShips
- startingLittyShips
howMuchRun
pirateName
player
@@ -107,6 +106,9 @@
We survive
total of
int numOfShips
+ runFromShips()
+ dang it!
+ dang it
HP
@@ -131,8 +133,8 @@
-
+
@@ -283,6 +285,7 @@
+
1550458470138
@@ -459,17 +462,24 @@
1552210228514
-
+
+ 1552238814974
+
+
+
+ 1552238814974
+
+
-
+
-
+
@@ -566,7 +576,6 @@
-
@@ -591,7 +600,8 @@
-
+
+
@@ -654,6 +664,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -677,20 +697,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/out/production/TaipanClone/ShipWarfare.class b/out/production/TaipanClone/ShipWarfare.class
index c5ed7032c0d092c9bbcf56f86ddfa849481ff933..d6a3b07c1d29a9866f34232ee337bcfb36f2f9d3 100644
GIT binary patch
literal 7539
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 2) {
title.setVisible(false);
}
@@ -685,6 +682,10 @@ public class ShipWarfareGUI extends Application {
}
+ if (counter>=2){
+ title.setVisible(false);
+ }
+