diff --git a/.gitattributes b/.gitattributes index c939a6b2771..6323c0b4b0c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -11231,6 +11231,7 @@ res/cardsfolder/t/thran_golem.txt svneol=native#text/plain res/cardsfolder/t/thran_lens.txt svneol=native#text/plain res/cardsfolder/t/thran_quarry.txt svneol=native#text/plain res/cardsfolder/t/thran_tome.txt -text +res/cardsfolder/t/thran_turbine.txt -text res/cardsfolder/t/thran_war_machine.txt svneol=native#text/plain res/cardsfolder/t/thran_weaponry.txt -text svneol=unset#text/plain res/cardsfolder/t/thrashing_mossdog.txt -text diff --git a/res/cardsfolder/t/thran_turbine.txt b/res/cardsfolder/t/thran_turbine.txt new file mode 100644 index 00000000000..de2eb01c40e --- /dev/null +++ b/res/cardsfolder/t/thran_turbine.txt @@ -0,0 +1,11 @@ +Name:Thran Turbine +ManaCost:1 +Types:Artifact +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ ChooseAmount | TriggerDescription$ At the beginning of your upkeep, you may add 1 or 2 to your mana pool. You can't spend this mana to cast spells. +SVar:ChooseAmount:DB$ ChooseNumber | Min$ 0 | Max$ 2 | ListTitle$ Choose the amount of mana | SubAbility$ DBMana +SVar:DBMana:DB$ Mana | Amount$ X | References$ X | Produced$ 1 | RestrictValid$ nonSpell +SVar:X:Count$ChosenNumber +SVar:RemAIDeck:True +SVar:Picture:http://www.wizards.com/global/images/magic/general/thran_turbine.jpg +Oracle:At the beginning of your upkeep, you may add {1} or {2} to your mana pool. You can't spend this mana to cast spells. +SetInfo:USG Uncommon \ No newline at end of file diff --git a/src/main/java/forge/card/spellability/AbilityManaPart.java b/src/main/java/forge/card/spellability/AbilityManaPart.java index 5ebe0238f87..55883740363 100644 --- a/src/main/java/forge/card/spellability/AbilityManaPart.java +++ b/src/main/java/forge/card/spellability/AbilityManaPart.java @@ -175,6 +175,10 @@ public class AbilityManaPart implements java.io.Serializable { // Loop over restrictions for (String restriction : this.manaRestrictions.split(",")) { + if (restriction.equals("nonSpell")) { + return !sa.isSpell(); + } + if (restriction.startsWith("CostContainsX")) { if (sa.isXCost()) { return true;