External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 19:41:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed Godo, Bandit Warlord copies not untapping themselves (fixes #4827)

Browse source 
Reworked the trigger, also affects Aurelia, the Warleader
This commit is contained in:
Evan Kranzler 2018-05-19 17:39:20 -04:00
parent e8ee1fc4f9
commit 01fb64367e
4 changed files with 128 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

90
Mage/src/main/java/mage/abilities/common/AttacksFirstTimeTriggeredAbility.java Normal file
View file

@ -0,0 +1,90 @@
/*
* 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.abilities.common;
import mage.MageObjectReference;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.watchers.common.AttackedThisTurnWatcher;
/**
*
* @author TheElk801
*/
public class AttacksFirstTimeTriggeredAbility extends TriggeredAbilityImpl {
public AttacksFirstTimeTriggeredAbility(Effect effect, boolean optional) {
super(Zone.BATTLEFIELD, effect, optional);
this.addWatcher(new AttackedThisTurnWatcher());
}
public AttacksFirstTimeTriggeredAbility(final AttacksFirstTimeTriggeredAbility ability) {
super(ability);
}
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == GameEvent.EventType.ATTACKER_DECLARED;
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (!event.getSourceId().equals(this.getSourceId())) {
return false;
}
AttackedThisTurnWatcher watcher = (AttackedThisTurnWatcher) game.getState().getWatchers().get(AttackedThisTurnWatcher.class.getSimpleName());
if (watcher == null) {
return false;
}
Permanent sourcePerm = game.getPermanentOrLKIBattlefield(event.getSourceId());
if (sourcePerm == null) {
return false;
}
for (MageObjectReference mor : watcher.getAttackedThisTurnCreaturesCounts().keySet()) {
if (mor.refersTo(sourcePerm, game)
&& watcher.getAttackedThisTurnCreaturesCounts().get(mor) > 1) {
return false;
}
}
return true;
}
@Override
public String getRule() {
return "Whenever {this} attacks for the first time each turn, " + super.getRule();
}
@Override
public AttacksFirstTimeTriggeredAbility copy() {
return new AttacksFirstTimeTriggeredAbility(this);
}
}

16
Mage/src/main/java/mage/watchers/common/AttackedThisTurnWatcher.java
View file

@ -27,7 +27,9 @@
*/
package mage.watchers.common;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import mage.MageObjectReference;
import mage.constants.WatcherScope;
@ -40,7 +42,8 @@ import mage.watchers.Watcher;
*/
public class AttackedThisTurnWatcher extends Watcher {
public final Set<MageObjectReference> attackedThisTurnCreatures = new HashSet<>();
protected final Set<MageObjectReference> attackedThisTurnCreatures = new HashSet<>();
protected final Map<MageObjectReference, Integer> attackedThisTurnCreaturesCounts = new HashMap<>();
public AttackedThisTurnWatcher() {
super(AttackedThisTurnWatcher.class.getSimpleName(), WatcherScope.GAME);
@ -49,12 +52,16 @@ public class AttackedThisTurnWatcher extends Watcher {
public AttackedThisTurnWatcher(final AttackedThisTurnWatcher watcher) {
super(watcher);
this.attackedThisTurnCreatures.addAll(watcher.attackedThisTurnCreatures);
this.attackedThisTurnCreaturesCounts.putAll(watcher.attackedThisTurnCreaturesCounts);
}
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.ATTACKER_DECLARED) {
this.attackedThisTurnCreatures.add(new MageObjectReference(event.getSourceId(), game));
MageObjectReference mor = new MageObjectReference(event.getSourceId(), game);
this.attackedThisTurnCreatures.add(mor);
this.attackedThisTurnCreaturesCounts.putIfAbsent(mor, 0);
this.attackedThisTurnCreaturesCounts.compute(mor, (k, v) -> (v + 1));
}
}
@ -62,6 +69,10 @@ public class AttackedThisTurnWatcher extends Watcher {
return this.attackedThisTurnCreatures;
}
public Map<MageObjectReference, Integer> getAttackedThisTurnCreaturesCounts() {
return this.attackedThisTurnCreaturesCounts;
}
@Override
public AttackedThisTurnWatcher copy() {
return new AttackedThisTurnWatcher(this);
@ -71,6 +82,7 @@ public class AttackedThisTurnWatcher extends Watcher {
public void reset() {
super.reset();
this.attackedThisTurnCreatures.clear();
this.attackedThisTurnCreaturesCounts.clear();
}
}