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

Make it so "target opponent" cards auto-target your opponent when playing 1v1.

Browse Source
This commit is contained in:
drdev
2014-08-25 22:23:38 +00:00
parent adf11e77da
commit acf3aa6693
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
forge-gui/src/main/java/forge/player/TargetSelection.java
View File

@@ -83,10 +83,12 @@ public class TargetSelection {
boolean hasEnoughTargets = minTargets == 0 || numTargeted >= minTargets; boolean hasEnoughTargets = minTargets == 0 || numTargeted >= minTargets;
boolean hasAllTargets = numTargeted == maxTargets && maxTargets > 0; boolean hasAllTargets = numTargeted == maxTargets && maxTargets > 0;
if (maxTargets == 0) return true; if (maxTargets == 0) { return true; }
// if not enough targets chosen, cancel Ability // if not enough targets chosen, cancel Ability
if (this.bTargetingDone && !hasEnoughTargets) if (this.bTargetingDone && !hasEnoughTargets) {
return false; return false;
}
if (this.bTargetingDone && hasEnoughTargets || hasAllTargets || tgt.isDividedAsYouChoose() && tgt.getStillToDivide() == 0) { if (this.bTargetingDone && hasEnoughTargets || hasAllTargets || tgt.isDividedAsYouChoose() && tgt.getStillToDivide() == 0) {
return true; return true;
@@ -114,6 +116,15 @@ public class TargetSelection {
} }
else { else {
final List<Card> validTargets = this.getValidCardsToTarget(); final List<Card> validTargets = this.getValidCardsToTarget();
if (validTargets.isEmpty()) {
//if no valid cards to target and only one valid non-card, auto-target the non-card
//this handles "target opponent" cards, along with any other cards that can only target a single non-card game entity
//note that we don't handle auto-targeting cards this way since it's possible that the result will be undesirable
List<GameObject> nonCardTargets = tgt.getAllCandidates(this.ability, true);
if (nonCardTargets.size() == 1) {
return ability.getTargets().add(nonCardTargets.get(0));
}
}
final Map<Player, Object> playersWithValidTargets = new HashMap<Player, Object>(); final Map<Player, Object> playersWithValidTargets = new HashMap<Player, Object>();
for (Card card : validTargets) { for (Card card : validTargets) {
playersWithValidTargets.put(card.getController(), null); playersWithValidTargets.put(card.getController(), null);