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

Merge

Browse source
This commit is contained in:
BetaSteward 2011-09-19 15:03:51 -04:00
commit 16aa9ad3da
25 changed files with 875 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/mage/abilities/effects/common/DestroyAllEffect.java
View file

@ -61,7 +61,7 @@ public class DestroyAllEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
for (Permanent permanent: game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game)) {
for (Permanent permanent: game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) {
permanent.destroy(source.getId(), game, false);
}
return true;

27
Mage/src/mage/abilities/keyword/AffinityForArtifactsAbility.java
View file

@ -1,3 +1,30 @@
/*
* Copyright 2011 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.keyword;
import mage.Constants;

153
Mage/src/mage/abilities/keyword/FlashbackAbility.java Normal file
View file

@ -0,0 +1,153 @@
/*
* Copyright 2011 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.keyword;
import mage.Constants;
import mage.abilities.Ability;
import mage.abilities.ActivatedAbilityImpl;
import mage.abilities.DelayedTriggeredAbility;
import mage.abilities.costs.mana.ManaCosts;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect;
import mage.abilities.effects.common.ExileSourceEffect;
import mage.cards.Card;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.ZoneChangeEvent;
import mage.players.Player;
import mage.target.targetpointer.FixedTarget;
/**
* @author nantuko
*/
public class FlashbackAbility extends ActivatedAbilityImpl<FlashbackAbility> {
public FlashbackAbility(ManaCosts costs, Constants.TimingRule timingRule) {
super(Constants.Zone.GRAVEYARD, new FlashbackEffect(), costs);
this.timing = timingRule;
this.usesStack = false;
this.addEffect(new CreateDelayedTriggeredAbilityEffect(new FlashbackTriggeredAbility()));
}
@Override
public boolean activate(Game game, boolean noMana) {
Card card = game.getCard(sourceId);
if (card != null) {
getEffects().get(0).setTargetPointer(new FixedTarget(card.getId()));
return super.activate(game, noMana);
}
return false;
}
public FlashbackAbility(final FlashbackAbility ability) {
super(ability);
}
@Override
public FlashbackAbility copy() {
return new FlashbackAbility(this);
}
@Override
public String getRule() {
StringBuilder sbRule = new StringBuilder("Flashback ");
if (manaCosts.size() > 0) {
sbRule.append(manaCosts.getText());
}
if (costs.size() > 0) {
if (sbRule.length() > 0) {
sbRule.append(",");
}
sbRule.append(costs.getText());
}
return sbRule.toString();
}
}
class FlashbackEffect extends OneShotEffect<FlashbackEffect> {
public FlashbackEffect() {
super(Constants.Outcome.Benefit);
staticText = "";
}
public FlashbackEffect(final FlashbackEffect effect) {
super(effect);
}
@Override
public FlashbackEffect copy() {
return new FlashbackEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Card target = (Card) game.getObject(targetPointer.getFirst(source));
if (target != null) {
Player controller = game.getPlayer(target.getOwnerId());
if (controller != null) {
return controller.cast(target.getSpellAbility(), game, true);
}
}
return false;
}
}
class FlashbackTriggeredAbility extends DelayedTriggeredAbility<FlashbackTriggeredAbility> {
public FlashbackTriggeredAbility() {
super(new ExileSourceEffect());
usesStack = false;
}
public FlashbackTriggeredAbility(final FlashbackTriggeredAbility ability) {
super(ability);
}
@Override
public FlashbackTriggeredAbility copy() {
return new FlashbackTriggeredAbility(this);
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.ZONE_CHANGE && event.getTargetId().equals(this.sourceId)) {
ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
if (zEvent.getFromZone() == Constants.Zone.STACK) {
return true;
}
}
return false;
}
@Override
public String getRule() {
return "(If the flashback cost was paid, exile this card instead of putting it anywhere else any time it would leave the stack)";
}
}

6
Mage/src/mage/counters/CounterType.java
View file

@ -52,7 +52,7 @@ public enum CounterType {
EON(new EonCounter().name),
AWAKENING(new AwakeningCounter().name),
DEVOTION(new DevotionCounter().name),
DIVINE(new DivineCounter().name),
DIVINITY(new DivinityCounter().name),
WISH(new WishCounter().name),
HOOFPRINT(new HoofprintCounter().name),
KI(new KiCounter().name);
@ -121,8 +121,8 @@ public enum CounterType {
return new AwakeningCounter(amount);
case DEVOTION:
return new DevotionCounter(amount);
case DIVINE:
return new DivineCounter(amount);
case DIVINITY:
return new DivinityCounter(amount);
case WISH:
return new WishCounter(amount);
case HOOFPRINT:

21
Mage/src/mage/counters/common/DivineCounter.java
View file

@ -1,21 +0,0 @@
package mage.counters.common;
import mage.counters.Counter;
/**
* Divine counter.
*
* @author Loki
*/
public class DivineCounter extends Counter<DivineCounter> {
public DivineCounter() {
super("Divine");
this.count = 1;
}
public DivineCounter(int amount) {
super("Divine");
this.count = amount;
}
}

21
Mage/src/mage/counters/common/DivinityCounter.java Normal file
View file

@ -0,0 +1,21 @@
package mage.counters.common;
import mage.counters.Counter;
/**
* Divinity counter.
*
* @author Loki
*/
public class DivinityCounter extends Counter<DivinityCounter> {
public DivinityCounter() {
super("Divinity");
this.count = 1;
}
public DivinityCounter(int amount) {
super("Divinity");
this.count = amount;
}
}

10
Mage/src/mage/game/permanent/Battlefield.java
View file

@ -338,6 +338,10 @@ public class Battlefield implements Serializable {
return active;
}
public List<Permanent> getActivePermanents(FilterPermanent filter, UUID sourcePlayerId, Game game) {
return getActivePermanents(filter, sourcePlayerId, null, game);
}
/**
* Returns all {@link Permanent} that are within the range of influence of the specified player id
* and that match the supplied filter.
@ -348,18 +352,18 @@ public class Battlefield implements Serializable {
* @return a list of {@link Permanent}
* @see Permanent
*/
public List<Permanent> getActivePermanents(FilterPermanent filter, UUID sourcePlayerId, Game game) {
public List<Permanent> getActivePermanents(FilterPermanent filter, UUID sourcePlayerId, UUID sourceId, Game game) {
List<Permanent> active = new ArrayList<Permanent>();
if (game.getRangeOfInfluence() == RangeOfInfluence.ALL) {
for (Permanent perm: field.values()) {
if (perm.isPhasedIn() && filter.match(perm, null, sourcePlayerId, game))
if (perm.isPhasedIn() && filter.match(perm, sourceId, sourcePlayerId, game))
active.add(perm);
}
}
else {
Set<UUID> range = game.getPlayer(sourcePlayerId).getInRange();
for (Permanent perm: field.values()) {
if (perm.isPhasedIn() && range.contains(perm.getControllerId()) && filter.match(perm, null, sourcePlayerId, game))
if (perm.isPhasedIn() && range.contains(perm.getControllerId()) && filter.match(perm, sourceId, sourcePlayerId, game))
active.add(perm);
}
}

38
Mage/src/mage/players/PlayerImpl.java
View file

@ -521,14 +521,24 @@ public abstract class PlayerImpl<T extends PlayerImpl<T>> implements Player, Ser
protected boolean playAbility(ActivatedAbility ability, Game game) {
//20091005 - 602.2a
if (!game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.ACTIVATE_ABILITY, ability.getId(), ability.getSourceId(), playerId))) {
if (ability.isUsesStack()) {
if (!game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.ACTIVATE_ABILITY, ability.getId(), ability.getSourceId(), playerId))) {
int bookmark = game.bookmarkState();
ability.newId();
game.getStack().push(new StackAbility(ability, playerId));
String message = ability.getActivatedMessage(game);
if (ability.activate(game, false)) {
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.ACTIVATED_ABILITY, ability.getId(), ability.getSourceId(), playerId));
game.fireInformEvent(name + message);
game.removeBookmark(bookmark);
return true;
}
game.restoreState(bookmark);
}
} else {
int bookmark = game.bookmarkState();
ability.newId();
game.getStack().push(new StackAbility(ability, playerId));
String message = ability.getActivatedMessage(game);
if (ability.activate(game, false)) {
game.fireEvent(GameEvent.getEvent(GameEvent.EventType.ACTIVATED_ABILITY, ability.getId(), ability.getSourceId(), playerId));
game.fireInformEvent(name + message);
ability.resolve(game);
game.removeBookmark(bookmark);
return true;
}
@ -595,10 +605,18 @@ public abstract class PlayerImpl<T extends PlayerImpl<T>> implements Player, Ser
int bookmark = game.bookmarkState();
TriggeredAbility ability = (TriggeredAbility) source.copy();
if (ability != null && ability.canChooseTarget(game)) {
game.getStack().push(new StackAbility(ability, playerId));
if (ability.activate(game, false)) {
game.removeBookmark(bookmark);
return true;
if (ability.isUsesStack()) {
game.getStack().push(new StackAbility(ability, playerId));
if (ability.activate(game, false)) {
game.removeBookmark(bookmark);
return true;
}
} else {
if (ability.activate(game, false)) {
ability.resolve(game);
game.removeBookmark(bookmark);
return true;
}
}
}
game.restoreState(bookmark);

32
Mage/src/mage/watchers/common/CastFromHandWatcher.java Normal file
View file

@ -0,0 +1,32 @@
package mage.watchers.common;
import mage.Constants;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.stack.Spell;
import mage.watchers.WatcherImpl;
public class CastFromHandWatcher extends WatcherImpl<CastFromHandWatcher> {
public CastFromHandWatcher() {
super("CastFromHand");
}
public CastFromHandWatcher(final CastFromHandWatcher watcher) {
super(watcher);
}
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.SPELL_CAST && event.getZone() == Constants.Zone.HAND) {
Spell spell = (Spell) game.getObject(event.getTargetId());
if (this.getSourceId().equals(spell.getSourceId())) {
condition = true;
}
}
}
@Override
public CastFromHandWatcher copy() {
return new CastFromHandWatcher(this);
}
}