From 47720cf8be96598f3562f7adeee031aeb8a16ffc Mon Sep 17 00:00:00 2001
From: theelk801 <theelk801@gmail.com>
Date: Mon, 12 May 2025 09:08:34 -0400
Subject: [PATCH] [FIN] Implement Rinoa Heartilly

---
 .../src/mage/cards/r/RinoaHeartilly.java      | 54 +++++++++++++++++++
 Mage.Sets/src/mage/sets/FinalFantasy.java     |  2 +
 .../game/permanent/token/AngeloToken.java     | 32 +++++++++++
 3 files changed, 88 insertions(+)
 create mode 100644 Mage.Sets/src/mage/cards/r/RinoaHeartilly.java
 create mode 100644 Mage/src/main/java/mage/game/permanent/token/AngeloToken.java

diff --git a/Mage.Sets/src/mage/cards/r/RinoaHeartilly.java b/Mage.Sets/src/mage/cards/r/RinoaHeartilly.java
new file mode 100644
index 00000000000..c6f911ce47b
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/r/RinoaHeartilly.java
@@ -0,0 +1,54 @@
+package mage.cards.r;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.AttacksTriggeredAbility;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.dynamicvalue.common.CreaturesYouControlCount;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.continuous.BoostTargetEffect;
+import mage.abilities.hint.common.CreaturesYouControlHint;
+import mage.constants.SubType;
+import mage.constants.SuperType;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.filter.StaticFilters;
+import mage.game.permanent.token.AngeloToken;
+import mage.target.TargetPermanent;
+
+/**
+ *
+ * @author TheElk801
+ */
+public final class RinoaHeartilly extends CardImpl {
+
+    public RinoaHeartilly(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}{W}");
+        
+        this.supertype.add(SuperType.LEGENDARY);
+        this.subtype.add(SubType.HUMAN);
+        this.subtype.add(SubType.REBEL);
+        this.subtype.add(SubType.WARLOCK);
+        this.power = new MageInt(4);
+        this.toughness = new MageInt(4);
+
+        // When Rinoa Heartilly enters, create Angelo, a legendary 1/1 green and white Dog creature token.
+        this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new AngeloToken())));
+
+        // Angelo Cannon -- Whenever Rinoa Heartilly attacks, another target creature you control gets +1/+1 until end of turn for each creature you control.
+        Ability ability=new AttacksTriggeredAbility(new BoostTargetEffect(
+                CreaturesYouControlCount.instance,CreaturesYouControlCount.instance
+        ).setText("another target creature you control gets +1/+1 until end of turn for each creature you control"));ability.addTarget(new TargetPermanent(StaticFilters.FILTER_ANOTHER_TARGET_CREATURE_YOU_CONTROL));this.addAbility(ability.withFlavorWord("Angelo Cannon").addHint(CreaturesYouControlHint.instance));
+    }
+
+    private RinoaHeartilly(final RinoaHeartilly card) {
+        super(card);
+    }
+
+    @Override
+    public RinoaHeartilly copy() {
+        return new RinoaHeartilly(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/sets/FinalFantasy.java b/Mage.Sets/src/mage/sets/FinalFantasy.java
index 9486905314b..f0d453fc62b 100644
--- a/Mage.Sets/src/mage/sets/FinalFantasy.java
+++ b/Mage.Sets/src/mage/sets/FinalFantasy.java
@@ -119,6 +119,8 @@ public final class FinalFantasy extends ExpansionSet {
         cards.add(new SetCardInfo("Ragnarok, Divine Deliverance", "446b", Rarity.UNCOMMON, mage.cards.r.RagnarokDivineDeliverance.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Ragnarok, Divine Deliverance", "526b", Rarity.UNCOMMON, mage.cards.r.RagnarokDivineDeliverance.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Ragnarok, Divine Deliverance", "99b", Rarity.UNCOMMON, mage.cards.r.RagnarokDivineDeliverance.class, NON_FULL_USE_VARIOUS));
+        cards.add(new SetCardInfo("Rinoa Heartilly", 237, Rarity.UNCOMMON, mage.cards.r.RinoaHeartilly.class, NON_FULL_USE_VARIOUS));
+        cards.add(new SetCardInfo("Rinoa Heartilly", 502, Rarity.UNCOMMON, mage.cards.r.RinoaHeartilly.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Sazh's Chocobo", 200, Rarity.UNCOMMON, mage.cards.s.SazhsChocobo.class));
         cards.add(new SetCardInfo("Sephiroth, Planet's Heir", 505, Rarity.MYTHIC, mage.cards.s.SephirothPlanetsHeir.class, NON_FULL_USE_VARIOUS));
         cards.add(new SetCardInfo("Sephiroth, Planet's Heir", 553, Rarity.MYTHIC, mage.cards.s.SephirothPlanetsHeir.class, NON_FULL_USE_VARIOUS));
diff --git a/Mage/src/main/java/mage/game/permanent/token/AngeloToken.java b/Mage/src/main/java/mage/game/permanent/token/AngeloToken.java
new file mode 100644
index 00000000000..7e958450adc
--- /dev/null
+++ b/Mage/src/main/java/mage/game/permanent/token/AngeloToken.java
@@ -0,0 +1,32 @@
+package mage.game.permanent.token;
+
+import mage.MageInt;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.SuperType;
+
+/**
+ * @author TheElk801
+ */
+public final class AngeloToken extends TokenImpl {
+
+    public AngeloToken() {
+        super("Angelo", "Angelo, a legendary 1/1 green and white Dog creature token");
+        supertype.add(SuperType.LEGENDARY);
+        cardType.add(CardType.CREATURE);
+        subtype.add(SubType.DOG);
+
+        color.setGreen(true);
+        color.setWhite(true);
+        power = new MageInt(1);
+        toughness = new MageInt(1);
+    }
+
+    private AngeloToken(final AngeloToken token) {
+        super(token);
+    }
+
+    public AngeloToken copy() {
+        return new AngeloToken(this);
+    }
+}