Commit 00e0d808 authored by Malo KERVESTIN's avatar Malo KERVESTIN
Browse files

fix merge

parent 53222fe1
package game;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
......
......@@ -2,76 +2,68 @@ package game;
import game.controllers.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map.Entry;
import game.Player.Position;
public class Game {
public static void main(String[] args) {
// UserController userController = UserController.getInstance();
UserController userController = UserController.getInstance();
// User felix = userController.addUser("felix");
// User malo = userController.addUser("malo");
// userController.addUser("felix");
User felix = userController.addUser("felix");
User malo = userController.addUser("malo");
userController.addUser("felix");
// userController.connect(felix);
// userController.connect(malo);
userController.connect(felix);
userController.connect(malo);
// CardController cardController = CardController.getInstance();
CardController cardController = CardController.getInstance();
// Player p = new Player("Paul Pogba", Position.COURT_FIELD_PLAYER, (float)
// 5.0); // pq mettre le score dans le
// // constructeur ?
// Card card1 = cardController.createCard(1, Card.Rarity.COMMON, p);
// cardController.createCard(1, Card.Rarity.COMMON, p);
// cardController.removeCard(card1);
Player p = new Player("Paul Pogba", Position.COURT_FIELD_PLAYER, (float) 5.0); // pq mettre le score dans le
// constructeur ?
Card card1 = cardController.createCard(1, Card.Rarity.COMMON, p);
cardController.createCard(1, Card.Rarity.COMMON, p);
cardController.removeCard(card1);
// cardController.createCard(1, Card.Rarity.RARE, p);
// cardController.createCard(2, Card.Rarity.RARE, p);
// cardController.createCard(3, Card.Rarity.RARE, p);
// cardController.createCard(4, Card.Rarity.RARE, p);
// cardController.createCard(5, Card.Rarity.RARE, p);
// cardController.createCard(6, Card.Rarity.RARE, p);
// cardController.createCard(7, Card.Rarity.RARE, p);
// cardController.createCard(8, Card.Rarity.RARE, p);
// cardController.createCard(9, Card.Rarity.RARE, p);
// cardController.createCard(10, Card.Rarity.RARE, p);
// cardController.createCard(11, Card.Rarity.RARE, p);
// System.out.println("####");
// // p.displayCards();
cardController.createCard(1, Card.Rarity.RARE, p);
cardController.createCard(2, Card.Rarity.RARE, p);
cardController.createCard(3, Card.Rarity.RARE, p);
cardController.createCard(4, Card.Rarity.RARE, p);
cardController.createCard(5, Card.Rarity.RARE, p);
cardController.createCard(6, Card.Rarity.RARE, p);
cardController.createCard(7, Card.Rarity.RARE, p);
cardController.createCard(8, Card.Rarity.RARE, p);
cardController.createCard(9, Card.Rarity.RARE, p);
cardController.createCard(10, Card.Rarity.RARE, p);
cardController.createCard(11, Card.Rarity.RARE, p);
System.out.println("####");
// p.displayCards();
// Market market = Market.getInstance();
Market market = Market.getInstance();
// Admin admin = Admin.getInstance();
// // admin.putOnMarket(new Pair<Card, Integer>(card1, 1000));
// market.displayBuyableCards();
// admin.putOnMarket(new Pair<Card, Integer>(card1, 1000));
market.displayBuyableCards();
// Card card2 = cardController.createCard(1, Card.Rarity.RARE,
// new Player("Kylian Mbappe", Position.COURT_FIELD_PLAYER, (float) 5.0));
// felix.addCard(card2);
// // market.displayBuyableCards();
// market.displayExchangeableCards();
// // felix.sell();
// // felix.buy();
// felix.exchange();
// felix.displayDeck();
// // market.displayBuyableCards();
// market.displayExchangeableCards();
Card card2 = cardController.createCard(1, Card.Rarity.RARE,
new Player("Kylian Mbappe", Position.COURT_FIELD_PLAYER, (float) 5.0));
felix.addCard(card2);
// market.displayBuyableCards();
market.displayExchangeableCards();
// felix.sell();
// felix.buy();
felix.exchange();
felix.displayDeck();
// market.displayBuyableCards();
market.displayExchangeableCards();
// userController.disconnect();
// userController.connect(malo);
// malo.addCard(card1);
// malo.exchange();
// malo.displayDeck();
// userController.disconnect();
// userController.connect(felix);
// felix.displayDeck();
// market.displayExchangeableCards();
userController.disconnect();
userController.connect(malo);
malo.addCard(card1);
malo.exchange();
malo.displayDeck();
userController.disconnect();
userController.connect(felix);
felix.displayDeck();
market.displayExchangeableCards();
// test parser
// try {
......
package game;
import java.util.ArrayList;
import java.util.Map;
import java.util.Scanner;
import game.Card.Rarity;
import game.Player.Position;
......
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