Merge branch 'chosennumber' into 'master'

add chosen number to card detail pane

Closes #1668

See merge request core-developers/forge!3505

forge-game/src/main/java/forge/game/card/Card.java

@@ -1437,6 +1437,7 @@ public class Card extends GameEntity implements Comparable<Card> {
     }
     public final void setChosenNumber(final int i) {
         chosenNumber = i;
+        view.updateChosenNumber(this);
     }
 
     public final Card getExiledWith() {

forge-game/src/main/java/forge/game/card/CardView.java

@@ -306,6 +306,13 @@ public class CardView extends GameEntityView {
         set(TrackableProperty.ChosenType, c.getChosenType());
     }
 
+    public String getChosenNumber() {
+        return get(TrackableProperty.ChosenNumber);
+    }
+    void updateChosenNumber(Card c) {
+        set(TrackableProperty.ChosenNumber, c.getChosenNumber().toString());
+    }
+
     public List<String> getChosenColors() {
         return get(TrackableProperty.ChosenColors);
     }

forge-game/src/main/java/forge/trackable/TrackableProperty.java

@@ -50,6 +50,7 @@ public enum TrackableProperty {
     ChosenType(TrackableTypes.StringType),
     ChosenColors(TrackableTypes.StringListType),
     ChosenCards(TrackableTypes.CardViewCollectionType),
+    ChosenNumber(TrackableTypes.StringType),
     ChosenPlayer(TrackableTypes.PlayerViewType),
     ChosenDirection(TrackableTypes.EnumType(Direction.class)),
     ChosenEvenOdd(TrackableTypes.EnumType(EvenOdd.class)),

forge-gui/src/main/java/forge/card/CardDetailUtil.java

@@ -416,6 +416,14 @@ public class CardDetailUtil {
             area.append(")");
         }
 
+        // chosen number
+        if (!card.getChosenNumber().isEmpty()) {
+            if (area.length() != 0) {
+                area.append("\n");
+            }
+            area.append("(chosen number: ").append(card.getChosenNumber()).append(")");
+        }
+
         // chosen player
         if (card.getChosenPlayer() != null) {
             if (area.length() != 0) {