github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 19:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

spjspj - Add new condition 'SourceHasRemainedOnBattlefield' and adjust DL SIlumgar to use it as well (as DL Silumgar was buggy with Ghostly Flicker for example)

Browse source 
Also implement Preacher (DRK)
This commit is contained in:
spjspj 2016-04-19 01:53:04 +10:00
parent 194c817c11
commit c885f212d3
3 changed files with 216 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Mage.Sets/src/mage/sets/dragonsoftarkir/DragonlordSilumgar.java
View file

@ -31,6 +31,8 @@ import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.condition.CompoundCondition;
import mage.abilities.condition.common.SourceHasRemainedInSameZoneCondition;
import mage.abilities.condition.common.SourceOnBattlefieldControlUnchangedCondition;
import mage.abilities.decorator.ConditionalContinuousEffect;
import mage.abilities.effects.OneShotEffect;
@ -108,9 +110,15 @@ class DragonlordSilumgarEffect extends OneShotEffect {
Permanent sourcePermanent = game.getPermanent(source.getSourceId());
Player controller = game.getPlayer(source.getControllerId());
Permanent target = game.getPermanent(getTargetPointer().getFirst(game, source));
if (controller != null && sourcePermanent != null && target != null
&& controller.getId().equals(sourcePermanent.getControllerId())) {
game.addEffect(new ConditionalContinuousEffect(new GainControlTargetEffect(Duration.Custom), new SourceOnBattlefieldControlUnchangedCondition(), null), source);
if (controller != null && sourcePermanent != null && target != null && controller.getId().equals(sourcePermanent.getControllerId())) {
SourceHasRemainedInSameZoneCondition condition = new SourceHasRemainedInSameZoneCondition(sourcePermanent.getId());
game.addEffect(new ConditionalContinuousEffect(
new GainControlTargetEffect(Duration.Custom),
new CompoundCondition(new SourceOnBattlefieldControlUnchangedCondition(), condition),
null),
source);
if (!game.isSimulation()) {
game.informPlayers(sourcePermanent.getLogName() + ": " + controller.getLogName() + " gained control of " + target.getLogName());
}

131
Mage.Sets/src/mage/sets/mastersedition/Preacher.java Normal file
View file

@ -0,0 +1,131 @@
/*
* 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.mastersedition;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.common.SkipUntapOptionalAbility;
import mage.abilities.condition.CompoundCondition;
import mage.abilities.condition.common.SourceHasRemainedInSameZoneCondition;
import mage.abilities.condition.common.SourceTappedCondition;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.decorator.ConditionalContinuousEffect;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.continuous.GainControlTargetEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.common.TargetOpponentsChoicePermanent;
/**
*
* @author spjspj
*/
public class Preacher extends CardImpl {
public Preacher(UUID ownerId) {
super(ownerId, 24, "Preacher", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{W}{W}");
this.expansionSetCode = "MED";
this.subtype.add("Human");
this.subtype.add("Cleric");
this.power = new MageInt(1);
this.toughness = new MageInt(1);
// You may choose not to untap Preacher during your untap step.
this.addAbility(new SkipUntapOptionalAbility());
// {tap}: Gain control of target creature of an opponent's choice that he or she controls for as long as Preacher remains tapped.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreacherEffect(), new TapSourceCost());
ability.addTarget(new TargetOpponentsChoicePermanent(new FilterControlledCreaturePermanent()));
this.addAbility(ability);
}
public Preacher(final Preacher card) {
super(card);
}
@Override
public Preacher copy() {
return new Preacher(this);
}
}
class PreacherEffect extends OneShotEffect {
public PreacherEffect() {
super(Outcome.GainControl);
this.staticText = "Gain control of target creature of an opponent's choice that he or she controls for as long as {this} remains tapped";
}
public PreacherEffect(final PreacherEffect effect) {
super(effect);
}
@Override
public PreacherEffect copy() {
return new PreacherEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Permanent sourcePermanent = game.getPermanent(source.getSourceId());
Player controller = game.getPlayer(source.getControllerId());
if (controller != null && sourcePermanent != null
&& controller.getId().equals(sourcePermanent.getControllerId())) {
UUID target = source.getFirstTarget();
if (target != null && game.getPermanent(target) != null) {
Permanent targetPermanent = game.getPermanent(target);
SourceHasRemainedInSameZoneCondition condition = new SourceHasRemainedInSameZoneCondition(sourcePermanent.getId());
SourceHasRemainedInSameZoneCondition conditionTarget = new SourceHasRemainedInSameZoneCondition(target);
ConditionalContinuousEffect effect = new ConditionalContinuousEffect(
new GainControlTargetEffect(Duration.Custom),
new CompoundCondition(SourceTappedCondition.getInstance(), new CompoundCondition (condition, conditionTarget)),
"Gain control of target creature of an opponent's choice that he or she controls for as long as {this} remains tapped");
game.addEffect(effect, source);
}
}
return false;
}
}

74
Mage/src/main/java/mage/abilities/condition/common/SourceHasRemainedInSameZoneCondition.java Normal file
View file

@ -0,0 +1,74 @@
/*
* 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.condition.common;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.condition.Condition;
import mage.game.Game;
/**
* As long as the card has remained in the same zone
* since this condition was created, the condition is true.
*
* @author spjspj
*/
public class SourceHasRemainedInSameZoneCondition implements Condition {
UUID idToCheck = null;
int timesChangedZones = -1;
public SourceHasRemainedInSameZoneCondition(UUID idToCheck) {
this.idToCheck = idToCheck;
this.timesChangedZones = -1;
}
public SourceHasRemainedInSameZoneCondition getInstance(UUID cardId) {
return new SourceHasRemainedInSameZoneCondition(cardId);
}
@Override
public boolean apply(Game game, Ability source) {
if (idToCheck != null && game.getCard(idToCheck) != null) {
if (timesChangedZones == -1) {
timesChangedZones = game.getState().getZoneChangeCounter(idToCheck);
}
if (timesChangedZones == game.getState().getZoneChangeCounter(idToCheck)) {
return true;
}
}
return false;
}
@Override
public String toString() {
return "if {this} has remained in the same zone";
}
}