diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Command.java b/app/src/main/java/com/iutlaval/myapplication/Game/Command.java index 462672e..5c4119f 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Command.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Command.java @@ -25,7 +25,8 @@ public final class Command { public static final String DESTROY_CARD = "destroyself"; //demande au clien de retirer une carte du terrain public static final String DESTROY_ADV_CARD = "destroyadv"; //demande au client de retirer une carte adverse du terrain public static final String BATTLE = "battlephase"; - + public static final String SET_ENEMY_HP = "setenemhp"; + public static final String SET_HP = "sethp"; //inutilisé public static final String SELECT_CARD = "selectCard"; diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java b/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java index 9b228cb..7f3c9a7 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java @@ -278,6 +278,17 @@ public class GameLogicThread extends Thread{ renderer.removeToDraw(enemyCardToDestroy); break; + case Command.SET_ENEMY_HP: + renderer.removeToDrawWithoutUpdate("advHp"); + renderer.addToDraw(new DrawableText(" Hp : "+coms.recieve(),1F,10F,"advHp",100,12,Color.WHITE)); + + break; + + case Command.SET_HP: + renderer.removeToDrawWithoutUpdate("playerHp"); + renderer.addToDraw(new DrawableText(" Hp : " + coms.recieve(),85F,80F,"playerHp",100,12,Color.WHITE)); + break; + case "timeout": //ceci est une erreur et non une commande elle se doit donc de ne rien faire break; @@ -382,10 +393,9 @@ public class GameLogicThread extends Thread{ } public synchronized boolean setOnCardAttackRequest(DrawableCard card, int zoneCible) { - if(board.getAdvCardsOnBoard()[zoneCible] == null + if(zoneCible == -1 || zoneCible != 100 && board.getAdvCardsOnBoard()[zoneCible] == null || card.getCard().getAttack() == 0) { - Log.e("DENIED",""+ board.getAdvCardsOnBoard()[zoneCible] + " r "+card.getCard().getAttack()); return false; } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/PlayableZonesHandler.java b/app/src/main/java/com/iutlaval/myapplication/Game/PlayableZonesHandler.java index e668748..dfcb4b2 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/PlayableZonesHandler.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/PlayableZonesHandler.java @@ -110,6 +110,13 @@ public class PlayableZonesHandler { * @return */ public int getEnemyHoveredZone(Drawable card) { + if(card.getX() < 10F && card.getY() < 10F) + { + //cent veut dire que l'on attaque le joueur + return 100; + } + + for(int i=0 ; i< board.MAX_CARD_ON_BOARD;i++) { int cardX =(DrawableCard.getCardWith()+1)*i + 20 + DrawableCard.getCardWith()/2; @@ -122,7 +129,6 @@ public class PlayableZonesHandler { return i; } else { - Log.e("NO CARD ON ",""+i); break; } } diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/TouchHandler.java b/app/src/main/java/com/iutlaval/myapplication/Game/TouchHandler.java index 92ac696..a603c1a 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/TouchHandler.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/TouchHandler.java @@ -210,7 +210,6 @@ public class TouchHandler { unScalled_X > GameLogicThread.BUTTON_X_POS && unScalled_X < GameLogicThread.BUTTON_X_POS + GameLogicThread.BUTTON_X_SIZE && unScalled_Y > GameLogicThread.BUTTON_Y_POS && unScalled_Y < GameLogicThread.BUTTON_Y_POS + GameLogicThread.BUTTON_Y_SIZE) { - Log.e("push","detected"); gameLogic.requestEndTurn(); } } @@ -220,7 +219,6 @@ public class TouchHandler { if(dragAndDropCard != null){ if(event.getAction() == MotionEvent.ACTION_UP) { int zone = playableZonesHandler.getEnemyHoveredZone(dragAndDropCard); - Log.e("hovered : ",""+zone); if(zone != -1) { gameLogic.setOnCardAttackRequest(dragAndDropCard,zone);