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

Merge branch 'unblink' into 'master'

Browse Source 
MID: Unblinking Observer and support

See merge request core-developers/forge!5407
This commit is contained in:
Michael Kamensky
2021-09-22 03:14:54 +00:00
parent f0de6a79dd 7abb206b4c
commit b4ab53b1e8
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
View File

@@ -308,9 +308,8 @@ public class AbilityManaPart implements java.io.Serializable {
if (restriction.equals("CumulativeUpkeep")) { if (restriction.equals("CumulativeUpkeep")) {
if (sa.isCumulativeupkeep()) { if (sa.isCumulativeupkeep()) {
return true; return true;
} else {
continue;
} }
continue;
} }
if (restriction.startsWith("CostContainsX")) { if (restriction.startsWith("CostContainsX")) {
@@ -319,13 +318,20 @@ public class AbilityManaPart implements java.io.Serializable {
} }
continue; continue;
} }
if (restriction.equals("Disturb")) {
if (sa.isDisturb()) {
return true;
}
continue;
}
if (restriction.equals("MorphOrManifest")) { if (restriction.equals("MorphOrManifest")) {
if ((sa.isSpell() && sa.getHostCard().isCreature() && sa.isCastFaceDown()) if ((sa.isSpell() && sa.getHostCard().isCreature() && sa.isCastFaceDown())
|| sa.isManifestUp() || sa.isMorphUp()) { || sa.isManifestUp() || sa.isMorphUp()) {
return true; return true;
} else {
continue;
} }
continue;
} }
if (sa.isValid(restriction, this.getSourceCard().getController(), this.getSourceCard(), null)) { if (sa.isValid(restriction, this.getSourceCard().getController(), this.getSourceCard(), null)) {

8
forge-gui/res/cardsfolder/upcoming/unblinking_observer.txt Executable file
View File

@@ -0,0 +1,8 @@
Name:Unblinking Observer
ManaCost:1 U
Types:Creature Homunculus
PT:2/1
A:AB$ Mana | Cost$ T | Produced$ U | RestrictValid$ Disturb,Instant,Sorcery | SpellDescription$ Add {U}. Spend this mana only to pay a disturb cost or cast an instant or sorcery spell.
DeckNeeds:Type$Instant|Sorcery
DeckHints:Keyword$Disturb
Oracle:{T}: Add {U}. Spend this mana only to pay a disturb cost or cast an instant or sorcery spell.