From 4232d9f3760034b6297e0cee93c35a7c68e0a3a7 Mon Sep 17 00:00:00 2001
From: tool4EvEr <tool4EvEr@192.168.0.59>
Date: Thu, 10 Feb 2022 22:11:51 +0100
Subject: [PATCH] Crew rules change

---
 forge-game/src/main/java/forge/game/card/CardFactoryUtil.java  | 3 +--
 forge-game/src/main/java/forge/game/cost/CostTapType.java      | 2 +-
 .../gamemodes/match/input/InputSelectEntitiesFromList.java     | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
index 014f784fdd6..0dee6f5ced9 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -3356,8 +3356,7 @@ public class CardFactoryUtil {
             final String power = k[1];
 
             // tapXType has a special check for withTotalPower, and NEEDS it to be "+withTotalPowerGE"
-            // So adding redundant YouCtrl to simplify matters even though its unnecessary
-            String effect = "AB$ Animate | Cost$ tapXType<Any/Creature.YouCtrl+withTotalPowerGE" + power + "> | " +
+            String effect = "AB$ Animate | Cost$ tapXType<Any/Creature.Other+withTotalPowerGE" + power + "> | " +
                     "CostDesc$ Crew " + power + " (Tap any number of creatures you control with total power " + power +
                     " or more: | Crew$ True | Secondary$ True | Defined$ Self | Types$ Creature,Artifact | " +
                     "RemoveCardTypes$ True | StackDescription$ SpellDescription | SpellDescription$ CARDNAME becomes" +
diff --git a/forge-game/src/main/java/forge/game/cost/CostTapType.java b/forge-game/src/main/java/forge/game/cost/CostTapType.java
index 44c7e80982e..e8a9b4ff2ac 100644
--- a/forge-game/src/main/java/forge/game/cost/CostTapType.java
+++ b/forge-game/src/main/java/forge/game/cost/CostTapType.java
@@ -184,7 +184,7 @@ public class CostTapType extends CostPartWithList {
         }
 
         final int amount = this.getAbilityAmount(ability);
-        return (typeList.size() != 0) && (typeList.size() >= amount);
+        return typeList.size() != 0 && typeList.size() >= amount;
     }
 
     /* (non-Javadoc)
diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectEntitiesFromList.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectEntitiesFromList.java
index 524f17d26cb..ed593159fe1 100644
--- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectEntitiesFromList.java
+++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectEntitiesFromList.java
@@ -127,7 +127,7 @@ public class InputSelectEntitiesFromList<T extends GameEntity> extends InputSele
         if (sa != null && sa.hasParam("Crew")) {
             msg.append("\nCrewing: ").
             append(CardLists.getTotalPower((FCollection<Card>)getSelected(), true, true)).
-            append(" / ").append(TextUtil.fastReplace(sa.getPayCosts().getCostPartByType(CostTapType.class).getType(), "Creature.YouCtrl+withTotalPowerGE", ""));
+            append(" / ").append(TextUtil.fastReplace(sa.getPayCosts().getCostPartByType(CostTapType.class).getType(), "Creature.Other+withTotalPowerGE", ""));
         }
 
         return msg.toString();