Browse Source

Clean up Scanners

pull/3/head
Gregory Rudolph 4 years ago
parent
commit
265157f45e
Signed by: rudi
GPG Key ID: EF64F3CBD1A1EBDD
  1. 4
      Driver.java
  2. 6
      Game.java
  3. 4
      Player.java

4
Driver.java

@ -17,10 +17,10 @@ public class Driver { @@ -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();

6
Game.java

@ -1,4 +1,6 @@ @@ -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 { @@ -53,8 +55,8 @@ public class Game {
this.player2Field=new ArrayList<Card>();
}
public void Turn(Player player,Player target) {
player.turn(target);
public void Turn(Player player,Player target, Scanner in) {
player.turn(target, in);
}
}

4
Player.java

@ -41,10 +41,9 @@ public class Player { @@ -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 { @@ -94,7 +93,6 @@ public class Player {
else
System.out.println("You've selected an invalid card.");
}
}
@Override

Loading…
Cancel
Save