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

tweak Sindbad effect to reveal drawn to player before discard

Browse Source
This commit is contained in:
Northmoc
2021-09-29 19:35:42 -04:00
parent 63bfa9aefb
commit cf2086a79b
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/ability/effects/DrawEffect.java
View File

@@ -60,7 +60,11 @@ public class DrawEffect extends SpellAbilityEffect {
final CardCollectionView drawn = p.drawCards(actualNum, sa); final CardCollectionView drawn = p.drawCards(actualNum, sa);
if (sa.hasParam("Reveal")) { if (sa.hasParam("Reveal")) {
p.getGame().getAction().reveal(drawn, p); if (sa.getParam("Reveal").equals("All")) {
p.getGame().getAction().reveal(drawn, p, false);
} else {
p.getGame().getAction().reveal(drawn, p);
}
} }
if (sa.hasParam("RememberDrawn")) { if (sa.hasParam("RememberDrawn")) {
for (final Card c : drawn) { for (final Card c : drawn) {

7
forge-gui/res/cardsfolder/f/faadiyah_seer.txt
View File

@@ -2,8 +2,7 @@ Name:Fa'adiyah Seer
ManaCost:1 G ManaCost:1 G
Types:Creature Human Shaman Types:Creature Human Shaman
PT:1/1 PT:1/1
A:AB$ Draw | Cost$ T | NumCards$ 1 | Reveal$ True | RememberDrawn$ True | SubAbility$ DBDiscard | SpellDescription$ Draw a card and reveal it. If it isn't a land card, discard it. A:AB$ Draw | Cost$ T | NumCards$ 1 | Reveal$ All | RememberDrawn$ True | SubAbility$ DBDiscard | StackDescription$ SpellDescription | SpellDescription$ Draw a card and reveal it. If it isn't a land card, discard it.
SVar:DBDiscard:DB$ Discard | Mode$ Defined | Defined$ You | DefinedCards$ Remembered | ConditionDefined$ Remembered | ConditionPresent$ Card.nonLand | ConditionCompare$ EQ1 | SubAbility$ DBCleanup SVar:DBDiscard:DB$ Discard | Mode$ Defined | Defined$ You | DefinedCards$ Remembered | ConditionDefined$ Remembered | ConditionPresent$ Card.nonLand | ConditionCompare$ EQ1 | StackDescription$ None | SubAbility$ DBCleanup
SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:Picture:http://www.wizards.com/global/images/magic/general/faadiyah_seer.jpg
Oracle:{T}: Draw a card and reveal it. If it isn't a land card, discard it. Oracle:{T}: Draw a card and reveal it. If it isn't a land card, discard it.

7
forge-gui/res/cardsfolder/s/sindbad.txt
View File

@@ -2,8 +2,7 @@ Name:Sindbad
ManaCost:1 U ManaCost:1 U
Types:Creature Human Types:Creature Human
PT:1/1 PT:1/1
A:AB$ Draw | Cost$ T | NumCards$ 1 | Reveal$ True | RememberDrawn$ True | SubAbility$ DBDiscard | SpellDescription$ Draw a card and reveal it. If it isn't a land card, discard it. A:AB$ Draw | Cost$ T | NumCards$ 1 | Reveal$ All | RememberDrawn$ True | SubAbility$ DBDiscard | StackDescription$ SpellDescription | SpellDescription$ Draw a card and reveal it. If it isn't a land card, discard it.
SVar:DBDiscard:DB$ Discard | Mode$ Defined | Defined$ You | DefinedCards$ Remembered | ConditionDefined$ Remembered | ConditionPresent$ Card.nonLand | ConditionCompare$ EQ1 | SubAbility$ DBCleanup SVar:DBDiscard:DB$ Discard | Mode$ Defined | Defined$ You | DefinedCards$ Remembered | ConditionDefined$ Remembered | ConditionPresent$ Card.nonLand | ConditionCompare$ EQ1 | SubAbility$ DBCleanup | StackDescription$ None
SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:Picture:http://www.wizards.com/global/images/magic/general/sindbad.jpg
Oracle:{T}: Draw a card and reveal it. If it isn't a land card, discard it. Oracle:{T}: Draw a card and reveal it. If it isn't a land card, discard it.