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

Merge remote-tracking branch 'core/master'

Browse Source
This commit is contained in:
Anthony Calosa
2021-03-10 19:18:35 +08:00
parent 2d51428123 a235c757f5
commit 9c151d2d66
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/res/cardsfolder/d/dredge_the_mire.txt
View File

@@ -5,4 +5,6 @@ A:SP$ RepeatEach | Cost$ 3 B | RepeatPlayers$ Player.Opponent | RepeatSubAbility
SVar:DBChoose:DB$ ChooseCard | Defined$ Player.IsRemembered | Mandatory$ True | Choices$ Creature.RememberedPlayerOwn | ChoiceTitle$ Choose a creature card in your graveyard | ChoiceZone$ Graveyard | RememberChosen$ True | AILogic$ WorstCard
SVar:DBChangeZone:DB$ ChangeZoneAll | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | ChangeType$ Card.IsRemembered | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
SVar:NeedsToPlayVar:Z GE1
SVar:Z:Count$ValidGraveyard Creature.OppOwn
Oracle:Each opponent chooses a creature card in their graveyard. Put those cards onto the battlefield under your control.

3
forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java
View File

@@ -179,7 +179,8 @@ public class ConquestUtil {
return Iterables.filter(FModel.getMagicDb().getCommonCards(), new Predicate<PaperCard>() {
@Override
public boolean apply(PaperCard card) {
if (FModel.getMagicDb().getEditions().get(card.getEdition()).getType() == CardEdition.Type.REPRINT) {
if (FModel.getMagicDb().getEditions().get(card.getEdition()).getType() == CardEdition.Type.PROMOS
|| FModel.getMagicDb().getEditions().get(card.getEdition()).getType() == CardEdition.Type.REPRINT) {
return false; // exclude promos from the starting planeswalker set
}
if (selected.contains(card.getName())) {