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

add TargetsWithDifferentCMC param

Browse Source
This commit is contained in:
Northmoc
2020-09-16 17:06:19 -04:00
parent b9884a6513
commit f829e218ba
3 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-game/src/main/java/forge/game/ability/AbilityFactory.java
View File

@@ -347,6 +347,9 @@ public final class AbilityFactory {
if (mapParams.containsKey("TargetsWithDifferentControllers")) {
abTgt.setDifferentControllers(true);
}
if (mapParams.containsKey("TargetsWithDifferentCMC")) {
abTgt.setDifferentCMC(true);
}
if (mapParams.containsKey("DividedAsYouChoose")) {
abTgt.calculateStillToDivide(mapParams.get("DividedAsYouChoose"), null, null);
abTgt.setDividedAsYouChoose(true);

15
forge-game/src/main/java/forge/game/spellability/TargetRestrictions.java
View File

@@ -62,6 +62,7 @@ public class TargetRestrictions {
private boolean uniqueTargets = false;
private boolean singleZone = false;
private boolean differentControllers = false;
private boolean differentCMC = false;
private boolean sameController = false;
private boolean withoutSameCreatureType = false;
private boolean withSameCreatureType = false;
@@ -105,6 +106,7 @@ public class TargetRestrictions {
this.uniqueTargets = target.isUniqueTargets();
this.singleZone = target.isSingleZone();
this.differentControllers = target.isDifferentControllers();
this.differentCMC = target.isDifferentCMC();
this.sameController = target.isSameController();
this.withoutSameCreatureType = target.isWithoutSameCreatureType();
this.withSameCreatureType = target.isWithSameCreatureType();
@@ -675,6 +677,19 @@ public class TargetRestrictions {
this.randomTarget = random;
}
/**
* @return the differentCMC
*/
public boolean isDifferentCMC() {
return differentCMC;
}
/**
* @param different the differentCMC to set
*/
public void setDifferentCMC(boolean different) {
this.differentCMC = different;
}
/**
* @return the differentControllers
*/

17
forge-gui/src/main/java/forge/match/input/InputSelectTargets.java
View File

@@ -189,7 +189,7 @@ public final class InputSelectTargets extends InputSyncronizedBase {
}
}
// If all cards must have different controllers
// If all cards must have same controllers
if (tgt.isSameController()) {
final List<Player> targetedControllers = new ArrayList<>();
for (final GameObject o : targetDepth.keySet()) {
@@ -219,6 +219,21 @@ public final class InputSelectTargets extends InputSyncronizedBase {
}
}
// If all cards must have different CMC
if (tgt.isDifferentCMC()) {
final List<Integer> targetedCMCs = new ArrayList<>();
for (final GameObject o : targetDepth.keySet()) {
if (o instanceof Card) {
final Integer cmc = ((Card) o).getCMC();
targetedCMCs.add(cmc);
}
}
if (targetedCMCs.contains(card.getCMC())) {
showMessage(sa.getHostCard() + " - Cannot target this card (must have different CMC)");
return false;
}
}
if (!choices.contains(card)) {
showMessage(sa.getHostCard() + " - The selected card is not a valid choice to be targeted.");
return false;