conception.adoc + modification Creature.java pour la claireté

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

@@ -652,7 +652,10 @@ package planet{
 [plantuml]
 ....
 package player{
-
+    enum PlayerTeam{
+        CREATURE
+        TRAQUE
+    }
     abstract class Player{
         # name : String
         # inGameId : Integer
@@ -746,18 +749,47 @@ package player{
     }
 
     class Creature{
+        - hand : HandCreature
+        - rights : CreatureRight
+        + getHand() : HandCreature
+        + getRights() : CreatureRight
+        + getTeam() : PlayerTeam
+        - reset()
+        - initializationJeton()
+        + jetonsSize() : Integer
+        + jetonsPlayedSize() : Integer
+        + jetonsIsEmpty() : boolean
+        + getJetons() : JetonSymbol[*]
+        + playJeton(jeton : JetonSymbol) : boolean
+        + playJeton(jetons : JetonSymbol[*]) : boolean
+        + jetonsPlayedIsEmpty() : boolean
+        + getMaxTrackingCards() : Integer
+        + getTrackingCardHand() : TrackingCard[*]
+        + getTrackingCardsPlayed() : TrackingCard[*]
+        + trackingCardHandSize() : Integer
+        + trackingCardPlayedSize() : Integer
+        + trackingCardIsEmpty() : Boolean
+        + trackingCardPlayedIsEmpty() : Boolean
+        - clearTrackingCardPlayed()
+        + addTrackingCard(trackingCard : TrackingCard) : Boolean
+        + addTrackingCard(trackingCards : TrackingCard[*]) : Boolean
+        + removeTrackingCard(trackingCard : TrackingCard) : Boolean
+        + removeTrackingCard(trackingCards : TrackingCard[*]) : Boolean
+        + playTrackingCard(trackingCard : TrackingCard) : Boolean
+        + playTrackingCard(trackingCards : TrackingCard[*]) : Boolean
+        - addTrackingCardToApplied(trackingCard : TrackingCard)
+        - addTrackingCardToApplied(trackingCards : TrackingCard[*])
+        - removeTrackingCardToApplied(trackingCard : TrackingCard)
+        - removeTrackingCardToApplied(trackingCards : TrackingCard[*])
+        - setMaxTrackingCardPlayable(maxTrackingCardPlayable : Integer)
+        + getTrackingCardToApplied() : TrackingCard[*]
+        + getMaxTrackingCardPlayable() : Integer
 
-    }
 
-    package playerstatus{
-        abstract class PlayerStatus{
-            # currentPhase : Phase
-            # expectedAction : ActionContainer
-            + getCurrentPhase() : Phase
-            + setCurrentPhase(phase : Phase)
-            + getExpectedAction() : ActionContainer
-        }
 
+    }
+
+    package rights{
         class TraqueStatus{
             - survivalCardsPlayed : SurvivalCard[*]
             - placeCardsPlayed : PlaceCard[*]
@@ -783,22 +815,6 @@ package player{
         }
     }
 
-    Player <|-- Creature
-    Player <|-- Traque
-
-    PlayerStatus <|-- CreatureStatus
-    PlayerStatus <|-- TraqueStatus
-
-    Creature "1" - "1" CreatureStatus
-    Traque "1" - "1" TraqueStatus
-}
-
-....
-
-=== Hand TODO
-.Package hand
-[plantuml]
-....
 package hand{
     class Deck <T extends PlayerCard>{
         - cards : T[*]
@@ -849,9 +865,22 @@ package hand{
     HandCreature "1" -- "1" Deck
     HandTraque "1" -- "1" Deck
 }
+
+    Player <|-- Creature
+    Player <|-- Traque
+
+    PlayerStatus <|-- CreatureStatus
+    PlayerStatus <|-- TraqueStatus
+
+    Creature "1" - "1" CreatureStatus
+    Traque "1" - "1" TraqueStatus
+}
+
 ....
 
 
+
+
 === Power
 .Package power
 [plantuml]

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

@@ -118,28 +118,28 @@ public class Creature extends Player {
         hand.clearTrackingCardPlayed();
     }
 
-    public boolean addTrackingCard(TrackingCard card){
-        return hand.addTrackingCard(card);
+    public boolean addTrackingCard(TrackingCard trackingCard){
+        return hand.addTrackingCard(trackingCard);
     }
 
-    public boolean addTrackingCard(List<TrackingCard> cardList){
-        return hand.addTrackingCard(cardList);
+    public boolean addTrackingCard(List<TrackingCard> trackingCards){
+        return hand.addTrackingCard(trackingCards);
     }
 
-    public boolean removeTrackingCard(TrackingCard card){
-        return hand.removeTrackingCard(card);
+    public boolean removeTrackingCard(TrackingCard trackingCard){
+        return hand.removeTrackingCard(trackingCard);
     }
 
-    public boolean removeTrackingCard(List<TrackingCard> cardList){
-        return hand.removeTrackingCard(cardList);
+    public boolean removeTrackingCard(List<TrackingCard> trackingCards){
+        return hand.removeTrackingCard(trackingCards);
     }
 
-    public boolean playTrackingCard(TrackingCard card){
-        return hand.playTrackingCard(card);
+    public boolean playTrackingCard(TrackingCard trackingCard){
+        return hand.playTrackingCard(trackingCard);
     }
 
-    public boolean playTrackingCard(List<TrackingCard> cardList){
-        return hand.playTrackingCard(cardList);
+    public boolean playTrackingCard(List<TrackingCard> trackingCards){
+        return hand.playTrackingCard(trackingCards);
     }
 
     public void addTrackingCardToApplied(TrackingCard trackingCard) {