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

Small fix for ExileFromHand Input

Browse Source
This commit is contained in:
Sol
2011-08-25 00:15:57 +00:00
parent 631821a038
commit 6132594038
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/card/cost/CostExile.java
View File

@@ -15,7 +15,7 @@ public class CostExile extends CostPartWithList {
//Exile<Num/Type{/TypeDescription}> //Exile<Num/Type{/TypeDescription}>
//ExileFromHand<Num/Type{/TypeDescription}> //ExileFromHand<Num/Type{/TypeDescription}>
//ExileFromGraveyard<Num/Type{/TypeDescription}> //ExileFromGraveyard<Num/Type{/TypeDescription}>
//ExileFromLibrary<Num/Type{/TypeDescription}> //ExileFromTop<Num/Type{/TypeDescription}> (of library)
private String from = Constant.Zone.Battlefield; private String from = Constant.Zone.Battlefield;

10
src/main/java/forge/card/cost/Cost_Input.java
View File

@@ -469,8 +469,11 @@ public class Cost_Input {
if (nLeft > 1) { if (nLeft > 1) {
msg.append("s"); msg.append("s");
} }
typeList = AllZoneUtil.getPlayerCardsInPlay(sa.getSourceCard().getController()); if (part.getFrom().equals(Constant.Zone.Hand)){
msg.append(" from your Hand");
}
typeList = AllZoneUtil.getCardsInZone(part.getFrom(), sa.getActivatingPlayer());
typeList = typeList.getValidCards(type.split(";"), sa.getActivatingPlayer(), sa.getSourceCard()); typeList = typeList.getValidCards(type.split(";"), sa.getActivatingPlayer(), sa.getSourceCard());
AllZone.getDisplay().showMessage(msg.toString()); AllZone.getDisplay().showMessage(msg.toString());
ButtonUtil.enableOnlyCancel(); ButtonUtil.enableOnlyCancel();
@@ -515,10 +518,11 @@ public class Cost_Input {
public static Input exileFrom(final SpellAbility sa, final CostExile part, final String type, final Cost_Payment payment, final int nNeeded) { public static Input exileFrom(final SpellAbility sa, final CostExile part, final String type, final Cost_Payment payment, final int nNeeded) {
Input target = new Input() { Input target = new Input() {
private static final long serialVersionUID = 734256837615635021L; private static final long serialVersionUID = 734256837615635021L;
CardList typeList;
@Override @Override
public void showMessage() { public void showMessage() {
CardList typeList = AllZoneUtil.getCardsInZone(part.getFrom(), sa.getActivatingPlayer()); typeList = AllZoneUtil.getCardsInZone(part.getFrom(), sa.getActivatingPlayer());
typeList = typeList.getValidCards(type.split(";"), sa.getActivatingPlayer(), sa.getSourceCard()); typeList = typeList.getValidCards(type.split(";"), sa.getActivatingPlayer(), sa.getSourceCard());
for (int i = 0; i < nNeeded; i++) { for (int i = 0; i < nNeeded; i++) {