github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 11:09:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Zedruu, the Greathearted - Fixed tooltip text, removed unused imports, simplified some logic.

Browse source
This commit is contained in:
LevelX2 2015-07-30 11:32:19 +02:00
parent 67bd4956d9
commit c5873a0132
2 changed files with 57 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Mage.Sets/src/mage/sets/commander/ZedruuTheGreathearted.java
View file

@ -27,34 +27,35 @@
*/
package mage.sets.commander;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import mage.MageInt;
import mage.MageObjectReference;
import mage.abilities.Ability;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.costs.mana.ColoredManaCost;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.dynamicvalue.common.CardsInControllerHandCount;
import mage.abilities.dynamicvalue.common.PermanentsYouOwnThatOpponentsControlCount;
import mage.abilities.effects.ContinuousEffectImpl;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.abilities.effects.common.GainLifeEffect;
import mage.cards.CardImpl;
import mage.constants.*;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.SubLayer;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.TargetPlayer;
import mage.target.common.TargetControlledPermanent;
import mage.target.common.TargetOpponent;
/**
*
* @author anonymous
* @author andyfries
*/
public class ZedruuTheGreathearted extends CardImpl {
@ -68,8 +69,12 @@ public class ZedruuTheGreathearted extends CardImpl {
this.toughness = new MageInt(4);
// At the beginning of your upkeep, you gain X life and draw X cards, where X is the number of permanents you own that your opponents control.
Ability ability = new BeginningOfUpkeepTriggeredAbility(new GainLifeEffect(new PermanentsYouOwnThatOpponentsControlCount()), TargetController.YOU, false);
ability.addEffect(new DrawCardSourceControllerEffect(new PermanentsYouOwnThatOpponentsControlCount()));
Effect effect = new GainLifeEffect(new PermanentsYouOwnThatOpponentsControlCount());
effect.setText("you gain X life");
Ability ability = new BeginningOfUpkeepTriggeredAbility(effect, TargetController.YOU, false);
effect = new DrawCardSourceControllerEffect(new PermanentsYouOwnThatOpponentsControlCount());
effect.setText("and draw X cards, where X is the number of permanents you own that your opponents control");
ability.addEffect(effect);
this.addAbility(ability);
// {R}{W}{U}: Target opponent gains control of target permanent you control.
@ -90,7 +95,7 @@ public class ZedruuTheGreathearted extends CardImpl {
class ZedruuTheGreatheartedEffect extends ContinuousEffectImpl {
MageObjectReference targetPermanentReference;
private MageObjectReference targetPermanentReference;
public ZedruuTheGreatheartedEffect() {
super(Duration.Custom, Layer.ControlChangingEffects_2, SubLayer.NA, Outcome.GainControl);
@ -115,10 +120,9 @@ public class ZedruuTheGreathearted extends CardImpl {
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getFirstTarget());
Permanent permanent = targetPermanentReference.getPermanent(game);
if (player != null && permanent != null) {
return permanent.changeControllerId(player.getId(), game);
if (permanent != null) {
return permanent.changeControllerId(source.getFirstTarget(), game);
} else {
discard();
}

63
Mage/src/mage/abilities/dynamicvalue/common/PermanentsYouOwnThatOpponentsControlCount.java
View file

@ -1,45 +1,59 @@
/*
* 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.abilities.dynamicvalue.common;
import java.util.Set;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.effects.Effect;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import java.util.List;
import java.util.Set;
import java.util.UUID;
public class PermanentsYouOwnThatOpponentsControlCount implements DynamicValue {
@Override
public int calculate(Game game, Ability sourceAbility, Effect effect) {
if (sourceAbility != null) {
Player controller = game.getPlayer(sourceAbility.getControllerId());
Set<UUID> opponentIds = game.getOpponents(sourceAbility.getControllerId());
int count = 0;
if (controller != null) {
UUID controllerId = controller.getId();
Set<UUID> opponentIds = game.getOpponents(controllerId);
int count = 0;
for (UUID opponentId : opponentIds){
List<Permanent> opponentPermanents = game.getBattlefield().getAllActivePermanents(opponentId);
for (Permanent opponentPermanent : opponentPermanents){
if (opponentPermanent.getOwnerId().equals(controllerId)){
count++;
}
}
for (Permanent permanent : game.getBattlefield().getActivePermanents(sourceAbility.getControllerId(), game)) {
if (!permanent.getOwnerId().equals(permanent.getControllerId()) && permanent.getOwnerId().equals(sourceAbility.getControllerId())) {
if (opponentIds.contains(permanent.getControllerId())) {
count++;
}
return count;
}
}
return 0;
return count;
}
@Override
public DynamicValue copy() {
public PermanentsYouOwnThatOpponentsControlCount copy() {
return new PermanentsYouOwnThatOpponentsControlCount();
}
@ -53,4 +67,3 @@ public class PermanentsYouOwnThatOpponentsControlCount implements DynamicValue {
return "1";
}
}