From 1d2c014378dd2bb8c2c277da4a52afdadedd2c39 Mon Sep 17 00:00:00 2001 From: fdai4581 Date: Mon, 6 Feb 2023 18:48:04 +0100 Subject: [PATCH 01/17] add Ship class --- src/main/java/BattleShip/Ship.java | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/main/java/BattleShip/Ship.java diff --git a/src/main/java/BattleShip/Ship.java b/src/main/java/BattleShip/Ship.java new file mode 100644 index 0000000..4502ccf --- /dev/null +++ b/src/main/java/BattleShip/Ship.java @@ -0,0 +1,9 @@ +package BattleShip; + +public class Ship { + + String name; + int length; + public int numOfHits = 0; + boolean kill = false; +} From 80b7d8c025b6285fec04ba114579a25c7477e177 Mon Sep 17 00:00:00 2001 From: fdai4581 Date: Mon, 6 Feb 2023 18:48:32 +0100 Subject: [PATCH 02/17] add BSButton class --- src/main/java/BattleShip/BSButton.java | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 src/main/java/BattleShip/BSButton.java diff --git a/src/main/java/BattleShip/BSButton.java b/src/main/java/BattleShip/BSButton.java new file mode 100644 index 0000000..130af7e --- /dev/null +++ b/src/main/java/BattleShip/BSButton.java @@ -0,0 +1,5 @@ +package BattleShip; + +public class BSButton { + +} \ No newline at end of file From c997e52b393306651b44f21a4eebde19f14c5845 Mon Sep 17 00:00:00 2001 From: fdai4581 Date: Mon, 6 Feb 2023 18:49:01 +0100 Subject: [PATCH 03/17] add BShip class --- src/main/java/BattleShip/BShip.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/main/java/BattleShip/BShip.java diff --git a/src/main/java/BattleShip/BShip.java b/src/main/java/BattleShip/BShip.java new file mode 100644 index 0000000..386888c --- /dev/null +++ b/src/main/java/BattleShip/BShip.java @@ -0,0 +1,4 @@ +package BattleShip; + +public class BShip { +} From 1d244f2a5f0e20ee1e978dabf901b72629a894f9 Mon Sep 17 00:00:00 2001 From: fdai4581 Date: Mon, 6 Feb 2023 18:53:51 +0100 Subject: [PATCH 04/17] update --- src/main/java/BattleShip/Ship.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/BattleShip/Ship.java b/src/main/java/BattleShip/Ship.java index 4502ccf..65609ee 100644 --- a/src/main/java/BattleShip/Ship.java +++ b/src/main/java/BattleShip/Ship.java @@ -6,4 +6,9 @@ public class Ship { int length; public int numOfHits = 0; boolean kill = false; + + public Ship(int l, String n) { + length = l; + name = n; + } } From 3da4edebf6edfb2b2ac4f62cfe9c4f49dc8d3923 Mon Sep 17 00:00:00 2001 From: fdai4581 Date: Mon, 6 Feb 2023 18:55:52 +0100 Subject: [PATCH 05/17] update --- src/main/java/BattleShip/Ship.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/BattleShip/Ship.java b/src/main/java/BattleShip/Ship.java index 65609ee..292d55d 100644 --- a/src/main/java/BattleShip/Ship.java +++ b/src/main/java/BattleShip/Ship.java @@ -11,4 +11,16 @@ public class Ship { length = l; name = n; } + + public String getName() { + return name; + } + + public int getLength() { + return length; + } + + public boolean isKilled() { + return kill; + } } From d1ee2fe878f35b8e5776bd9014dfdd5856bf44e0 Mon Sep 17 00:00:00 2001 From: fdai4581 Date: Mon, 6 Feb 2023 18:57:43 +0100 Subject: [PATCH 06/17] update --- src/main/java/BattleShip/Ship.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/BattleShip/Ship.java b/src/main/java/BattleShip/Ship.java index 292d55d..40c9648 100644 --- a/src/main/java/BattleShip/Ship.java +++ b/src/main/java/BattleShip/Ship.java @@ -23,4 +23,13 @@ public class Ship { public boolean isKilled() { return kill; } + + public boolean counter() { + //Count hits until number of hits equals ship length, then mark as killed. + numOfHits++; + if(numOfHits == length) { + kill = true; + } + return kill; + } } From 13453e740fbe41301ce9621af7a68fcd6b86e5eb Mon Sep 17 00:00:00 2001 From: fdai4581 Date: Mon, 6 Feb 2023 19:00:10 +0100 Subject: [PATCH 07/17] add Direction class --- src/main/java/BattleShip/Direction.java | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/main/java/BattleShip/Direction.java diff --git a/src/main/java/BattleShip/Direction.java b/src/main/java/BattleShip/Direction.java new file mode 100644 index 0000000..df0369b --- /dev/null +++ b/src/main/java/BattleShip/Direction.java @@ -0,0 +1,4 @@ +package BattleShip; + +public class Direction { +} From d84aa13e132da2f5dc7061281c977cd5d913abc2 Mon Sep 17 00:00:00 2001 From: fdai4581 Date: Mon, 6 Feb 2023 19:01:06 +0100 Subject: [PATCH 08/17] update --- src/main/java/BattleShip/Direction.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/BattleShip/Direction.java b/src/main/java/BattleShip/Direction.java index df0369b..c14f5bd 100644 --- a/src/main/java/BattleShip/Direction.java +++ b/src/main/java/BattleShip/Direction.java @@ -1,4 +1,8 @@ package BattleShip; public class Direction { + + int countHits; + int cellLocation; + } From 2c7be938202a38579f32bec54ab7b393cf5b5a41 Mon Sep 17 00:00:00 2001 From: fdai4581 Date: Mon, 6 Feb 2023 19:02:14 +0100 Subject: [PATCH 09/17] update --- src/main/java/BattleShip/Direction.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/BattleShip/Direction.java b/src/main/java/BattleShip/Direction.java index c14f5bd..785838f 100644 --- a/src/main/java/BattleShip/Direction.java +++ b/src/main/java/BattleShip/Direction.java @@ -5,4 +5,12 @@ public class Direction { int countHits; int cellLocation; + public void setCount(int a) { + countHits = a; + } + + public int getCount() { + return countHits; + } + } From 4e4a49d993620af796aaf94fd9a10f3707b12c9a Mon Sep 17 00:00:00 2001 From: fdai4581 Date: Mon, 6 Feb 2023 19:03:58 +0100 Subject: [PATCH 10/17] update --- src/main/java/BattleShip/Direction.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/BattleShip/Direction.java b/src/main/java/BattleShip/Direction.java index 785838f..29caf4c 100644 --- a/src/main/java/BattleShip/Direction.java +++ b/src/main/java/BattleShip/Direction.java @@ -13,4 +13,11 @@ public class Direction { return countHits; } + public void setCell(int b) { + cellLocation = b; + } + + public int getCell() { + return cellLocation; + } } From 0696b86f1a9b475f2cd6d68da0fb06eba292a1cf Mon Sep 17 00:00:00 2001 From: fdai4581 Date: Mon, 6 Feb 2023 19:07:35 +0100 Subject: [PATCH 11/17] refactoring: --- src/main/java/BattleShip/Direction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/BattleShip/Direction.java b/src/main/java/BattleShip/Direction.java index 29caf4c..19cedde 100644 --- a/src/main/java/BattleShip/Direction.java +++ b/src/main/java/BattleShip/Direction.java @@ -2,8 +2,8 @@ package BattleShip; public class Direction { - int countHits; - int cellLocation; + int countHits, cellLocation; + public void setCount(int a) { countHits = a; From af48649d42cfeafd78441126b3f9c3055a9cfe8a Mon Sep 17 00:00:00 2001 From: fdai4581 Date: Mon, 6 Feb 2023 19:28:22 +0100 Subject: [PATCH 12/17] update --- src/main/java/BattleShip/BSButton.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/BattleShip/BSButton.java b/src/main/java/BattleShip/BSButton.java index 130af7e..7042215 100644 --- a/src/main/java/BattleShip/BSButton.java +++ b/src/main/java/BattleShip/BSButton.java @@ -1,5 +1,10 @@ package BattleShip; -public class BSButton { +import javax.swing.*; + +public class BSButton { + + int gridLocation; + Ship cellContents = null; } \ No newline at end of file From c7c667ff9c74ea41c3b4461a329c3161c4b02a52 Mon Sep 17 00:00:00 2001 From: fdai4581 Date: Mon, 6 Feb 2023 19:29:09 +0100 Subject: [PATCH 13/17] refactoring: --- src/main/java/BattleShip/BSButton.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/BattleShip/BSButton.java b/src/main/java/BattleShip/BSButton.java index 7042215..c9eb96e 100644 --- a/src/main/java/BattleShip/BSButton.java +++ b/src/main/java/BattleShip/BSButton.java @@ -2,7 +2,7 @@ package BattleShip; import javax.swing.*; -public class BSButton { +public class BSButton extends JButton { int gridLocation; Ship cellContents = null; From 5f3434c72ef6387a9fce4e44798ccce5a2619c50 Mon Sep 17 00:00:00 2001 From: fdai4581 Date: Mon, 6 Feb 2023 19:31:19 +0100 Subject: [PATCH 14/17] refactoring: --- src/main/java/BattleShip/Direction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/BattleShip/Direction.java b/src/main/java/BattleShip/Direction.java index 19cedde..29dcc6f 100644 --- a/src/main/java/BattleShip/Direction.java +++ b/src/main/java/BattleShip/Direction.java @@ -1,6 +1,6 @@ package BattleShip; -public class Direction { +class Direction { int countHits, cellLocation; From 7419bb5ec96e4d51e4181b5a83dd1b41564b5d38 Mon Sep 17 00:00:00 2001 From: fdai4581 Date: Mon, 6 Feb 2023 19:33:32 +0100 Subject: [PATCH 15/17] update --- src/main/java/BattleShip/BSButton.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/BattleShip/BSButton.java b/src/main/java/BattleShip/BSButton.java index c9eb96e..b6c2426 100644 --- a/src/main/java/BattleShip/BSButton.java +++ b/src/main/java/BattleShip/BSButton.java @@ -7,4 +7,12 @@ public class BSButton extends JButton { int gridLocation; Ship cellContents = null; + public void setGridLocation(int l) { + gridLocation = l; + } + + public int getGridLocation() { + return gridLocation; + } + } \ No newline at end of file From 73f023d78256129b20117c2125cd7ee6c32707a9 Mon Sep 17 00:00:00 2001 From: fdai4581 Date: Mon, 6 Feb 2023 19:35:22 +0100 Subject: [PATCH 16/17] update --- src/main/java/BattleShip/BSButton.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/BattleShip/BSButton.java b/src/main/java/BattleShip/BSButton.java index b6c2426..3262b23 100644 --- a/src/main/java/BattleShip/BSButton.java +++ b/src/main/java/BattleShip/BSButton.java @@ -15,4 +15,12 @@ public class BSButton extends JButton { return gridLocation; } + public void setCellContents(Ship s) { + cellContents = s; + } + + public Ship getCellContents() { + return cellContents; + } + } \ No newline at end of file From 5d680e3ebb3c4c06949fa1ed081fffdd5e922af1 Mon Sep 17 00:00:00 2001 From: Thoumi Ngonga Brice Date: Mon, 6 Feb 2023 19:59:50 +0100 Subject: [PATCH 17/17] Add AIGridGui Class --- src/main/java/BattleShip/AIGridGUI.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/main/java/BattleShip/AIGridGUI.java diff --git a/src/main/java/BattleShip/AIGridGUI.java b/src/main/java/BattleShip/AIGridGUI.java new file mode 100644 index 0000000..1e9c686 --- /dev/null +++ b/src/main/java/BattleShip/AIGridGUI.java @@ -0,0 +1,6 @@ +package BattleShip; +import javax.swing.*; + +public class AIGridGUI extends JPanel { + +}