External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-10 21:02:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'magefree/master'

Browse source
This commit is contained in:
Samuel Sandeen 2016-09-10 17:47:40 -04:00
commit 3ac80b45f3
45 changed files with 338 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

197
Mage.Sets/src/mage/sets/conspiracytakethecrown/LeovoldEmissaryOfTrest.java Normal file
View file

@ -0,0 +1,197 @@
/*
* 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.conspiracytakethecrown;
import java.util.HashSet;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.ContinuousRuleModifyingEffectImpl;
import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.cards.CardImpl;
import mage.constants.*;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.watchers.Watcher;
/**
*
* @author maxlebedev
*/
public class LeovoldEmissaryOfTrest extends CardImpl {
public LeovoldEmissaryOfTrest(UUID ownerId) {
super(ownerId, 77, "Leovold, Emissary of Trest", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{B}{G}{U}");
this.expansionSetCode = "CN2";
this.supertype.add("Legendary");
this.subtype.add("Elf");
this.subtype.add("Advisor");
this.power = new MageInt(3);
this.toughness = new MageInt(3);
// Each opponent can't draw more than one card each turn. (Based on SpiritOfTheLabyrinth)
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new LeovoldEmissaryOfTrestEffect()), new LeovoldEmissaryOfTrestWatcher());
// Whenever you or a permanent you control becomes the target of a spell or ability an opponent controls, you may draw a card.
this.addAbility(new LeovoldEmissaryOfTrestTriggeredAbility());
}
public LeovoldEmissaryOfTrest(final LeovoldEmissaryOfTrest card) {
super(card);
}
@Override
public LeovoldEmissaryOfTrest copy() {
return new LeovoldEmissaryOfTrest(this);
}
}
class LeovoldEmissaryOfTrestWatcher extends Watcher {
private final HashSet<UUID> playersThatDrewCard;
public LeovoldEmissaryOfTrestWatcher() {
super("DrewCard", WatcherScope.GAME);
this.playersThatDrewCard = new HashSet<>();
}
public LeovoldEmissaryOfTrestWatcher(final LeovoldEmissaryOfTrestWatcher watcher) {
super(watcher);
this.playersThatDrewCard = new HashSet<>();
playersThatDrewCard.addAll(watcher.playersThatDrewCard);
}
@Override
public LeovoldEmissaryOfTrestWatcher copy() {
return new LeovoldEmissaryOfTrestWatcher(this);
}
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.DREW_CARD ) {
if (!playersThatDrewCard.contains(event.getPlayerId())) {
playersThatDrewCard.add(event.getPlayerId());
}
}
}
@Override
public void reset() {
super.reset();
playersThatDrewCard.clear();
}
public boolean hasPlayerDrewCardThisTurn(UUID playerId) {
return playersThatDrewCard.contains(playerId);
}
}
class LeovoldEmissaryOfTrestEffect extends ContinuousRuleModifyingEffectImpl {
public LeovoldEmissaryOfTrestEffect() {
super(Duration.WhileOnBattlefield, Outcome.Detriment, false, false);
staticText = "Each opponent can't draw more than one card each turn";
}
public LeovoldEmissaryOfTrestEffect(final LeovoldEmissaryOfTrestEffect effect) {
super(effect);
}
@Override
public LeovoldEmissaryOfTrestEffect copy() {
return new LeovoldEmissaryOfTrestEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
return true;
}
@Override
public boolean checksEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.DRAW_CARD;
}
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
LeovoldEmissaryOfTrestWatcher watcher = (LeovoldEmissaryOfTrestWatcher) game.getState().getWatchers().get("DrewCard");
Player controller = game.getPlayer(source.getControllerId());
return watcher != null && controller != null && watcher.hasPlayerDrewCardThisTurn(event.getPlayerId())
&& game.isOpponent(controller, event.getPlayerId());
}
}
class LeovoldEmissaryOfTrestTriggeredAbility extends TriggeredAbilityImpl {
LeovoldEmissaryOfTrestTriggeredAbility() {
super(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), true);
}
LeovoldEmissaryOfTrestTriggeredAbility(final LeovoldEmissaryOfTrestTriggeredAbility ability) {
super(ability);
}
@Override
public LeovoldEmissaryOfTrestTriggeredAbility copy() {
return new LeovoldEmissaryOfTrestTriggeredAbility(this);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.TARGETED;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
Player controller = game.getPlayer(this.getControllerId());
Player targetter = game.getPlayer(event.getPlayerId());
if (controller != null && targetter != null && !controller.getId().equals(targetter.getId())) {
if (event.getTargetId().equals(controller.getId())) {
return true;
}
Permanent permanent = game.getPermanentOrLKIBattlefield(event.getTargetId());
if (permanent != null && this.getControllerId().equals(permanent.getControllerId())) {
return true;
}
}
return false;
}
@Override
public String getRule() {
return "Whenever you or a permanent you control becomes the target of a spell or ability an opponent controls, you may draw a card.";
}
}

2
Mage.Sets/src/mage/sets/eldritchmoon/UlrichUncontestedAlpha.java
View file

@ -65,6 +65,8 @@ public class UlrichUncontestedAlpha extends CardImpl {
this.subtype.add("Werewolf");
this.power = new MageInt(6);
this.toughness = new MageInt(6);
this.color.setRed(true);
this.color.setGreen(true);
// this card is the second face of double-faced card
this.nightCard = true;

2
Mage.Sets/src/mage/sets/lorwyn/Shapesharer.java
View file

@ -109,7 +109,7 @@ class ShapesharerEffect extends OneShotEffect {
if (copyTo != null) {
Permanent copyFrom = game.getPermanentOrLKIBattlefield(ability.getTargets().get(1).getFirstTarget());
if (copyFrom != null) {
game.copyPermanent(Duration.EndOfTurn, copyFrom, copyTo.getId(), ability, new EmptyApplyToPermanent());
game.copyPermanent(Duration.UntilYourNextTurn, copyFrom, copyTo.getId(), ability, new EmptyApplyToPermanent());
}
}
return true;

3
Mage.Sets/src/mage/sets/mercadianmasques/VernalEquinox.java
View file

@ -57,7 +57,8 @@ public class VernalEquinox extends CardImpl {
this.expansionSetCode = "MMQ";
// Any player may cast creature and enchantment cards as though they had flash.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter)));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CastAsThoughItHadFlashAllEffect(Duration.WhileOnBattlefield, filter, true)));
}
public VernalEquinox(final VernalEquinox card) {

8
Mage.Sets/src/mage/sets/oathofthegatewatch/HissingQuagmire.java
View file

@ -56,11 +56,11 @@ public class HissingQuagmire extends CardImpl {
// Hissing Quagmire enters the battlefield tapped.
this.addAbility(new EntersBattlefieldTappedAbility());
// {T}: Add {B} or {G} to your mana pool.
this.addAbility(new BlackManaAbility());
this.addAbility(new GreenManaAbility());
// {1}{B}{G}: Hissing Quagmire becomes a 2/2 black and green Elemental creature with deathtouch until end of turn. It's still a land.
Effect effect = new BecomesCreatureSourceEffect(new HissingQuagmireToken(), "land", Duration.EndOfTurn);
effect.setText("{this} becomes a 2/2 black and green Elemental creature with deathtouch until end of turn. It's still a land");
@ -83,8 +83,8 @@ class HissingQuagmireToken extends Token {
super("", "2/2 black and green Elemental creature with deathtouch");
cardType.add(CardType.CREATURE);
subtype.add("Elemental");
color.setRed(true);
color.setWhite(true);
color.setBlack(true);
color.setGreen(true);
power = new MageInt(2);
toughness = new MageInt(2);
addAbility(DeathtouchAbility.getInstance());

2
Mage.Sets/src/mage/sets/planechase2012/MassMutiny.java
View file

@ -70,7 +70,7 @@ public class MassMutiny extends CardImpl {
Player opponent = game.getPlayer(opponentId);
if (opponent != null) {
ability.getTargets().clear();
FilterCreaturePermanent filter = new FilterCreaturePermanent("creature from opponent " + opponent.getLogName());
FilterCreaturePermanent filter = new FilterCreaturePermanent("creature from opponent " + opponent.getName());
filter.add(new ControllerIdPredicate(opponentId));
TargetCreaturePermanent target = new TargetCreaturePermanent(0, 1, filter, false);
ability.addTarget(target);

14
Mage.Sets/src/mage/sets/theros/NykthosShrineToNyx.java
View file

@ -75,7 +75,7 @@ public class NykthosShrineToNyx extends CardImpl {
}
class NykthosShrineToNyxManaAbility extends ManaAbility {
public NykthosShrineToNyxManaAbility() {
super(Zone.BATTLEFIELD, new NykthosDynamicManaEffect(), new GenericManaCost(2));
this.addCost(new TapSourceCost());
@ -94,15 +94,14 @@ class NykthosShrineToNyxManaAbility extends ManaAbility {
public List<Mana> getNetMana(Game game) {
netMana.clear();
if (game != null) {
for (String colorChoice :ChoiceColor.colorChoices) {
netMana.add(((NykthosDynamicManaEffect)this.getEffects().get(0)).computeMana(colorChoice, game, this));
for (String colorChoice : ChoiceColor.colorChoices) {
netMana.add(((NykthosDynamicManaEffect) this.getEffects().get(0)).computeMana(colorChoice, game, this));
}
}
return netMana;
}
}
class NykthosDynamicManaEffect extends ManaEffect {
private final Mana computedMana;
@ -132,7 +131,7 @@ class NykthosDynamicManaEffect extends ManaEffect {
if (controller.choose(outcome, choice, game)) {
computeMana(choice.getChoice(), game, source);
checkToFirePossibleEvents(computedMana, game, source);
game.getPlayer(source.getControllerId()).getManaPool().addMana(computedMana, game, source);
controller.getManaPool().addMana(computedMana, game, source);
return true;
}
}
@ -145,10 +144,9 @@ class NykthosDynamicManaEffect extends ManaEffect {
return null;
}
public Mana computeMana(String color, Game game, Ability source){
public Mana computeMana(String color, Game game, Ability source) {
this.computedMana.clear();
if (color !=null && !color.isEmpty()) {
if (color != null && !color.isEmpty()) {
switch (color) {
case "Red":
computedMana.setRed(new DevotionCount(ColoredManaSymbol.R).calculate(game, source, this));