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

- C15: added Seal of the Guilds

Browse Source
This commit is contained in:
swordshine
2016-01-03 12:40:11 +00:00
parent 1015e23c27
commit 8310a2c28f
5 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -1459,6 +1459,14 @@ public class AbilityUtils {
return sum;
}
//Count$HasNumChosenColors.<DefinedCards related to spellability>
if (sq[0].contains("HasNumChosenColors")) {
int sum = 0;
for (Card card : AbilityUtils.getDefinedCards(sa.getHostCard(), sq[1], sa)) {
sum += CardUtil.getColors(card).getSharedColors(ColorSet.fromNames(c.getChosenColors())).countColors();
}
return sum;
}
if (sq[0].startsWith("TriggerRememberAmount")) {
final SpellAbility root = sa.getRootAbility();
int count = 0;

4
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -3649,10 +3649,6 @@ public class Card extends GameEntity implements Comparable<Card> {
if (!source.hasChosenColor() || !CardUtil.getColors(this).hasAnyColor(MagicColor.fromName(source.getChosenColor())))
return false;
} else if (property.equals("AllChosenColors")) {
if (!source.hasChosenColor() || !CardUtil.getColors(this).hasAllColors(ColorSet.fromNames(source.getChosenColors()).getColor()))
return false;
} else if (property.equals("AnyChosenColor")) {
if (!source.hasChosenColor() || !CardUtil.getColors(this).hasAnyColor(ColorSet.fromNames(source.getChosenColors()).getColor()))
return false;