From 289606d25e18062240279607319c09a62f43d839 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Thu, 29 Sep 2016 12:58:56 +0200
Subject: [PATCH] Some minor fixes to Riptide Replicator and Elvish Guidance.

---
 .../src/mage/sets/onslaught/ElvishGuidance.java | 17 +++++------------
 .../mage/sets/onslaught/RiptideReplicator.java  |  8 ++++----
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/onslaught/ElvishGuidance.java b/Mage.Sets/src/mage/sets/onslaught/ElvishGuidance.java
index 41ce9161940..fc20c132dd6 100644
--- a/Mage.Sets/src/mage/sets/onslaught/ElvishGuidance.java
+++ b/Mage.Sets/src/mage/sets/onslaught/ElvishGuidance.java
@@ -41,7 +41,6 @@ import mage.constants.Outcome;
 import mage.constants.Rarity;
 import mage.constants.Zone;
 import mage.filter.common.FilterCreaturePermanent;
-import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
@@ -60,12 +59,12 @@ public class ElvishGuidance extends CardImpl {
         this.subtype.add("Aura");
 
         // Enchant land
-         TargetPermanent auraTarget = new TargetLandPermanent();
+        TargetPermanent auraTarget = new TargetLandPermanent();
         this.getSpellAbility().addTarget(auraTarget);
-        this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
+        this.getSpellAbility().addEffect(new AttachEffect(Outcome.PutManaInPool));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
-        
+
         // Whenever enchanted land is tapped for mana, its controller adds {G} to his or her mana pool for each Elf on the battlefield.
         this.addAbility(new ElvishGuidanceTriggeredAbility());
     }
@@ -82,14 +81,8 @@ public class ElvishGuidance extends CardImpl {
 
 class ElvishGuidanceTriggeredAbility extends TriggeredManaAbility {
 
-    private static final FilterCreaturePermanent elvesFilter = new FilterCreaturePermanent();
-    
-    static {
-        elvesFilter.add(new SubtypePredicate("Elf"));
-    }
-   
     public ElvishGuidanceTriggeredAbility() {
-        super(Zone.BATTLEFIELD, new DynamicManaEffect(Mana.GreenMana(1), new PermanentsOnBattlefieldCount(elvesFilter)));
+        super(Zone.BATTLEFIELD, new DynamicManaEffect(Mana.GreenMana(1), new PermanentsOnBattlefieldCount(new FilterCreaturePermanent("Elf", "Elf"))));
     }
 
     public ElvishGuidanceTriggeredAbility(final ElvishGuidanceTriggeredAbility ability) {
@@ -114,6 +107,6 @@ class ElvishGuidanceTriggeredAbility extends TriggeredManaAbility {
 
     @Override
     public String getRule() {
-        return "Whenever enchanted land is tapped for mana, its controller adds {G} to his or her mana pool for each Elf on the battlefield";
+        return "Whenever enchanted land is tapped for mana, its controller adds {G} to his or her mana pool for each Elf on the battlefield.";
     }
 }
diff --git a/Mage.Sets/src/mage/sets/onslaught/RiptideReplicator.java b/Mage.Sets/src/mage/sets/onslaught/RiptideReplicator.java
index 9f1c85913fb..9b01951ecae 100644
--- a/Mage.Sets/src/mage/sets/onslaught/RiptideReplicator.java
+++ b/Mage.Sets/src/mage/sets/onslaught/RiptideReplicator.java
@@ -62,11 +62,11 @@ public class RiptideReplicator extends CardImpl {
 
         // As Riptide Replicator enters the battlefield, choose a color and a creature type.
         Ability ability = new EntersBattlefieldAbility(new ChooseColorEffect(Outcome.Neutral));
-        Effect effect = new ChooseColorEffect(Outcome.Neutral);
+        Effect effect = new ChooseCreatureTypeEffect(Outcome.Neutral);
         effect.setText("and a creature type");
-        ability.addEffect(new ChooseCreatureTypeEffect(Outcome.Neutral));
+        ability.addEffect(effect);
         this.addAbility(ability);
-        
+
         // Riptide Replicator enters the battlefield with X charge counters on it.
         this.addAbility(new EntersBattlefieldAbility(new EntersBattlefieldWithXCountersEffect(CounterType.CHARGE.createInstance())));
 
@@ -90,7 +90,7 @@ class RiptideReplicatorEffect extends OneShotEffect {
 
     RiptideReplicatorEffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "Put an X/X creature token of the chosen color and type onto the battlefield, where X is the number of charge counters on Riptide Replicator.";
+        this.staticText = "Put an X/X creature token of the chosen color and type onto the battlefield, where X is the number of charge counters on {this}.";
     }
 
     RiptideReplicatorEffect(final RiptideReplicatorEffect effect) {