added stuff!

src/main/java/BattleshipBust.java

@@ -12,13 +12,13 @@ private void setUpGame() {
         ship1.setName("Lucille");
         SimpleBattleship ship2 = new SimpleBattleship();
         ship2.setName("Drax");
-        SimpleBattleship ship3 = new SimpleBattleship();
-        ship3.setName("Lilith");
+//        SimpleBattleship ship3 = new SimpleBattleship();
+//        ship3.setName("Lilith");
 //        SimpleBattleship ship4 = new SimpleBattleship();
 //        ship4.setName("Vincent");
         battleshipList.add(ship1);
         battleshipList.add(ship2);
-        battleshipList.add(ship3);
+//        battleshipList.add(ship3);
 //        battleshipList.add(ship4);
 
         System.out.println("Your goal is to sink the three Ships.");
@@ -33,10 +33,10 @@ private void setUpGame() {
             ArrayList<String> newLocation = helper.placeBattleship(3);
             ship2.setLocationCells(newLocation);
         }
-        for (SimpleBattleship lilithToSet : battleshipList) {
-            ArrayList<String> newLocation = helper.placeBattleship(3);
-            ship3.setLocationCells(newLocation);
-        }
+//        for (SimpleBattleship lilithToSet : battleshipList) {
+//            ArrayList<String> newLocation = helper.placeBattleship(3);
+//            ship3.setLocationCells(newLocation);
+//        }
 //        for (SimpleBattleship vincentToSet : battleshipList) {
 //            ArrayList<String> newLocation = helper.placeBattleship(3);
 //            ship4.setLocationCells(newLocation);
@@ -60,7 +60,7 @@ private void checkUserGuess(String userGuess) {
             if (result.equals("hit")) {
                 break;
             }
-            if (result.equals("kill")) {
+            else if (result.equals("kill")) {
                 battleshipList.remove(x);
                 break;
             }

src/main/java/GameHelper.java

@@ -4,9 +4,9 @@
 import java.util.ArrayList;
 
 public class GameHelper {
-    private static final String alphabet = "abcdefg";
-    private int gridLength = 7;
-    private int gridSize = 49;
+    private static final String alphabet = "abcd";
+    private int gridLength = 4;
+    private int gridSize = 16;
     private int[] grid = new int[gridSize];
     private int comCount = 0;
 
@@ -39,7 +39,7 @@ public ArrayList<String> placeBattleship(int comSize) {
         }
         while (!success & attempts++ < 200) {
             location = (int) (Math.random() * gridSize);
-            System.out.println("Try " + location);
+            System.out.println(location);
             int x = 0;
             success = true;
             while (success && x < comSize) {

src/main/java/SimpleBattleship.java

@@ -18,10 +18,12 @@ public String checkYourself(String userInput) {
         if (index >= 0) {
             locationCells.remove(index);
             result = "hit";
+            return result;
         }
         if (locationCells.isEmpty()) {
             result = "kill";
             System.out.println("Ouch! You sunk " + name + " : ( ");
+
         } if (index <= 0) {
             result = "miss";
         }