From 809c02eb8d5c7a250a89a5b318ca0a0278322642 Mon Sep 17 00:00:00 2001
From: xenohedron <xenohedron@users.noreply.github.com>
Date: Sun, 16 Jul 2023 15:13:31 -0400
Subject: [PATCH] Reimplement Common Bond

---
 Mage.Sets/src/mage/cards/c/CommonBond.java | 59 +++++-----------------
 1 file changed, 12 insertions(+), 47 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/c/CommonBond.java b/Mage.Sets/src/mage/cards/c/CommonBond.java
index 2df657300c2..c582e75b1b7 100644
--- a/Mage.Sets/src/mage/cards/c/CommonBond.java
+++ b/Mage.Sets/src/mage/cards/c/CommonBond.java
@@ -1,34 +1,32 @@
-
 package mage.cards.c;
 
-import java.util.UUID;
-import mage.abilities.Ability;
-import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.counter.AddCountersTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.Outcome;
 import mage.counters.CounterType;
-import mage.filter.common.FilterCreaturePermanent;
-import mage.game.Game;
-import mage.game.permanent.Permanent;
 import mage.target.common.TargetCreaturePermanent;
+import mage.target.targetpointer.SecondTargetPointer;
 
+import java.util.UUID;
 
 /**
- *
- * @author LevelX2
+ * @author xenohedron
  */
 public final class CommonBond extends CardImpl {
 
     public CommonBond(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{G}{W}");
 
+        // Put a +1/+1 counter on target creature.
+        this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance()));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent().withChooseHint("1st"));
+
+        // Put a +1/+1 counter on target creature.
+        this.getSpellAbility().addEffect(new AddCountersTargetEffect(CounterType.P1P1.createInstance())
+                .setTargetPointer(new SecondTargetPointer()).concatBy("<br>"));
+        this.getSpellAbility().addTarget(new TargetCreaturePermanent().withChooseHint("2nd"));
 
-        // Put a +1/+1 counter on target creature. Put a +1/+1 counter on target creature.
-        this.getSpellAbility().addEffect(new CommonBondEffect());
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("first creature")));
-        this.getSpellAbility().addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("second creature (can be the same as the first)")));
     }
 
     private CommonBond(final CommonBond card) {
@@ -40,36 +38,3 @@ public final class CommonBond extends CardImpl {
         return new CommonBond(this);
     }
 }
-
-class CommonBondEffect extends OneShotEffect {
-
-    public CommonBondEffect() {
-        super(Outcome.BoostCreature);
-        staticText = "Put a +1/+1 counter on target creature. Put a +1/+1 counter on target creature.";
-    }
-
-    public CommonBondEffect(final CommonBondEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public boolean apply(Game game, Ability source) {
-        int affectedTargets = 0;
-        Permanent permanent = game.getPermanent(source.getTargets().get(0).getFirstTarget());
-        if (permanent != null) {
-            permanent.addCounters(CounterType.P1P1.createInstance(1), source.getControllerId(), source, game);
-            affectedTargets ++;
-        }
-        permanent = game.getPermanent(source.getTargets().get(1).getFirstTarget());
-        if (permanent != null) {
-            permanent.addCounters(CounterType.P1P1.createInstance(1), source.getControllerId(), source, game);
-            affectedTargets ++;
-        }
-        return affectedTargets > 0;
-    }
-
-    @Override
-    public CommonBondEffect copy() {
-        return new CommonBondEffect(this);
-    }
-}