From 548448bda1f8093b37cfd725824c9005388c8a66 Mon Sep 17 00:00:00 2001
From: KahootChampion <p.harismuhammadkhan@gmail.com>
Date: Sun, 7 Apr 2019 13:15:26 -0600
Subject: [PATCH] Fixed various issues but mainly with SHipWarfareText firing
 even when "r" was inputed as the command to run

---
 src/ShipWarfareGUI.java   |  2 +-
 src/ShipWarfareLogic.java |  3 +--
 src/ShipWarfareText.java  | 26 +++++++++++++++-----------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/ShipWarfareGUI.java b/src/ShipWarfareGUI.java
index e2ec7df..1ad6ea6 100644
--- a/src/ShipWarfareGUI.java
+++ b/src/ShipWarfareGUI.java
@@ -487,7 +487,7 @@ public class ShipWarfareGUI extends Player {
                 title.setText("Ayy captain we will try to run!");
                 counter++;
 
-                if (logic.runFromShips(userAttacks) == false) {
+                if (logic.runFromShips() == false) {
                     report.setText(("Couldn't run away"));
                     try {
                         winOrLose = destroyShipsOrEscape(primaryStage);
diff --git a/src/ShipWarfareLogic.java b/src/ShipWarfareLogic.java
index bb4494a..e1bf4fa 100644
--- a/src/ShipWarfareLogic.java
+++ b/src/ShipWarfareLogic.java
@@ -44,8 +44,7 @@ public class ShipWarfareLogic extends Player {
      *
      * @return true if the user is allowed to run, false if not, the "default" is false
      */
-    public boolean runFromShips(boolean userAttacks) {
-        userAttacks = false;
+    public boolean runFromShips() {
         Random randomValue = new Random();
         int runSuccessChance = randomValue.nextInt(10) + 1;
         if (runSuccessChance == 2) {
diff --git a/src/ShipWarfareText.java b/src/ShipWarfareText.java
index aa8ce22..242e7c0 100644
--- a/src/ShipWarfareText.java
+++ b/src/ShipWarfareText.java
@@ -43,10 +43,13 @@ public class ShipWarfareText extends Player {
 
 
             } else if (response.equalsIgnoreCase("r")) {
-                if (logic.runFromShips(userAttacks) == false) {
+                userAttacks=false;
+                boolean runSuccess = logic.runFromShips();
+                if(runSuccess==false) {
                     System.out.println("Couldn't run away!");
                     if (destroyPeasantShipsOrEscape())
                         break;
+                }
                 } else {
                     System.out.println("Phew! Got away safely");
                     delayForSeconds(2);
@@ -58,9 +61,9 @@ public class ShipWarfareText extends Player {
         }
 
 
-    }
 
-   
+
+
 
     /**
      * Asks user if they would like to fight or run against ships
@@ -70,9 +73,9 @@ public class ShipWarfareText extends Player {
         System.out.printf("What do you want to do? Enter \"f\" to fight, and \"r\" to run (we have %d guns)\n", getGuns());
 
     }
-    
 
-  
+
+
     /**
      * delays for a specific amount of seconds, takes an integer as an argument
      * @param num the seconds to delay
@@ -81,8 +84,8 @@ public class ShipWarfareText extends Player {
     public void delayForSeconds(int num) throws Exception {
         TimeUnit.SECONDS.sleep(num);
     }
-    
-    
+
+
 
     /**
      * The user faces off against the peasant ships and either prevails, dies, or runs away
@@ -166,10 +169,10 @@ public class ShipWarfareText extends Player {
                 setHP(getHP() - (1 + randomValue.nextInt(10)));
             }
             if (getHP() > 0) {
-                displayQuery(userInput);
-                String response ="";
+                String response = displayQuery(userInput);
                 if (response.equalsIgnoreCase("r")) {
-                    if (logic.runFromShips(userAttacks) == false) {
+                    userAttacks=false;
+                    if (logic.runFromShips() == false) {
                         System.out.println("Couldn't run away");
                     } else {
                         exitValue = 3;
@@ -201,7 +204,7 @@ public class ShipWarfareText extends Player {
 
     }
 
-    public void displayQuery(Scanner userInput) throws Exception {
+    public String displayQuery(Scanner userInput) throws Exception {
         System.out.printf("EEK, our current ship status is %d%% \n", getHP());
         delayForSeconds(1);
         if (userAttacks == false) {
@@ -211,6 +214,7 @@ public class ShipWarfareText extends Player {
         System.out.printf("Shall we continue to fight? Enter \"f\" to fight, and \"r\" to run (We have %d gun(s) left)\n", getGuns());
 
         String response = userInput.nextLine();
+        return response;
     }
 
     public static void main(String[] args) throws Exception {