fix subtypes

Mage.Sets/src/mage/cards/c/Conflux.java

@@ -40,7 +40,6 @@ import mage.game.Game;
 import mage.players.Player;
 import mage.target.common.TargetCardInLibrary;
 
-import java.util.List;
 import java.util.UUID;
 
 /**
@@ -107,7 +106,7 @@ class ConfluxEffect extends OneShotEffect {
         if (you != null && you.getLibrary().hasCards()) {
             if (you.searchLibrary(targetWhite, game)) {
                 if (!targetWhite.getTargets().isEmpty()) {
-                    for (UUID cardId : (List<UUID>) targetWhite.getTargets()) {
+                    for (UUID cardId : targetWhite.getTargets()) {
                         Card card = you.getLibrary().remove(cardId, game);
                         if (card != null) {
                             cards.add(card);
@@ -119,7 +118,7 @@ class ConfluxEffect extends OneShotEffect {
         if (you != null && you.getLibrary().hasCards()) {
             if (you.searchLibrary(targetBlue, game)) {
                 if (!targetBlue.getTargets().isEmpty()) {
-                    for (UUID cardId : (List<UUID>) targetBlue.getTargets()) {
+                    for (UUID cardId : targetBlue.getTargets()) {
                         Card card = you.getLibrary().remove(cardId, game);
                         if (card != null) {
                             cards.add(card);
@@ -131,7 +130,7 @@ class ConfluxEffect extends OneShotEffect {
         if (you != null && you.getLibrary().hasCards()) {
             if (you.searchLibrary(targetBlack, game)) {
                 if (!targetBlack.getTargets().isEmpty()) {
-                    for (UUID cardId : (List<UUID>) targetBlack.getTargets()) {
+                    for (UUID cardId : targetBlack.getTargets()) {
                         Card card = you.getLibrary().remove(cardId, game);
                         if (card != null) {
                             cards.add(card);
@@ -143,7 +142,7 @@ class ConfluxEffect extends OneShotEffect {
         if (you != null && you.getLibrary().hasCards()) {
             if (you.searchLibrary(targetRed, game)) {
                 if (!targetRed.getTargets().isEmpty()) {
-                    for (UUID cardId : (List<UUID>) targetRed.getTargets()) {
+                    for (UUID cardId : targetRed.getTargets()) {
                         Card card = you.getLibrary().remove(cardId, game);
                         if (card != null) {
                             cards.add(card);
@@ -155,7 +154,7 @@ class ConfluxEffect extends OneShotEffect {
         if (you != null && you.getLibrary().hasCards()) {
             if (you.searchLibrary(targetGreen, game)) {
                 if (!targetGreen.getTargets().isEmpty()) {
-                    for (UUID cardId : (List<UUID>) targetGreen.getTargets()) {
+                    for (UUID cardId : targetGreen.getTargets()) {
                         Card card = you.getLibrary().remove(cardId, game);
                         if (card != null) {
                             cards.add(card);

Mage.Sets/src/mage/cards/d/DauthiJackal.java

@@ -52,7 +52,7 @@ public class DauthiJackal extends CardImpl {
     public DauthiJackal(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}");
         this.subtype.add("Dauthi");
-        this.subtype.add("Hound");
+        this.subtype.add("Jackal");
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);
 

Mage.Sets/src/mage/cards/g/GoblinTestPilot.java

@@ -51,6 +51,7 @@ public class GoblinTestPilot extends CardImpl {
     public GoblinTestPilot(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}{R}");
         this.subtype.add("Goblin");
+        this.subtype.add("Pilot");
         this.subtype.add("Wizard");
 
         this.power = new MageInt(0);

Mage.Sets/src/mage/cards/h/HurrJackal.java

@@ -27,12 +27,10 @@
  */
 package mage.cards.h;
 
-import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.TapSourceCost;
-
 import mage.abilities.effects.common.CantBeRegeneratedTargetEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
@@ -41,6 +39,8 @@ import mage.constants.Duration;
 import mage.constants.Zone;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
  *
  * @author MarcoMarin
@@ -49,7 +49,7 @@ public class HurrJackal extends CardImpl {
 
     public HurrJackal(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}");
-        this.subtype.add("Hound");
+        this.subtype.add("Jackal");
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 

Mage.Sets/src/mage/cards/j/JackalFamiliar.java

@@ -27,7 +27,6 @@
  */
 package mage.cards.j;
 
-import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.keyword.CantAttackAloneAbility;
 import mage.abilities.keyword.CantBlockAloneAbility;
@@ -35,6 +34,8 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 
+import java.util.UUID;
+
 /**
  * @author magenoxx_at_gmail.com
  */
@@ -42,7 +43,7 @@ public class JackalFamiliar extends CardImpl {
 
     public JackalFamiliar(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}");
-        this.subtype.add("Hound");
+        this.subtype.add("Jackal");
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);

Mage.Sets/src/mage/cards/j/JackalPup.java

@@ -27,7 +27,6 @@
  */
 package mage.cards.j;
 
-import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.DealtDamageToSourceTriggeredAbility;
@@ -40,6 +39,8 @@ import mage.constants.Zone;
 import mage.game.Game;
 import mage.players.Player;
 
+import java.util.UUID;
+
 /**
  *
  * @author jeffwadsworth
@@ -49,7 +50,7 @@ public class JackalPup extends CardImpl {
 
     public JackalPup(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{R}");
-        this.subtype.add("Hound");
+        this.subtype.add("Jackal");
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);

Mage.Sets/src/mage/cards/r/RefuseCooperate.java

@@ -27,7 +27,6 @@
  */
 package mage.cards.r;
 
-import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.CopyTargetSpellEffect;
@@ -44,6 +43,8 @@ import mage.game.stack.Spell;
 import mage.players.Player;
 import mage.target.TargetSpell;
 
+import java.util.UUID;
+
 /**
  *
  * @author LevelX2
@@ -51,7 +52,7 @@ import mage.target.TargetSpell;
 public class RefuseCooperate extends SplitCard {
 
     public RefuseCooperate(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, new CardType[]{CardType.SORCERY}, "{3}{R}", "{2}{U}", SpellAbilityType.SPLIT_AFTERMATH);
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, new CardType[]{CardType.INSTANT}, "{3}{R}", "{2}{U}", SpellAbilityType.SPLIT_AFTERMATH);
 
         // Refuse
         // Refuse deals damage to target spell's controller equal to that spell's converted mana cost.

Mage.Sets/src/mage/cards/t/TrainedJackal.java

@@ -27,12 +27,13 @@
  */
 package mage.cards.t;
 
-import java.util.UUID;
 import mage.MageInt;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 
+import java.util.UUID;
+
 /**
  *
  * @author LevelX2
@@ -41,7 +42,7 @@ public class TrainedJackal extends CardImpl {
 
     public TrainedJackal(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}");
-        this.subtype.add("Hound");
+        this.subtype.add("Jackal");
 
         this.power = new MageInt(1);
         this.toughness = new MageInt(2);

Mage.Sets/src/mage/cards/t/TreeMonkey.java

@@ -27,12 +27,13 @@
  */
 package mage.cards.t;
 
-import java.util.UUID;
-import mage.constants.CardType;
 import mage.MageInt;
 import mage.abilities.keyword.ReachAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+
+import java.util.UUID;
 
 /**
  *
@@ -42,7 +43,7 @@ public class TreeMonkey extends CardImpl {
 
     public TreeMonkey(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}");
-        this.subtype.add("Ape");
+        this.subtype.add("Monkey");
 
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);

Mage.Sets/src/mage/cards/z/ZodiacMonkey.java

@@ -27,12 +27,13 @@
  */
 package mage.cards.z;
 
-import java.util.UUID;
-import mage.constants.CardType;
 import mage.MageInt;
 import mage.abilities.keyword.ForestwalkAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+
+import java.util.UUID;
 
 /**
  *
@@ -42,7 +43,7 @@ public class ZodiacMonkey extends CardImpl {
 
     public ZodiacMonkey(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}");
-        this.subtype.add("Ape");
+        this.subtype.add("Monkey");
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);