diff --git a/Mage.Sets/mage-sets.iml b/Mage.Sets/mage-sets.iml
new file mode 100644
index 0000000000..cf833ce9c5
--- /dev/null
+++ b/Mage.Sets/mage-sets.iml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Mage.Sets/src/mage/sets/timeshifted/AkromaAngelOfWrath.java b/Mage.Sets/src/mage/sets/timeshifted/AkromaAngelOfWrath.java
new file mode 100644
index 0000000000..24a34a031f
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/timeshifted/AkromaAngelOfWrath.java
@@ -0,0 +1,85 @@
+/*
+ * 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.timeshifted;
+
+import java.util.UUID;
+import mage.Constants.CardType;
+import mage.Constants.Rarity;
+import mage.MageInt;
+import mage.abilities.keyword.*;
+import mage.cards.CardImpl;
+import mage.filter.Filter;
+import mage.filter.FilterCard;
+
+/**
+ *
+ * @author Loki
+ */
+public class AkromaAngelOfWrath extends CardImpl {
+ private static FilterCard filter = new FilterCard("Black");
+ private static FilterCard filter2 = new FilterCard("Red");
+
+ static {
+ filter.setUseColor(true);
+ filter.getColor().setBlack(true);
+ filter.setScopeColor(Filter.ComparisonScope.Any);
+
+ filter2.setUseColor(true);
+ filter2.getColor().setRed(true);
+ filter2.setScopeColor(Filter.ComparisonScope.Any);
+ }
+
+ public AkromaAngelOfWrath(UUID ownerId) {
+ super(ownerId, 1, "Akroma, Angel of Wrath", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{5}{W}{W}{W}");
+ this.expansionSetCode = "TSB";
+ this.supertype.add("Legendary");
+ this.subtype.add("Angel");
+
+ this.color.setWhite(true);
+ this.power = new MageInt(6);
+ this.toughness = new MageInt(6);
+
+ this.addAbility(FlyingAbility.getInstance());
+ this.addAbility(FirstStrikeAbility.getInstance());
+ this.addAbility(VigilanceAbility.getInstance());
+ this.addAbility(TrampleAbility.getInstance());
+ this.addAbility(HasteAbility.getInstance());
+ // protection from black and from red
+ this.addAbility(new ProtectionAbility(filter));
+ this.addAbility(new ProtectionAbility(filter2));
+ }
+
+ public AkromaAngelOfWrath(final AkromaAngelOfWrath card) {
+ super(card);
+ }
+
+ @Override
+ public AkromaAngelOfWrath copy() {
+ return new AkromaAngelOfWrath(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/worldwake/ArchonOfRedemption.java b/Mage.Sets/src/mage/sets/worldwake/ArchonOfRedemption.java
new file mode 100644
index 0000000000..93ed10c876
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/worldwake/ArchonOfRedemption.java
@@ -0,0 +1,145 @@
+/*
+ * 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.worldwake;
+
+import java.util.UUID;
+
+import mage.Constants;
+import mage.Constants.CardType;
+import mage.Constants.Rarity;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.ZoneChangeEvent;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.targetpointer.FixedTarget;
+
+/**
+ * @author Loki
+ */
+public class ArchonOfRedemption extends CardImpl {
+
+ public ArchonOfRedemption(UUID ownerId) {
+ super(ownerId, 3, "Archon of Redemption", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{W}{W}");
+ this.expansionSetCode = "WWK";
+ this.subtype.add("Archon");
+
+ this.color.setWhite(true);
+ this.power = new MageInt(3);
+ this.toughness = new MageInt(4);
+
+ this.addAbility(FlyingAbility.getInstance());
+ // Whenever Archon of Redemption or another creature with flying enters the battlefield under your control, you may gain life equal to that creature's power.
+ this.addAbility(new ArchonOfRedemptionTriggeredAbility());
+ }
+
+ public ArchonOfRedemption(final ArchonOfRedemption card) {
+ super(card);
+ }
+
+ @Override
+ public ArchonOfRedemption copy() {
+ return new ArchonOfRedemption(this);
+ }
+}
+
+class ArchonOfRedemptionTriggeredAbility extends TriggeredAbilityImpl {
+ ArchonOfRedemptionTriggeredAbility() {
+ super(Constants.Zone.BATTLEFIELD, new ArchonOfRedemptionEffect(), true);
+ }
+
+ ArchonOfRedemptionTriggeredAbility(final ArchonOfRedemptionTriggeredAbility ability) {
+ super(ability);
+ }
+
+ @Override
+ public ArchonOfRedemptionTriggeredAbility copy() {
+ return new ArchonOfRedemptionTriggeredAbility(this);
+ }
+
+ @Override
+ public boolean checkTrigger(GameEvent event, Game game) {
+ if (event.getType() == GameEvent.EventType.ZONE_CHANGE) {
+ UUID targetId = event.getTargetId();
+ Permanent permanent = game.getPermanent(targetId);
+ ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
+ if (zEvent.getToZone() == Constants.Zone.BATTLEFIELD
+ && permanent.getControllerId().equals(this.controllerId)
+ && permanent.getCardType().contains(CardType.CREATURE)
+ && (targetId.equals(this.getSourceId())
+ || (permanent.getAbilities().contains(FlyingAbility.getInstance()) && !targetId.equals(this.getSourceId())))) {
+ for (Effect effect : this.getEffects()) {
+ effect.setTargetPointer(new FixedTarget(event.getTargetId()));
+ }
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public String getRule() {
+ return "Whenever {this} or another creature with flying enters the battlefield under your control, you may gain life equal to that creature's power";
+ }
+}
+
+class ArchonOfRedemptionEffect extends OneShotEffect {
+ ArchonOfRedemptionEffect() {
+ super(Constants.Outcome.GainLife);
+ }
+
+ ArchonOfRedemptionEffect(final ArchonOfRedemptionEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ Permanent p = game.getPermanent(targetPointer.getFirst(source));
+ Player player = game.getPlayer(source.getControllerId());
+ if (p == null) {
+ p = (Permanent) game.getLastKnownInformation(targetPointer.getFirst(source), Constants.Zone.BATTLEFIELD);
+ }
+ if (p != null && player != null) {
+ player.gainLife(p.getPower().getValue(), game);
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public ArchonOfRedemptionEffect copy() {
+ return new ArchonOfRedemptionEffect(this);
+ }
+}
\ No newline at end of file