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

- Added Death or Glory.

Browse Source
This commit is contained in:
Sloth
2012-02-16 18:03:14 +00:00
parent f0504c8934
commit cc658ee7e5
7 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@@ -1992,6 +1992,7 @@ res/cardsfolder/d/death_grasp.txt svneol=native#text/plain
res/cardsfolder/d/death_hood_cobra.txt svneol=native#text/plain
res/cardsfolder/d/death_mutation.txt svneol=native#text/plain
res/cardsfolder/d/death_of_a_thousand_stings.txt svneol=native#text/plain
res/cardsfolder/d/death_or_glory.txt -text
res/cardsfolder/d/death_pit_offering.txt svneol=native#text/plain
res/cardsfolder/d/death_pits_of_rath.txt svneol=native#text/plain
res/cardsfolder/d/death_pulse.txt svneol=native#text/plain

13
res/cardsfolder/d/death_or_glory.txt Normal file
View File

@@ -0,0 +1,13 @@
Name:Death or Glory
ManaCost:4 W
Types:Sorcery
Text:no text
A:SP$ TwoPiles | Cost$ 4 W | Defined$ You | Separator$ You | Chooser$ Opponent | ChosenPile$ DBReturn | UnchosenPile$ DBExile | ValidCards$ Creature | Zone$ Graveyard | SpellDescription$ Separate all creature cards in your graveyard into two piles. Exile the pile of an opponent's choice and return the other to the battlefield.
SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Battlefield
SVar:DBExile:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Exile
SVar:RemAIDeck:True
SVar:Rarity:Rare
SVar:Picture:http://www.wizards.com/global/images/magic/general/death_or_glory.jpg
SetInfo:INV|Rare|http://magiccards.info/scans/en/in/13.jpg
Oracle:Separate all creature cards in your graveyard into two piles. Exile the pile of an opponent's choice and return the other to the battlefield.
End

2
res/cardsfolder/d/do_or_die.txt
View File

@@ -2,7 +2,7 @@ Name:Do or Die
ManaCost:1 B
Types:Sorcery
Text:no text
A:SP$ TwoPiles | Cost$ 1 B | ValidTgts$ Player | TgtPrompt$ Select target player | Separator$ You | ChosenPile$ DBDestroy | ValidCards$ Creature | SpellDescription$ Separate all creatures target player controls into two piles. Destroy all creatures in the pile of that player's choice. They can't be regenerated.
A:SP$ TwoPiles | Cost$ 1 B | ValidTgts$ Player | TgtPrompt$ Select target player | Separator$ You | ChosenPile$ DBDestroy | ValidCards$ Creature | Zone$ Battlefield | SpellDescription$ Separate all creatures target player controls into two piles. Destroy all creatures in the pile of that player's choice. They can't be regenerated.
SVar:DBDestroy:DB$ Destroy | Defined$ Remembered | NoRegen$ True
SVar:RemAIDeck:True
SVar:Rarity:Rare

2
res/cardsfolder/f/fact_or_fiction.txt
View File

@@ -3,7 +3,7 @@ ManaCost:3 U
Types:Instant
Text:no text
A:SP$ Dig | Cost$ 3 U | DigNum$ 5 | Reveal$ True | RememberRevealed$ True | NoMove$ True | SubAbility$ DBTwoPiles | SpellDescription$ Reveal the top five cards of your library. An opponent separates those cards into two piles. Put one pile into your hand and the other into your graveyard.
SVar:DBTwoPiles:DB$ TwoPiles | Defined$ You | DefinedCards$ Remembered | Separator$ Opponent | ChosenPile$ DBHand | ChosenPile$ DBHand | UnchosenPile$ DBGrave
SVar:DBTwoPiles:DB$ TwoPiles | Defined$ You | DefinedCards$ Remembered | Separator$ Opponent | ChosenPile$ DBHand | UnchosenPile$ DBGrave
SVar:DBHand:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Hand
SVar:DBGrave:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Graveyard
SVar:Rarity:Uncommon

2
res/cardsfolder/s/sphinx_of_uthuun.txt
View File

@@ -6,7 +6,7 @@ PT:5/5
K:Flying
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, reveal the top five cards of your library. An opponent separates those cards into two piles. Put one pile into your hand and the other into your graveyard.
SVar:TrigChangeZone:AB$Dig | Cost$ 0 | DigNum$ 5 | Reveal$ True | RememberRevealed$ True | NoMove$ True | SubAbility$ DBTwoPiles | SpellDescription$ Reveal the top five cards of your library. An opponent separates those cards into two piles. Put one pile into your hand and the other into your graveyard.
SVar:DBTwoPiles:DB$ TwoPiles | Defined$ You | DefinedCards$ Remembered | Separator$ Opponent | ChosenPile$ DBHand | ChosenPile$ DBHand | UnchosenPile$ DBGrave
SVar:DBTwoPiles:DB$ TwoPiles | Defined$ You | DefinedCards$ Remembered | Separator$ Opponent | ChosenPile$ DBHand | UnchosenPile$ DBGrave
SVar:DBHand:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Hand
SVar:DBGrave:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Graveyard | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True

6
src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
View File

@@ -1029,7 +1029,7 @@ public final class AbilityFactoryChangeZone {
if (params.containsKey("AtRandom")) {
c = CardUtil.getRandom(fetchList.toArray());
} else if (defined) {
c = fetchList.get(i);
c = fetchList.get(0);
} else if (type.contains("Basic")) {
c = AbilityFactoryChangeZone.basicManaFixing(fetchList);
} else if (AbilityFactoryChangeZone.areAllBasics(type)) {
@@ -1060,9 +1060,7 @@ public final class AbilityFactoryChangeZone {
}
fetched.add(c);
if (!defined) {
fetchList.remove(c);
}
fetchList.remove(c);
}
if (origin.contains(Zone.Library) && !defined) {

16
src/main/java/forge/card/abilityfactory/AbilityFactoryClash.java
View File

@@ -620,7 +620,7 @@ public final class AbilityFactoryClash {
Constant.Zone zone = null;
boolean pile1WasChosen = true;
if (params.containsKey("Origin")) {
if (params.containsKey("Zone")) {
zone = Constant.Zone.smartValueOf(params.get("Zone"));
}
@@ -666,10 +666,11 @@ public final class AbilityFactoryClash {
final List<Card> l = GuiUtils.getChoicesOptional("Put into pile 1 (multi-select)", pool.toArray());
for (final Card c : l) {
pile1.add(c);
pool.remove(c);
}
for (final Card c : pool) {
pile2.add(c);
if (!pile1.contains(c)) {
pile2.add(c);
}
}
} else if (size > 0) {
//computer separates
@@ -736,8 +737,13 @@ public final class AbilityFactoryClash {
}
} else {
final int cmc1 = CardFactoryUtil.evaluatePermanentList(new CardList(pile1));
final int cmc2 = CardFactoryUtil.evaluatePermanentList(new CardList(pile2));
int cmc1 = CardFactoryUtil.evaluatePermanentList(new CardList(pile1));
int cmc2 = CardFactoryUtil.evaluatePermanentList(new CardList(pile2));
if (pool.getNotType("Creature").isEmpty()) {
cmc1 = CardFactoryUtil.evaluateCreatureList(new CardList(pile1));
cmc2 = CardFactoryUtil.evaluateCreatureList(new CardList(pile2));
System.out.println("value:" + cmc1 + " " + cmc2);
}
// for now, this assumes that the outcome will be bad
// TODO: This should really have a ChooseLogic param to