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

- Fixed spReturnTgt and it will no longer give a null when using Urborg Uprising.

Browse Source
This commit is contained in:
jendave
2011-08-06 09:02:24 +00:00
parent 76e7518c0c
commit e646c1d4ce
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/cardsfolder/urborg_uprising.txt
View File

@@ -1,7 +1,7 @@
Name:Urborg Uprising Name:Urborg Uprising
ManaCost:4 B ManaCost:4 B
Types:Sorcery Types:Sorcery
Text:Return up to two target creature cards from your graveyard to your hand. (NOTE: This spell is rather buggy and should not be used at this time.) Text:Return up to two target creature cards from your graveyard to your hand.
K:spReturnTgt:2/UpTo:Creature:Hand K:spReturnTgt:2/UpTo:Creature:Hand
K:Draw a card. K:Draw a card.
SVar:Rarity:None SVar:Rarity:None

11
src/forge/CardFactory.java
View File

@@ -3860,8 +3860,10 @@ public class CardFactory implements NewConstants {
if (returnUpTo[0]) { if (returnUpTo[0]) {
for (int i = 0; i < numCardsToReturn; i++) { for (int i = 0; i < numCardsToReturn; i++) {
if (!grave.isEmpty()) { if (grave.size() > 0) {
Card c = AllZone.Display.getChoiceOptional("Select a card", grave.toArray()); Object o = AllZone.Display.getChoiceOptional("Select a card", grave.toArray());
if (o == null) break;
Card c = (Card) o;
targets.add(c); targets.add(c);
grave.remove(c); grave.remove(c);
} }
@@ -3869,7 +3871,8 @@ public class CardFactory implements NewConstants {
} else if (grave.size() > numCardsToReturn) { } else if (grave.size() > numCardsToReturn) {
for (int i = 0; i < numCardsToReturn; i++) { for (int i = 0; i < numCardsToReturn; i++) {
Card c = AllZone.Display.getChoice("Select a card", grave.toArray()); Object o = AllZone.Display.getChoice("Select a card", grave.toArray());
Card c = (Card) o;
targets.add(c); targets.add(c);
grave.remove(c); grave.remove(c);
} }
@@ -3878,7 +3881,7 @@ public class CardFactory implements NewConstants {
targets = grave; targets = grave;
} }
if (targets != null && !targets.isEmpty()) { if (targets.size() > 0) {
spRtrnTgt.setTargetList(targets); spRtrnTgt.setTargetList(targets);
stopSetNext(new Input_PayManaCost(spRtrnTgt)); stopSetNext(new Input_PayManaCost(spRtrnTgt));
} else stop(); } else stop();