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

- Added doDrawBack() to spReturnTgt and added Macabre Waltz.

Browse Source
This commit is contained in:
jendave
2011-08-06 09:12:54 +00:00
parent 2a20214a2d
commit 2f06273865
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@@ -2462,6 +2462,7 @@ res/cardsfolder/lux_cannon.txt -text svneol=native#text/plain
res/cardsfolder/lynx.txt -text svneol=native#text/plain res/cardsfolder/lynx.txt -text svneol=native#text/plain
res/cardsfolder/lys_alana_huntmaster.txt -text svneol=native#text/plain res/cardsfolder/lys_alana_huntmaster.txt -text svneol=native#text/plain
res/cardsfolder/ma_chao_western_warrior.txt -text svneol=native#text/plain res/cardsfolder/ma_chao_western_warrior.txt -text svneol=native#text/plain
res/cardsfolder/macabre_waltz.txt -text svneol=native#text/plain
res/cardsfolder/macetail_hystrodon.txt -text svneol=native#text/plain res/cardsfolder/macetail_hystrodon.txt -text svneol=native#text/plain
res/cardsfolder/machinate.txt -text svneol=native#text/plain res/cardsfolder/machinate.txt -text svneol=native#text/plain
res/cardsfolder/mad_auntie.txt -text svneol=native#text/plain res/cardsfolder/mad_auntie.txt -text svneol=native#text/plain

12
res/cardsfolder/macabre_waltz.txt Normal file
View File

@@ -0,0 +1,12 @@
Name:Macabre Waltz
ManaCost:1 B
Types:Sorcery
Text:Return up to two target creature cards from your graveyard to your hand, then discard a card.
K:spReturnTgt:2/UpTo:Creature:Hand:Drawback$YouDiscard/1
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/macabre_waltz.jpg
End
K:spDestroyTgt:Creature.cmcLE3:NoRegen

6
src/forge/CardFactory.java
View File

@@ -3650,7 +3650,7 @@ public class CardFactory implements NewConstants {
* Generic return target card(s) from graveyard to Hand, Battlefield or Top of Library * Generic return target card(s) from graveyard to Hand, Battlefield or Top of Library
* spReturnTgt:{Num Cards/Parameters}:{Type}:{To Zone}:{DrawBack}:{Spell Desc} * spReturnTgt:{Num Cards/Parameters}:{Type}:{To Zone}:{DrawBack}:{Spell Desc}
* *
* DrawBack and X Count/Costs are not yet implemented. * X Count/Costs are not yet implemented.
*/ */
if (hasKeyword(card, "spReturnTgt") != -1) { if (hasKeyword(card, "spReturnTgt") != -1) {
int n = hasKeyword(card, "spReturnTgt"); int n = hasKeyword(card, "spReturnTgt");
@@ -3806,6 +3806,10 @@ public class CardFactory implements NewConstants {
AllZone.GameAction.moveToTopOfLibrary(c); AllZone.GameAction.moveToTopOfLibrary(c);
} }
} }
}// for
if (!Drawback[0].equals("none")) {
CardFactoryUtil.doDrawBack(Drawback[0], 0, card.getController(), AllZone.GameAction.getOpponent(card.getController()), card.getController(), card, card, this);
} }
}// resolve() }// resolve()