Erfan

core/src/graphic/main/AssetHandler.java

@@ -138,6 +138,12 @@ public static synchronized void load() {
         assetManager.load("button/card in deck.png", Texture.class);
         assetManager.load("button/card in deck1.png", Texture.class);
         assetManager.load("button/deckName.png", Texture.class);
+        assetManager.load("button/secondCustom1.png", Texture.class);
+        assetManager.load("button/secondCustom1-1.png", Texture.class);
+        assetManager.load("button/increaseButton.png", Texture.class);
+        assetManager.load("button/decreaseButton.png", Texture.class);
+        assetManager.load("button/multiplayer1.png", Texture.class);
+        assetManager.load("button/multiplayer1-1.png", Texture.class);
 
 
         for(int i = 1; i <= 11; i++)

core/src/graphic/screen/BattleScreen.java

@@ -21,6 +21,8 @@
 import model.game.CellEffect;
 import model.game.Game;
 import model.game.Player;
+import network.Client;
+import network.MouseState;
 
 import java.awt.*;
 import java.util.ArrayList;
@@ -149,7 +151,6 @@ public void create() {
         manaStart2 = new Vector2(1330 - mana.getWidth(), 730);
 
         mousePos = new Vector2();
-
         hero1Icon = AssetHandler.getData().get(player1.getHero().getIconId());
         hero2Icon = AssetHandler.getData().get(player2.getHero().getIconId());
 
@@ -283,87 +284,13 @@ public boolean keyTyped(char character) {
 
             @Override
             public boolean touchDown(int screenX, int screenY, int pointer, int button) {
-                if(game.isGameEnded()){
-                    ScreenManager.setScreen(new MenuScreen());
-                }
-                if(endTurnButton.isActive()){
-                    endTurn();
-                } else if(endGameButton.isActive()){
-                    game.exitFromGame();
-                    endGame();
-                } else if(graveyardButton.isActive()){
-                    showingGraveyard = !showingGraveyard;
-                } else if(fastForwardButton.isActive()){
-                    setFastForward();
-                }
-                else if(checkHeroSp()){
-                    if(game.getWhoIsHisTurn().canUseHeroSp())
-                        heroSpSelected = true;
-                } else if(getMouseCell() != null){
-                    if(getMouseCell().getInsideArmy() != null && game.getWhoIsHisTurn().isFriend(getMouseCell().getInsideArmy())) {
-                        selectedCell = getMouseCell();
-                        selectedCellHand = null;
-                        heroSpSelected = false;
-                        selectedArmy = selectedCell.getInsideArmy();
-                        setCommand("select " + selectedArmy.getID().getValue());
-                        synchronized (game){
-                            game.notify();
-                        }
-                    } else if(selectedArmy != null && getMouseCell().getInsideArmy() == null) {
-                        Cell cell = getMouseCell();
-                        if (!game.getWhoIsHisTurn().canMove(selectedCell, cell)){
-                            setPopUp("Invalid Cell");
-                            return false;
-                        }
-                        runSound.play();
-                        game.getWhoIsHisTurn().moveArmy(selectedCell, cell);
-                        selectedCell = null;
-                        selectedArmy = null;
-                    } else if(selectedCellHand != null && getMouseCell().getInsideArmy() == null) {
-//                        Cell cell = getMouseCell();
-//                        if(game.getWhoIsHisTurn().moveFromHandToCell(handCards.get(selectedCellHand), cell));
-//                            handCards.put(selectedCellHand, null);
-//                        selectedCellHand = null;
-                    } else if(selectedArmy != null && getMouseCell().getInsideArmy() != null) {
-                        Cell cell = getMouseCell();
-                        Army target = cell.getInsideArmy();
-                        if(game.getWhoIsHisTurn().isInRange(selectedCell, cell)) {
-                            attackSound.play();
-                            animations.get(selectedArmy).attack();
-                            if (game.getWhoIsHisTurn().isInRange(cell, selectedCell))
-                                animations.get(target).attack();
-                        }
-                        game.getWhoIsHisTurn().attack(selectedCell, cell);
-                        if(selectedCell.getInsideArmy().getHp() <= 0){
-                            animations.get(selectedArmy).death();
-                            game.setupCardDeaf(selectedCell);
-                        }
-                        if(cell.getInsideArmy().getHp() <= 0){
-                            animations.get(target).death();
-                            game.setupCardDeaf(cell);
-                        }
-                        selectedCell = null;
-                        selectedArmy = null;
-                    } else if(heroSpSelected){
-                        game.getWhoIsHisTurn().useSpecialPower(getMouseCell());
-                    }
-                } else if(getMouseHandCell() != null){
-                    selectedCellHand = getMouseHandCell();
-                    selectedCell = null;
-                    selectedArmy = null;
-                    heroSpSelected = false;
-                }
+                mouseTouchDown();
                 return false;
             }
 
             @Override
             public boolean touchUp(int screenX, int screenY, int pointer, int button) {
-                if(selectedCellHand != null && getMouseCell()!= null && getMouseCell().getInsideArmy() == null){
-                    Cell cell = getMouseCell();
-                    if(game.getWhoIsHisTurn().moveFromHandToCell(handCards.get(selectedCellHand), cell));
-                    handCards.put(selectedCellHand, null);
-                    selectedCellHand = null;
-                }
+                mouseTouchUp();
                 return false;
             }
 
@@ -383,7 +310,122 @@ public boolean scrolled(int amount) {
             }
         });
     }
+    public void updateByServer() {
+        camera.update();
+        shapeRenderer.setProjectionMatrix(camera.combined);
+        game = Game.getCurrentGame();
+        player1 = game.getFirstPlayer();
+        player2 = game.getSecondPlayer();
+
+        if(game.isGameEnded()){
+            endGame();
+        }
+
+        checkTurnTime();
+
+        updateHandCells();
+
+        setAnimations();
+        Client.setMousePos();
+        mousePos.set(Client.getMousePos());
+        //mousePos.set(Gdx.input.getX(), Gdx.input.getY());
+        mousePos = viewport.unproject(mousePos);
+
+        endTurnButton.setActive(endTurnButton.contains(mousePos));
+        endGameButton.setActive(endGameButton.contains(mousePos));
+        graveyardButton.setActive(graveyardButton.contains(mousePos));
+        fastForwardButton.setActive(fastForwardButton.contains(mousePos));
+
+        updateGraveyard();
+        if(Client.getMouseState() == MouseState.TOUCH_DOWN) {
+            mouseTouchDown();
+        }
+        else if(Client.getMouseState() == MouseState.TOUCH_UP) {
+            mouseTouchUp();
+        }
+    }
+    public void mouseTouchUp() {
+            if(selectedCellHand != null && getMouseCell()!= null && getMouseCell().getInsideArmy() == null){
+                Cell cell = getMouseCell();
+                if(game.getWhoIsHisTurn().moveFromHandToCell(handCards.get(selectedCellHand), cell));
+                handCards.put(selectedCellHand, null);
+                selectedCellHand = null;
+            }
+            return;
 
+    }
+    public void mouseTouchDown() {
+        if (game.isGameEnded()) {
+            ScreenManager.setScreen(new MenuScreen());
+        }
+        if (endTurnButton.isActive()) {
+            endTurn();
+        } else if (endGameButton.isActive()) {
+            game.exitFromGame();
+            endGame();
+        } else if (graveyardButton.isActive()) {
+            showingGraveyard = !showingGraveyard;
+        } else if (fastForwardButton.isActive()) {
+            setFastForward();
+        } else if (checkHeroSp()) {
+            if (game.getWhoIsHisTurn().canUseHeroSp())
+                heroSpSelected = true;
+        } else if (getMouseCell() != null) {
+            if (getMouseCell().getInsideArmy() != null && game.getWhoIsHisTurn().isFriend(getMouseCell().getInsideArmy())) {
+                selectedCell = getMouseCell();
+                selectedCellHand = null;
+                heroSpSelected = false;
+                selectedArmy = selectedCell.getInsideArmy();
+                setCommand("select " + selectedArmy.getID().getValue());
+                synchronized (game) {
+                    game.notify();
+                }
+            } else if (selectedArmy != null && getMouseCell().getInsideArmy() == null) {
+                Cell cell = getMouseCell();
+                if (!game.getWhoIsHisTurn().canMove(selectedCell, cell)) {
+                    setPopUp("Invalid Cell");
+                    return;
+                }
+                runSound.play();
+                game.getWhoIsHisTurn().moveArmy(selectedCell, cell);
+                selectedCell = null;
+                selectedArmy = null;
+            } else if (selectedCellHand != null && getMouseCell().getInsideArmy() == null) {
+//                        Cell cell = getMouseCell();
+//                        if(game.getWhoIsHisTurn().moveFromHandToCell(handCards.get(selectedCellHand), cell));
+//                            handCards.put(selectedCellHand, null);
+//                        selectedCellHand = null;
+            } else if (selectedArmy != null && getMouseCell().getInsideArmy() != null) {
+                Cell cell = getMouseCell();
+                Army target = cell.getInsideArmy();
+                if (game.getWhoIsHisTurn().isInRange(selectedCell, cell)) {
+                    attackSound.play();
+                    animations.get(selectedArmy).attack();
+                    if (game.getWhoIsHisTurn().isInRange(cell, selectedCell))
+                        animations.get(target).attack();
+                }
+                game.getWhoIsHisTurn().attack(selectedCell, cell);
+                if (selectedCell.getInsideArmy().getHp() <= 0) {
+                    animations.get(selectedArmy).death();
+                    game.setupCardDeaf(selectedCell);
+                }
+                if (cell.getInsideArmy().getHp() <= 0) {
+                    animations.get(target).death();
+                    game.setupCardDeaf(cell);
+                }
+                selectedCell = null;
+                selectedArmy = null;
+            } else if (heroSpSelected) {
+                game.getWhoIsHisTurn().useSpecialPower(getMouseCell());
+            }
+        } else if (getMouseHandCell() != null) {
+            selectedCellHand = getMouseHandCell();
+            selectedCell = null;
+            selectedArmy = null;
+            heroSpSelected = false;
+        }
+        return;
+    }
     public void endTurn() {
         selectedCell = null;
         selectedArmy = null;

core/src/graphic/screen/LoadingScreen.java

@@ -8,6 +8,7 @@
 import graphic.main.AssetHandler;
 import graphic.main.Gif;
 import graphic.main.Main;
+import graphic.screen.gameMenuScreens.WaitingScreen;
 
 import java.awt.*;
 

core/src/graphic/screen/LoginScreen.java

@@ -5,15 +5,17 @@
 import com.badlogic.gdx.InputProcessor;
 import com.badlogic.gdx.audio.Music;
 import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.g2d.*;
-import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator;
+import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.graphics.g2d.GlyphLayout;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 import com.badlogic.gdx.math.Vector2;
 import graphic.Others.SlotType;
 import graphic.main.AssetHandler;
 import graphic.main.Button;
 import graphic.main.Main;
 import model.other.Account;
+import network.Client;
 
 import java.awt.*;
 
@@ -119,7 +121,7 @@ else if (currentSlot.equals(SlotType.PASSWORD) && signUpButton.isActive())
                         }
                     }
                     if (loginButton.isActive() && Account.doesAccountExist(userName)) {
-                        if (Account.checkIfPasswordIsCorrect(userName,password)) {
+                        if (Client.logIn(userName, password).equals("correct login")) {
                             Account.setCurrentAccount(Account.findAccount(userName));
                             ScreenManager.setScreen(new MenuScreen());
                         }

core/src/graphic/screen/gameMenuScreens/ChooseNumberOfPlayersMenuScreen.java

@@ -85,7 +85,7 @@ public boolean touchDown(int screenX, int screenY, int pointer, int button) {
                 if (button != Input.Buttons.LEFT)
                     return false;
                 if (multiPlayerButton.isActive())
-                    ScreenManager.setScreen(new MultiPlayerMenuScreen());
+                    ScreenManager.setScreen(new MultiPlayerScreen());
                 if (storyButton.isActive())
                     ScreenManager.setScreen(new StoryMenuScreen());
                 if (customButton.isActive())

core/src/graphic/screen/gameMenuScreens/Datas.java

@@ -193,6 +193,7 @@ public Deck setDeck(Deck deck) {
         }
         return copyDeck;
     }
+
     public void makeKillHeroCustom(int deckNumber) {
         type = GameType.KILL_HERO;
         Account account;
@@ -245,4 +246,37 @@ public void run() {
         }).start();
 
     }
+    public void makeKillHeroCustom(final Account account) {
+        type = GameType.KILL_HERO;
+        secondAccount = account;
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                playGame(0);
+            }
+        }).start();
+    }
+
+    public void makeCaptureTheFlagCustom(Account account) {
+        type = GameType.CAPTURE_THE_FLAG;
+        secondAccount = account;
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                playGame(1);
+            }
+        }).start();
+    }
+
+    public void makeRollUpFlagCustom(Account account, final int numberOfFlags) {
+        type = GameType.ROLLUP_FLAGS;
+        secondAccount = account;
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                playGame(numberOfFlags);
+            }
+        }).start();
+    }
+
 }