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

- Added Diaochan, Artful Beauty

Browse Source
This commit is contained in:
swordshine
2014-03-05 05:08:04 +00:00
parent 34c2d37b46
commit cd45fd824d
7 changed files with 57 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,10 @@ public final class InputSelectTargets extends InputSyncronizedBase {
sb.append(" (").append(o.getValue()).append(" times)");
sb.append("\n");
}
if (!sa.getUniqueTargets().isEmpty()) {
sb.append("Parent Targeted:");
sb.append(sa.getUniqueTargets()).append("\n");
}
sb.append(sa.getHostCard() + " - " + tgt.getVTSelection());
int maxTargets = tgt.getMaxTargets(sa.getHostCard(), sa);

14
forge-gui/src/main/java/forge/gui/player/HumanPlaySpellAbility.java
View File

@@ -39,6 +39,7 @@ import forge.game.zone.Zone;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
@@ -139,9 +140,16 @@ public class HumanPlaySpellAbility {
TargetRestrictions tgt = currentAbility.getTargetRestrictions();
if (tgt != null && tgt.doesTarget()) {
clearTargets(currentAbility);
Player targetingPlayer = ability.hasParam("TargetingPlayer") ?
AbilityUtils.getDefinedPlayers(source, ability.getParam("TargetingPlayer"), currentAbility).get(0) : ability.getActivatingPlayer();
Player targetingPlayer;
if (currentAbility.hasParam("TargetingPlayer")) {
List<Player> candidates = AbilityUtils.getDefinedPlayers(source, currentAbility.getParam("TargetingPlayer"), currentAbility);
// activator chooses targeting player
targetingPlayer = ability.getActivatingPlayer().getController().chooseSingleEntityForEffect(
candidates, currentAbility, "Choose the targeting player");
} else {
targetingPlayer = ability.getActivatingPlayer();
}
if (!targetingPlayer.getController().chooseTargetsFor(currentAbility))
return false;
}