conception.adoc + modification HandTraque.java pour la CLARTÉ

not-alone-doc/src/doc/asciidoc/_sections/conception.adoc

@@ -849,20 +849,34 @@ package player{
         class PlaceCardDeck{
             - placeCards : PlaceCard[*]
             - defausse : PlaceCard[*]
-            + throwAway(placeCard : PlaceCard) : Boolean
-            + throwAway(placeCards : PlaceCard[*]) : Boolean
-            + takeBack(placeCard : PlaceCard) : Boolean
-            + takeBack(placeCards : PlaceCard[*]) : Boolean
+            - playedCards : PlaceCard[*]
+            + getPlayedCards() : PlaceCard[*]
+            + getPlaceCards() : PlaceCard[*]
+            + getDefausse() : PlaceCard[*]
+            - setPlaceCards(placeCards : PlaceCard[*])
+            - setDefausse(defausse : PlaceCard[*])
+            - setPlayedCards(playedCards : PlaceCard[*])
+            + throwAway() : Boolean
+            + throwAway(card : PlaceCard) : Boolean
+            + throwAway(cards : PlaceCard[*]) : Boolean
+            + takeBack(card : PlaceCard) : Boolean
+            + takeBack(cards : PlaceCard[*]) : Boolean
+            - takeBackAllFromDefausse()
+            - takeBackPlayedPlaceCards()
             + add(card : PlaceCard) : Boolean
             + add(cards : PlaceCard[*]) : Boolean
             + addInDefausse(card : PlaceCard) : Boolean
             + addInDefausse(cards : PlaceCard[*]) : Boolean
             + play(card : PlaceCard) : Boolean
             + play(cards : PlaceCard) : Boolean
+            + handSize() : Integer
+            + handIsEmpty() : boolean
+            + defausseSize() : Integer
+            + defausseIsEmpty() : boolean
+            + playedCardSize() : Integer
+            + playedCardIsEmpty() : boolean
         }
 
-        abstract class Hand{}
-
         class HandCreature{
             - trackingCards : Deck<TrackingCard>
             - jetons : JetonSymbol[*]
@@ -902,13 +916,58 @@ package player{
 
         class HandTraque{
             - survivalCards : Deck<SurvivalCard>
-            - placeCards PlaceCardDeck
-            + getSurvivalCards() : Deck<SurvivalCard>
-            + getPlaceCards() : PlaceCardDeck
+            - placeCards : PlaceCardDeck
+            - survivalCardsToApplied : SurvivalCard[*]
+            - addSurvivalCardToApplied(survivalCard : SurvivalCard)
+            - addSurvivalCardToApplied(survivalCards : SurvivalCard[*])
+            - removeSurvivalCardToApplied(survivalCard : SurvivalCard)
+            - removeSurvivalCardToApplied(survivalCards : SurvivalCard[*])
+            + getSurvivalCardsToApplied() : SurvivalCard[*]
+            + getPlaceCards() : PlaceCard[*]
+            + getPlaceCardsPlayed() : PlaceCard[*]
+            + getDefausse() : PlaceCard[*]
+            - setPlaceCards(placeCards : PlaceCard[*])
+            - setDefausse(placeCards : PlaceCard[*])
+            + getPlaceCardsDeck() : PlaceCardDeck
+            + placeCardHandSize() : Integer
+            + placeCardIsEmpty() : boolean
+            + defausseSize() : Integer
+            + defausseIsEmpty() : boolean
+            + placeCardPlayedSize() : Integer
+            + placeCardPlayedIsEmpty() : boolean
+            + throwAwayPlaceCard() : boolean
+            + throwAwayPlaceCard(card : PlaceCard) : boolean
+            + throwAwayPlaceCard(cards : PlaceCard[*]) : boolean
+            + takeBackPlaceCard(card : PlaceCard) : boolean
+            + takeBackPlaceCard(cards : PlaceCard[*]) : boolean
+            + takeBackPlayedPlaceCards(card : PlaceCard) : boolean
+            + takeBackPlaceCard(cards : PlaceCard[*]) : boolean
+            - takeBackPlayedPlaceCards()
+            - takeBackAllPlaceCardFromDefausse()
+            + addPlaceCard(card : PlaceCard) : boolean
+            + addPlaceCard(cards : PlaceCard[*]) : boolean
+            + addPlaceCardInDefausse(card : PlaceCard) : boolean
+            + addPlaceCardInDefausse(cards : PlaceCard[*]) : boolean
+            + playPlaceCard(card : PlaceCard) : boolean
+            + playPlaceCard(cards : PlaceCard[*]) : boolean
+            + getSurvivalCardsDeck() : Deck<SurvivalCard>
+            + getSurvivalCardsHand() : SurvivalCard[*]
+            + getSurvivalCardsPlayed() : SurvivalCard[*]
+            + survivalCardHandSize() : Integer
+            + survivalCardPlayedSize() : Integer
+            + survivalCardIsEmpty() : boolean
+            + survivalCardPlayedIsEmpty() : boolean
+            - clearSurvivalCardPlayed()
+            + addSurvivalCard(card : SurvivalCard) : boolean
+            + addSurvivalCard(cards : SurvivalCard[*]) : boolean
+            + removeSurvivalCard(card : SurvivalCard) : boolean
+            + removeSurvivalCard(cards : SurvivalCard[*]) : boolean
+            + playSurvivalCard(card : SurvivalCard) : boolean
+            + playSurvivalCard(cards : SurvivalCard[*]) : boolean
+
+
         }
 
-        Hand <|-- HandCreature
-        Hand <|-- HandTraque
 
         HandTraque "1" -- "1" PlaceCardDeck
         HandCreature "1" -- "1" Deck

not-alone-server/src/main/java/fr/univnantes/alma/server/game/item/player/hand/HandTraque.java

@@ -65,12 +65,12 @@ public class HandTraque {
         return placeCards.getDefausse();
     }
 
-    public void setPlaceCards(List<PlaceCard> cards) {
-        placeCards.setPlaceCards(cards);
+    public void setPlaceCards(List<PlaceCard> placeCards) {
+        this.placeCards.setPlaceCards(placeCards);
     }
 
-    public void setDefausse(List<PlaceCard> cards) {
-        placeCards.setDefausse(cards);
+    public void setDefausse(List<PlaceCard> placeCards) {
+        this.placeCards.setDefausse(placeCards);
     }
 
     public PlaceCardDeck getPlaceCardsDeck(){