diff --git a/Driver.java b/Driver.java index c3e73de..dda01d4 100644 --- a/Driver.java +++ b/Driver.java @@ -17,10 +17,10 @@ public class Driver { while(player1.lifeTotal>=0&&player2.lifeTotal>=0){ if (game.player1.lifeTotal>0) - game.Turn(game.player1,game.player2); + game.Turn(game.player1,game.player2,in); System.out.println("------------------------------------------------------------------------------------------------------------------------------"); if (game.player2.lifeTotal>0) - game.Turn(game.player2,game.player1); + game.Turn(game.player2,game.player1,in); System.out.println("------------------------------------------------------------------------------------------------------------------------------"); } in.close(); diff --git a/Game.java b/Game.java index eaa9316..bcc3249 100644 --- a/Game.java +++ b/Game.java @@ -1,4 +1,6 @@ import java.util.ArrayList; +import java.util.Scanner; + public class Game { protected Player player1; protected Player player2; @@ -53,8 +55,8 @@ public class Game { this.player2Field=new ArrayList(); } - public void Turn(Player player,Player target) { - player.turn(target); + public void Turn(Player player,Player target, Scanner in) { + player.turn(target, in); } } \ No newline at end of file diff --git a/Player.java b/Player.java index a027b83..bd8ec14 100644 --- a/Player.java +++ b/Player.java @@ -41,10 +41,9 @@ public class Player { } - public void turn(Player target) { + public void turn(Player target, Scanner in) { int currentMana = manaTotal; int cardUse = 0; - Scanner in = new Scanner(System.in); System.out.println("\n\n\tIt is " + name + "'s turn."); deck.drawCard(); System.out.println("Your health and armor is " + lifeTotal + " and " + armorTotal @@ -94,7 +93,6 @@ public class Player { else System.out.println("You've selected an invalid card."); } - } @Override