From 65e3da52d8421ab2a9a790b676c008785c8b336a Mon Sep 17 00:00:00 2001 From: Marshall Date: Sat, 20 Jun 2015 19:51:30 -0400 Subject: [PATCH 01/10] Updating author annotations from last PR --- Mage.Sets/src/mage/sets/antiquities/CitanulDruid.java | 2 +- Mage.Sets/src/mage/sets/antiquities/Onulet.java | 2 +- Mage.Sets/src/mage/sets/antiquities/StaffOfZegon.java | 2 +- Mage.Sets/src/mage/sets/fifthedition/PhantasmalForces.java | 2 +- Mage.Sets/src/mage/sets/fourthedition/Onulet.java | 2 +- Mage.Sets/src/mage/sets/fourthedition/PhantasmalForces.java | 2 +- Mage.Sets/src/mage/sets/homelands/SerraAviary.java | 2 +- Mage.Sets/src/mage/sets/legends/AcidRain.java | 2 +- Mage.Sets/src/mage/sets/legends/HornOfDeafening.java | 2 +- Mage.Sets/src/mage/sets/limitedalpha/PhantasmalForces.java | 2 +- Mage.Sets/src/mage/sets/limitedalpha/SedgeTroll.java | 2 +- Mage.Sets/src/mage/sets/limitedbeta/PhantasmalForces.java | 2 +- Mage.Sets/src/mage/sets/limitedbeta/SedgeTroll.java | 2 +- Mage.Sets/src/mage/sets/mastersedition/Onulet.java | 2 +- Mage.Sets/src/mage/sets/masterseditioniv/AcidRain.java | 2 +- Mage.Sets/src/mage/sets/masterseditioniv/AlluringScent.java | 2 +- Mage.Sets/src/mage/sets/masterseditioniv/BeeSting.java | 2 +- Mage.Sets/src/mage/sets/masterseditioniv/CitanulDruid.java | 2 +- Mage.Sets/src/mage/sets/masterseditioniv/CloudDragon.java | 2 +- Mage.Sets/src/mage/sets/masterseditioniv/FireTempest.java | 2 +- Mage.Sets/src/mage/sets/masterseditioniv/HornOfDeafening.java | 2 +- Mage.Sets/src/mage/sets/masterseditioniv/IronhoofOx.java | 2 +- Mage.Sets/src/mage/sets/masterseditioniv/LavaFlow.java | 2 +- Mage.Sets/src/mage/sets/masterseditioniv/Onulet.java | 2 +- Mage.Sets/src/mage/sets/masterseditioniv/PhantasmalForces.java | 2 +- Mage.Sets/src/mage/sets/masterseditioniv/SedgeTroll.java | 2 +- Mage.Sets/src/mage/sets/masterseditioniv/SerraAviary.java | 2 +- Mage.Sets/src/mage/sets/masterseditioniv/StaffOfZegon.java | 2 +- Mage.Sets/src/mage/sets/portal/AlluringScent.java | 2 +- Mage.Sets/src/mage/sets/portal/BeeSting.java | 2 +- Mage.Sets/src/mage/sets/portal/CloudDragon.java | 2 +- Mage.Sets/src/mage/sets/portal/FireTempest.java | 2 +- Mage.Sets/src/mage/sets/portal/LavaFlow.java | 2 +- Mage.Sets/src/mage/sets/portalsecondage/AlluringScent.java | 2 +- Mage.Sets/src/mage/sets/portalsecondage/BeeSting.java | 2 +- Mage.Sets/src/mage/sets/portalsecondage/IronhoofOx.java | 2 +- Mage.Sets/src/mage/sets/revisededition/Onulet.java | 2 +- Mage.Sets/src/mage/sets/revisededition/PhantasmalForces.java | 2 +- Mage.Sets/src/mage/sets/revisededition/SedgeTroll.java | 2 +- Mage.Sets/src/mage/sets/starter1999/AlluringScent.java | 2 +- Mage.Sets/src/mage/sets/starter1999/FireTempest.java | 2 +- Mage.Sets/src/mage/sets/unlimitededition/PhantasmalForces.java | 2 +- Mage.Sets/src/mage/sets/unlimitededition/SedgeTroll.java | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/Mage.Sets/src/mage/sets/antiquities/CitanulDruid.java b/Mage.Sets/src/mage/sets/antiquities/CitanulDruid.java index 3e593593680..dff9da458eb 100644 --- a/Mage.Sets/src/mage/sets/antiquities/CitanulDruid.java +++ b/Mage.Sets/src/mage/sets/antiquities/CitanulDruid.java @@ -43,7 +43,7 @@ import mage.filter.predicate.permanent.ControllerPredicate; /** * - * @author anonymous + * @author ilcartographer */ public class CitanulDruid extends CardImpl { private static final FilterArtifactSpell filter = new FilterArtifactSpell(); diff --git a/Mage.Sets/src/mage/sets/antiquities/Onulet.java b/Mage.Sets/src/mage/sets/antiquities/Onulet.java index d27a886f10f..b3a44081d82 100644 --- a/Mage.Sets/src/mage/sets/antiquities/Onulet.java +++ b/Mage.Sets/src/mage/sets/antiquities/Onulet.java @@ -32,7 +32,7 @@ import mage.constants.Rarity; /** * - * @author anonymous + * @author ilcartographer */ public class Onulet extends mage.sets.mastersedition.Onulet { diff --git a/Mage.Sets/src/mage/sets/antiquities/StaffOfZegon.java b/Mage.Sets/src/mage/sets/antiquities/StaffOfZegon.java index e1e494a7351..d2de484bc05 100644 --- a/Mage.Sets/src/mage/sets/antiquities/StaffOfZegon.java +++ b/Mage.Sets/src/mage/sets/antiquities/StaffOfZegon.java @@ -31,7 +31,7 @@ import java.util.UUID; /** * - * @author anonymous + * @author ilcartographer */ public class StaffOfZegon extends mage.sets.masterseditioniv.StaffOfZegon { diff --git a/Mage.Sets/src/mage/sets/fifthedition/PhantasmalForces.java b/Mage.Sets/src/mage/sets/fifthedition/PhantasmalForces.java index 66a87d3c2c7..9e1ad079cc9 100644 --- a/Mage.Sets/src/mage/sets/fifthedition/PhantasmalForces.java +++ b/Mage.Sets/src/mage/sets/fifthedition/PhantasmalForces.java @@ -31,7 +31,7 @@ import java.util.UUID; /** * - * @author anonymous + * @author ilcartographer */ public class PhantasmalForces extends mage.sets.fourthedition.PhantasmalForces { diff --git a/Mage.Sets/src/mage/sets/fourthedition/Onulet.java b/Mage.Sets/src/mage/sets/fourthedition/Onulet.java index f058249f256..a7ad5753d54 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/Onulet.java +++ b/Mage.Sets/src/mage/sets/fourthedition/Onulet.java @@ -32,7 +32,7 @@ import mage.constants.Rarity; /** * - * @author anonymous + * @author ilcartographer */ public class Onulet extends mage.sets.mastersedition.Onulet { diff --git a/Mage.Sets/src/mage/sets/fourthedition/PhantasmalForces.java b/Mage.Sets/src/mage/sets/fourthedition/PhantasmalForces.java index eb4c8632ca2..11f365ceae2 100644 --- a/Mage.Sets/src/mage/sets/fourthedition/PhantasmalForces.java +++ b/Mage.Sets/src/mage/sets/fourthedition/PhantasmalForces.java @@ -40,7 +40,7 @@ import mage.constants.TargetController; /** * - * @author anonymous + * @author ilcartographer */ public class PhantasmalForces extends CardImpl { diff --git a/Mage.Sets/src/mage/sets/homelands/SerraAviary.java b/Mage.Sets/src/mage/sets/homelands/SerraAviary.java index 56700a59dbd..121b481e671 100644 --- a/Mage.Sets/src/mage/sets/homelands/SerraAviary.java +++ b/Mage.Sets/src/mage/sets/homelands/SerraAviary.java @@ -41,7 +41,7 @@ import mage.filter.predicate.mageobject.AbilityPredicate; /** * - * @author anonymous + * @author ilcartographer */ public class SerraAviary extends CardImpl { diff --git a/Mage.Sets/src/mage/sets/legends/AcidRain.java b/Mage.Sets/src/mage/sets/legends/AcidRain.java index 3cde320343e..209e5fe1814 100644 --- a/Mage.Sets/src/mage/sets/legends/AcidRain.java +++ b/Mage.Sets/src/mage/sets/legends/AcidRain.java @@ -37,7 +37,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; /** * - * @author anonymous + * @author ilcartographer */ public class AcidRain extends CardImpl { diff --git a/Mage.Sets/src/mage/sets/legends/HornOfDeafening.java b/Mage.Sets/src/mage/sets/legends/HornOfDeafening.java index 4c89862c354..53950cdd4c1 100644 --- a/Mage.Sets/src/mage/sets/legends/HornOfDeafening.java +++ b/Mage.Sets/src/mage/sets/legends/HornOfDeafening.java @@ -44,7 +44,7 @@ import mage.target.common.TargetCreaturePermanent; /** * - * @author anonymous + * @author ilcartographer */ public class HornOfDeafening extends CardImpl { diff --git a/Mage.Sets/src/mage/sets/limitedalpha/PhantasmalForces.java b/Mage.Sets/src/mage/sets/limitedalpha/PhantasmalForces.java index 2a21c51caf1..2dd9eabf26f 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/PhantasmalForces.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/PhantasmalForces.java @@ -31,7 +31,7 @@ import java.util.UUID; /** * - * @author anonymous + * @author ilcartographer */ public class PhantasmalForces extends mage.sets.fourthedition.PhantasmalForces { diff --git a/Mage.Sets/src/mage/sets/limitedalpha/SedgeTroll.java b/Mage.Sets/src/mage/sets/limitedalpha/SedgeTroll.java index d72be7da06b..07ae33e3ddc 100644 --- a/Mage.Sets/src/mage/sets/limitedalpha/SedgeTroll.java +++ b/Mage.Sets/src/mage/sets/limitedalpha/SedgeTroll.java @@ -31,7 +31,7 @@ import java.util.UUID; /** * - * @author anonymous + * @author ilcartographer */ public class SedgeTroll extends mage.sets.masterseditioniv.SedgeTroll { diff --git a/Mage.Sets/src/mage/sets/limitedbeta/PhantasmalForces.java b/Mage.Sets/src/mage/sets/limitedbeta/PhantasmalForces.java index 26f73deb1c9..a70fbdb3a8f 100644 --- a/Mage.Sets/src/mage/sets/limitedbeta/PhantasmalForces.java +++ b/Mage.Sets/src/mage/sets/limitedbeta/PhantasmalForces.java @@ -31,7 +31,7 @@ import java.util.UUID; /** * - * @author anonymous + * @author ilcartographer */ public class PhantasmalForces extends mage.sets.fourthedition.PhantasmalForces { diff --git a/Mage.Sets/src/mage/sets/limitedbeta/SedgeTroll.java b/Mage.Sets/src/mage/sets/limitedbeta/SedgeTroll.java index 727f55b9a73..52f81ffef84 100644 --- a/Mage.Sets/src/mage/sets/limitedbeta/SedgeTroll.java +++ b/Mage.Sets/src/mage/sets/limitedbeta/SedgeTroll.java @@ -31,7 +31,7 @@ import java.util.UUID; /** * - * @author anonymous + * @author ilcartographer */ public class SedgeTroll extends mage.sets.masterseditioniv.SedgeTroll { diff --git a/Mage.Sets/src/mage/sets/mastersedition/Onulet.java b/Mage.Sets/src/mage/sets/mastersedition/Onulet.java index 26d81b2f413..95231f592f3 100644 --- a/Mage.Sets/src/mage/sets/mastersedition/Onulet.java +++ b/Mage.Sets/src/mage/sets/mastersedition/Onulet.java @@ -37,7 +37,7 @@ import mage.constants.Rarity; /** * - * @author anonymous + * @author ilcartographer */ public class Onulet extends CardImpl { diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/AcidRain.java b/Mage.Sets/src/mage/sets/masterseditioniv/AcidRain.java index 3364fb827a9..7a677970422 100644 --- a/Mage.Sets/src/mage/sets/masterseditioniv/AcidRain.java +++ b/Mage.Sets/src/mage/sets/masterseditioniv/AcidRain.java @@ -31,7 +31,7 @@ import java.util.UUID; /** * - * @author anonymous + * @author ilcartographer */ public class AcidRain extends mage.sets.legends.AcidRain { diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/AlluringScent.java b/Mage.Sets/src/mage/sets/masterseditioniv/AlluringScent.java index 02f566a2eaa..2053b9ea44c 100644 --- a/Mage.Sets/src/mage/sets/masterseditioniv/AlluringScent.java +++ b/Mage.Sets/src/mage/sets/masterseditioniv/AlluringScent.java @@ -32,7 +32,7 @@ import mage.constants.Rarity; /** * - * @author anonymous + * @author ilcartographer */ public class AlluringScent extends mage.sets.portal.AlluringScent { diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/BeeSting.java b/Mage.Sets/src/mage/sets/masterseditioniv/BeeSting.java index 9aa50ac612f..262aa8869d2 100644 --- a/Mage.Sets/src/mage/sets/masterseditioniv/BeeSting.java +++ b/Mage.Sets/src/mage/sets/masterseditioniv/BeeSting.java @@ -31,7 +31,7 @@ import java.util.UUID; /** * - * @author anonymous + * @author ilcartographer */ public class BeeSting extends mage.sets.portal.BeeSting { diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/CitanulDruid.java b/Mage.Sets/src/mage/sets/masterseditioniv/CitanulDruid.java index 88024ad7fc7..8db6b13cd7c 100644 --- a/Mage.Sets/src/mage/sets/masterseditioniv/CitanulDruid.java +++ b/Mage.Sets/src/mage/sets/masterseditioniv/CitanulDruid.java @@ -32,7 +32,7 @@ import mage.constants.Rarity; /** * - * @author anonymous + * @author ilcartographer */ public class CitanulDruid extends mage.sets.antiquities.CitanulDruid { diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/CloudDragon.java b/Mage.Sets/src/mage/sets/masterseditioniv/CloudDragon.java index 346ed2c10a1..b46cadad065 100644 --- a/Mage.Sets/src/mage/sets/masterseditioniv/CloudDragon.java +++ b/Mage.Sets/src/mage/sets/masterseditioniv/CloudDragon.java @@ -37,7 +37,7 @@ import mage.constants.Rarity; /** * - * @author anonymous + * @author ilcartographer */ public class CloudDragon extends CardImpl { diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/FireTempest.java b/Mage.Sets/src/mage/sets/masterseditioniv/FireTempest.java index 0b5846ce451..8e2e2697e5b 100644 --- a/Mage.Sets/src/mage/sets/masterseditioniv/FireTempest.java +++ b/Mage.Sets/src/mage/sets/masterseditioniv/FireTempest.java @@ -31,7 +31,7 @@ import java.util.UUID; /** * - * @author anonymous + * @author ilcartographer */ public class FireTempest extends mage.sets.portal.FireTempest { diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/HornOfDeafening.java b/Mage.Sets/src/mage/sets/masterseditioniv/HornOfDeafening.java index 0b311293e79..6b16f5612e7 100644 --- a/Mage.Sets/src/mage/sets/masterseditioniv/HornOfDeafening.java +++ b/Mage.Sets/src/mage/sets/masterseditioniv/HornOfDeafening.java @@ -32,7 +32,7 @@ import mage.constants.Rarity; /** * - * @author anonymous + * @author ilcartographer */ public class HornOfDeafening extends mage.sets.legends.HornOfDeafening { diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/IronhoofOx.java b/Mage.Sets/src/mage/sets/masterseditioniv/IronhoofOx.java index 5c40de1cc18..29324fa3a0d 100644 --- a/Mage.Sets/src/mage/sets/masterseditioniv/IronhoofOx.java +++ b/Mage.Sets/src/mage/sets/masterseditioniv/IronhoofOx.java @@ -32,7 +32,7 @@ import mage.constants.Rarity; /** * - * @author anonymous + * @author ilcartographer */ public class IronhoofOx extends mage.sets.portalsecondage.IronhoofOx { diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/LavaFlow.java b/Mage.Sets/src/mage/sets/masterseditioniv/LavaFlow.java index 28e23ad688c..031f2f567bc 100644 --- a/Mage.Sets/src/mage/sets/masterseditioniv/LavaFlow.java +++ b/Mage.Sets/src/mage/sets/masterseditioniv/LavaFlow.java @@ -32,7 +32,7 @@ import mage.constants.Rarity; /** * - * @author anonymous + * @author ilcartographer */ public class LavaFlow extends mage.sets.portal.LavaFlow { diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/Onulet.java b/Mage.Sets/src/mage/sets/masterseditioniv/Onulet.java index c60fa210652..32b52d24d5c 100644 --- a/Mage.Sets/src/mage/sets/masterseditioniv/Onulet.java +++ b/Mage.Sets/src/mage/sets/masterseditioniv/Onulet.java @@ -31,7 +31,7 @@ import java.util.UUID; /** * - * @author anonymous + * @author ilcartographer */ public class Onulet extends mage.sets.mastersedition.Onulet { diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/PhantasmalForces.java b/Mage.Sets/src/mage/sets/masterseditioniv/PhantasmalForces.java index a0423b8bc0e..57aa8ede817 100644 --- a/Mage.Sets/src/mage/sets/masterseditioniv/PhantasmalForces.java +++ b/Mage.Sets/src/mage/sets/masterseditioniv/PhantasmalForces.java @@ -32,7 +32,7 @@ import mage.constants.Rarity; /** * - * @author anonymous + * @author ilcartographer */ public class PhantasmalForces extends mage.sets.fourthedition.PhantasmalForces { diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/SedgeTroll.java b/Mage.Sets/src/mage/sets/masterseditioniv/SedgeTroll.java index bd09ae6f64b..777d8b153e2 100644 --- a/Mage.Sets/src/mage/sets/masterseditioniv/SedgeTroll.java +++ b/Mage.Sets/src/mage/sets/masterseditioniv/SedgeTroll.java @@ -43,7 +43,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate; /** * - * @author anonymous + * @author ilcartographer */ public class SedgeTroll extends CardImpl { diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/SerraAviary.java b/Mage.Sets/src/mage/sets/masterseditioniv/SerraAviary.java index 466ff99dd01..1822f4bd119 100644 --- a/Mage.Sets/src/mage/sets/masterseditioniv/SerraAviary.java +++ b/Mage.Sets/src/mage/sets/masterseditioniv/SerraAviary.java @@ -32,7 +32,7 @@ import mage.constants.Rarity; /** * - * @author anonymous + * @author ilcartographer */ public class SerraAviary extends mage.sets.homelands.SerraAviary { diff --git a/Mage.Sets/src/mage/sets/masterseditioniv/StaffOfZegon.java b/Mage.Sets/src/mage/sets/masterseditioniv/StaffOfZegon.java index fd9f8cd3f42..62d35af6fe1 100644 --- a/Mage.Sets/src/mage/sets/masterseditioniv/StaffOfZegon.java +++ b/Mage.Sets/src/mage/sets/masterseditioniv/StaffOfZegon.java @@ -42,7 +42,7 @@ import mage.target.common.TargetCreaturePermanent; /** * - * @author anonymous + * @author ilcartographer */ public class StaffOfZegon extends CardImpl { diff --git a/Mage.Sets/src/mage/sets/portal/AlluringScent.java b/Mage.Sets/src/mage/sets/portal/AlluringScent.java index 9011d1b8343..fcd20fda219 100644 --- a/Mage.Sets/src/mage/sets/portal/AlluringScent.java +++ b/Mage.Sets/src/mage/sets/portal/AlluringScent.java @@ -37,7 +37,7 @@ import mage.target.common.TargetCreaturePermanent; /** * - * @author anonymous + * @author ilcartographer */ public class AlluringScent extends CardImpl { diff --git a/Mage.Sets/src/mage/sets/portal/BeeSting.java b/Mage.Sets/src/mage/sets/portal/BeeSting.java index 7fd92df02bb..fca843e4ecc 100644 --- a/Mage.Sets/src/mage/sets/portal/BeeSting.java +++ b/Mage.Sets/src/mage/sets/portal/BeeSting.java @@ -36,7 +36,7 @@ import mage.target.common.TargetCreatureOrPlayer; /** * - * @author anonymous + * @author ilcartographer */ public class BeeSting extends CardImpl { diff --git a/Mage.Sets/src/mage/sets/portal/CloudDragon.java b/Mage.Sets/src/mage/sets/portal/CloudDragon.java index 0f296f7deae..aeda4e36799 100644 --- a/Mage.Sets/src/mage/sets/portal/CloudDragon.java +++ b/Mage.Sets/src/mage/sets/portal/CloudDragon.java @@ -31,7 +31,7 @@ import java.util.UUID; /** * - * @author anonymous + * @author ilcartographer */ public class CloudDragon extends mage.sets.masterseditioniv.CloudDragon { diff --git a/Mage.Sets/src/mage/sets/portal/FireTempest.java b/Mage.Sets/src/mage/sets/portal/FireTempest.java index 73a5edd2c58..ba3f8471c5f 100644 --- a/Mage.Sets/src/mage/sets/portal/FireTempest.java +++ b/Mage.Sets/src/mage/sets/portal/FireTempest.java @@ -35,7 +35,7 @@ import mage.constants.Rarity; /** * - * @author anonymous + * @author ilcartographer */ public class FireTempest extends CardImpl { diff --git a/Mage.Sets/src/mage/sets/portal/LavaFlow.java b/Mage.Sets/src/mage/sets/portal/LavaFlow.java index 90da5519b19..c1b7c9ec381 100644 --- a/Mage.Sets/src/mage/sets/portal/LavaFlow.java +++ b/Mage.Sets/src/mage/sets/portal/LavaFlow.java @@ -40,7 +40,7 @@ import mage.target.TargetPermanent; /** * - * @author anonymous + * @author ilcartographer */ public class LavaFlow extends CardImpl { private static final FilterPermanent filter = new FilterPermanent("creature or land"); diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AlluringScent.java b/Mage.Sets/src/mage/sets/portalsecondage/AlluringScent.java index 21362c14c5b..22d9aa4eb09 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/AlluringScent.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/AlluringScent.java @@ -31,7 +31,7 @@ import java.util.UUID; /** * - * @author anonymous + * @author ilcartographer */ public class AlluringScent extends mage.sets.portal.AlluringScent { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/BeeSting.java b/Mage.Sets/src/mage/sets/portalsecondage/BeeSting.java index 46420f52aa4..2a92ef4411e 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/BeeSting.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/BeeSting.java @@ -31,7 +31,7 @@ import java.util.UUID; /** * - * @author anonymous + * @author ilcartographer */ public class BeeSting extends mage.sets.portal.BeeSting { diff --git a/Mage.Sets/src/mage/sets/portalsecondage/IronhoofOx.java b/Mage.Sets/src/mage/sets/portalsecondage/IronhoofOx.java index 78317a733e3..d03926604c3 100644 --- a/Mage.Sets/src/mage/sets/portalsecondage/IronhoofOx.java +++ b/Mage.Sets/src/mage/sets/portalsecondage/IronhoofOx.java @@ -38,7 +38,7 @@ import mage.constants.Zone; /** * - * @author anonymous + * @author ilcartographer */ public class IronhoofOx extends CardImpl { diff --git a/Mage.Sets/src/mage/sets/revisededition/Onulet.java b/Mage.Sets/src/mage/sets/revisededition/Onulet.java index 9289aa7ff50..02813e1c91a 100644 --- a/Mage.Sets/src/mage/sets/revisededition/Onulet.java +++ b/Mage.Sets/src/mage/sets/revisededition/Onulet.java @@ -32,7 +32,7 @@ import mage.constants.Rarity; /** * - * @author anonymous + * @author ilcartographer */ public class Onulet extends mage.sets.mastersedition.Onulet { diff --git a/Mage.Sets/src/mage/sets/revisededition/PhantasmalForces.java b/Mage.Sets/src/mage/sets/revisededition/PhantasmalForces.java index 2dd68aefcc1..928fed59acb 100644 --- a/Mage.Sets/src/mage/sets/revisededition/PhantasmalForces.java +++ b/Mage.Sets/src/mage/sets/revisededition/PhantasmalForces.java @@ -31,7 +31,7 @@ import java.util.UUID; /** * - * @author anonymous + * @author ilcartographer */ public class PhantasmalForces extends mage.sets.fourthedition.PhantasmalForces { diff --git a/Mage.Sets/src/mage/sets/revisededition/SedgeTroll.java b/Mage.Sets/src/mage/sets/revisededition/SedgeTroll.java index 08073719432..8822262f9a7 100644 --- a/Mage.Sets/src/mage/sets/revisededition/SedgeTroll.java +++ b/Mage.Sets/src/mage/sets/revisededition/SedgeTroll.java @@ -31,7 +31,7 @@ import java.util.UUID; /** * - * @author anonymous + * @author ilcartographer */ public class SedgeTroll extends mage.sets.masterseditioniv.SedgeTroll { diff --git a/Mage.Sets/src/mage/sets/starter1999/AlluringScent.java b/Mage.Sets/src/mage/sets/starter1999/AlluringScent.java index a9596f50154..8bb298116cd 100644 --- a/Mage.Sets/src/mage/sets/starter1999/AlluringScent.java +++ b/Mage.Sets/src/mage/sets/starter1999/AlluringScent.java @@ -31,7 +31,7 @@ import java.util.UUID; /** * - * @author anonymous + * @author ilcartographer */ public class AlluringScent extends mage.sets.portal.AlluringScent { diff --git a/Mage.Sets/src/mage/sets/starter1999/FireTempest.java b/Mage.Sets/src/mage/sets/starter1999/FireTempest.java index dc65152b60f..a68ba48a31c 100644 --- a/Mage.Sets/src/mage/sets/starter1999/FireTempest.java +++ b/Mage.Sets/src/mage/sets/starter1999/FireTempest.java @@ -31,7 +31,7 @@ import java.util.UUID; /** * - * @author anonymous + * @author ilcartographer */ public class FireTempest extends mage.sets.portal.FireTempest { diff --git a/Mage.Sets/src/mage/sets/unlimitededition/PhantasmalForces.java b/Mage.Sets/src/mage/sets/unlimitededition/PhantasmalForces.java index bfcfed29b27..61e5a4482d9 100644 --- a/Mage.Sets/src/mage/sets/unlimitededition/PhantasmalForces.java +++ b/Mage.Sets/src/mage/sets/unlimitededition/PhantasmalForces.java @@ -31,7 +31,7 @@ import java.util.UUID; /** * - * @author anonymous + * @author ilcartographer */ public class PhantasmalForces extends mage.sets.fourthedition.PhantasmalForces { diff --git a/Mage.Sets/src/mage/sets/unlimitededition/SedgeTroll.java b/Mage.Sets/src/mage/sets/unlimitededition/SedgeTroll.java index 4469f488942..455725de133 100644 --- a/Mage.Sets/src/mage/sets/unlimitededition/SedgeTroll.java +++ b/Mage.Sets/src/mage/sets/unlimitededition/SedgeTroll.java @@ -31,7 +31,7 @@ import java.util.UUID; /** * - * @author anonymous + * @author ilcartographer */ public class SedgeTroll extends mage.sets.masterseditioniv.SedgeTroll { From 8611f7499c3db99c45d879035c2505c3909b77bd Mon Sep 17 00:00:00 2001 From: Marshall Date: Sat, 20 Jun 2015 21:06:16 -0400 Subject: [PATCH 02/10] Breaking Point added --- .../src/mage/sets/judgment/BreakingPoint.java | 111 ++++++++++++++++++ .../sets/sorinvstibalt/BreakingPoint.java | 52 ++++++++ 2 files changed, 163 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/judgment/BreakingPoint.java create mode 100644 Mage.Sets/src/mage/sets/sorinvstibalt/BreakingPoint.java diff --git a/Mage.Sets/src/mage/sets/judgment/BreakingPoint.java b/Mage.Sets/src/mage/sets/judgment/BreakingPoint.java new file mode 100644 index 00000000000..9dbac265357 --- /dev/null +++ b/Mage.Sets/src/mage/sets/judgment/BreakingPoint.java @@ -0,0 +1,111 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.judgment; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.effects.OneShotEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.filter.common.FilterCreaturePermanent; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.game.stack.Spell; +import mage.game.stack.StackObject; +import mage.players.Player; + +/** + * + * @author ilcartographer + */ +public class BreakingPoint extends CardImpl { + + public BreakingPoint(UUID ownerId) { + super(ownerId, 81, "Breaking Point", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{R}{R}"); + this.expansionSetCode = "JUD"; + + // Any player may have Breaking Point deal 6 damage to him or her. If no one does, destroy all creatures. Creatures destroyed this way can't be regenerated. + this.getSpellAbility().addEffect(new BreakingPointDestroyEffect()); + } + + public BreakingPoint(final BreakingPoint card) { + super(card); + } + + @Override + public BreakingPoint copy() { + return new BreakingPoint(this); + } +} + +class BreakingPointDestroyEffect extends OneShotEffect { + + public BreakingPointDestroyEffect() { + super(Outcome.Benefit); + this.staticText = "Any player may have Breaking Point deal 6 damage to him or her. If no one does, destroy all creatures. Creatures destroyed this way can't be regenerated."; + } + + public BreakingPointDestroyEffect(final BreakingPointDestroyEffect effect) { + super(effect); + } + + @Override + public BreakingPointDestroyEffect copy() { + return new BreakingPointDestroyEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + StackObject spell = null; + for(StackObject object : game.getStack()){ + if(object instanceof Spell && object.getSourceId().equals(source.getSourceId())){ + spell = object; + } + } + if(spell != null){ + boolean destroyCreatures = true; + for(UUID uuid : game.getPlayerList()){ + Player player = game.getPlayer(uuid); + if(player != null && player.chooseUse(Outcome.Detriment, "Have " + spell.getName() + " deal 6 damage to you?", game)){ + destroyCreatures = false; + player.damage(6, source.getSourceId(), game, false, true); + game.informPlayers(player.getLogName() + " has " + spell.getName() + " deal 6 to him or her"); + } + } + if (destroyCreatures) { + for (Permanent permanent : game.getBattlefield().getActivePermanents(new FilterCreaturePermanent("creatures"), source.getControllerId(), source.getSourceId(), game)) { + permanent.destroy(source.getSourceId(), game, true); + } + } + return destroyCreatures; + } + return false; + } +} diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/BreakingPoint.java b/Mage.Sets/src/mage/sets/sorinvstibalt/BreakingPoint.java new file mode 100644 index 00000000000..8a375ed1fb9 --- /dev/null +++ b/Mage.Sets/src/mage/sets/sorinvstibalt/BreakingPoint.java @@ -0,0 +1,52 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.sorinvstibalt; + +import java.util.UUID; + +/** + * + * @author ilcartographer + */ +public class BreakingPoint extends mage.sets.judgment.BreakingPoint { + + public BreakingPoint(UUID ownerId) { + super(ownerId); + this.cardNumber = 67; + this.expansionSetCode = "DDK"; + } + + public BreakingPoint(final BreakingPoint card) { + super(card); + } + + @Override + public BreakingPoint copy() { + return new BreakingPoint(this); + } +} From cfc1171b4d821f6b9e986ce1d4f958a179ec8a35 Mon Sep 17 00:00:00 2001 From: Marshall Date: Sat, 20 Jun 2015 21:13:21 -0400 Subject: [PATCH 03/10] Strangling Soot added --- .../sets/sorinvstibalt/StranglingSoot.java | 74 +++++++++++++++++++ .../mage/sets/timespiral/StranglingSoot.java | 52 +++++++++++++ 2 files changed, 126 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/sorinvstibalt/StranglingSoot.java create mode 100644 Mage.Sets/src/mage/sets/timespiral/StranglingSoot.java diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/StranglingSoot.java b/Mage.Sets/src/mage/sets/sorinvstibalt/StranglingSoot.java new file mode 100644 index 00000000000..11688e61a4a --- /dev/null +++ b/Mage.Sets/src/mage/sets/sorinvstibalt/StranglingSoot.java @@ -0,0 +1,74 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.sorinvstibalt; + +import java.util.UUID; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.common.DestroyTargetEffect; +import mage.abilities.keyword.FlashbackAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TimingRule; +import mage.filter.Filter; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.ToughnessPredicate; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author ilcartographer + */ +public class StranglingSoot extends CardImpl { + + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with toughess 3 or less"); + + static { + filter.add(new ToughnessPredicate(Filter.ComparisonType.LessThan, 4)); + } + + public StranglingSoot(UUID ownerId) { + super(ownerId, 65, "Strangling Soot", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{B}"); + this.expansionSetCode = "DDK"; + + // Destroy target creature with toughness 3 or less. + this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); + this.getSpellAbility().addEffect(new DestroyTargetEffect()); + // Flashback {5}{R} + this.addAbility(new FlashbackAbility(new ManaCostsImpl("{5}{R}"), TimingRule.INSTANT)); + } + + public StranglingSoot(final StranglingSoot card) { + super(card); + } + + @Override + public StranglingSoot copy() { + return new StranglingSoot(this); + } +} diff --git a/Mage.Sets/src/mage/sets/timespiral/StranglingSoot.java b/Mage.Sets/src/mage/sets/timespiral/StranglingSoot.java new file mode 100644 index 00000000000..fb8de84eab2 --- /dev/null +++ b/Mage.Sets/src/mage/sets/timespiral/StranglingSoot.java @@ -0,0 +1,52 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.timespiral; + +import java.util.UUID; + +/** + * + * @author ilcartographer + */ +public class StranglingSoot extends mage.sets.sorinvstibalt.StranglingSoot { + + public StranglingSoot(UUID ownerId) { + super(ownerId); + this.cardNumber = 132; + this.expansionSetCode = "TSP"; + } + + public StranglingSoot(final StranglingSoot card) { + super(card); + } + + @Override + public StranglingSoot copy() { + return new StranglingSoot(this); + } +} From 1d17ced17448cbb577260b061d69ab2ed9b3717f Mon Sep 17 00:00:00 2001 From: Marshall Date: Sat, 20 Jun 2015 21:19:35 -0400 Subject: [PATCH 04/10] Coal Stoker added --- .../mage/sets/sorinvstibalt/CoalStoker.java | 71 +++++++++++++++++++ .../src/mage/sets/timespiral/CoalStoker.java | 52 ++++++++++++++ 2 files changed, 123 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/sorinvstibalt/CoalStoker.java create mode 100644 Mage.Sets/src/mage/sets/timespiral/CoalStoker.java diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/CoalStoker.java b/Mage.Sets/src/mage/sets/sorinvstibalt/CoalStoker.java new file mode 100644 index 00000000000..0d64066dfa0 --- /dev/null +++ b/Mage.Sets/src/mage/sets/sorinvstibalt/CoalStoker.java @@ -0,0 +1,71 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.sorinvstibalt; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.EntersBattlefieldTriggeredAbility; +import mage.abilities.condition.common.CastFromHandCondition; +import mage.abilities.decorator.ConditionalOneShotEffect; +import mage.abilities.effects.common.ExileAllEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.filter.common.FilterAttackingCreature; +import mage.watchers.common.CastFromHandWatcher; + +/** + * + * @author ilcartographer + */ +public class CoalStoker extends CardImpl { + + public CoalStoker(UUID ownerId) { + super(ownerId, 49, "Coal Stoker", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{3}{R}"); + this.expansionSetCode = "DDK"; + this.subtype.add("Elemental"); + this.power = new MageInt(3); + this.toughness = new MageInt(3); + + // When Coal Stoker enters the battlefield, if you cast it from your hand, add {R}{R}{R} to your mana pool. + Ability ability = new EntersBattlefieldTriggeredAbility( + new ConditionalOneShotEffect(, new CastFromHandCondition(), + " if you cast it from your hand, add {R}{R}{R} to your mana pool.")); + this.addAbility(ability, new CastFromHandWatcher()); + } + + public CoalStoker(final CoalStoker card) { + super(card); + } + + @Override + public CoalStoker copy() { + return new CoalStoker(this); + } +} diff --git a/Mage.Sets/src/mage/sets/timespiral/CoalStoker.java b/Mage.Sets/src/mage/sets/timespiral/CoalStoker.java new file mode 100644 index 00000000000..87e12900291 --- /dev/null +++ b/Mage.Sets/src/mage/sets/timespiral/CoalStoker.java @@ -0,0 +1,52 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.timespiral; + +import java.util.UUID; + +/** + * + * @author ilcartographer + */ +public class CoalStoker extends mage.sets.sorinvstibalt.CoalStoker { + + public CoalStoker(UUID ownerId) { + super(ownerId); + this.cardNumber = 150; + this.expansionSetCode = "TSP"; + } + + public CoalStoker(final CoalStoker card) { + super(card); + } + + @Override + public CoalStoker copy() { + return new CoalStoker(this); + } +} From 91edab2ae8b32a1db0f6b1cd9d6c0830ce1c0e11 Mon Sep 17 00:00:00 2001 From: Marshall Date: Sat, 20 Jun 2015 21:20:48 -0400 Subject: [PATCH 05/10] Saved Coal Stoker file... --- Mage.Sets/src/mage/sets/sorinvstibalt/CoalStoker.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/CoalStoker.java b/Mage.Sets/src/mage/sets/sorinvstibalt/CoalStoker.java index 0d64066dfa0..90aebf995f4 100644 --- a/Mage.Sets/src/mage/sets/sorinvstibalt/CoalStoker.java +++ b/Mage.Sets/src/mage/sets/sorinvstibalt/CoalStoker.java @@ -29,10 +29,12 @@ package mage.sets.sorinvstibalt; import java.util.UUID; import mage.MageInt; +import mage.Mana; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.CastFromHandCondition; import mage.abilities.decorator.ConditionalOneShotEffect; +import mage.abilities.effects.common.BasicManaEffect; import mage.abilities.effects.common.ExileAllEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -55,7 +57,7 @@ public class CoalStoker extends CardImpl { // When Coal Stoker enters the battlefield, if you cast it from your hand, add {R}{R}{R} to your mana pool. Ability ability = new EntersBattlefieldTriggeredAbility( - new ConditionalOneShotEffect(, new CastFromHandCondition(), + new ConditionalOneShotEffect(new BasicManaEffect(new Mana(3, 0, 0, 0, 0, 0, 0)), new CastFromHandCondition(), " if you cast it from your hand, add {R}{R}{R} to your mana pool.")); this.addAbility(ability, new CastFromHandWatcher()); } From 5b14342a180f5547cab3687f099c70fa3b69a6ad Mon Sep 17 00:00:00 2001 From: Marshall Date: Sat, 20 Jun 2015 21:28:07 -0400 Subject: [PATCH 06/10] Lavaborn Muse added --- .../src/mage/sets/legions/LavabornMuse.java | 52 +++++++++++ .../mage/sets/sorinvstibalt/LavabornMuse.java | 86 +++++++++++++++++++ .../mage/sets/tenthedition/LavabornMuse.java | 52 +++++++++++ 3 files changed, 190 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/legions/LavabornMuse.java create mode 100644 Mage.Sets/src/mage/sets/sorinvstibalt/LavabornMuse.java create mode 100644 Mage.Sets/src/mage/sets/tenthedition/LavabornMuse.java diff --git a/Mage.Sets/src/mage/sets/legions/LavabornMuse.java b/Mage.Sets/src/mage/sets/legions/LavabornMuse.java new file mode 100644 index 00000000000..20948d6ccc0 --- /dev/null +++ b/Mage.Sets/src/mage/sets/legions/LavabornMuse.java @@ -0,0 +1,52 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.legions; + +import java.util.UUID; + +/** + * + * @author ilcartographer + */ +public class LavabornMuse extends mage.sets.sorinvstibalt.LavabornMuse { + + public LavabornMuse(UUID ownerId) { + super(ownerId); + this.cardNumber = 105; + this.expansionSetCode = "LGN"; + } + + public LavabornMuse(final LavabornMuse card) { + super(card); + } + + @Override + public LavabornMuse copy() { + return new LavabornMuse(this); + } +} diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/LavabornMuse.java b/Mage.Sets/src/mage/sets/sorinvstibalt/LavabornMuse.java new file mode 100644 index 00000000000..03353d0dbf7 --- /dev/null +++ b/Mage.Sets/src/mage/sets/sorinvstibalt/LavabornMuse.java @@ -0,0 +1,86 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.sorinvstibalt; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; +import mage.abilities.condition.Condition; +import mage.abilities.decorator.ConditionalTriggeredAbility; +import mage.abilities.effects.common.DamageTargetEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.constants.TargetController; +import mage.constants.Zone; +import mage.game.Game; +import mage.players.Player; + +/** + * + * @author ilcartographer + */ +public class LavabornMuse extends CardImpl { + + public LavabornMuse(UUID ownerId) { + super(ownerId, 50, "Lavaborn Muse", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{R}"); + this.expansionSetCode = "DDK"; + this.subtype.add("Spirit"); + this.power = new MageInt(3); + this.toughness = new MageInt(3); + + // At the beginning of each opponent's upkeep, if that player has two or fewer cards in hand, Lavaborn Muse deals 3 damage to him or her. + this.addAbility(new ConditionalTriggeredAbility( + new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), TargetController.OPPONENT, false, true), + new CardsInActivePlayersHandCondition(), + "At the beginning of each opponent's upkeep, if that player has two or fewer cards in hand, {this} deals 3 damage to him or her.", + false)); + } + + public LavabornMuse(final LavabornMuse card) { + super(card); + } + + @Override + public LavabornMuse copy() { + return new LavabornMuse(this); + } +} + +// TODO: Figure out CardsInHandCondition parameters and use that instead of rewriting this +// TODO: Update HellfireMongrel, ShriekingAffliction to use the CardsInHandCondition? +class CardsInActivePlayersHandCondition implements Condition { + + @Override + public boolean apply(Game game, Ability source) { + Player player = game.getPlayer(game.getActivePlayerId()); + return player != null && player.getHand().size() <= 2; + } +} + diff --git a/Mage.Sets/src/mage/sets/tenthedition/LavabornMuse.java b/Mage.Sets/src/mage/sets/tenthedition/LavabornMuse.java new file mode 100644 index 00000000000..65bde3e1498 --- /dev/null +++ b/Mage.Sets/src/mage/sets/tenthedition/LavabornMuse.java @@ -0,0 +1,52 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.tenthedition; + +import java.util.UUID; + +/** + * + * @author ilcartographer + */ +public class LavabornMuse extends mage.sets.sorinvstibalt.LavabornMuse { + + public LavabornMuse(UUID ownerId) { + super(ownerId); + this.cardNumber = 216; + this.expansionSetCode = "10E"; + } + + public LavabornMuse(final LavabornMuse card) { + super(card); + } + + @Override + public LavabornMuse copy() { + return new LavabornMuse(this); + } +} From 18a4902d65db23f4f8f1c019c0110e1cda6ba9c0 Mon Sep 17 00:00:00 2001 From: Marshall Date: Sat, 20 Jun 2015 21:30:02 -0400 Subject: [PATCH 07/10] Ancient Craving added --- .../sets/portalsecondage/AncientCraving.java | 52 ++++++++++++++++ .../sets/sorinvstibalt/AncientCraving.java | 52 ++++++++++++++++ .../mage/sets/starter1999/AncientCraving.java | 60 +++++++++++++++++++ 3 files changed, 164 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/portalsecondage/AncientCraving.java create mode 100644 Mage.Sets/src/mage/sets/sorinvstibalt/AncientCraving.java create mode 100644 Mage.Sets/src/mage/sets/starter1999/AncientCraving.java diff --git a/Mage.Sets/src/mage/sets/portalsecondage/AncientCraving.java b/Mage.Sets/src/mage/sets/portalsecondage/AncientCraving.java new file mode 100644 index 00000000000..4dc2cbf056c --- /dev/null +++ b/Mage.Sets/src/mage/sets/portalsecondage/AncientCraving.java @@ -0,0 +1,52 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.portalsecondage; + +import java.util.UUID; + +/** + * + * @author ilcartographer + */ +public class AncientCraving extends mage.sets.starter1999.AncientCraving { + + public AncientCraving(UUID ownerId) { + super(ownerId); + this.cardNumber = 2; + this.expansionSetCode = "PO2"; + } + + public AncientCraving(final AncientCraving card) { + super(card); + } + + @Override + public AncientCraving copy() { + return new AncientCraving(this); + } +} diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/AncientCraving.java b/Mage.Sets/src/mage/sets/sorinvstibalt/AncientCraving.java new file mode 100644 index 00000000000..be12502f97f --- /dev/null +++ b/Mage.Sets/src/mage/sets/sorinvstibalt/AncientCraving.java @@ -0,0 +1,52 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.sorinvstibalt; + +import java.util.UUID; + +/** + * + * @author ilcartographer + */ +public class AncientCraving extends mage.sets.starter1999.AncientCraving { + + public AncientCraving(UUID ownerId) { + super(ownerId); + this.cardNumber = 28; + this.expansionSetCode = "DDK"; + } + + public AncientCraving(final AncientCraving card) { + super(card); + } + + @Override + public AncientCraving copy() { + return new AncientCraving(this); + } +} diff --git a/Mage.Sets/src/mage/sets/starter1999/AncientCraving.java b/Mage.Sets/src/mage/sets/starter1999/AncientCraving.java new file mode 100644 index 00000000000..a0bd441c2e9 --- /dev/null +++ b/Mage.Sets/src/mage/sets/starter1999/AncientCraving.java @@ -0,0 +1,60 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.starter1999; + +import java.util.UUID; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; +import mage.abilities.effects.common.LoseLifeSourceControllerEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; + +/** + * + * @author ilcartographer + */ +public class AncientCraving extends CardImpl { + + public AncientCraving(UUID ownerId) { + super(ownerId, 64, "Ancient Craving", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{B}"); + this.expansionSetCode = "S99"; + + // You draw three cards and you lose 3 life. + this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(3)); + this.getSpellAbility().addEffect(new LoseLifeSourceControllerEffect(3)); + } + + public AncientCraving(final AncientCraving card) { + super(card); + } + + @Override + public AncientCraving copy() { + return new AncientCraving(this); + } +} From ff4c3d3d3ea25b25e114e098adad14f84db47574 Mon Sep 17 00:00:00 2001 From: Marshall Date: Sat, 20 Jun 2015 21:36:33 -0400 Subject: [PATCH 08/10] Decompose added --- .../src/mage/sets/odyssey/Decompose.java | 61 +++++++++++++++++++ .../mage/sets/sorinvstibalt/Decompose.java | 52 ++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/odyssey/Decompose.java create mode 100644 Mage.Sets/src/mage/sets/sorinvstibalt/Decompose.java diff --git a/Mage.Sets/src/mage/sets/odyssey/Decompose.java b/Mage.Sets/src/mage/sets/odyssey/Decompose.java new file mode 100644 index 00000000000..739a0781337 --- /dev/null +++ b/Mage.Sets/src/mage/sets/odyssey/Decompose.java @@ -0,0 +1,61 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.odyssey; + +import java.util.UUID; +import mage.abilities.effects.common.ExileTargetEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Rarity; +import mage.filter.FilterCard; +import mage.target.common.TargetCardInASingleGraveyard; + +/** + * + * @author ilcartographer + */ +public class Decompose extends CardImpl { + + public Decompose(UUID ownerId) { + super(ownerId, 128, "Decompose", Rarity.UNCOMMON, new CardType[]{CardType.SORCERY}, "{1}{B}"); + this.expansionSetCode = "ODY"; + + // Exile up to three target cards from a single graveyard. + this.getSpellAbility().addEffect(new ExileTargetEffect()); + this.getSpellAbility().addTarget(new TargetCardInASingleGraveyard(0, 3, new FilterCard("cards"))); + } + + public Decompose(final Decompose card) { + super(card); + } + + @Override + public Decompose copy() { + return new Decompose(this); + } +} diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/Decompose.java b/Mage.Sets/src/mage/sets/sorinvstibalt/Decompose.java new file mode 100644 index 00000000000..b7c56dd58c6 --- /dev/null +++ b/Mage.Sets/src/mage/sets/sorinvstibalt/Decompose.java @@ -0,0 +1,52 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.sorinvstibalt; + +import java.util.UUID; + +/** + * + * @author ilcartographer + */ +public class Decompose extends mage.sets.odyssey.Decompose { + + public Decompose(UUID ownerId) { + super(ownerId); + this.cardNumber = 20; + this.expansionSetCode = "DDK"; + } + + public Decompose(final Decompose card) { + super(card); + } + + @Override + public Decompose copy() { + return new Decompose(this); + } +} From 5c65b278abff00f546092aea007e209a88ec91fb Mon Sep 17 00:00:00 2001 From: Marshall Date: Sat, 20 Jun 2015 21:49:05 -0400 Subject: [PATCH 09/10] Revenant Patriarch added --- .../sets/guildpact/RevenantPatriarch.java | 52 +++++++++ .../sets/sorinvstibalt/RevenantPatriarch.java | 107 ++++++++++++++++++ 2 files changed, 159 insertions(+) create mode 100644 Mage.Sets/src/mage/sets/guildpact/RevenantPatriarch.java create mode 100644 Mage.Sets/src/mage/sets/sorinvstibalt/RevenantPatriarch.java diff --git a/Mage.Sets/src/mage/sets/guildpact/RevenantPatriarch.java b/Mage.Sets/src/mage/sets/guildpact/RevenantPatriarch.java new file mode 100644 index 00000000000..9ad228ec560 --- /dev/null +++ b/Mage.Sets/src/mage/sets/guildpact/RevenantPatriarch.java @@ -0,0 +1,52 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.guildpact; + +import java.util.UUID; + +/** + * + * @author ilcartographer + */ +public class RevenantPatriarch extends mage.sets.sorinvstibalt.RevenantPatriarch { + + public RevenantPatriarch(UUID ownerId) { + super(ownerId); + this.cardNumber = 59; + this.expansionSetCode = "GPT"; + } + + public RevenantPatriarch(final RevenantPatriarch card) { + super(card); + } + + @Override + public RevenantPatriarch copy() { + return new RevenantPatriarch(this); + } +} diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/RevenantPatriarch.java b/Mage.Sets/src/mage/sets/sorinvstibalt/RevenantPatriarch.java new file mode 100644 index 00000000000..c5db0e5293c --- /dev/null +++ b/Mage.Sets/src/mage/sets/sorinvstibalt/RevenantPatriarch.java @@ -0,0 +1,107 @@ +/* + * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ +package mage.sets.sorinvstibalt; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.CantBlockAbility; +import mage.abilities.common.EntersBattlefieldTriggeredAbility; +import mage.abilities.condition.Condition; +import mage.abilities.condition.common.ManaWasSpentCondition; +import mage.abilities.effects.OneShotEffect; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.ColoredManaSymbol; +import mage.constants.Outcome; +import mage.constants.Rarity; +import mage.constants.TurnPhase; +import mage.game.Game; +import mage.game.turn.TurnMod; +import mage.players.Player; +import mage.watchers.common.ManaSpentToCastWatcher; + +/** + * + * @author ilcartographer + */ +public class RevenantPatriarch extends CardImpl { + + public RevenantPatriarch(UUID ownerId) { + super(ownerId, 16, "Revenant Patriarch", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{4}{B}"); + this.expansionSetCode = "DDK"; + this.subtype.add("Spirit"); + this.power = new MageInt(4); + this.toughness = new MageInt(3); + + // When Revenant Patriarch enters the battlefield, if {W} was spent to cast it, target player skips his or her next combat phase. + this.addAbility(new EntersBattlefieldTriggeredAbility(new SkipNextCombatIfConditionEffect(new ManaWasSpentCondition(ColoredManaSymbol.W)), false), new ManaSpentToCastWatcher()); + // Revenant Patriarch can't block. + this.addAbility(new CantBlockAbility()); + } + + public RevenantPatriarch(final RevenantPatriarch card) { + super(card); + } + + @Override + public RevenantPatriarch copy() { + return new RevenantPatriarch(this); + } +} + +class SkipNextCombatIfConditionEffect extends OneShotEffect { + + protected Condition condition; + + public SkipNextCombatIfConditionEffect(Condition condition) { + super(Outcome.Detriment); + staticText = "that player skips his or her next combat phase"; + this.condition = condition; + } + + public SkipNextCombatIfConditionEffect(final SkipNextCombatIfConditionEffect effect) { + super(effect); + this.condition = effect.condition; + } + + @Override + public boolean apply(Game game, Ability source) { + Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); + if (player != null && !condition.apply(game, source)) { + game.getState().getTurnMods().add(new TurnMod(player.getId(), TurnPhase.COMBAT, null, true)); + return true; + } + return false; + } + + @Override + public SkipNextCombatIfConditionEffect copy() { + return new SkipNextCombatIfConditionEffect(this); + } +} From bbeb421f912f8f35f159e006a76a4e4b33ba1270 Mon Sep 17 00:00:00 2001 From: Marshall Date: Sun, 21 Jun 2015 20:50:03 -0400 Subject: [PATCH 10/10] Revenant Patriarch trigger fixed --- .../sets/sorinvstibalt/RevenantPatriarch.java | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/Mage.Sets/src/mage/sets/sorinvstibalt/RevenantPatriarch.java b/Mage.Sets/src/mage/sets/sorinvstibalt/RevenantPatriarch.java index c5db0e5293c..b8ea4b2fe3e 100644 --- a/Mage.Sets/src/mage/sets/sorinvstibalt/RevenantPatriarch.java +++ b/Mage.Sets/src/mage/sets/sorinvstibalt/RevenantPatriarch.java @@ -30,10 +30,11 @@ package mage.sets.sorinvstibalt; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; +import mage.abilities.TriggeredAbility; import mage.abilities.common.CantBlockAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.condition.Condition; import mage.abilities.condition.common.ManaWasSpentCondition; +import mage.abilities.decorator.ConditionalTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.cards.CardImpl; import mage.constants.CardType; @@ -44,6 +45,7 @@ import mage.constants.TurnPhase; import mage.game.Game; import mage.game.turn.TurnMod; import mage.players.Player; +import mage.target.TargetPlayer; import mage.watchers.common.ManaSpentToCastWatcher; /** @@ -60,7 +62,10 @@ public class RevenantPatriarch extends CardImpl { this.toughness = new MageInt(3); // When Revenant Patriarch enters the battlefield, if {W} was spent to cast it, target player skips his or her next combat phase. - this.addAbility(new EntersBattlefieldTriggeredAbility(new SkipNextCombatIfConditionEffect(new ManaWasSpentCondition(ColoredManaSymbol.W)), false), new ManaSpentToCastWatcher()); + TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new TargetPlayerSkipNextCombatEffect(), false); + ability.addTarget(new TargetPlayer()); + this.addAbility(new ConditionalTriggeredAbility(ability, new ManaWasSpentCondition(ColoredManaSymbol.W), + "if {W} was spent to cast it, target player skips his or her next combat phase."), new ManaSpentToCastWatcher()); // Revenant Patriarch can't block. this.addAbility(new CantBlockAbility()); } @@ -75,33 +80,30 @@ public class RevenantPatriarch extends CardImpl { } } -class SkipNextCombatIfConditionEffect extends OneShotEffect { +class TargetPlayerSkipNextCombatEffect extends OneShotEffect { - protected Condition condition; - - public SkipNextCombatIfConditionEffect(Condition condition) { + public TargetPlayerSkipNextCombatEffect() { super(Outcome.Detriment); - staticText = "that player skips his or her next combat phase"; - this.condition = condition; } - public SkipNextCombatIfConditionEffect(final SkipNextCombatIfConditionEffect effect) { + public TargetPlayerSkipNextCombatEffect(final TargetPlayerSkipNextCombatEffect effect) { super(effect); - this.condition = effect.condition; } @Override public boolean apply(Game game, Ability source) { Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); - if (player != null && !condition.apply(game, source)) { + + if (player != null) { game.getState().getTurnMods().add(new TurnMod(player.getId(), TurnPhase.COMBAT, null, true)); return true; } + return false; } @Override - public SkipNextCombatIfConditionEffect copy() { - return new SkipNextCombatIfConditionEffect(this); + public TargetPlayerSkipNextCombatEffect copy() { + return new TargetPlayerSkipNextCombatEffect(this); } }