mirror of
https://github.com/correl/mage.git
synced 2025-04-02 03:18:09 -09:00
Some minor changes.
This commit is contained in:
parent
77cd43e8da
commit
570ed36cd8
7 changed files with 26 additions and 11 deletions
Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck
Mage.Sets/src/mage/sets
futuresight
magic2010
shadowmoor
worldwake
Mage/src/mage
|
@ -188,7 +188,7 @@ public class TinyLeaders extends DeckValidator {
|
|||
valid = false;
|
||||
}
|
||||
} else {
|
||||
invalid.put("Commander", "Sideboard must contain only the commander");
|
||||
invalid.put("Commander", "Sideboard must contain only the commander and a maximum of 10 sideboard cards");
|
||||
valid = false;
|
||||
}
|
||||
|
||||
|
|
|
@ -102,6 +102,7 @@ class YixlidJailerEffect extends ContinuousEffectImpl {
|
|||
for (Card card : player.getGraveyard().getCards(game)) {
|
||||
if (card != null) {
|
||||
card.getAbilities().clear(); // Will the abilities ever come back????
|
||||
// TODO: Fix that (LevelX2)
|
||||
// game.getContinuousEffects().removeGainedEffectsForSource(card.getId());
|
||||
// game.getState().resetTriggersForSourceId(card.getId());
|
||||
Abilities abilities = game.getState().getAllOtherAbilities(card.getId());
|
||||
|
|
|
@ -28,11 +28,11 @@
|
|||
package mage.sets.magic2010;
|
||||
|
||||
import java.util.UUID;
|
||||
import mage.abilities.effects.common.continious.BoostAllEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.constants.CardType;
|
||||
import mage.constants.Duration;
|
||||
import mage.constants.Rarity;
|
||||
import mage.abilities.effects.common.continious.BoostAllEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterAttackingCreature;
|
||||
|
||||
/**
|
||||
|
@ -47,8 +47,7 @@ public class TrumpetBlast extends CardImpl {
|
|||
super(ownerId, 160, "Trumpet Blast", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{2}{R}");
|
||||
this.expansionSetCode = "M10";
|
||||
|
||||
this.color.setRed(true);
|
||||
|
||||
// Attacking creatures get +2/+0 until end of turn.
|
||||
this.getSpellAbility().addEffect(new BoostAllEffect(2, 0, Duration.EndOfTurn, filter, false));
|
||||
}
|
||||
|
||||
|
|
|
@ -106,7 +106,7 @@ class DemigodOfRevengeTriggeredAbility extends TriggeredAbilityImpl {
|
|||
|
||||
@Override
|
||||
public String getRule() {
|
||||
return "When you cast Demigod of Revenge, " + super.getRule();
|
||||
return "When you cast {this}, " + super.getRule();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -133,9 +133,9 @@ class DemigodOfRevengeReturnEffect extends OneShotEffect {
|
|||
|
||||
@Override
|
||||
public boolean apply(Game game, Ability source) {
|
||||
Player player = game.getPlayer(source.getControllerId());
|
||||
if (player != null) {
|
||||
for (Card creature : player.getGraveyard().getCards(filter, game)) {
|
||||
Player controller = game.getPlayer(source.getControllerId());
|
||||
if (controller != null) {
|
||||
for (Card creature : controller.getGraveyard().getCards(filter, game)) {
|
||||
creature.putOntoBattlefield(game, Zone.GRAVEYARD, source.getSourceId(), source.getControllerId());
|
||||
}
|
||||
return true;
|
||||
|
|
|
@ -53,9 +53,15 @@ public class CreepingTarPit extends CardImpl {
|
|||
public CreepingTarPit (UUID ownerId) {
|
||||
super(ownerId, 134, "Creeping Tar Pit", Rarity.RARE, new CardType[]{CardType.LAND}, null);
|
||||
this.expansionSetCode = "WWK";
|
||||
|
||||
// Creeping Tar Pit enters the battlefield tapped.
|
||||
this.addAbility(new EntersBattlefieldTappedAbility());
|
||||
|
||||
// {T}: Add {U} or {B} to your mana pool.
|
||||
this.addAbility(new BlueManaAbility());
|
||||
this.addAbility(new BlackManaAbility());
|
||||
|
||||
// {1}{U}{B}: Until end of turn, Creeping Tar Pit becomes a 3/2 blue and black Elemental creature and is unblockable. It's still a land.
|
||||
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new CreepingTarPitToken(), "land", Duration.EndOfTurn), new ManaCostsImpl("{1}{U}{B}")));
|
||||
}
|
||||
|
||||
|
|
|
@ -35,7 +35,6 @@ import java.util.List;
|
|||
import java.util.UUID;
|
||||
import mage.abilities.common.ZoneChangeTriggeredAbility;
|
||||
import mage.abilities.costs.AlternativeCost;
|
||||
import mage.abilities.costs.AlternativeSourceCosts;
|
||||
import mage.abilities.costs.Cost;
|
||||
import mage.abilities.keyword.ProtectionAbility;
|
||||
import mage.abilities.mana.ManaAbility;
|
||||
|
@ -300,6 +299,16 @@ public class AbilitiesImpl<T extends Ability> extends ArrayList<T> implements Ab
|
|||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean containsClass(Class classObject) {
|
||||
for (T ability: this) {
|
||||
if (ability.getClass().equals(classObject)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public T get(UUID abilityId) {
|
||||
for (T ability: this) {
|
||||
|
|
|
@ -60,7 +60,7 @@ public enum CardRepository {
|
|||
// raise this if db structure was changed
|
||||
private static final long CARD_DB_VERSION = 36;
|
||||
// raise this if new cards were added to the server
|
||||
private static final long CARD_CONTENT_VERSION = 4;
|
||||
private static final long CARD_CONTENT_VERSION = 5;
|
||||
|
||||
private final Random random = new Random();
|
||||
private Dao<CardInfo, Object> cardDao;
|
||||
|
|
Loading…
Add table
Reference in a new issue