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 XChoice to CostDiscard

Browse Source 
Convert Firestorm and Vengeful Dreams to Script
This commit is contained in:
Sol
2011-08-24 01:33:21 +00:00
parent 8d29f7b3ce
commit 633b69ec82
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/forge/card/cardFactory/CardFactory_Instants.java
View File

@@ -1017,6 +1017,7 @@ public class CardFactory_Instants {
//*************** START *********** START **************************
/*
else if (cardName.equals("Vengeful Dreams")) {
final CardList targets = new CardList();
final SpellAbility spell = new Spell(card) {
@@ -1094,8 +1095,8 @@ public class CardFactory_Instants {
card.addSpellAbility(spell);
}//*************** END ************ END **************************
*/
/*
//*************** START *********** START **************************
else if (cardName.equals("Firestorm")) {
final ArrayList<Object> targets = new ArrayList<Object>();
@@ -1187,7 +1188,7 @@ public class CardFactory_Instants {
card.addSpellAbility(spell);
}//*************** END ************ END **************************
*/
//*************** START *********** START **************************
else if (cardName.equals("Cryptic Command")) {

4
src/main/java/forge/card/cost/CostDiscard.java
View File

@@ -175,6 +175,10 @@ public class CostDiscard extends CostPartWithList {
else{
Integer c = convertAmount();
if (c == null){
String sVar = source.getSVar(amount);
if (sVar.equals("XChoice")){
return false;
}
c = AbilityFactory.calculateAmount(source, amount, ability);
}