replacemen des null , ajout surport string vide , ajout 2 command

This commit is contained in:
marc barbier
2021-01-06 20:15:11 +01:00
parent 794aed0156
commit 18f4788652
8 changed files with 24 additions and 13 deletions
@@ -33,7 +33,7 @@ public class Renaissance_Charles extends Card {
*/
@Override
public String getDescription() {
return null;
return "";
}
/**
@@ -33,7 +33,7 @@ public class Renaissance_Chatherine extends Card {
*/
@Override
public String getDescription() {
return null;
return "";
}
/**
@@ -33,7 +33,7 @@ public class Renaissance_Elisabeth extends Card {
*/
@Override
public String getDescription() {
return null;
return "";
}
/**
@@ -33,7 +33,7 @@ public class Renaissance_Henri extends Card {
*/
@Override
public String getDescription() {
return null;
return "";
}
/**
@@ -34,7 +34,7 @@ public class Renaissance_Rabelais extends Card {
*/
@Override
public String getDescription() {
return null;
return "";
}
/**
@@ -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";
}
@@ -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;