Merge pull request #986 from squee1968/5moresqueecards

5moresqueecards

forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java

@@ -843,7 +843,7 @@ public final class StaticAbilityContinuous {
                                     newSA.getRestrictions().setLimitToCheck(params.get("GainsAbilitiesLimitPerTurn"));
                                 }
                                 if (params.containsKey("GainsAbilitiesActivateIgnoreColor")) {
-                                    newSA.putParam("ActivateIgnoreColor","True");
+                                    newSA.putParam("ActivateIgnoreColor", params.get("GainsAbilitiesActivateIgnoreColor"));
                                 }
                                 newSA.setOriginalAbility(sa); // need to be set to get the Once Per turn Clause correct
                                 newSA.setGrantorStatic(stAb);

forge-gui/res/cardsfolder/s/scheming_fence.txt

@@ -5,7 +5,7 @@ PT:2/3
 K:ETBReplacement:Other:ChooseCard
 SVar:ChooseCard:DB$ ChooseCard | Choices$ Permanent.nonLand | MinAmount$ 0 | ChoiceTitle$ You may choose a nonland permanent | AILogic$ OppPreferred | SpellDescription$ As CARDNAME enters the battlefield, you may choose a nonland permanent.
 S:Mode$ Continuous | Affected$ Card.ChosenCard | AddHiddenKeyword$ CARDNAME's activated abilities can't be activated. | Description$ Activated abilities of the chosen permanent can't be activated.
-S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Battlefield | GainsAbilitiesOfDefined$ ChosenCard | GainsValidAbilities$ Activated.nonLoyalty | GainsAbilitiesActivateIgnoreColor$ True | Description$ CARDNAME has all activated abilities of the chosen permanent except for loyalty abilities. You may spend mana as though it were mana of any color to activate those abilities.
+S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Battlefield | GainsAbilitiesOfDefined$ ChosenCard | GainsValidAbilities$ Activated.nonLoyalty | GainsAbilitiesActivateIgnoreColor$ AnyType->AnyColor | Description$ CARDNAME has all activated abilities of the chosen permanent except for loyalty abilities. You may spend mana as though it were mana of any color to activate those abilities.
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Static$ True | ValidCard$ Card.ChosenCard | Execute$ TrigCleanup
 SVar:TrigCleanup:DB$ Cleanup | ClearChosenCard$ True
 Oracle:As Scheming Fence enters the battlefield, you may choose a nonland permanent.\nActivated abilities of the chosen permanent can't be activated.\nScheming Fence has all activated abilities of the chosen permanent except for loyalty abilities. You may spend mana as though it were mana of any color to activate those abilities.

forge-gui/res/cardsfolder/upcoming/ghost_lantern_bind_spirit.txt

@@ -0,0 +1,17 @@
+Name:Ghost Lantern
+ManaCost:B
+Types:Artifact Equipment
+K:Equip:1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainCounter | TriggerDescription$ Whenever a creature you control dies, put a +1/+1 counter on equipped creature.
+SVar:TrigGainCounter:DB$ PutCounter | Defined$ Equipped | CounterType$ P1P1
+DeckHas:Ability$Counters
+Oracle:Whenever a creature you control dies, put a +1/+1 counter on equipped creature.\nEquip {1}
+
+ALTERNATE
+
+Name:Bind Spirit
+ManaCost:1 B
+Types:Instant Adventure
+A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature in your graveyard | SpellDescription$ Return target creature card from your graveyard to your hand
+DeckHas:Ability$Graveyard
+Oracle:Return target creature card from your graveyard to your hand.

forge-gui/res/cardsfolder/upcoming/githzerai_monk.txt

@@ -0,0 +1,10 @@
+Name:Githzerai Monk
+ManaCost:4 W
+Types:Creature Gith Monk
+PT:3/2
+K:Flash
+K:Flying
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigTapAll | TriggerDescription$ Psychic Defense — When CARDNAME enters the battlefield, tap all creatures you don't control.
+SVar:TrigTapAll:DB$ TapAll | ValidCards$ Creature.YouDontCtrl
+SVar:PlayMain1:TRUE
+Oracle:Flash\nFlying\nPsychic Defense — When Githzerai Monk enters the battlefield, tap all creatures you don't control.

forge-gui/res/cardsfolder/upcoming/green_slime.txt

@@ -0,0 +1,10 @@
+Name:Green Slime
+ManaCost:2 G
+Types:Creature Ooze
+PT:2/2
+K:Flash
+K:Foretell: G
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigCounterAbility | SpellDescription$ When CARDNAME enters the battlefield, counter target activated or triggered ability from an artifact or enchantment source. If a permanent's ability is countered this way, destroy that permanent.
+SVar:TrigCounterAbility:DB$ Counter | TargetType$ Activated,Triggered | TgtPrompt$ Select target activated or triggered ability from an artifact or enchantment source | ValidTgts$ Artifact,Enchantment | DestroyPermanent$ True
+AI:RemoveDeck:Random
+Oracle:Flash\nWhen Green Slime enters the battlefield, counter target activated or triggered ability from an artifact or enchantment source. If a permanent's ability is countered this way, destroy that permanent.\nFortell {G}

forge-gui/res/cardsfolder/upcoming/grell_philosopher.txt

@@ -0,0 +1,11 @@
+Name:Grell Philosopher
+ManaCost:2 U
+Types:Creature Horror Wizard
+PT:1/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEffect | TriggerDescription$ Aberrant Tinkering — When CARDNAME enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn. You may spend blue mana as though it were mana of any color to pay the activation costs of CARDNAME's abilities.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigEffect | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ Aberrant Tinkering — When CARDNAME enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn. You may spend blue mana as though it were mana of any color to pay the activation costs of CARDNAME's abilities.
+SVar:TrigEffect:DB$ Effect | ValidTgts$ Card.Artifact+OppCtrl | TgtZone$ Battlefield | TgtPrompt$ Select target artifact an opponent controls | StaticAbilities$ STSteal | ImprintCards$ Targeted | RememberObjects$ Valid Creature.Horror+YouCtrl | ForgetOnMoved$ Battlefield
+SVar:STSteal:Mode$ Continuous | Affected$ Card.IsRemembered | EffectZone$ Command | GainsAbilitiesOfDefined$ ImprintedLKI | GainsAbilitiesActivateIgnoreColor$ U->AnyColor
+AI:RemoveDeck:All
+DeckHints:Type$Horror
+Oracle:Aberrant Tinkering — When Grell Philosopher enters the battlefield and at the beginning of your upkeep, each Horror you control gains all activated abilities of target artifact an opponent controls until end of turn. You may spend blue mana as though it were mana of any color to activate those abilities.

forge-gui/res/cardsfolder/upcoming/hammers_of_moradin.txt

@@ -0,0 +1,10 @@
+Name:Hammers of Moradin
+ManaCost:2 W
+Types:Creature Dwarf Cleric
+PT:3/3
+K:Myriad
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TapOneEach | TriggerDescription$ Whenever CARDNAME attacks, for each opponent, tap up to one target creature that player controls.
+SVar:TapOneEach:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Choose one target creature that each opponent controls | TargetMin$ 0 | TargetMax$ OneEach | TargetsWithDifferentControllers$ True
+SVar:OneEach:PlayerCountOpponents$Amount
+SVar:HasAttackEffect:TRUE
+Oracle:Myriad\nWhenever Hammers of Moradin attacks, for each opponent, tap up to one target creature that player controls.

forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java

@@ -139,11 +139,11 @@ public class HumanPlaySpellAbility {
                 }
             }
             if (ability.hasParam("ActivateIgnoreColor")) {
-                AbilityUtils.applyManaColorConversion(payment, MagicColor.Constant.ANY_COLOR_CONVERSION);
+                params.put("ManaConversion", ability.getParam("ActivateIgnoreColor"));
                 manaColorConversion = true;
             }
 
-            if (keywordColor) {
+            if (keywordColor || manaColorConversion) {
                 AbilityUtils.applyManaColorConversion(payment, params);
             }
         }