Commit fee124d6 authored by Felix RABADAN's avatar Felix RABADAN
Browse files

fix merge

parent 7cf67966
......@@ -5,10 +5,10 @@ import game.controllers.*;
import java.io.FileNotFoundException;
import game.Parser;
import game.Player.Position;
public class Game {
public static void main(String[] args) {
<<<<<<< HEAD
UserController userController = UserController.getInstance();
User felix = userController.addUser("felix");
......@@ -20,7 +20,7 @@ public class Game {
CardController cardController = CardController.getInstance();
Player p = new Player("Paul Pogba", Position.FIELD_PLAYER);
Player p = new Player("Paul Pogba", Position.COURT_FIELD_PLAYER);
Card card1 = cardController.createCard(1, Card.Rarity.COMMON, p);
cardController.createCard(1, Card.Rarity.COMMON, p);
cardController.removeCard(card1);
......@@ -38,13 +38,7 @@ public class Game {
cardController.createCard(11, Card.Rarity.RARE, p);
System.out.println("####");
p.displayCards();
=======
UserController userAdmin = UserController.getInstance();
User felix = userAdmin.addUser("felix");
userAdmin.addUser("malo");
userAdmin.addUser("felix");
System.out.println(felix.getName());
//test parser
Parser fnnantesPlayers = new Parser();
try {
......@@ -53,6 +47,5 @@ public class Game {
// TODO Auto-generated catch block
e.printStackTrace();
}
>>>>>>> parsing
}
}
package game;
public enum Position {
GOAL_KEEPER,
FIELD_PLAYER,
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment