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

Fix MayFlashSac

Browse Source
This commit is contained in:
Bug Hunter
2022-01-23 20:20:42 +00:00
committed by Michael Kamensky
parent f5430b7e26
commit 01e9a321a9
6 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -1996,8 +1996,8 @@ public class CardFactoryUtil {
+ " | TriggerDescription$ If you cast it any time a sorcery couldn't have been cast, " + " | TriggerDescription$ If you cast it any time a sorcery couldn't have been cast, "
+ " the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step."; + " the controller of the permanent it becomes sacrifices it at the beginning of the next cleanup step.";
final String strDelay = "DB$ DelayedTrigger | Mode$ Phase | Phase$ Cleanup | TriggerDescription$ At the beginning of the next cleanup step, sacrifice CARDNAME."; final String strDelay = "DB$ DelayedTrigger | Mode$ Phase | Phase$ Cleanup | RememberObjects$ Self | TriggerDescription$ At the beginning of the next cleanup step, sacrifice CARDNAME.";
final String strSac = "DB$ SacrificeAll | Defined$ Self"; final String strSac = "DB$ SacrificeAll | Defined$ DelayTriggerRememberedLKI";
SpellAbility saDelay = AbilityFactory.getAbility(strDelay, card); SpellAbility saDelay = AbilityFactory.getAbility(strDelay, card);
saDelay.setAdditionalAbility("Execute", (AbilitySub) AbilityFactory.getAbility(strSac, card)); saDelay.setAdditionalAbility("Execute", (AbilitySub) AbilityFactory.getAbility(strSac, card));

4
forge-game/src/main/java/forge/game/card/CardPredicates.java
View File

@@ -228,7 +228,7 @@ public final class CardPredicates {
return new Predicate<Card>() { return new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
return (c != null) && c.isValid(restrictions, sourceController, source, spellAbility); return c != null && c.isValid(restrictions, sourceController, source, spellAbility);
} }
}; };
} }
@@ -237,7 +237,7 @@ public final class CardPredicates {
return new Predicate<Card>() { return new Predicate<Card>() {
@Override @Override
public boolean apply(final Card c) { public boolean apply(final Card c) {
return (c != null) && c.isValid(restrictions, sourceController, source, spellAbility); return c != null && c.isValid(restrictions, sourceController, source, spellAbility);
} }
}; };
} }

2
forge-game/src/main/java/forge/game/cost/CostReveal.java
View File

@@ -72,7 +72,7 @@ public class CostReveal extends CostPartWithList {
modifiedHand.remove(source); // can't pay for itself modifiedHand.remove(source); // can't pay for itself
handList = modifiedHand; handList = modifiedHand;
} }
handList = CardLists.getValidCards(handList, getType().split(","), payer, source, ability); handList = CardLists.getValidCards(handList, getType(), payer, source, ability);
return handList.size(); return handList.size();
} }

3
forge-game/src/main/java/forge/game/phase/PhaseType.java
View File

@@ -116,8 +116,7 @@ public enum PhaseType {
String sTo = s.substring(idxArrow + 2); String sTo = s.substring(idxArrow + 2);
PhaseType to = StringUtils.isBlank(sTo) ? PhaseType.CLEANUP : PhaseType.smartValueOf(sTo); PhaseType to = StringUtils.isBlank(sTo) ? PhaseType.CLEANUP : PhaseType.smartValueOf(sTo);
result.addAll(EnumSet.range(from, to)); result.addAll(EnumSet.range(from, to));
} } else {
else {
result.add(PhaseType.smartValueOf(s)); result.add(PhaseType.smartValueOf(s));
} }
} }

2
forge-gui/res/cardsfolder/g/gravecrawler.txt
View File

@@ -3,7 +3,7 @@ ManaCost:B
Types:Creature Zombie Types:Creature Zombie
PT:2/1 PT:2/1
K:CARDNAME can't block. K:CARDNAME can't block.
S:Mode$ Continuous | Affected$ Card.Self | AffectedZone$ GraveYard | EffectZone$ Graveyard | MayPlay$ True | IsPresent$ Zombie.YouCtrl | Description$ You may cast CARDNAME from your graveyard as long as you control a Zombie. S:Mode$ Continuous | Affected$ Card.Self | AffectedZone$ Graveyard | EffectZone$ Graveyard | MayPlay$ True | IsPresent$ Zombie.YouCtrl | Description$ You may cast CARDNAME from your graveyard as long as you control a Zombie.
SVar:SacMe:3 SVar:SacMe:3
SVar:DiscardMe:3 SVar:DiscardMe:3
DeckHints:Type$Zombie DeckHints:Type$Zombie

3
forge-gui/res/cardsfolder/m/marang_river_prowler.txt
View File

@@ -4,9 +4,8 @@ Types:Creature Human Rogue
PT:2/1 PT:2/1
K:Unblockable K:Unblockable
K:CARDNAME can't block. K:CARDNAME can't block.
S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Graveyard | MayPlay$ True | IsPresent$ Permanent.Black+YouCtrl,Permanent.Green+YouCtrl | Description$ You may cast CARDNAME from you graveyard as long as you control a black or green permanent. S:Mode$ Continuous | Affected$ Card.Self | AffectedZone$ Graveyard | EffectZone$ Graveyard | MayPlay$ True | IsPresent$ Permanent.Black+YouCtrl,Permanent.Green+YouCtrl | Description$ You may cast CARDNAME from you graveyard as long as you control a black or green permanent.
SVar:SacMe:3 SVar:SacMe:3
SVar:DiscardMe:3 SVar:DiscardMe:3
DeckHints:Color$Black|Green DeckHints:Color$Black|Green
SVar:Picture:http://www.wizards.com/global/images/magic/general/marang_river_prowler.jpg
Oracle:Marang River Prowler can't block and can't be blocked.\nYou may cast Marang River Prowler from your graveyard as long as you control a black or green permanent. Oracle:Marang River Prowler can't block and can't be blocked.\nYou may cast Marang River Prowler from your graveyard as long as you control a black or green permanent.