From b7bcdf00991967ad00ba1fac913d01d757ec1a82 Mon Sep 17 00:00:00 2001
From: theelk801 <theelk801@gmail.com>
Date: Fri, 5 Apr 2024 08:49:42 -0400
Subject: [PATCH] [OTC] Implement Angel of Indemnity

---
 .../src/mage/cards/a/AngelOfIndemnity.java    | 66 +++++++++++++++++++
 .../OutlawsOfThunderJunctionCommander.java    |  1 +
 2 files changed, 67 insertions(+)
 create mode 100644 Mage.Sets/src/mage/cards/a/AngelOfIndemnity.java

diff --git a/Mage.Sets/src/mage/cards/a/AngelOfIndemnity.java b/Mage.Sets/src/mage/cards/a/AngelOfIndemnity.java
new file mode 100644
index 00000000000..458e2015978
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/a/AngelOfIndemnity.java
@@ -0,0 +1,66 @@
+package mage.cards.a;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect;
+import mage.abilities.keyword.EncoreAbility;
+import mage.abilities.keyword.FlyingAbility;
+import mage.abilities.keyword.LifelinkAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.ComparisonType;
+import mage.constants.SubType;
+import mage.filter.FilterCard;
+import mage.filter.common.FilterPermanentCard;
+import mage.filter.predicate.mageobject.ManaValuePredicate;
+import mage.target.common.TargetCardInYourGraveyard;
+
+import java.util.UUID;
+
+/**
+ * @author TheElk801
+ */
+public final class AngelOfIndemnity extends CardImpl {
+
+    private static final FilterCard filter
+            = new FilterPermanentCard("permanent card with mana value 4 or less from your graveyard");
+
+    static {
+        filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, 5));
+    }
+
+    public AngelOfIndemnity(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{W}");
+
+        this.subtype.add(SubType.ANGEL);
+        this.subtype.add(SubType.WARRIOR);
+        this.power = new MageInt(5);
+        this.toughness = new MageInt(5);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+
+        // Lifelink
+        this.addAbility(LifelinkAbility.getInstance());
+
+        // When Angel of Indemnity enters the battlefield, return target permanent card with mana value 4 or less from your graveyard to the battlefield.
+        Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnFromGraveyardToBattlefieldTargetEffect());
+        ability.addTarget(new TargetCardInYourGraveyard(filter));
+        this.addAbility(ability);
+
+        // Encore {6}{W}{W}
+        this.addAbility(new EncoreAbility(new ManaCostsImpl<>("{6}{W}{W}")));
+    }
+
+    private AngelOfIndemnity(final AngelOfIndemnity card) {
+        super(card);
+    }
+
+    @Override
+    public AngelOfIndemnity copy() {
+        return new AngelOfIndemnity(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/OutlawsOfThunderJunctionCommander.java b/Mage.Sets/src/mage/sets/OutlawsOfThunderJunctionCommander.java
index 8e238a6f9e9..5fbcec68dbf 100644
--- a/Mage.Sets/src/mage/sets/OutlawsOfThunderJunctionCommander.java
+++ b/Mage.Sets/src/mage/sets/OutlawsOfThunderJunctionCommander.java
@@ -19,6 +19,7 @@ public final class OutlawsOfThunderJunctionCommander extends ExpansionSet {
         super("Outlaws of Thunder Junction Commander", "OTC", ExpansionSet.buildDate(2024, 4, 19), SetType.SUPPLEMENTAL);
         this.hasBasicLands = false;
 
+        cards.add(new SetCardInfo("Angel of Indemnity", 45, Rarity.RARE, mage.cards.a.AngelOfIndemnity.class));
         cards.add(new SetCardInfo("Stella Lee, Wild Card", 3, Rarity.MYTHIC, mage.cards.s.StellaLeeWildCard.class));
     }
 }