external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch' into 'master'

Browse Source 
Add Ormos, Archive Keeper

See merge request core-developers/forge!2927
This commit is contained in:
swordshine
2020-06-29 01:00:15 +00:00
parent 52fef4b724 da6188e61c
commit 54e8c6f0ec
9 changed files with 67 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forge-game/src/main/java/forge/game/cost/CostDiscard.java
View File

@@ -18,6 +18,9 @@
package forge.game.cost;
import java.util.Map;
import java.util.Set;
import com.google.common.collect.Sets;
import forge.game.ability.AbilityKey;
import forge.game.card.Card;
@@ -83,6 +86,9 @@ public class CostDiscard extends CostPartWithList {
else if (this.getType().equals("LastDrawn")) {
sb.append("the last card you drew this turn");
}
else if (this.getType().equals("DifferentNames")) {
sb.append(Cost.convertAmountTypeToWords(i, this.getAmount(), "Card")).append(" with different names");
}
else {
final StringBuilder desc = new StringBuilder();
@@ -129,6 +135,13 @@ public class CostDiscard extends CostPartWithList {
final Card c = payer.getLastDrawnCard();
return handList.contains(c);
}
else if (type.equals("DifferentNames")) {
Set<String> cardNames = Sets.newHashSet();
for (Card c : handList) {
cardNames.add(c.getName());
}
return amount != null && cardNames.size() >= amount;
}
else {
boolean sameName = false;
if (type.contains("+WithSameName")) {