* Rules: chicken subtype replaced by bird subtype (Chicken à la King, Chicken Egg, Fowl Play, Free-Range Chicken, Poultrygeist);

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

@@ -1,7 +1,5 @@
-
 package mage.cards.c;
 
-import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.common.SimpleActivatedAbility;
@@ -23,30 +21,31 @@ import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.target.common.TargetControlledPermanent;
 
+import java.util.UUID;
+
 /**
- *
  * @author spjspj
  */
 public final class ChickenALaKing extends CardImpl {
 
-    private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Chicken you control");
+    private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Bird you control");
 
     static {
         filter.add(Predicates.not(TappedPredicate.instance));
-        filter.add(SubType.CHICKEN.getPredicate());
+        filter.add(SubType.BIRD.getPredicate());
     }
 
     public ChickenALaKing(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}{U}");
 
-        this.subtype.add(SubType.CHICKEN);
+        this.subtype.add(SubType.BIRD);
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        // Whenever a 6 is rolled on a six-sided die, put a +1/+1 counter on each Chicken.
+        // Whenever a 6 is rolled on a six-sided die, put a +1/+1 counter on each Bird.
         this.addAbility(new ChickenALaKingTriggeredAbility());
 
-        // Tap an untapped Chicken you control: Roll a six-sided die.
+        // Tap an untapped Bird you control: Roll a six-sided die.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RollDiceEffect(null, Outcome.Benefit, 6), new TapTargetCost(new TargetControlledPermanent(1, 1, filter, false))));
     }
 
@@ -62,10 +61,10 @@ public final class ChickenALaKing extends CardImpl {
 
 class ChickenALaKingTriggeredAbility extends TriggeredAbilityImpl {
 
-    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("each Chicken");
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("each Bird");
 
     static {
-        filter.add(SubType.CHICKEN.getPredicate());
+        filter.add(SubType.BIRD.getPredicate());
     }
 
     public ChickenALaKingTriggeredAbility() {
@@ -93,9 +92,7 @@ class ChickenALaKingTriggeredAbility extends TriggeredAbilityImpl {
             String data = event.getData();
             if (data != null) {
                 int numSides = Integer.parseInt(data);
-                if (event.getAmount() == 6 && numSides == 6) {
+                return event.getAmount() == 6 && numSides == 6;
-                    return true;
-                }
             }
         }
         return false;
@@ -103,6 +100,6 @@ class ChickenALaKingTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "Whenever a 6 is rolled on a six-sided die, put a +1/+1 counter on each Chicken";
+        return "Whenever a 6 is rolled on a six-sided die, put a +1/+1 counter on each Bird";
     }
 }

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

@@ -1,4 +1,3 @@
-
 package mage.cards.c;
 
 import mage.MageInt;
@@ -14,13 +13,12 @@ import mage.constants.Outcome;
 import mage.constants.SubType;
 import mage.constants.TargetController;
 import mage.game.Game;
-import mage.game.permanent.token.GiantChickenToken;
+import mage.game.permanent.token.GiantBirdToken;
 import mage.players.Player;
 
 import java.util.UUID;
 
 /**
- *
  * @author ciaccona007
  */
 
@@ -33,7 +31,7 @@ public final class ChickenEgg extends CardImpl {
         this.power = new MageInt(0);
         this.toughness = new MageInt(1);
 
-        // At the beginning of your upkeep, roll a six-sided die. If you roll a 6, sacrifice Chicken Egg and create a 4/4 red Giant Chicken creature token.
+        // At the beginning of your upkeep, roll a six-sided die. If you roll a 6, sacrifice Chicken Egg and create a 4/4 red Giant Bird creature token.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new ChickenEggEffect(), TargetController.YOU, false));
     }
 
@@ -51,7 +49,7 @@ class ChickenEggEffect extends OneShotEffect {
 
     ChickenEggEffect() {
         super(Outcome.Benefit);
-        this.staticText = "roll a six-sided die. If you roll a 6, sacrifice {this} and create a 4/4 red Giant Chicken creature token";
+        this.staticText = "roll a six-sided die. If you roll a 6, sacrifice {this} and create a 4/4 red Giant Bird creature token";
     }
 
     ChickenEggEffect(final ChickenEggEffect effect) {
@@ -65,7 +63,7 @@ class ChickenEggEffect extends OneShotEffect {
             int result = controller.rollDice(game, 6);
             if (result == 6) {
                 new SacrificeSourceEffect().apply(game, source);
-                return (new CreateTokenEffect(new GiantChickenToken(), 1)).apply(game, source);
+                return (new CreateTokenEffect(new GiantBirdToken(), 1)).apply(game, source);
             }
         }
         return false;

Mage.Sets/src/mage/cards/f/FowlPlay.java

@@ -1,27 +1,20 @@
-
 package mage.cards.f;
 
-import java.util.UUID;
-import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.common.AttachEffect;
 import mage.abilities.effects.common.continuous.BecomesCreatureAttachedEffect;
-import mage.constants.Outcome;
-import mage.game.permanent.token.custom.CreatureToken;
-import mage.target.TargetPermanent;
 import mage.abilities.keyword.EnchantAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.constants.CardType;
+import mage.constants.*;
-import mage.constants.Duration;
+import mage.game.permanent.token.custom.CreatureToken;
-import mage.constants.SubType;
+import mage.target.TargetPermanent;
-import mage.constants.Zone;
-import mage.game.permanent.token.TokenImpl;
 import mage.target.common.TargetCreaturePermanent;
 
+import java.util.UUID;
+
 /**
- *
  * @author spjspj
  */
 public final class FowlPlay extends CardImpl {
@@ -38,10 +31,10 @@ public final class FowlPlay extends CardImpl {
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
 
-        // Enchanted creature is a Chicken with base power and toughness 1/1 and loses all abilities.
+        // Enchanted creature is a Bird with base power and toughness 1/1 and loses all abilities.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
-                new BecomesCreatureAttachedEffect(new CreatureToken(1, 1, "1/1 Chicken creature", SubType.CHICKEN),
+                new BecomesCreatureAttachedEffect(new CreatureToken(1, 1, "1/1 Bird creature", SubType.BIRD),
-                        "Enchanted creature is a Chicken with base power and toughness 1/1 and loses all abilities",
+                        "Enchanted creature is a Bird with base power and toughness 1/1 and loses all abilities",
                         Duration.WhileOnBattlefield, BecomesCreatureAttachedEffect.LoseType.ABILITIES_SUBTYPE)));
     }
 

Mage.Sets/src/mage/cards/f/FreeRangeChicken.java

@@ -1,9 +1,5 @@
-
 package mage.cards.f;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleActivatedAbility;
@@ -12,27 +8,25 @@ import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.continuous.BoostSourceEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.constants.CardType;
+import mage.constants.*;
-import mage.constants.Duration;
-import mage.constants.Outcome;
-import mage.constants.SubType;
-import mage.constants.WatcherScope;
-import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 import mage.watchers.Watcher;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
 /**
- *
  * @author L_J
  */
 public final class FreeRangeChicken extends CardImpl {
 
     public FreeRangeChicken(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}");
-        this.subtype.add(SubType.CHICKEN);
+        this.subtype.add(SubType.BIRD);
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);
 

Mage.Sets/src/mage/cards/p/Poultrygeist.java

@@ -1,4 +1,3 @@
-
 package mage.cards.p;
 
 import mage.MageInt;
@@ -20,14 +19,14 @@ import mage.players.Player;
 import java.util.UUID;
 
 /**
- *
  * @author ciaccona007
  */
 public final class Poultrygeist extends CardImpl {
 
     public Poultrygeist(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}");
-        this.subtype.add(SubType.CHICKEN);
+        this.subtype.add(SubType.BIRD);
+        this.subtype.add(SubType.SPIRIT);
 
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);

Mage/src/main/java/mage/constants/SubType.java

@@ -96,7 +96,6 @@ public enum SubType {
     CENTAUR("Centaur", SubTypeSet.CreatureType),
     CEREAN("Cerean", SubTypeSet.CreatureType, true), // Star Wars
     CEPHALID("Cephalid", SubTypeSet.CreatureType),
-    CHICKEN("Chicken", SubTypeSet.CreatureType, true), // Unglued
     CHIMERA("Chimera", SubTypeSet.CreatureType),
     CHISS("Chiss", SubTypeSet.CreatureType, true),
     CITIZEN("Citizen", SubTypeSet.CreatureType),

Mage/src/main/java/mage/game/permanent/token/GiantBirdToken.java

@@ -1,4 +1,3 @@
-
 package mage.game.permanent.token;
 
 import mage.MageInt;
@@ -6,27 +5,26 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 
 /**
- *
  * @author ciaccona007
  */
 
-public final class GiantChickenToken extends TokenImpl {
+public final class GiantBirdToken extends TokenImpl {
 
-    public GiantChickenToken() {
+    public GiantBirdToken() {
-        super("Giant Chicken", "4/4 red Giant Chicken creature token");
+        super("Giant Bird", "4/4 red Giant Bird creature token");
         cardType.add(CardType.CREATURE);
         color.setRed(true);
         subtype.add(SubType.GIANT);
-        subtype.add(SubType.CHICKEN);
+        subtype.add(SubType.BIRD);
         power = new MageInt(4);
         toughness = new MageInt(4);
     }
 
-    public GiantChickenToken(final GiantChickenToken token) {
+    public GiantBirdToken(final GiantBirdToken token) {
         super(token);
     }
 
-    public GiantChickenToken copy() {
+    public GiantBirdToken copy() {
-        return new GiantChickenToken(this);
+        return new GiantBirdToken(this);
     }
 }

Utils/mtg-cards-data.txt

@@ -33008,20 +33008,20 @@ Lexivore|Unglued|7|U|{3}{W}|Creature - Beast|2|3| Whenever Lexivore deals damage
 Miss Demeanor|Unglued|10|U|{3}{W}|Creature - Lady of Proper Etiquette|3|1| Flying, first strike At the beginning of each other player's upkeep, you may compliment that player on their game play. If you don't, sacrifice Miss Demeanor.|
 Once More with Feeling|Unglued|11|R|{W}{W}{W}{W}|Sorcery|||Exile all permanents and all cards from all graveyards. Each player shuffles their hand into their library, then draws seven cards. Each player's life total becomes 10. Exile Once More with Feeling. DCI ruling - A deck can have only one card named Once More with Feeling.|
 Checks and Balances|Unglued|16|U|{2}{U}|Enchantment|||Cast Checks and Balances only if there are three or more players in the game. Whenever a player casts a spell, each of that player's opponents may discard a card. If they do, counter that spell.|
-Chicken a la King|Unglued|17|R|{1}{U}{U}|Creature - Chicken|2|2| Whenever a 6 is rolled on a six-sided die, put a +1/+1 counter on each Chicken. (You may roll dice only when instructed to.) Tap an untapped Chicken you control: Roll a six-sided die.|
+Chicken a la King|Unglued|17|R|{1}{U}{U}|Creature - Bird|2|2| Whenever a 6 is rolled on a six-sided die, put a +1/+1 counter on each Bird. (You may roll dice only when instructed to.) Tap an untapped Bird you control: Roll a six-sided die.|
 Clambassadors|Unglued|18|C|{3}{U}|Creature - Clamfolk|4|4| Whenever Clambassadors deals damage to a player, choose an artifact, creature, or land you control. That player gains control of that permanent.|
 Clam-I-Am|Unglued|19|C|{2}{U}|Creature - Clamfolk|2|2| If you roll a 3 on a six-sided die, you may reroll that die.|
 Denied!|Unglued|22|C|{U}|Instant|||Choose a card name, then target spell's controller reveals their hand. If a card with the chosen name is revealed this way, counter that spell.|
-Fowl Play|Unglued|24|C|{2}{U}|Enchantment - Aura|||Enchant creature Enchanted creature is a Chicken with base power and toughness 1/1 and loses all abilities.|
+Fowl Play|Unglued|24|C|{2}{U}|Enchantment - Aura|||Enchant creature Enchanted creature is a Bird with base power and toughness 1/1 and loses all abilities.|
 Free-for-All|Unglued|25|R|{3}{U}|Enchantment|||When Free-for-All enters the battlefield, exile all creatures face down. At the beginning of each player's upkeep, that player chooses a card exiled with Free-for-All at random and puts it onto the battlefield. When Free-for-All leaves the battlefield, put all cards exiled with it into their owners' graveyards.|
 Psychic Network|Unglued|26|R|{U}|Enchantment|||Each player plays with the top card of their library held against their forehead, revealed to each other player.|
 Deadhead|Unglued|30|C|{3}{B}|Creature - Zombie|3|3| {0}: Return Deadhead from your graveyard to the battlefield. Activate this ability only if an opponent isn't touching their hand (of cards).|
 Jumbo Imp|Unglued|34|U|{2}{B}|Creature - Imp|0|0| Flying$As Jumbo Imp enters the battlefield, roll a six-sided die. Jumbo Imp enters the battlefield with a number of +1/+1 counters on it equal to the result.$At the beginning of your upkeep, roll a six-sided die and put a number of +1/+1 counters on Jumbo Imp equal to the result. At the beginning of your end step, roll a six-sided die and remove a number of +1/+1 counters from Jumbo Imp equal to the result.|
 Organ Harvest|Unglued|35|C|{B}|Sorcery|||Your team may sacrifice any number of creatures. For each creature sacrificed this way, you add {B}{B}.|
-Poultrygeist|Unglued|37|C|{2}{B}|Creature - Chicken|1|1| Flying Whenever a creature dies, you may roll a six-sided die. If you roll a 1, sacrifice Poultrygeist. Otherwise, put a +1/+1 counter on Poultrygeist.|
+Poultrygeist|Unglued|37|C|{2}{B}|Creature - Bird|1|1| Flying Whenever a creature dies, you may roll a six-sided die. If you roll a 1, sacrifice Poultrygeist. Otherwise, put a +1/+1 counter on Poultrygeist.|
 Temp of the Damned|Unglued|38|C|{2}{B}|Creature - Zombie|3|3| As Temp of the Damned enters the battlefield, roll a six-sided die. Temp of the Damned enters the battlefield with a number of funk counters on it equal to the result. At the beginning of your upkeep, remove a funk counter from Temp of the Damned. If you can't, sacrifice it.|
 Burning Cinder Fury of Crimson Chaos Fire|Unglued|40|R|{3}{R}|Enchantment|||Whenever any player taps a permanent, that player choose one of their opponents. The chosen player gains control of that permanent at the beginning of the next end step. At the beginning of each player's end step, if that player didn't tap any nonland permanents that turn, Burning Cinder Fury of Crimson Chaos Fire deals 3 damage to that player.|
-Chicken Egg|Unglued|41|R|{1}{R}|Creature - Egg|0|1| At the beginning of your upkeep, roll a six-sided die. If you roll a 6, sacrifice Chicken Egg and create a 4/4 red Giant Chicken creature token.|
+Chicken Egg|Unglued|41|R|{1}{R}|Creature - Egg|0|1| At the beginning of your upkeep, roll a six-sided die. If you roll a 6, sacrifice Chicken Egg and create a 4/4 red Giant Bird creature token.|
 Goblin Bookie|Unglued|43|C|{R}|Creature - Goblin|1|1| {R}, {T}: Reflip any coin or reroll any die. (Activate this ability only any time it makes sense.)|
 Goblin Bowling Team|Unglued|44|C|{3}{R}|Creature - Goblin|1|1| If Goblin Bowling Team would deal damage to a creature or player, it deals that much damage plus the result of a six-sided die roll to that creature or player instead.|
 Goblin Tutor|Unglued|45|U|{R}|Instant|||Roll a six-sided die. If you roll a 1, Goblin Tutor has no effect. Otherwise, search your library for the indicated card, reveal it, put it into your hand, then shuffle your library. 2 - A card named Goblin Tutor 3 - An enchantment card 4 - An artifact card 5 - A creature card 6 - An instant or sorcery card|
@@ -33033,7 +33033,7 @@ Strategy, Schmategy|Unglued|52|R|{1}{R}|Sorcery|||Roll a six-sided die. Strategy
 The Ultimate Nightmare of Wizards of the Coast Customer Service|Unglued|53|U|{X}{Y}{Z}{R}{R}|Sorcery|||The Ultimate Nightmare of Wizards of the Coast® Customer Service deals X damage to each of Y target creatures and Z target players.|
 Elvish Impersonators|Unglued|56|C|{3}{G}|Creature - Elves, */*, As Elvish Impersonators enters the battlefield, roll a six-sided die twice. Its base power becomes the first result and its base toughness becomes the second result.|
 Flock of Rabid Sheep|Unglued|57|U|{X}{G}{G}|Sorcery|||Flip X coins. For each flip you win, create a 2/2 green Sheep creature token named Rabid Sheep.|
-Free-Range Chicken|Unglued|58|C|{3}{G}|Creature - Chicken|3|3| {1}{G}: Roll two six-sided dice. If both results are the same, Free-Range Chicken gets +X/+X until end of turn, where X is that result. If the total of those results is equal to any other total you have rolled this turn for Free-Range Chicken, sacrifice it. (For example, if you roll two 3s, Free-Range Chicken gets +3/+3. If you roll a total of 6 for Free-Range Chicken later that turn, sacrifice it.)|
+Free-Range Chicken|Unglued|58|C|{3}{G}|Creature - Bird|3|3| {1}{G}: Roll two six-sided dice. If both results are the same, Free-Range Chicken gets +X/+X until end of turn, where X is that result. If the total of those results is equal to any other total you have rolled this turn for Free-Range Chicken, sacrifice it. (For example, if you roll two 3s, Free-Range Chicken gets +3/+3. If you roll a total of 6 for Free-Range Chicken later that turn, sacrifice it.)|
 Gerrymandering|Unglued|59|U|{2}{G}|Sorcery|||Exile all lands. Give each player a number of those cards chosen at random equal to the number of those cards the player controlled. Each player returns those cards to the battlefield under that player's control.|
 Growth Spurt|Unglued|61|C|{1}{G}|Instant|||Roll a six-sided die. Target creature gets +X/+X until end of turn, where X is the result.|
 Hungry Hungry Heifer|Unglued|63|U|{2}{G}|Creature - Cow|3|3| At the beginning of your upkeep, you may remove a counter from a permanent you control. If you don't, sacrifice Hungry Hungry Heifer.|