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

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2016-02-21 23:22:55 +01:00
commit 067eeebc5d
14 changed files with 238 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/commander2013/IllusionistsGambit.java
View file

@ -200,7 +200,7 @@ class IllusionistsGambitRestrictionEffect extends RestrictionEffect {
}
@Override
public boolean canAttack(UUID defenderId, Ability source, Game game) {
public boolean canAttack(Permanent attacker, UUID defenderId, Ability source, Game game) {
if (defenderId.equals(source.getControllerId())) {
return false;
}

2
Mage.Sets/src/mage/sets/fifthdawn/SilentArbiter.java
View file

@ -92,7 +92,7 @@ class SilentArbiterAttackRestrictionEffect extends RestrictionEffect {
}
@Override
public boolean canAttack(UUID defenderId, Ability source, Game game) {
public boolean canAttack(Permanent attacker, UUID defenderId, Ability source, Game game) {
return game.getCombat().getAttackers().isEmpty();
}
}

146
Mage.Sets/src/mage/sets/invasion/DuelingGrounds.java Normal file
View file

@ -0,0 +1,146 @@
/*
* 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.invasion;
import java.util.Set;
import java.util.UUID;
import mage.MageObjectReference;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.ContinuousEffect;
import mage.abilities.effects.RestrictionEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.watchers.common.AttackedThisTurnWatcher;
import mage.watchers.common.BlockedThisTurnWatcher;
/**
*
* @author Quercitron
*/
public class DuelingGrounds extends CardImpl {
public DuelingGrounds(UUID ownerId) {
super(ownerId, 245, "Dueling Grounds", Rarity.RARE, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}{W}");
this.expansionSetCode = "INV";
// No more than one creature can attack each turn.
this.addAbility(
new SimpleStaticAbility(Zone.BATTLEFIELD, new NoMoreThanOneCreatureCanAttackEachTurnEffect()),
new AttackedThisTurnWatcher());
// No more than one creature can block each turn.
this.addAbility(
new SimpleStaticAbility(Zone.BATTLEFIELD, new NoMoreThanOneCreatureCanBlockEachTurnEffect()),
new BlockedThisTurnWatcher());
}
public DuelingGrounds(final DuelingGrounds card) {
super(card);
}
@Override
public DuelingGrounds copy() {
return new DuelingGrounds(this);
}
}
class NoMoreThanOneCreatureCanAttackEachTurnEffect extends RestrictionEffect {
public NoMoreThanOneCreatureCanAttackEachTurnEffect() {
super(Duration.WhileOnBattlefield);
}
public NoMoreThanOneCreatureCanAttackEachTurnEffect(final NoMoreThanOneCreatureCanAttackEachTurnEffect effect) {
super(effect);
this.staticText = "No more than one creature can attack each turn";
}
@Override
public ContinuousEffect copy() {
return new NoMoreThanOneCreatureCanAttackEachTurnEffect(this);
}
@Override
public boolean applies(Permanent permanent, Ability source, Game game) {
return true;
}
@Override
public boolean canAttack(Permanent attacker, UUID defenderId, Ability source, Game game) {
if (!game.getCombat().getAttackers().isEmpty()) {
return false;
}
AttackedThisTurnWatcher watcher = (AttackedThisTurnWatcher) game.getState().getWatchers().get("AttackedThisTurn");
Set<UUID> attackedThisTurnCreatures = watcher.getAttackedThisTurnCreatures();
return attackedThisTurnCreatures.isEmpty()
|| (attackedThisTurnCreatures.size() == 1 && attackedThisTurnCreatures.contains(attacker.getId()));
}
}
class NoMoreThanOneCreatureCanBlockEachTurnEffect extends RestrictionEffect {
public NoMoreThanOneCreatureCanBlockEachTurnEffect() {
super(Duration.WhileOnBattlefield);
this.staticText = "No more than one creature can block each turn";
}
public NoMoreThanOneCreatureCanBlockEachTurnEffect(final NoMoreThanOneCreatureCanBlockEachTurnEffect effect) {
super(effect);
}
@Override
public ContinuousEffect copy() {
return new NoMoreThanOneCreatureCanBlockEachTurnEffect(this);
}
@Override
public boolean applies(Permanent permanent, Ability source, Game game) {
return true;
}
@Override
public boolean canBlock(Permanent attacker, Permanent blocker, Ability source, Game game) {
if (!game.getCombat().getBlockers().isEmpty()) {
return false;
}
BlockedThisTurnWatcher watcher = (BlockedThisTurnWatcher) game.getState().getWatchers().get("BlockedThisTurn");
Set<MageObjectReference> blockedThisTurnCreatures = watcher.getBlockedThisTurnCreatures();
MageObjectReference blockerReference = new MageObjectReference(blocker.getId(), blocker.getZoneChangeCounter(game), game);
return blockedThisTurnCreatures.isEmpty()
|| (blockedThisTurnCreatures.size() == 1 && blockedThisTurnCreatures.contains(blockerReference));
}
}

2
Mage.Sets/src/mage/sets/legions/GoblinGoon.java
View file

@ -90,7 +90,7 @@ class GoblinGoonCantAttackEffect extends RestrictionEffect {
}
@Override
public boolean canAttack(UUID defenderId, Ability source, Game game) {
public boolean canAttack(Permanent attacker, UUID defenderId, Ability source, Game game) {
UUID defendingPlayerId;
Player defender = game.getPlayer(defenderId);
if (defender == null) {

2
Mage.Sets/src/mage/sets/newphyrexia/ChainedThroatseeker.java
View file

@ -91,7 +91,7 @@ class ChainedThroatseekerCantAttackEffect extends RestrictionEffect {
}
@Override
public boolean canAttack(UUID defenderId, Ability source, Game game) {
public boolean canAttack(Permanent attacker, UUID defenderId, Ability source, Game game) {
Player targetPlayer = game.getPlayer(defenderId);
if (targetPlayer != null) {
if (targetPlayer.getCounters().containsKey(CounterType.POISON)) {

2
Mage.Sets/src/mage/sets/timeshifted/TeferisMoat.java
View file

@ -92,7 +92,7 @@ class TeferisMoatRestrictionEffect extends RestrictionEffect {
}
@Override
public boolean canAttack(UUID defenderId, Ability source, Game game) {
public boolean canAttack(Permanent attacker, UUID defenderId, Ability source, Game game) {
return !defenderId.equals(source.getControllerId());
}

2
Mage/src/main/java/mage/abilities/effects/RestrictionEffect.java
View file

@ -65,7 +65,7 @@ public abstract class RestrictionEffect extends ContinuousEffectImpl {
return true;
}
public boolean canAttack(UUID defenderId, Ability source, Game game) {
public boolean canAttack(Permanent attacker, UUID defenderId, Ability source, Game game) {
return true;
}

2
Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackControllerAttachedEffect.java
View file

@ -63,7 +63,7 @@ public class CantAttackControllerAttachedEffect extends RestrictionEffect {
}
@Override
public boolean canAttack(UUID defenderId, Ability source, Game game) {
public boolean canAttack(Permanent attacker, UUID defenderId, Ability source, Game game) {
if (defenderId.equals(source.getControllerId())) {
return false;
}

2
Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackIfDefenderControlsPermanent.java
View file

@ -63,7 +63,7 @@ public class CantAttackIfDefenderControlsPermanent extends RestrictionEffect {
}
@Override
public boolean canAttack(UUID defenderId, Ability source, Game game) {
public boolean canAttack(Permanent attacker, UUID defenderId, Ability source, Game game) {
UUID defendingPlayerId;
Player player = game.getPlayer(defenderId);
if (player == null) {

2
Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackUnlessDefenderControllsPermanent.java
View file

@ -63,7 +63,7 @@ public class CantAttackUnlessDefenderControllsPermanent extends RestrictionEffec
}
@Override
public boolean canAttack(UUID defenderId, Ability source, Game game) {
public boolean canAttack(Permanent attacker, UUID defenderId, Ability source, Game game) {
UUID defendingPlayerId;
Player player = game.getPlayer(defenderId);
if (player == null) {

2
Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouAllEffect.java
View file

@ -65,7 +65,7 @@ public class CantAttackYouAllEffect extends RestrictionEffect {
}
@Override
public boolean canAttack(UUID defenderId, Ability source, Game game) {
public boolean canAttack(Permanent attacker, UUID defenderId, Ability source, Game game) {
return !defenderId.equals(source.getControllerId());
}

2
Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouOrPlaneswalkerAllEffect.java
View file

@ -65,7 +65,7 @@ public class CantAttackYouOrPlaneswalkerAllEffect extends RestrictionEffect {
}
@Override
public boolean canAttack(UUID defenderId, Ability source, Game game) {
public boolean canAttack(Permanent attacker, UUID defenderId, Ability source, Game game) {
if (defenderId.equals(source.getControllerId())) {
return false;
}

2
Mage/src/main/java/mage/game/permanent/PermanentImpl.java
View file

@ -1108,7 +1108,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
return false;
}
for (Ability ability : effectEntry.getValue()) {
if (!effectEntry.getKey().canAttack(defenderId, ability, game)) {
if (!effectEntry.getKey().canAttack(this, defenderId, ability, game)) {
return false;
}
}

79
Mage/src/main/java/mage/watchers/common/BlockedThisTurnWatcher.java Normal file
View file

@ -0,0 +1,79 @@
/*
* 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.watchers.common;
import java.util.HashSet;
import java.util.Set;
import mage.MageObjectReference;
import mage.constants.WatcherScope;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.watchers.Watcher;
/**
*
* @author Quercitron
*/
public class BlockedThisTurnWatcher extends Watcher {
private final Set<MageObjectReference> blockedThisTurnCreatures;
public BlockedThisTurnWatcher() {
super("BlockedThisTurn", WatcherScope.GAME);
blockedThisTurnCreatures = new HashSet<>();
}
public BlockedThisTurnWatcher(final BlockedThisTurnWatcher watcher) {
super(watcher);
blockedThisTurnCreatures = new HashSet<>(watcher.blockedThisTurnCreatures);
}
@Override
public Watcher copy() {
return new BlockedThisTurnWatcher(this);
}
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.BLOCKER_DECLARED) {
this.blockedThisTurnCreatures.add(new MageObjectReference(event.getSourceId(), game));
}
}
public Set<MageObjectReference> getBlockedThisTurnCreatures() {
return this.blockedThisTurnCreatures;
}
@Override
public void reset() {
super.reset();
blockedThisTurnCreatures.clear();
}
}