Clean up Scanners
This commit is contained in:
@ -17,10 +17,10 @@ public class Driver {
|
|||||||
|
|
||||||
while(player1.lifeTotal>=0&&player2.lifeTotal>=0){
|
while(player1.lifeTotal>=0&&player2.lifeTotal>=0){
|
||||||
if (game.player1.lifeTotal>0)
|
if (game.player1.lifeTotal>0)
|
||||||
game.Turn(game.player1,game.player2);
|
game.Turn(game.player1,game.player2,in);
|
||||||
System.out.println("------------------------------------------------------------------------------------------------------------------------------");
|
System.out.println("------------------------------------------------------------------------------------------------------------------------------");
|
||||||
if (game.player2.lifeTotal>0)
|
if (game.player2.lifeTotal>0)
|
||||||
game.Turn(game.player2,game.player1);
|
game.Turn(game.player2,game.player1,in);
|
||||||
System.out.println("------------------------------------------------------------------------------------------------------------------------------");
|
System.out.println("------------------------------------------------------------------------------------------------------------------------------");
|
||||||
}
|
}
|
||||||
in.close();
|
in.close();
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Scanner;
|
||||||
|
|
||||||
public class Game {
|
public class Game {
|
||||||
protected Player player1;
|
protected Player player1;
|
||||||
protected Player player2;
|
protected Player player2;
|
||||||
@ -53,8 +55,8 @@ public class Game {
|
|||||||
this.player2Field=new ArrayList<Card>();
|
this.player2Field=new ArrayList<Card>();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Turn(Player player,Player target) {
|
public void Turn(Player player,Player target, Scanner in) {
|
||||||
player.turn(target);
|
player.turn(target, in);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -41,10 +41,9 @@ public class Player {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void turn(Player target) {
|
public void turn(Player target, Scanner in) {
|
||||||
int currentMana = manaTotal;
|
int currentMana = manaTotal;
|
||||||
int cardUse = 0;
|
int cardUse = 0;
|
||||||
Scanner in = new Scanner(System.in);
|
|
||||||
System.out.println("\n\n\tIt is " + name + "'s turn.");
|
System.out.println("\n\n\tIt is " + name + "'s turn.");
|
||||||
deck.drawCard();
|
deck.drawCard();
|
||||||
System.out.println("Your health and armor is " + lifeTotal + " and " + armorTotal
|
System.out.println("Your health and armor is " + lifeTotal + " and " + armorTotal
|
||||||
@ -94,7 +93,6 @@ public class Player {
|
|||||||
else
|
else
|
||||||
System.out.println("You've selected an invalid card.");
|
System.out.println("You've selected an invalid card.");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user