mirror of
https://github.com/correl/mage.git
synced 2024-11-15 19:19:33 +00:00
resolve conflicts
This commit is contained in:
Evan Kranzler
parent
dc8c9b8dbe
commit
b10ae22bc3
2 changed files with 0 additions and 156 deletions
|
|
@ -1,84 +0,0 @@
|
||||||
/*
|
|
||||||
* 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.cards.g;
|
|
||||||
|
|
||||||
import java.util.UUID;
|
|
||||||
import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
|
|
||||||
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
|
|
||||||
import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
|
|
||||||
import mage.abilities.decorator.ConditionalTriggeredAbility;
|
|
||||||
import mage.abilities.dynamicvalue.common.StaticValue;
|
|
||||||
import mage.abilities.effects.common.LookLibraryAndPickControllerEffect;
|
|
||||||
import mage.abilities.effects.common.TransformSourceEffect;
|
|
||||||
import mage.abilities.keyword.TransformAbility;
|
|
||||||
import mage.constants.SuperType;
|
|
||||||
import mage.cards.CardImpl;
|
|
||||||
import mage.cards.CardSetInfo;
|
|
||||||
import mage.cards.i.ItlimocCradleOfTheSun;
|
|
||||||
import mage.constants.CardType;
|
|
||||||
import mage.constants.ComparisonType;
|
|
||||||
import mage.constants.TargetController;
|
|
||||||
import mage.filter.StaticFilters;
|
|
||||||
import mage.filter.common.FilterCreatureCard;
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @author TheElk801
|
|
||||||
*/
|
|
||||||
public class GrowingRitesOfItlimoc extends CardImpl {
|
|
||||||
|
|
||||||
public GrowingRitesOfItlimoc(UUID ownerId, CardSetInfo setInfo) {
|
|
||||||
super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}");
|
|
||||||
|
|
||||||
this.addSuperType(SuperType.LEGENDARY);
|
|
||||||
this.transformable = true;
|
|
||||||
this.secondSideCardClazz = ItlimocCradleOfTheSun.class;
|
|
||||||
|
|
||||||
// When Growing Rites of Itlimoc enters the battlefield, look at the top four cards of your library. You may reveal a creature card from among them and put it into your hand. Put the rest on the bottom of your library in any order.
|
|
||||||
this.addAbility(new EntersBattlefieldTriggeredAbility(
|
|
||||||
new LookLibraryAndPickControllerEffect(
|
|
||||||
new StaticValue(4), false, new StaticValue(1), new FilterCreatureCard("a creature card"), false
|
|
||||||
)));
|
|
||||||
|
|
||||||
// At the beginning of your end step, if you control four or more creatures, transform Growing Rites of Itlimoc.
|
|
||||||
this.addAbility(new TransformAbility());
|
|
||||||
this.addAbility(new ConditionalTriggeredAbility(
|
|
||||||
new BeginningOfEndStepTriggeredAbility(new TransformSourceEffect(true), TargetController.YOU, false),
|
|
||||||
new PermanentsOnTheBattlefieldCondition(StaticFilters.FILTER_CONTROLLED_A_CREATURE, ComparisonType.MORE_THAN, 3),
|
|
||||||
"At the beginning of your end step, if you control four or more creatures, transform {this}"));
|
|
||||||
}
|
|
||||||
|
|
||||||
public GrowingRitesOfItlimoc(final GrowingRitesOfItlimoc card) {
|
|
||||||
super(card);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public GrowingRitesOfItlimoc copy() {
|
|
||||||
return new GrowingRitesOfItlimoc(this);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,72 +0,0 @@
|
||||||
/*
|
|
||||||
* 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.cards.i;
|
|
||||||
|
|
||||||
import java.util.UUID;
|
|
||||||
import mage.Mana;
|
|
||||||
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
|
|
||||||
import mage.abilities.mana.DynamicManaAbility;
|
|
||||||
import mage.abilities.mana.GreenManaAbility;
|
|
||||||
import mage.constants.SuperType;
|
|
||||||
import mage.cards.CardImpl;
|
|
||||||
import mage.cards.CardSetInfo;
|
|
||||||
import mage.constants.CardType;
|
|
||||||
import mage.filter.common.FilterControlledCreaturePermanent;
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @author TheElk801
|
|
||||||
*/
|
|
||||||
public class ItlimocCradleOfTheSun extends CardImpl {
|
|
||||||
|
|
||||||
public ItlimocCradleOfTheSun(UUID ownerId, CardSetInfo setInfo) {
|
|
||||||
super(ownerId, setInfo, new CardType[]{CardType.LAND}, "");
|
|
||||||
|
|
||||||
this.addSuperType(SuperType.LEGENDARY);
|
|
||||||
this.nightCard = true;
|
|
||||||
|
|
||||||
// {T}: Add {G} to your mana pool.
|
|
||||||
this.addAbility(new GreenManaAbility());
|
|
||||||
|
|
||||||
// {T}: Add {G} to your mana pool for each creature you control.
|
|
||||||
DynamicManaAbility ability = new DynamicManaAbility(
|
|
||||||
Mana.GreenMana(1),
|
|
||||||
new PermanentsOnBattlefieldCount(new FilterControlledCreaturePermanent("creature you control"))
|
|
||||||
);
|
|
||||||
this.addAbility(ability);
|
|
||||||
}
|
|
||||||
|
|
||||||
public ItlimocCradleOfTheSun(final ItlimocCradleOfTheSun card) {
|
|
||||||
super(card);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItlimocCradleOfTheSun copy() {
|
|
||||||
return new ItlimocCradleOfTheSun(this);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in a new issue