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

- Fixed Martyr of Sands.

Browse Source
This commit is contained in:
Sloth
2012-06-25 19:46:34 +00:00
parent 2ae164c44f
commit 3ef3469016
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/cardsfolder/m/martyr_of_sands.txt
View File

@@ -5,7 +5,7 @@ Text:no text
PT:1/1
A:AB$ GainLife | Cost$ 1 Reveal<X/Card.White> Sac<1/CARDNAME> | CostDesc$ 1, Reveal X white cards from your hand, Sacrifice Martyr of Sands: | LifeAmount$ Y | References$ X,Y | SpellDescription$ You gain three times X life.
SVar:X:XChoice
SVar:Y:Number$3/Times.ChosenX
SVar:Y:SVar$ChosenX/Times.3
SVar:RemAIDeck:True
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/martyr_of_sands.jpg

17
src/main/java/forge/card/cost/CostReveal.java
View File

@@ -144,22 +144,25 @@ public class CostReveal extends CostPartWithList {
this.addToList(source);
payment.setPaidManaPart(this, true);
} else {
Integer c = this.convertAmount();
Integer num = this.convertAmount();
CardList handList = activator.getCardsIn(ZoneType.Hand);
handList = handList.getValidCards(this.getType().split(";"), activator, ability.getSourceCard());
if (c == null) {
if (num == null) {
final String sVar = ability.getSVar(amount);
if (sVar.equals("XChoice")) {
c = CostUtil.chooseXValue(source, ability, handList.size());
num = CostUtil.chooseXValue(source, ability, handList.size());
} else {
c = AbilityFactory.calculateAmount(source, amount, ability);
num = AbilityFactory.calculateAmount(source, amount, ability);
}
}
CostUtil.setInput(CostReveal.inputRevealCost(this.getType(), handList, payment, this, ability, c));
if (num > 0) {
CostUtil.setInput(CostReveal.inputRevealCost(this.getType(), handList, payment, this, ability, num));
return false;
} else {
payment.setPaidManaPart(this, true);
}
}
this.addListToHash(ability, "Revealed");
return true;
@@ -240,7 +243,7 @@ public class CostReveal extends CostPartWithList {
this.done();
}
if (AllZone.getHumanPlayer().getZone(ZoneType.Hand).size() < nNeeded) {
if (handList.size() + this.nReveal < nNeeded) {
this.stop();
}
final StringBuilder type = new StringBuilder("");