- Fixed #5948

magefree · Dec 6, 2019 · 97f066a · 97f066a
1 parent ba78d41
commit 97f066a
Showing 1 changed file with 35 additions and 20 deletions.
diff --git a/Mage.Sets/src/mage/cards/c/CallerOfTheHunt.java b/Mage.Sets/src/mage/cards/c/CallerOfTheHunt.java
@@ -1,34 +1,35 @@
-
 package mage.cards.c;
 
 import mage.MageObject;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.CostAdjuster;
-import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
-import mage.abilities.effects.ContinuousEffect;
 import mage.abilities.effects.Effect;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.InfoEffect;
-import mage.abilities.effects.common.continuous.SetPowerSourceEffect;
-import mage.abilities.effects.common.continuous.SetToughnessSourceEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.choices.Choice;
 import mage.choices.ChoiceCreatureType;
 import mage.constants.*;
-import mage.filter.FilterPermanent;
-import mage.filter.predicate.mageobject.ChosenSubtypePredicate;
 import mage.game.Game;
 import mage.players.Player;
-
 import java.util.UUID;
+import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
+import mage.abilities.effects.ContinuousEffect;
+import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
+import mage.abilities.effects.common.continuous.SetPowerToughnessSourceEffect;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.target.targetpointer.FixedTarget;
 
 /**
  * @author jeffwadsworth
  */
 public final class CallerOfTheHunt extends CardImpl {
 
+    FilterCreaturePermanent filter = new FilterCreaturePermanent();
+
     public CallerOfTheHunt(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}");
 
@@ -38,7 +39,9 @@ public CallerOfTheHunt(UUID ownerId, CardSetInfo setInfo) {
         // Caller of the Hunt's power and toughness are each equal to the number of creatures of the chosen type on the battlefield.
         this.addAbility(new SimpleStaticAbility(Zone.ALL, new InfoEffect("as an additional cost to cast this spell, choose a creature type. \r"
                 + "{this}'s power and toughness are each equal to the number of creatures of the chosen type on the battlefield")));
+
         this.getSpellAbility().setCostAdjuster(CallerOfTheHuntAdjuster.instance);
+
     }
 
     public CallerOfTheHunt(final CallerOfTheHunt card) {
@@ -58,19 +61,27 @@ enum CallerOfTheHuntAdjuster implements CostAdjuster {
     public void adjustCosts(Ability ability, Game game) {
         MageObject mageObject = game.getObject(ability.getSourceId());
         Effect effect = new ChooseCreatureTypeEffect(Outcome.Benefit);
-        if (mageObject != null
-                && effect.apply(game, ability)) {
-            FilterPermanent filter = new FilterPermanent();
-            filter.add(ChosenSubtypePredicate.instance);
-            ContinuousEffect effectPower = new SetPowerSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.Custom);
-            ContinuousEffect effectToughness = new SetToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.Custom);
-            game.addEffect(effectPower, ability);
-            game.addEffect(effectToughness, ability);
+        if (mageObject != null) {
+            effect.apply(game, ability);
+        }
+        if (mageObject != null) {
+            SubType typeChoice = (SubType) game.getState().getValue(mageObject.getId() + "_type");
+            if (typeChoice != null) {
+                FilterCreaturePermanent filter = new FilterCreaturePermanent("chosen creature type");
+                filter.add(new SubtypePredicate(typeChoice));
+                ContinuousEffect effectPowerToughness = new SetPowerToughnessSourceEffect(
+                        new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame);
+                effectPowerToughness.setText("");
+                SimpleStaticAbility sa = new SimpleStaticAbility(Zone.ALL, effectPowerToughness);
+                GainAbilityTargetEffect effectTest = new GainAbilityTargetEffect(sa, Duration.EndOfGame);
+                effectTest.setTargetPointer(new FixedTarget(ability.getSourceId()));
+                game.getState().addEffect(effectTest, ability);
+            }
         }
     }
 }
 
-class ChooseCreatureTypeEffect extends OneShotEffect { // code by LevelX2, but that other version is not compatible with this card
+class ChooseCreatureTypeEffect extends OneShotEffect {
 
     public ChooseCreatureTypeEffect(Outcome outcome) {
         super(outcome);
@@ -86,11 +97,15 @@ public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         MageObject mageObject = game.getObject(source.getSourceId());
         Choice typeChoice = new ChoiceCreatureType(mageObject);
-        if (controller != null && mageObject != null && controller.choose(outcome, typeChoice, game)) {
+        if (controller != null
+                && mageObject != null
+                && controller.choose(outcome, typeChoice, game)) {
             if (!game.isSimulation()) {
-                game.informPlayers(mageObject.getName() + ": " + controller.getLogName() + " has chosen " + typeChoice.getChoice());
+                game.informPlayers(mageObject.getName() + ": "
+                        + controller.getLogName() + " has chosen " + typeChoice.getChoice());
             }
-            game.getState().setValue(mageObject.getId() + "_type", SubType.byDescription(typeChoice.getChoice()));
+            game.getState().setValue(mageObject.getId()
+                    + "_type", SubType.byDescription(typeChoice.getChoice()));
             return true;
         }
         return false;