From da0e3292d32779c1842a1cb8897d75bb5f7d6aac Mon Sep 17 00:00:00 2001 From: Zach H Date: Tue, 29 Dec 2015 16:50:50 -0500 Subject: [PATCH] Token PT shown in create related dialog --- cockatrice/src/carddatabase.cpp | 7 ++++++- cockatrice/src/player.cpp | 9 ++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/cockatrice/src/carddatabase.cpp b/cockatrice/src/carddatabase.cpp index 41a4976e..433f1d8b 100644 --- a/cockatrice/src/carddatabase.cpp +++ b/cockatrice/src/carddatabase.cpp @@ -660,7 +660,12 @@ void CardDatabase::refreshCachedReverseRelatedCards() if(card->getReverseRelatedCards().isEmpty()) continue; - QString relatedCardName = card->getName(); + QString relatedCardName; + if (card->getPowTough().size() > 0) + relatedCardName = card->getPowTough() + " " + card->getName(); // "n/n name" + else + relatedCardName = card->getName(); // "name" + foreach(QString targetCard, card->getReverseRelatedCards()) { if (!cards.contains(targetCard)) diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp index 135b4056..47b27703 100644 --- a/cockatrice/src/player.cpp +++ b/cockatrice/src/player.cpp @@ -1135,7 +1135,14 @@ void Player::actCreateRelatedCard() // get the target card name QAction *action = static_cast(sender()); - CardInfo *cardInfo = db->getCard(action->text()); + + // removes p/t from tokens (and leading space)) + QStringList spaces = action->text().split(" "); + + if (spaces.at(0).indexOf("/") != -1) // Strip space from creatures + spaces.removeFirst(); + + CardInfo *cardInfo = db->getCard(spaces.join(" ")); // create the token for the related card Command_CreateToken cmd;