From 8f324ac967c13dec94164bbe4cb1f213b19ba509 Mon Sep 17 00:00:00 2001
From: KahootChampion <p.harismuhammadkhan@gmail.com>
Date: Wed, 20 Feb 2019 07:31:39 -0700
Subject: [PATCH] I think I got the basic battling system down. Would
 appreciate i some of you guys beta tested it though and let me know the
 errors if there are any.

---
 out/production/TaipanClone/ShipWarfare.class | Bin 4146 -> 4148 bytes
 src/ShipWarfare.java                         |  24 +++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/out/production/TaipanClone/ShipWarfare.class b/out/production/TaipanClone/ShipWarfare.class
index 92592b5335928261234811258e25d8aaf74030be..afd7e0713bad595c9cf6ab2913e62b6e48558f29 100644
GIT binary patch
delta 2436
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

delta 2461
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

diff --git a/src/ShipWarfare.java b/src/ShipWarfare.java
index 428ea84..0f73aa5 100644
--- a/src/ShipWarfare.java
+++ b/src/ShipWarfare.java
@@ -5,6 +5,8 @@ import java.util.concurrent.TimeUnit;
 public class ShipWarfare extends Player {
 
     private int numOfPeasantShips = 0;
+    private boolean userAttacks= true;
+
 
 
     public void peasantFleetAttack() throws Exception {
@@ -15,6 +17,7 @@ public class ShipWarfare extends Player {
         while (true) {
             String response = userResponse.nextLine();
             if (response.equalsIgnoreCase("f")) {
+                userAttacks=true;
                 System.out.println("Ohh, fight ehh?");
                 boolean winOrLose= destroyShipsOrEscape(getNumOfPeasantShips());
                 if(winOrLose==true){
@@ -25,7 +28,11 @@ public class ShipWarfare extends Player {
 
             } else if (response.equalsIgnoreCase("r")) {
                 runFromShips();
-                if(runFromShips()==true){
+                if(runFromShips()==false) {
+                    System.out.println("Couldn't run away!");
+                    destroyShipsOrEscape(getNumOfPeasantShips());
+                }
+                else{
                     break;
                 }
 
@@ -74,12 +81,12 @@ public class ShipWarfare extends Player {
     }
 
     public boolean runFromShips() {
+        userAttacks=false;
         Random randomValue = new Random();
         int runSuccessChance = randomValue.nextInt(2) + 1;
         if (runSuccessChance == 2) {
             return true;
         } else if (runSuccessChance == 1) {
-            System.out.println("Couldn't run away");
             return false;
         }
         return false;
@@ -90,18 +97,19 @@ public class ShipWarfare extends Player {
         Random randomValue = new Random();
         int shipsRemaining = typeOfShip;
         int exitValue=0;
+        int counter=0;
 
-        if (exitValue == 0) {
             //Player volley
             while (exitValue == 0) {
+                counter++;
                 for (int i = 0; i < shipsRemaining; i++) {
-                    if (exitValue == 0) {
+                    if (userAttacks==true) {
                         for (int j = 0; j < getGuns(); j++) {
                             int hitOrMiss = randomValue.nextInt(2) + 1;
                             if (hitOrMiss == 2) {
                                 shipsRemaining--;
                                 if (shipsRemaining <= 0) {
-                                    exitValue = 1;
+                                    exitValue= 1;
                                     break;
                                 }
                                 System.out.println("Got eem");
@@ -138,7 +146,7 @@ public class ShipWarfare extends Player {
                     if (response.equalsIgnoreCase("r")) {
                         runFromShips();
                         if (runFromShips() == false) {
-                            exitValue = 6;
+                            System.out.println("Couldn't run away");
                         } else {
                             exitValue = 3;
                             break;
@@ -167,11 +175,7 @@ public class ShipWarfare extends Player {
         }
         //Type of ship implied to be Liu Yen fleet
 
-        else {
 
-        }
-        return false;
-    }
 
     public static void main(String[] args) throws Exception {
         ShipWarfare littyObject = new ShipWarfare();