From 0cd6ec39b2b8d2f569e561482a2439d7fa268131 Mon Sep 17 00:00:00 2001
From: xenohedron <xenohedron@users.noreply.github.com>
Date: Fri, 6 Sep 2024 21:36:40 -0400
Subject: [PATCH] fix Caduceus, Staff of Hermes (from #12794)

---
 .../mage/cards/c/CaduceusStaffOfHermes.java   | 56 ++++++++-----------
 1 file changed, 22 insertions(+), 34 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/c/CaduceusStaffOfHermes.java b/Mage.Sets/src/mage/cards/c/CaduceusStaffOfHermes.java
index 4c71ab6e76a..c1cae5fd322 100644
--- a/Mage.Sets/src/mage/cards/c/CaduceusStaffOfHermes.java
+++ b/Mage.Sets/src/mage/cards/c/CaduceusStaffOfHermes.java
@@ -6,12 +6,7 @@ import mage.abilities.condition.Condition;
 import mage.abilities.condition.common.LifeCompareCondition;
 import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.decorator.ConditionalContinuousEffect;
-import mage.abilities.decorator.ConditionalPreventionEffect;
-import mage.abilities.decorator.ConditionalReplacementEffect;
-import mage.abilities.effects.ContinuousEffectImpl;
-import mage.abilities.effects.Effect;
-import mage.abilities.effects.common.PreventAllDamageToSourceEffect;
-import mage.abilities.effects.common.PreventDamageToAttachedEffect;
+import mage.abilities.effects.common.PreventDamageToSourceEffect;
 import mage.abilities.effects.common.continuous.BoostEquippedEffect;
 import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect;
 import mage.abilities.keyword.EquipAbility;
@@ -20,19 +15,16 @@ import mage.abilities.keyword.LifelinkAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.*;
-import mage.constants.CardType;
-import mage.game.Game;
-import mage.players.Player;
 
 import java.util.UUID;
 
-
 /**
- *
- * @author JvdB01
+ * @author JvdB01, xenohedron
  */
 public final class CaduceusStaffOfHermes extends CardImpl {
 
+    private static final Condition condition = new LifeCompareCondition(TargetController.YOU, ComparisonType.OR_GREATER, 30);
+
     public CaduceusStaffOfHermes(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}{W}");
         
@@ -40,29 +32,25 @@ public final class CaduceusStaffOfHermes extends CardImpl {
         this.subtype.add(SubType.EQUIPMENT);
 
         // Equipped creature has lifelink.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.EQUIPMENT).setText("has lifelink")));
+        this.addAbility(new SimpleStaticAbility(new GainAbilityAttachedEffect(LifelinkAbility.getInstance(), AttachmentType.EQUIPMENT)));
+
         // As long as you have 30 or more life, equipped creature gets +5/+5 and has indestructible and "Prevent all damage that would be dealt to this creature."
-        this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(
-                        new BoostEquippedEffect(5,5),
-                        new LifeCompareCondition(TargetController.YOU, ComparisonType.OR_GREATER, 30),
-                        "As long as you have 30 or more life, equipped creature gets +5/+5"
-                        )
-                    )
-                );
-        this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect(
-                        new GainAbilityAttachedEffect(IndestructibleAbility.getInstance().getInstance(), AttachmentType.EQUIPMENT),
-                        new LifeCompareCondition(TargetController.YOU, ComparisonType.OR_GREATER, 30),
-                        "and has indestructible"
-                        )
-                    )
-                );
-        this.addAbility(new SimpleStaticAbility(new ConditionalPreventionEffect(
-                        new PreventDamageToAttachedEffect(Duration.WhileOnBattlefield, AttachmentType.EQUIPMENT, false),
-                        new LifeCompareCondition(TargetController.YOU, ComparisonType.OR_GREATER, 30),
-                        "and has \"Prevent all damage that would be dealt to this creature.\""
-                        )
-                    )
-        );
+        Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect(
+                new BoostEquippedEffect(5, 5), condition,
+                "As long as you have 30 or more life, equipped creature gets +5/+5"
+        ));
+        ability.addEffect(new ConditionalContinuousEffect(
+                new GainAbilityAttachedEffect(IndestructibleAbility.getInstance(), AttachmentType.EQUIPMENT), condition,
+                "and has indestructible"
+        ));
+        ability.addEffect(new ConditionalContinuousEffect(
+                new GainAbilityAttachedEffect(new SimpleStaticAbility(
+                        new PreventDamageToSourceEffect(Duration.WhileOnBattlefield, Integer.MAX_VALUE)
+                                .setText("Prevent all damage that would be dealt to this creature")
+                ), AttachmentType.EQUIPMENT), condition,
+                "and has \"Prevent all damage that would be dealt to this creature.\""
+        ));
+
         // Equip {W}{W}
         this.addAbility(new EquipAbility(Outcome.BoostCreature, new ManaCostsImpl<>("{W}{W}"), false));
     }