x

pseudohuman92 · Jul 3, 2024 · d0d2e6c · d0d2e6c
1 parent 4efea74
commit d0d2e6c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/main/java/com/visitor/card/properties/Playable.java b/src/main/java/com/visitor/card/properties/Playable.java
@@ -153,9 +153,8 @@ public void addTargetMultipleCardsOrPlayers(Game.Zone zone, Predicate<Targetable
                                                 int minCount, int maxCount, String message, Consumer<UUID> perTargetEffect, boolean withPlayers, boolean forCost) {
 
         String targetingMessage = message != null ? message : "Select " + (minCount < maxCount ? "between " + minCount + " and " + maxCount : minCount) + " cards" + (withPlayers ? " or players." : ".");
-        Predicate<Targetable> pred = predicate != null ? and(predicate, c -> isPlayer(c) || compareZones(c.getZone(), zone)) : (c -> isPlayer(c) || compareZones(c.getZone(), zone));
 
-        Effect t = new Effect(game, card, zone, minCount, maxCount, pred, targetingMessage, perTargetEffect);
+        Effect t = new Effect(game, card, zone, minCount, maxCount, predicate, targetingMessage, perTargetEffect);
         if (forCost) {
             costEffects.put(t.getId(), t);
         } else {
@@ -208,15 +207,8 @@ public void addTargetSingleUnitOrPlayer(Consumer<UUID> perTargetEffect, boolean
      * @param perTargetEffect
      */
     public void addTargetSingleUnit(Game.Zone zone, Predicate<Targetable> predicate, Consumer<UUID> perTargetEffect, String message, boolean forCost) {
-        Predicate<Targetable> finalCardPredicate = predicate != null ? predicate : Predicates::any;
         message = message != null ? message : "Select a unit.";
-        addTargetSingleCard(zone, and(Predicates::isUnit, finalCardPredicate), message, perTargetEffect, forCost);
-    }
-
-    public void addTargetSingleUnit(Predicate<Targetable> predicate, Consumer<UUID> perTargetEffect, String message, boolean forCost) {
-        Predicate<Targetable> finalCardPredicate = predicate != null ? predicate : Predicates::any;
-        message = message != null ? message : "Select a unit.";
-        addTargetSingleCard(Both_Play, and(Predicates::isUnit, finalCardPredicate), message, perTargetEffect, forCost);
+        addTargetSingleCard(zone, and(Predicates::isUnit, predicate), message, perTargetEffect, forCost);
     }
 
 

diff --git a/src/main/java/com/visitor/sets/base2/InfuseLife.java b/src/main/java/com/visitor/sets/base2/InfuseLife.java
@@ -20,7 +20,7 @@ public InfuseLife(Game game, UUID owner) {
                 "Additional Cost - Sacrifice a unit.\nUnits you control gains +X/+X where X is sacrificed unit's health.",
                 owner);
 
-        playable.addTargetSingleUnit(Base.Zone.Play, Predicates.controlledBy(controller),
+        playable.addTargetSingleUnit(Base.Zone.Play, Predicates::any,
                 c -> {
                     x = game.getCard(c).getHealth();
                     game.destroy(c);