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

Fixed range fro SacrificeAllEffect and Burning Inquiry

Browse source
This commit is contained in:
North 2012-06-20 00:15:13 +03:00
parent 239a4fb100
commit a6a333422b
2 changed files with 123 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Mage.Sets/src/mage/sets/magic2010/BurningInquiry.java
View file

@ -84,7 +84,12 @@ class BurningInquiryEffect extends OneShotEffect<BurningInquiryEffect> {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
for (UUID playerId : game.getPlayerList()) { Player controller = game.getPlayer(source.getControllerId());
if (controller == null) {
return false;
}
for (UUID playerId : controller.getInRange()) {
Player player = game.getPlayer(playerId); Player player = game.getPlayer(playerId);
if (player != null) { if (player != null) {
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {

225
Mage/src/mage/abilities/effects/common/SacrificeAllEffect.java
View file

@ -1,108 +1,117 @@
/* /*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, are * Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met: * permitted provided that the following conditions are met:
* *
* 1. Redistributions of source code must retain the above copyright notice, this list of * 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer. * conditions and the following disclaimer.
* *
* 2. Redistributions in binary form must reproduce the above copyright notice, this list * 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 * of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution. * provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED * 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 * 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 * 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 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 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 * 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 * 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 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* The views and conclusions contained in the software and documentation are those of the * 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 * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.abilities.effects.common; package mage.abilities.effects.common;
import mage.Constants.Outcome; import mage.Constants.Outcome;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterControlledPermanent;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.players.Player; import mage.players.Player;
import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetControlledPermanent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
/** /**
* *
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
*/ */
public class SacrificeAllEffect extends OneShotEffect<SacrificeAllEffect> { public class SacrificeAllEffect extends OneShotEffect<SacrificeAllEffect> {
protected int amount; protected int amount;
protected FilterControlledPermanent filter; protected FilterControlledPermanent filter;
public SacrificeAllEffect(FilterControlledPermanent filter) { public SacrificeAllEffect(FilterControlledPermanent filter) {
this(1, filter); this(1, filter);
} }
public SacrificeAllEffect(int amount, FilterControlledPermanent filter) { public SacrificeAllEffect(int amount, FilterControlledPermanent filter) {
super(Outcome.Sacrifice); super(Outcome.Sacrifice);
this.amount = amount; this.amount = amount;
this.filter = filter; this.filter = filter;
setText(); setText();
} }
public SacrificeAllEffect(final SacrificeAllEffect effect) { public SacrificeAllEffect(final SacrificeAllEffect effect) {
super(effect); super(effect);
this.amount = effect.amount; this.amount = effect.amount;
this.filter = effect.filter.copy(); this.filter = effect.filter.copy();
} }
@Override @Override
public SacrificeAllEffect copy() { public SacrificeAllEffect copy() {
return new SacrificeAllEffect(this); return new SacrificeAllEffect(this);
} }
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
List<UUID> perms = new ArrayList<UUID>(); Player controller = game.getPlayer(source.getControllerId());
for (Player player: game.getPlayers().values()) { if (controller == null) {
int numTargets = Math.min(amount, game.getBattlefield().countAll(filter, player.getId(), game)); return false;
TargetControlledPermanent target = new TargetControlledPermanent(numTargets, numTargets, filter, false); }
if (target.canChoose(player.getId(), game)) {
while (!target.isChosen()) { List<UUID> perms = new ArrayList<UUID>();
player.choose(Outcome.Sacrifice, target, source.getSourceId(), game); for (UUID playerId : controller.getInRange()) {
} Player player = game.getPlayer(playerId);
perms.addAll(target.getTargets()); if (player != null) {
} int numTargets = Math.min(amount, game.getBattlefield().countAll(filter, player.getId(), game));
} TargetControlledPermanent target = new TargetControlledPermanent(numTargets, numTargets, filter, false);
for (UUID permID: perms) { if (target.canChoose(player.getId(), game)) {
Permanent permanent = game.getPermanent(permID); while (!target.isChosen()) {
if (permanent != null) player.choose(Outcome.Sacrifice, target, source.getSourceId(), game);
permanent.sacrifice(source.getSourceId(), game); }
} perms.addAll(target.getTargets());
return true; }
} }
}
private void setText() { for (UUID permID : perms) {
StringBuilder sb = new StringBuilder(); Permanent permanent = game.getPermanent(permID);
sb.append("Each players sacrifices "); if (permanent != null) {
if (amount > 1) permanent.sacrifice(source.getSourceId(), game);
sb.append(amount).append(" "); }
else }
sb.append("a "); return true;
sb.append(filter.getMessage()); }
staticText = sb.toString();
} private void setText() {
StringBuilder sb = new StringBuilder();
sb.append("Each players sacrifices ");
} if (amount > 1)
sb.append(amount).append(" ");
else
sb.append("a ");
sb.append(filter.getMessage());
staticText = sb.toString();
}
}