From 13648d773eb181e53368419d1142bc919da4d865 Mon Sep 17 00:00:00 2001 From: BetaSteward Date: Sun, 19 Dec 2010 22:42:32 -0500 Subject: [PATCH 1/2] fixes --- .../effects/common/ReturnToHandTargetEffect.java | 11 +++++------ Mage/src/mage/game/permanent/PermanentImpl.java | 8 ++------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Mage/src/mage/abilities/effects/common/ReturnToHandTargetEffect.java b/Mage/src/mage/abilities/effects/common/ReturnToHandTargetEffect.java index acb150d039..88326bcf15 100644 --- a/Mage/src/mage/abilities/effects/common/ReturnToHandTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/ReturnToHandTargetEffect.java @@ -64,15 +64,13 @@ public class ReturnToHandTargetEffect extends OneShotEffect> extends CardImpl return false; Permanent attacker = game.getPermanent(attackerId); //20101001 - 509.1b - for (RestrictionEffect effect: game.getContinuousEffects().getApplicableRestrictionEffects(this, game)) { - if (!effect.canBlock(attacker, game)) + for (RestrictionEffect effect: game.getContinuousEffects().getApplicableRestrictionEffects(attacker, game)) { + if (!effect.canBlock(this, game)) return false; } -// for (EvasionAbility ability: attacker.getAbilities().getEvasionAbilities()) { -// if (!ability.canBlock(this, game)) -// return false; -// } if (attacker.hasProtectionFrom(this)) return false; return true; From 0bc5f88468826076555cc5a0aabf59580f2ce22d Mon Sep 17 00:00:00 2001 From: BetaSteward Date: Sun, 19 Dec 2010 22:46:04 -0500 Subject: [PATCH 2/2] matches - preliminary --- Mage/src/mage/game/Match.java | 62 ++++++++++++++++++++++++ Mage/src/mage/game/MatchPlayer.java | 75 +++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+) create mode 100644 Mage/src/mage/game/Match.java create mode 100644 Mage/src/mage/game/MatchPlayer.java diff --git a/Mage/src/mage/game/Match.java b/Mage/src/mage/game/Match.java new file mode 100644 index 0000000000..f7bc7d23b8 --- /dev/null +++ b/Mage/src/mage/game/Match.java @@ -0,0 +1,62 @@ +/* + * 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.game; + +import java.util.ArrayList; +import java.util.List; + +/** + * + * @author BetaSteward_at_googlemail.com + */ +public class Match { + + protected List players = new ArrayList(); + protected List games = new ArrayList(); + protected int winsNeeded; + + public Match(int winsNeeded) { + this.winsNeeded = winsNeeded; + } + + public void playDuel() { + + } + + public boolean isMatchOver() { + for (MatchPlayer player: players) { + if (player.getWins() >= winsNeeded) { + return true; + } + } + return false; + } + + +} diff --git a/Mage/src/mage/game/MatchPlayer.java b/Mage/src/mage/game/MatchPlayer.java new file mode 100644 index 0000000000..4402b85c50 --- /dev/null +++ b/Mage/src/mage/game/MatchPlayer.java @@ -0,0 +1,75 @@ +/* + * 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.game; + +import mage.cards.decks.Deck; +import mage.players.Player; + +/** + * + * @author BetaSteward_at_googlemail.com + */ +public class MatchPlayer { + private int wins; + private int loses; + private Deck deck; + private Player player; + + public MatchPlayer(Player player, Deck deck) { + this.player = player; + this.deck = deck; + this.wins = 0; + this.loses = 0; + } + + public int getWins() { + return wins; + } + + public void addWin() { + this.wins++; + } + + public int getLoses() { + return loses; + } + + public void addLose() { + this.loses++; + } + + public Deck getDeck() { + return deck; + } + + public Player getPlayer() { + return player; + } + +}