From 7eee628e9a87f9fdbeadc3e40224c860d16fd15e Mon Sep 17 00:00:00 2001 From: fdai7430 Date: Sat, 4 Feb 2023 17:52:57 +0100 Subject: [PATCH] refactoring: Pulled asking which item to use and on which enemy into its own function --- .../org/bitbiome/commands/UseCommand.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/bitbiome/commands/UseCommand.java b/src/main/java/org/bitbiome/commands/UseCommand.java index 183ba33..25684a4 100644 --- a/src/main/java/org/bitbiome/commands/UseCommand.java +++ b/src/main/java/org/bitbiome/commands/UseCommand.java @@ -14,14 +14,7 @@ private boolean combat = false; public void performCommand(Scanner scanner, boolean isRunning, String message, TravelEngine engine) { Player player = engine.getPlayer(); getEnemies(player.getLocation().getMobList()); - System.out.println("Which item would you like to use?"); - String item = scanner.nextLine(); - System.out.println("On who? (leave blank for self)"); - String target = scanner.nextLine(); - if(target.equals("")) - System.out.println(getUseMessage(item, engine)); - else - System.out.println(getUseMessage(item + " on " + target, engine)); + use(scanner, engine); while(enemies.size() > 0 && combat) { if(player.getHp() <= 0) System.exit(0); @@ -41,6 +34,17 @@ private boolean combat = false; } } + public void use(Scanner scanner, TravelEngine engine) { + System.out.println("Which item would you like to use?"); + String item = scanner.nextLine(); + System.out.println("On who? (leave blank for self)"); + String target = scanner.nextLine(); + if(target.equals("")) + System.out.println(getUseMessage(item, engine)); + else + System.out.println(getUseMessage(item + " on " + target, engine)); + } + public String getUseMessage(String msg, TravelEngine engine) { Player player = engine.getPlayer(); String message[] = msg.split(" on ");