diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Charles.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Charles.java index a823203..79eecc4 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Charles.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Charles.java @@ -33,7 +33,7 @@ public class Renaissance_Charles extends Card { */ @Override public String getDescription() { - return null; + return ""; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chatherine.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chatherine.java index 3202be9..0b5803d 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chatherine.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Chatherine.java @@ -33,7 +33,7 @@ public class Renaissance_Chatherine extends Card { */ @Override public String getDescription() { - return null; + return ""; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Elisabeth.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Elisabeth.java index 226ff9f..2a01861 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Elisabeth.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Elisabeth.java @@ -33,7 +33,7 @@ public class Renaissance_Elisabeth extends Card { */ @Override public String getDescription() { - return null; + return ""; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Henri.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Henri.java index 2db46f5..39093eb 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Henri.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Henri.java @@ -33,7 +33,7 @@ public class Renaissance_Henri extends Card { */ @Override public String getDescription() { - return null; + return ""; } /** diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Rabelais.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Rabelais.java index c413018..8300bab 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Rabelais.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Renaissance/Renaissance_Rabelais.java @@ -34,7 +34,7 @@ public class Renaissance_Rabelais extends Card { */ @Override public String getDescription() { - return null; + return ""; } /** 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 166d9e0..5e07cd3 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Command.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Command.java @@ -29,10 +29,8 @@ public final class Command { public static final String SET_HP = "sethp"; public static final String SET_CARD_HP = "setcardhp"; public static final String SET_ADV_CARD_HP = "setadvcardhp"; + public static final String SET_CARD_ATK = "setcardatk"; + public static final String SET_ADV_CARD_ATK = "setadvcardatk"; - //inutilisé - public static final String SELECT_CARD = "selectCard"; - public static final String DEFEND = "defend"; - public static final String CAST_SPELL = "castSpell"; } 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 ea7ba21..eb11b87 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java @@ -170,6 +170,7 @@ public class GameLogicThread extends Thread{ try { + int zonecartecible; //on limite le temps du readobject pour eviter les blockaeg coms.setLimitedTimeOut(); String serveurCmd = coms.recieve(); @@ -301,14 +302,26 @@ public class GameLogicThread extends Thread{ break; case Command.SET_CARD_HP : - int zonecartecible = coms.recieveInt(); + zonecartecible = coms.recieveInt(); board.getPlayerCardsOnBoard()[zonecartecible].setHealth(coms.recieveInt()); renderer.updateFrame(); break; case Command.SET_ADV_CARD_HP: - int zonecarteadvcible = coms.recieveInt(); - board.getAdvCardsOnBoard()[zonecarteadvcible].setHealth(coms.recieveInt()); + zonecartecible = coms.recieveInt(); + board.getAdvCardsOnBoard()[zonecartecible].setHealth(coms.recieveInt()); + renderer.updateFrame(); + break; + + case Command.SET_CARD_ATK: + zonecartecible = coms.recieveInt(); + board.getPlayerCardsOnBoard()[zonecartecible].setAttack(coms.recieveInt()); + renderer.updateFrame(); + break; + + case Command.SET_ADV_CARD_ATK: + zonecartecible = coms.recieveInt(); + board.getAdvCardsOnBoard()[zonecartecible].setAttack(coms.recieveInt()); renderer.updateFrame(); break; diff --git a/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java b/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java index 74bbefd..403a68d 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java +++ b/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java @@ -284,7 +284,7 @@ public class DrawableCard extends Drawable{ //dessine le texte cardTitle.drawOn(c,p); - if(cardDescription != null)cardDescription.drawOn(c,p); + if(cardDescription != null && !cardDescription.equals(""))cardDescription.drawOn(c,p); cardHpDrawable.drawOn(c,p); cardAtkDrawable.drawOn(c,p); cardCostDrawable.drawOn(c,p);