1 files changed, 35 insertions, 10 deletions

diff --git a/src/main/java/design/controller/userinput/menus/HolePlayMenu.java b/src/main/java/design/controller/userinput/menus/HolePlayMenu.java
index bcd7560..14e5345 100644
--- a/src/main/java/design/controller/userinput/menus/HolePlayMenu.java
+++ b/src/main/java/design/controller/userinput/menus/HolePlayMenu.java
@@ -36,21 +36,46 @@ public class HolePlayMenu extends Menu {
 
         if (inSetup) {
             // 0) Start hole
-            opts.add(new MenuOption("start hole", (a) -> {
+            opts.add(new MenuOption("start hole", () -> {
                 ctx.startHole();
                 System.out.println("Started hole " + round.getCurrentHole().getNumber() + ".");
                 this.present();
             }));
         } else {
             // 0) Take a shot
-            opts.add(new MenuOption("take a shot", (a) -> {
-                // Gets club
+            opts.add(new MenuOption("take a shot", () -> {
+                // loads golfers clubs
+                var golfer = Session.getCurrentGolfer();
+                Club[] clubs = (golfer == null) ? new Club[0] : golfer.getClubs();
+
+                if (clubs.length == 0) {
+                    System.out.println("You don't have any clubs yet. Add one first.");
+                    new AddClubMenu().present();
+                    this.present();
+                    return;
+                }
+
+                // list clubs
+                System.out.println("-- YOUR CLUBS --");
+                for (int i = 0; i < clubs.length; i++) {
+                    Club c = clubs[i];
+                    System.out.printf("%d: #%d %s - %s (%s)%n",
+                            i + 1, c.getId(), c.getNickname(), c.getManufacture(), c.getClubType());
+                }
+
+                // user selects one of their clubs
                 Scanner sc = new Scanner(System.in);
-                System.out.print("Club nickname: ");
-                String nick = sc.nextLine().trim();
-                // Defaulted to Driver for now
-                // TODO update logic
-                Club club = new Club("Generic", nick, Club.ClubType.DRIVER);
+                Club club = null;
+                while (club == null) {
+                    System.out.print("Select club # (1.." + clubs.length + "): ");
+                    String line = sc.nextLine().trim();
+                    int idx = Integer.parseInt(line);
+                    if (idx < 1 || idx > clubs.length) {
+                        System.out.println("Out of range. Try again.");
+                        continue;
+                    }
+                    club = clubs[idx - 1];
+                }
 
                 // Get shot distance (defaults to 0 of not stated)
                 System.out.print("Distance (yds, blank=0): ");
@@ -68,7 +93,7 @@ public class HolePlayMenu extends Menu {
             }));
 
             // 1) Hole out
-            opts.add(new MenuOption("hole out", (a) -> {
+            opts.add(new MenuOption("hole out", () -> {
                 // Precedes to next hole
                 int prev = round.getCurrentHole().getNumber();
                 ctx.holeOut();
@@ -78,7 +103,7 @@ public class HolePlayMenu extends Menu {
         }
 
         // End round (always shown)
-        opts.add(new MenuOption("end round", (a) -> {
+        opts.add(new MenuOption("end round", () -> {
             ctx.endRoundNow();
             System.out.println("Round ended.");
             new MainMenu().present();