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

* Fixed that a player doing a library search with a stated quality (701.15b) couldn't fail to find a card if cards with the stated quality did exist in the searched library.

Browse source
This commit is contained in:
LevelX2 2015-09-14 23:36:32 +02:00
parent dbc9113d52
commit 8f64a2ab54
6 changed files with 183 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

117
Mage/src/mage/target/Target.java
View file

@ -1,43 +1,41 @@
/*
* 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.
*/
* 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.target;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.abilities.Ability;
import mage.filter.Filter;
import mage.game.Game;
import java.io.Serializable;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import mage.abilities.Ability;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.filter.Filter;
import mage.game.Game;
import mage.players.Player;
/**
@ -47,69 +45,110 @@ import mage.players.Player;
public interface Target extends Serializable {
boolean isChosen();
boolean doneChosing();
void clearChosen();
boolean isNotTarget();
/**
* controlls if it will be checked, if the target can be targeted from source
* @param notTarget true = do not check for protection, false = check for protection
* controlls if it will be checked, if the target can be targeted from
* source
*
* @param notTarget true = do not check for protection, false = check for
* protection
*/
void setNotTarget(boolean notTarget);
// methods for targets
boolean canChoose(UUID sourceId, UUID sourceControllerId, Game game);
Set<UUID> possibleTargets(UUID sourceId, UUID sourceControllerId, Game game);
boolean chooseTarget(Outcome outcome, UUID playerId, Ability source, Game game);
void addTarget(UUID id, Ability source, Game game);
void addTarget(UUID id, int amount, Ability source, Game game);
void addTarget(UUID id, Ability source, Game game, boolean skipEvent);
void addTarget(UUID id, int amount, Ability source, Game game, boolean skipEvent);
boolean canTarget(UUID id, Game game);
boolean canTarget(UUID id, Ability source, Game game);
boolean canTarget(UUID playerId, UUID id, Ability source, Game game);
boolean canTarget(UUID playerId, UUID id, Ability source, Game game);
boolean isLegal(Ability source, Game game);
List<? extends Target> getTargetOptions(Ability source, Game game);
//methods for non-targets
boolean canChoose(UUID sourceControllerId, Game game);
Set<UUID> possibleTargets(UUID sourceControllerId, Game game);
boolean choose(Outcome outcome, UUID playerId, UUID sourceId, Game game);
void add(UUID id, Game game);
void remove(UUID targetId);
void updateTarget(UUID targetId, Game game);
String getMessage();
String getTargetName();
void setTargetName(String name);
String getTargetedName(Game game);
Zone getZone();
int getTargetAmount(UUID targetId);
int getNumberOfTargets();
int getMaxNumberOfTargets();
void setMinNumberOfTargets(int minNumberofTargets);
void setMaxNumberOfTargets(int maxNumberofTargets);
List<UUID> getTargets();
Filter getFilter();
boolean isRequired();
boolean isRequired(UUID sourceId, Game game);
boolean isRequired(Ability ability);
void setRequired(boolean required);
boolean isRequiredExplicitlySet();
boolean isRandom();
void setRandom(boolean atRandom);
UUID getFirstTarget();
Target copy();
// some targets are choosen from players that are not the controller of the ability (e.g. Pandemonium)
void setTargetController(UUID playerId);
UUID getTargetController();
void setAbilityController(UUID playerId);
UUID getAbilityController();
Player getTargetController(Game game, UUID playerId);
}
}

5
Mage/src/mage/target/TargetImpl.java
View file

@ -536,4 +536,9 @@ public abstract class TargetImpl implements Target {
}
}
@Override
public boolean isRequiredExplicitlySet() {
return requiredExplicitlySet;
}
}

3
Mage/src/mage/target/common/TargetCardInLibrary.java
View file

@ -64,6 +64,9 @@ public class TargetCardInLibrary extends TargetCard {
public TargetCardInLibrary(int minNumTargets, int maxNumTargets, FilterCard filter) {
super(minNumTargets, maxNumTargets, Zone.LIBRARY, filter);
// 701.15b If a player is searching a hidden zone for cards with a stated quality, such as a card
// with a certain card type or color, that player isn’t required to find some or all of those cards
// even if they’re present in that zone.
this.setRequired(!filter.hasPredicates());
this.librarySearchLimit = Integer.MAX_VALUE;
}