External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 21:29:17 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed issue 44 and made triggered abilities extendable

Browse source
This commit is contained in:
BetaSteward 2010-12-08 04:27:28 +00:00
parent 139faeb7a5
commit 7efd24464c
54 changed files with 115 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage.Sets/src/mage/sets/alarareborn/FinestHour.java
View file

@ -101,7 +101,6 @@ class FinestHourAbility extends TriggeredAbilityImpl<FinestHourAbility> {
if (game.getCombat().attacksAlone()) {
this.addTarget(new TargetCreaturePermanent());
this.targets.get(0).add(game.getCombat().getAttackers().get(0), game);
trigger(game, this.controllerId);
return true;
}
}

2
Mage.Sets/src/mage/sets/conflux/BloodhallOoze.java
View file

@ -100,7 +100,6 @@ class BloodhallOozeTriggeredAbility1 extends TriggeredAbilityImpl<BloodhallOozeT
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == EventType.UPKEEP_STEP_PRE && event.getPlayerId().equals(this.controllerId)) {
trigger(game, this.controllerId);
return true;
}
return false;
@ -142,7 +141,6 @@ class BloodhallOozeTriggeredAbility2 extends TriggeredAbilityImpl<BloodhallOozeT
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == EventType.UPKEEP_STEP_PRE && event.getPlayerId().equals(this.controllerId)) {
trigger(game, this.controllerId);
return true;
}
return false;

1
Mage.Sets/src/mage/sets/conflux/FontOfMythos.java
View file

@ -89,7 +89,6 @@ class FontOfMythosAbility extends TriggeredAbilityImpl<FontOfMythosAbility> {
if (event.getType() == EventType.DRAW_STEP_PRE) {
this.addTarget(new TargetPlayer());
this.targets.get(0).add(event.getPlayerId(),game);
trigger(game, this.controllerId);
return true;
}
return false;

1
Mage.Sets/src/mage/sets/conflux/QuenchableFire.java
View file

@ -141,7 +141,6 @@ class QuenchableFireDelayedTriggeredAbility extends DelayedTriggeredAbility<Quen
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == EventType.UPKEEP_STEP_PRE && event.getPlayerId().equals(this.controllerId)) {
trigger(game, this.controllerId);
for (SpecialAction action: game.getState().getSpecialActions()) {
if (action.getId().equals(specialActionId)) {
game.getState().getSpecialActions().remove(action);

1
Mage.Sets/src/mage/sets/conflux/SigilOfTheEmptyThrone.java
View file

@ -92,7 +92,6 @@ class SigilOfTheEmptyThroneAbility extends TriggeredAbilityImpl<SigilOfTheEmptyT
if (event.getType() == EventType.SPELL_CAST) {
Spell spell = game.getStack().getSpell(event.getTargetId());
if (spell != null && spell.getCardType().contains(CardType.ENCHANTMENT) && event.getPlayerId().equals(getControllerId())) {
trigger(game, this.controllerId);
return true;
}
}

1
Mage.Sets/src/mage/sets/magic2010/HowlingMine.java
View file

@ -88,7 +88,6 @@ class HowlingMineAbility extends TriggeredAbilityImpl<HowlingMineAbility> {
if (event.getType() == EventType.DRAW_STEP_PRE) {
this.addTarget(new TargetPlayer());
this.targets.get(0).add(event.getPlayerId(), game);
trigger(game, this.controllerId);
return true;
}
return false;

1
Mage.Sets/src/mage/sets/magic2010/IceCage.java
View file

@ -151,7 +151,6 @@ class IceCageAbility extends TriggeredAbilityImpl<IceCageAbility> {
Permanent enchantment = game.getPermanent(sourceId);
if (enchantment != null && enchantment.getAttachedTo() != null) {
if (event.getTargetId().equals(enchantment.getAttachedTo())) {
trigger(game, this.controllerId);
return true;
}
}

2
Mage.Sets/src/mage/sets/magic2010/ProteanHydra.java
View file

@ -189,7 +189,6 @@ public class ProteanHydra extends CardImpl<ProteanHydra> {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == EventType.COUNTER_REMOVED && event.getData().equals("+1/+1") && event.getTargetId().equals(this.getSourceId())) {
trigger(game, this.controllerId);
return true;
}
return false;
@ -220,7 +219,6 @@ public class ProteanHydra extends CardImpl<ProteanHydra> {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == EventType.END_TURN_STEP_PRE && event.getPlayerId().equals(this.controllerId)) {
trigger(game, this.controllerId);
return true;
}
return false;

1
Mage.Sets/src/mage/sets/magic2010/SoulWarden.java
View file

@ -95,7 +95,6 @@ class SoulWardenAbility extends TriggeredAbilityImpl<SoulWardenAbility> {
if (event.getType() == EventType.ZONE_CHANGE && ((ZoneChangeEvent)event).getToZone() == Zone.BATTLEFIELD) {
Permanent permanent = game.getPermanent(event.getTargetId());
if (permanent.getCardType().contains(CardType.CREATURE) && !permanent.getId().equals(this.getSourceId())) {
trigger(game, this.controllerId);
return true;
}
}

1
Mage.Sets/src/mage/sets/magic2010/WallOfFrost.java
View file

@ -97,7 +97,6 @@ class WallOfFrostAbility extends TriggeredAbilityImpl<WallOfFrostAbility> {
if (event.getType() == EventType.BLOCKER_DECLARED && event.getSourceId().equals(this.getSourceId())) {
this.addTarget(new TargetCreaturePermanent());
this.getTargets().get(0).add(event.getTargetId(), game);
trigger(game, this.controllerId);
return true;
}
return false;

1
Mage.Sets/src/mage/sets/magic2011/AjanisPridemate.java
View file

@ -92,7 +92,6 @@ class AjanisPridemateAbility extends TriggeredAbilityImpl<AjanisPridemateAbility
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == EventType.GAINED_LIFE && event.getPlayerId().equals(controllerId)) {
trigger(game, this.controllerId);
return true;
}
return false;

1
Mage.Sets/src/mage/sets/magic2011/ChandrasSpitfire.java
View file

@ -94,7 +94,6 @@ class ChandrasSpitfireAbility extends TriggeredAbilityImpl<ChandrasSpitfireAbili
if (event instanceof DamagedPlayerEvent) {
DamagedPlayerEvent damageEvent = (DamagedPlayerEvent)event;
if (!damageEvent.isCombatDamage() && game.getOpponents(controllerId).contains(event.getTargetId())) {
trigger(game, this.controllerId);
return true;
}
}

3
Mage.Sets/src/mage/sets/magic2011/FrostTitan.java
View file

@ -102,7 +102,6 @@ class FrostTitanAbility1 extends TriggeredAbilityImpl<FrostTitanAbility1> {
TargetStackObject target = new TargetStackObject();
target.add(event.getSourceId(), game);
this.addTarget(target);
trigger(game, this.controllerId);
return true;
}
return false;
@ -135,13 +134,11 @@ class FrostTitanAbility2 extends TriggeredAbilityImpl<FrostTitanAbility2> {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == EventType.ATTACKER_DECLARED && event.getSourceId().equals(this.getSourceId())) {
trigger(game, this.controllerId);
return true;
}
if (event.getType() == EventType.ZONE_CHANGE && event.getTargetId().equals(this.getSourceId()) ) {
ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
if (zEvent.getToZone() == Zone.BATTLEFIELD) {
trigger(game, this.controllerId);
return true;
}
}

1
Mage.Sets/src/mage/sets/magic2011/GarruksPackleader.java
View file

@ -97,7 +97,6 @@ class GarruksPackleaderAbility extends TriggeredAbilityImpl<GarruksPackleaderAbi
if (zEvent.getToZone() == Zone.BATTLEFIELD) {
Permanent permanent = game.getPermanent(event.getTargetId());
if (permanent != null && permanent.getCardType().contains(CardType.CREATURE) && permanent.getPower().getValue() > 2) {
trigger(game, this.controllerId);
return true;
}
}

2
Mage.Sets/src/mage/sets/magic2011/GraveTitan.java
View file

@ -95,13 +95,11 @@ class GraveTitanAbility extends TriggeredAbilityImpl<GraveTitanAbility> {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == EventType.ATTACKER_DECLARED && event.getSourceId().equals(this.getSourceId())) {
trigger(game, this.controllerId);
return true;
}
if (event.getType() == EventType.ZONE_CHANGE && event.getTargetId().equals(this.getSourceId()) ) {
ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
if (zEvent.getToZone() == Zone.BATTLEFIELD) {
trigger(game, this.controllerId);
return true;
}
}

2
Mage.Sets/src/mage/sets/magic2011/InfernoTitan.java
View file

@ -99,13 +99,11 @@ class InfernoTitanAbility extends TriggeredAbilityImpl<InfernoTitanAbility> {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == EventType.ATTACKER_DECLARED && event.getSourceId().equals(this.getSourceId())) {
trigger(game, this.controllerId);
return true;
}
if (event.getType() == EventType.ZONE_CHANGE && event.getTargetId().equals(this.getSourceId()) ) {
ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
if (zEvent.getToZone() == Zone.BATTLEFIELD) {
trigger(game, this.controllerId);
return true;
}
}

1
Mage.Sets/src/mage/sets/magic2011/JacesErasure.java
View file

@ -89,7 +89,6 @@ class JacesErasureAbility extends TriggeredAbilityImpl<JacesErasureAbility> {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == EventType.DREW_CARD && event.getPlayerId().equals(controllerId)) {
trigger(game, this.controllerId);
return true;
}
return false;

1
Mage.Sets/src/mage/sets/magic2011/LeylineOfVitality.java
View file

@ -97,7 +97,6 @@ class LeylineOfVitalityAbility extends TriggeredAbilityImpl<LeylineOfVitalityAbi
if (event.getType() == EventType.ZONE_CHANGE && ((ZoneChangeEvent)event).getToZone() == Zone.BATTLEFIELD) {
Permanent permanent = game.getPermanent(event.getTargetId());
if (permanent.getCardType().contains(CardType.CREATURE) && permanent.getControllerId().equals(this.controllerId)) {
trigger(game, this.controllerId);
return true;
}
}

1
Mage.Sets/src/mage/sets/magic2011/LilianasCaress.java
View file

@ -89,7 +89,6 @@ class LilianasCaressAbility extends TriggeredAbilityImpl<LilianasCaressAbility>
if (event.getType() == EventType.DISCARDED_CARD && game.getOpponents(controllerId).contains(event.getPlayerId())) {
this.addTarget(new TargetPlayer());
this.targets.get(0).add(event.getPlayerId(), game);
trigger(game, this.controllerId);
return true;
}
return false;

1
Mage.Sets/src/mage/sets/magic2011/MystifyingMaze.java
View file

@ -142,7 +142,6 @@ class MystifyingMazeDelayedTriggeredAbility extends DelayedTriggeredAbility<Myst
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == EventType.END_TURN_STEP_PRE) {
trigger(game, this.controllerId);
return true;
}
return false;

1
Mage.Sets/src/mage/sets/magic2011/PhantomBeast.java
View file

@ -90,7 +90,6 @@ public class PhantomBeast extends CardImpl<PhantomBeast> {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == EventType.TARGETED && event.getTargetId().equals(sourceId)) {
trigger(game, this.controllerId);
return true;
}
return false;

1
Mage.Sets/src/mage/sets/magic2011/PhylacteryLich.java
View file

@ -104,7 +104,6 @@ public class PhylacteryLich extends CardImpl<PhylacteryLich> {
if (perm.getCounters().getCount("phylactery") > 0)
return false;
}
trigger(game, controllerId);
return true;
}

2
Mage.Sets/src/mage/sets/magic2011/PrimalCocoon.java
View file

@ -102,7 +102,6 @@ class PrimalCocoonAbility1 extends TriggeredAbilityImpl<PrimalCocoonAbility1> {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == EventType.UPKEEP_STEP_PRE && event.getPlayerId().equals(this.controllerId)) {
trigger(game, this.controllerId);
return true;
}
return false;
@ -134,7 +133,6 @@ class PrimalCocoonAbility2 extends TriggeredAbilityImpl<PrimalCocoonAbility2> {
if (event.getType() == EventType.ATTACKER_DECLARED || event.getType() == EventType.BLOCKER_DECLARED) {
Permanent enchantment = game.getPermanent(sourceId);
if (enchantment != null && enchantment.getAttachedTo() != null && event.getSourceId() != null && event.getSourceId().equals(enchantment.getAttachedTo())) {
trigger(game, this.controllerId);
return true;
}
}

2
Mage.Sets/src/mage/sets/magic2011/SunTitan.java
View file

@ -117,13 +117,11 @@ class SunTitanAbility extends TriggeredAbilityImpl<SunTitanAbility> {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == EventType.ATTACKER_DECLARED && event.getSourceId().equals(this.getSourceId())) {
trigger(game, this.controllerId);
return true;
}
if (event.getType() == EventType.ZONE_CHANGE && event.getTargetId().equals(this.getSourceId()) ) {
ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
if (zEvent.getToZone() == Zone.BATTLEFIELD) {
trigger(game, this.controllerId);
return true;
}
}

1
Mage.Sets/src/mage/sets/magic2011/WildEvocation.java
View file

@ -95,7 +95,6 @@ class WildEvocationAbility extends TriggeredAbilityImpl<WildEvocationAbility> {
if (event.getType() == EventType.DRAW_STEP_PRE) {
this.addTarget(new TargetPlayer());
this.targets.get(0).add(event.getPlayerId(), game);
trigger(game, this.controllerId);
return true;
}
return false;

1
Mage.Sets/src/mage/sets/riseoftheeldrazi/Vengevine.java
View file

@ -99,7 +99,6 @@ class VengevineAbility extends TriggeredAbilityImpl<VengevineAbility> {
if (event.getType() == EventType.SPELL_CAST && event.getPlayerId().equals(controllerId)) {
Watcher watcher = game.getState().getWatchers().get(controllerId, "CreatureCast");
if (watcher != null && watcher.conditionMet()) {
trigger(game, this.controllerId);
return true;
}
}

1
Mage.Sets/src/mage/sets/shardsofalara/RafiqOfTheMany.java
View file

@ -102,7 +102,6 @@ class RafiqOfTheManyAbility extends TriggeredAbilityImpl<RafiqOfTheManyAbility>
if (game.getCombat().attacksAlone()) {
this.addTarget(new TargetCreaturePermanent());
this.targets.get(0).add(game.getCombat().getAttackers().get(0), game);
trigger(game, this.controllerId);
return true;
}
}

1
Mage.Sets/src/mage/sets/tenth/AngelsFeather.java
View file

@ -88,7 +88,6 @@ class AngelsFeatherAbility extends TriggeredAbilityImpl<AngelsFeatherAbility> {
if (event.getType() == EventType.SPELL_CAST) {
Spell spell = game.getStack().getSpell(event.getTargetId());
if (spell != null && spell.getColor().isWhite()) {
trigger(game, this.controllerId);
return true;
}
}

1
Mage.Sets/src/mage/sets/tenth/DemonsHorn.java
View file

@ -88,7 +88,6 @@ class DemonsHornAbility extends TriggeredAbilityImpl<DemonsHornAbility> {
if (event.getType() == EventType.SPELL_CAST) {
Spell spell = game.getStack().getSpell(event.getTargetId());
if (spell != null && spell.getColor().isBlack()) {
trigger(game, this.controllerId);
return true;
}
}

1
Mage.Sets/src/mage/sets/tenth/DragonsClaw.java
View file

@ -88,7 +88,6 @@ class DragonsClawAbility extends TriggeredAbilityImpl<DragonsClawAbility> {
if (event.getType() == EventType.SPELL_CAST) {
Spell spell = game.getStack().getSpell(event.getTargetId());
if (spell != null && spell.getColor().isRed()) {
trigger(game, this.controllerId);
return true;
}
}

1
Mage.Sets/src/mage/sets/tenth/KrakensEye.java
View file

@ -88,7 +88,6 @@ class KrakensEyeAbility extends TriggeredAbilityImpl<KrakensEyeAbility> {
if (event.getType() == EventType.SPELL_CAST) {
Spell spell = game.getStack().getSpell(event.getTargetId());
if (spell != null && spell.getColor().isBlue()) {
trigger(game, this.controllerId);
return true;
}
}

1
Mage.Sets/src/mage/sets/tenth/WurmsTooth.java
View file

@ -88,7 +88,6 @@ class WurmsToothAbility extends TriggeredAbilityImpl<WurmsToothAbility> {
if (event.getType() == EventType.SPELL_CAST) {
Spell spell = game.getStack().getSpell(event.getTargetId());
if (spell != null && spell.getColor().isGreen()) {
trigger(game, this.controllerId);
return true;
}
}

43
Mage.Sets/src/mage/sets/zendikar/AdventuringGear.java
View file

@ -33,11 +33,17 @@ import mage.Constants.CardType;
import mage.Constants.Duration;
import mage.Constants.Outcome;
import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.abilities.common.LandfallAbility;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.common.BoostEquippedEffect;
import mage.abilities.effects.common.BoostTargetEffect;
import mage.abilities.keyword.EquipAbility;
import mage.cards.CardImpl;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.target.common.TargetCreaturePermanent;
/**
*
@ -50,7 +56,7 @@ public class AdventuringGear extends CardImpl<AdventuringGear> {
this.expansionSetCode = "ZEN";
this.subtype.add("Equipment");
this.addAbility(new EquipAbility(Outcome.BoostCreature, new GenericManaCost(1)));
this.addAbility(new LandfallAbility(new BoostEquippedEffect(2, 2, Duration.EndOfTurn), false));
this.addAbility(new AdventuringGearAbility());
}
public AdventuringGear(final AdventuringGear card) {
@ -68,3 +74,38 @@ public class AdventuringGear extends CardImpl<AdventuringGear> {
}
}
class AdventuringGearAbility extends LandfallAbility {
public AdventuringGearAbility() {
super(null, false);
this.addEffect(new BoostTargetEffect(2, 2, Duration.EndOfTurn));
this.addTarget(new TargetCreaturePermanent());
}
public AdventuringGearAbility(final AdventuringGearAbility ability) {
super(ability);
}
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (super.checkTrigger(event, game)) {
Permanent equipment = game.getPermanent(this.sourceId);
if (equipment != null && equipment.getAttachedTo() != null) {
Permanent creature = game.getPermanent(equipment.getAttachedTo());
if (creature != null) {
this.getTargets().get(0).clearChosen();
this.getTargets().get(0).add(creature.getId(), game);
return true;
}
}
}
return false;
}
@Override
public AdventuringGearAbility copy() {
return new AdventuringGearAbility(this);
}
}

1
Mage.Sets/src/mage/sets/zendikar/BeastmasterAscension.java
View file

@ -95,7 +95,6 @@ class BeastmasterAscensionAbility extends TriggeredAbilityImpl<BeastmasterAscens
if (event.getType() == EventType.ATTACKER_DECLARED) {
Permanent source = game.getPermanent(event.getSourceId());
if (source != null && source.getControllerId().equals(controllerId)) {
trigger(game, this.controllerId);
return true;
}
}

1
Mage.Sets/src/mage/sets/zendikar/ScuteMob.java
View file

@ -93,7 +93,6 @@ class ScuteMobAbility extends TriggeredAbilityImpl<ScuteMobAbility> {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == EventType.UPKEEP_STEP_PRE && event.getPlayerId().equals(this.controllerId)) {
trigger(game, this.controllerId);
return true;
}
return false;

4
Mage/src/mage/abilities/DelayedTriggeredAbilities.java
View file

@ -48,8 +48,10 @@ import mage.game.events.GameEvent;
Iterator<DelayedTriggeredAbility> it = this.iterator();
while (it.hasNext()) {
DelayedTriggeredAbility ability = it.next();
if (ability.checkTrigger(event, game))
if (ability.checkTrigger(event, game)) {
ability.trigger(game, ability.controllerId);
it.remove();
}
}
}

1
Mage/src/mage/abilities/common/AttacksTriggeredAbility.java
View file

@ -52,7 +52,6 @@ public class AttacksTriggeredAbility extends TriggeredAbilityImpl<AttacksTrigger
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == EventType.ATTACKER_DECLARED && event.getSourceId().equals(this.getSourceId()) ) {
trigger(game, this.controllerId);
return true;
}
return false;

1
Mage/src/mage/abilities/common/BlocksTriggeredAbility.java
View file

@ -52,7 +52,6 @@ public class BlocksTriggeredAbility extends TriggeredAbilityImpl<BlocksTriggered
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == EventType.BLOCKER_DECLARED && event.getSourceId().equals(this.getSourceId()) ) {
trigger(game, this.controllerId);
return true;
}
return false;

1
Mage/src/mage/abilities/common/DealsCombatDamageToAPlayerTriggeredAbility.java
View file

@ -60,7 +60,6 @@ public class DealsCombatDamageToAPlayerTriggeredAbility extends TriggeredAbility
if (event.getType() == EventType.DAMAGED_PLAYER && event.getSourceId().equals(this.sourceId)) {
this.addTarget(new TargetPlayer());
this.targets.get(0).add(event.getPlayerId(), game);
trigger(game, this.controllerId);
return true;
}
return false;

1
Mage/src/mage/abilities/common/LandfallAbility.java
View file

@ -57,7 +57,6 @@ public class LandfallAbility extends TriggeredAbilityImpl<LandfallAbility> {
if (event.getType() == EventType.ZONE_CHANGE && ((ZoneChangeEvent)event).getToZone() == Zone.BATTLEFIELD) {
Permanent permanent = game.getPermanent(event.getTargetId());
if (permanent != null && permanent.getCardType().contains(CardType.LAND) && permanent.getControllerId().equals(this.controllerId)) {
trigger(game, this.controllerId);
return true;
}
}

1
Mage/src/mage/abilities/common/OnEventTriggeredAbility.java
View file

@ -75,7 +75,6 @@ public class OnEventTriggeredAbility extends TriggeredAbilityImpl<OnEventTrigger
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == eventType) {
if (allPlayers || event.getPlayerId().equals(this.controllerId) ) {
trigger(game, this.controllerId);
return true;
}
}

1
Mage/src/mage/abilities/common/SimpleTriggeredAbility.java
View file

@ -56,7 +56,6 @@ public class SimpleTriggeredAbility extends TriggeredAbilityImpl<SimpleTriggered
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == eventType) {
trigger(game, this.controllerId);
return true;
}
return false;

1
Mage/src/mage/abilities/common/ZoneChangeTriggeredAbility.java
View file

@ -72,7 +72,6 @@ public class ZoneChangeTriggeredAbility<T extends ZoneChangeTriggeredAbility<T>>
if (event.getType() == EventType.ZONE_CHANGE && event.getTargetId().equals(this.getSourceId())) {
ZoneChangeEvent zEvent = (ZoneChangeEvent)event;
if ((fromZone == null || zEvent.getFromZone() == fromZone) && (toZone == null || zEvent.getToZone() == toZone)) {
trigger(game, this.controllerId);
return true;
}
}

1
Mage/src/mage/abilities/effects/ContinuousEffect.java
View file

@ -45,6 +45,7 @@ public interface ContinuousEffect<T extends ContinuousEffect<T>> extends Effect<
public Duration getDuration();
public Date getTimestamp();
public void setTimestamp();
public void newId();
public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game);
public boolean hasLayer(Layer layer);
public void init(Ability source, Game game);

5
Mage/src/mage/abilities/effects/ContinuousEffectImpl.java
View file

@ -104,6 +104,11 @@ public abstract class ContinuousEffectImpl<T extends ContinuousEffectImpl<T>> ex
this.timestamp = new Date();
}
@Override
public void newId() {
this.id = UUID.randomUUID();
}
@Override
public boolean hasLayer(Layer layer) {
return this.layer == layer;

12
Mage/src/mage/abilities/effects/ContinuousEffects.java
View file

@ -384,26 +384,30 @@ public class ContinuousEffects implements Serializable {
case REPLACEMENT:
ReplacementEffect newReplacementEffect = (ReplacementEffect)effect.copy();
newReplacementEffect.setTimestamp();
newReplacementEffect.newId();
replacementEffects.add(newReplacementEffect);
abilityMap.put(newReplacementEffect.getId(), source);
abilityMap.put(newReplacementEffect.getId(), source.copy());
break;
case PREVENTION:
PreventionEffect newPreventionEffect = (PreventionEffect)effect.copy();
newPreventionEffect.setTimestamp();
newPreventionEffect.newId();
preventionEffects.add(newPreventionEffect);
abilityMap.put(newPreventionEffect.getId(), source);
abilityMap.put(newPreventionEffect.getId(), source.copy());
break;
case ASTHOUGH:
AsThoughEffect newAsThoughEffect = (AsThoughEffect)effect.copy();
newAsThoughEffect.setTimestamp();
newAsThoughEffect.newId();
asThoughEffects.add(newAsThoughEffect);
abilityMap.put(newAsThoughEffect.getId(), source);
abilityMap.put(newAsThoughEffect.getId(), source.copy());
break;
default:
ContinuousEffect newEffect = (ContinuousEffect)effect.copy();
newEffect.setTimestamp();
newEffect.newId();
layeredEffects.add(newEffect);
abilityMap.put(newEffect.getId(), source);
abilityMap.put(newEffect.getId(), source.copy());
break;
}
}

2
Mage/src/mage/abilities/effects/EffectImpl.java
View file

@ -39,7 +39,7 @@ import mage.abilities.Ability;
*/
public abstract class EffectImpl<T extends Effect<T>> implements Effect<T> {
protected final UUID id;
protected UUID id;
protected final Outcome outcome;
protected EffectType effectType;

1
Mage/src/mage/abilities/keyword/CascadeAbility.java
View file

@ -63,7 +63,6 @@ public class CascadeAbility extends TriggeredAbilityImpl<CascadeAbility> {
if (event.getType() == EventType.SPELL_CAST) {
Spell spell = game.getStack().getSpell(event.getTargetId());
if (spell != null && spell.getSourceId().equals(this.getSourceId())) {
trigger(game, this.controllerId);
return true;
}
}

1
Mage/src/mage/abilities/keyword/ExaltedAbility.java
View file

@ -63,7 +63,6 @@ public class ExaltedAbility extends TriggeredAbilityImpl<ExaltedAbility> {
TargetCreaturePermanent target = new TargetCreaturePermanent();
this.addTarget(target);
this.getTargets().get(0).add(game.getCombat().getAttackers().get(0),game);
trigger(game, controllerId);
return true;
}
}

1
Mage/src/mage/abilities/keyword/UnearthAbility.java
View file

@ -101,7 +101,6 @@ class UnearthDelayedTriggeredAbility extends DelayedTriggeredAbility<UnearthDela
@Override
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == EventType.END_TURN_STEP_PRE && event.getPlayerId().equals(this.controllerId)) {
trigger(game, this.controllerId);
return true;
}
return false;

4
Mage/src/mage/cards/CardImpl.java
View file

@ -171,7 +171,9 @@ public abstract class CardImpl<T extends CardImpl<T>> extends MageObjectImpl<T>
@Override
public void checkTriggers(Zone zone, GameEvent event, Game game) {
for (TriggeredAbility ability: abilities.getTriggeredAbilities(zone)) {
ability.checkTrigger(event, game);
if (ability.checkTrigger(event, game)) {
ability.trigger(game, ownerId);
}
}
}

49
Mage/src/mage/game/permanent/Battlefield.java
View file

@ -73,6 +73,13 @@ public class Battlefield implements Serializable {
field.clear();
}
/**
* Returns a count of all {@link Permanent} that match the filter.
* This method ignores the range of influence.
*
* @param filter
* @return count
*/
public int countAll(FilterPermanent filter) {
int count = 0;
for (Permanent permanent: field.values()) {
@ -83,6 +90,14 @@ public class Battlefield implements Serializable {
return count;
}
/**
* Returns a count of all {@link Permanent} that match the filter and are controlled by controllerId.
* This method ignores the range of influence.
*
* @param filter
* @param controllerId
* @return count
*/
public int countAll(FilterPermanent filter, UUID controllerId) {
int count = 0;
for (Permanent permanent: field.values()) {
@ -93,7 +108,15 @@ public class Battlefield implements Serializable {
return count;
}
/**
* Returns a count of all {@link Permanent} that are within the range of influence of the specified player id
* and that match the supplied filter.
*
* @param filter
* @param sourcePlayerId
* @param game
* @return count
*/
public int count(FilterPermanent filter, UUID sourcePlayerId, Game game) {
int count = 0;
if (game.getRangeOfInfluence() == RangeOfInfluence.ALL) {
@ -171,11 +194,11 @@ public class Battlefield implements Serializable {
}
/**
* Returns all Permanents on the battlefield that are controlled by the specified
* Returns all {@link Permanent} on the battlefield that are controlled by the specified
* player id. The method ignores the range of influence.
*
* @param controllerId
* @return a list of Permanent
* @return a list of {@link Permanent}
* @see Permanent
*/
public List<Permanent> getAllActivePermanents(UUID controllerId) {
@ -188,11 +211,11 @@ public class Battlefield implements Serializable {
}
/**
* Returns all Permanents on the battlefield that match the specified CardType.
* Returns all {@link Permanent} on the battlefield that match the specified {@link CardType}.
* This method ignores the range of influence.
*
* @param type
* @return a list of Permanent
* @return a list of {@link Permanent}
* @see Permanent
*/
public List<Permanent> getAllActivePermanents(CardType type) {
@ -205,11 +228,11 @@ public class Battlefield implements Serializable {
}
/**
* Returns all Permanents on the battlefield that match the supplied filter.
* Returns all {@link Permanent} on the battlefield that match the supplied filter.
* This method ignores the range of influence.
*
* @param filter
* @return a list of Permanent
* @return a list of {@link Permanent}
* @see Permanent
*/
public List<Permanent> getAllActivePermanents(FilterPermanent filter) {
@ -222,12 +245,12 @@ public class Battlefield implements Serializable {
}
/**
* Returns all Permanents that match the filter and are controlled by controllerId.
* Returns all {@link Permanent} that match the filter and are controlled by controllerId.
* This method ignores the range of influence.
*
* @param filter
* @param controllerId
* @return a list of Permanent
* @return a list of {@link Permanent}
* @see Permanent
*/
public List<Permanent> getAllActivePermanents(FilterPermanent filter, UUID controllerId) {
@ -240,13 +263,13 @@ public class Battlefield implements Serializable {
}
/**
* Returns all Permanents that are within the range of influence of the specified player id
* Returns all {@link Permanent} that are within the range of influence of the specified player id
* and that match the supplied filter.
*
* @param filter
* @param sourcePlayerId
* @param game
* @return a list of Permanent
* @return a list of {@link Permanent}
* @see Permanent
*/
public List<Permanent> getActivePermanents(FilterPermanent filter, UUID sourcePlayerId, Game game) {
@ -268,11 +291,11 @@ public class Battlefield implements Serializable {
}
/**
* Returns all Permanents that are within the range of influence of the specified player id.
* Returns all {@link Permanent} that are within the range of influence of the specified player id.
*
* @param sourcePlayerId
* @param game
* @return a list of Permanent
* @return a list of {@link Permanent}
* @see Permanent
*/
public List<Permanent> getActivePermanents(UUID sourcePlayerId, Game game) {

19
Mage/src/mage/game/permanent/PermanentCard.java
View file

@ -121,18 +121,25 @@ public class PermanentCard extends PermanentImpl<PermanentCard> {
// card abilities will get triggered later when the card hits the new zone
Card card = game.getCard(objectId).copy();
for (TriggeredAbility ability: abilities.getTriggeredAbilities(event.getFromZone())) {
if (!card.getAbilities().containsKey(ability.getId()))
ability.checkTrigger(event, game);
else if (ability instanceof ZoneChangeTriggeredAbility && event.getFromZone() == Zone.BATTLEFIELD) {
if (!card.getAbilities().containsKey(ability.getId())) {
if (ability.checkTrigger(event, game)) {
ability.trigger(game, controllerId);
}
} else if (ability instanceof ZoneChangeTriggeredAbility && event.getFromZone() == Zone.BATTLEFIELD) {
ZoneChangeTriggeredAbility zcAbility = (ZoneChangeTriggeredAbility)ability;
if (zcAbility.getToZone() == null) {
ability.checkTrigger(event, game);
if (ability.checkTrigger(event, game)) {
ability.trigger(game, controllerId);
}
}
}
}
for (TriggeredAbility ability: abilities.getTriggeredAbilities(event.getToZone())) {
if (!card.getAbilities().containsKey(ability.getId()))
ability.checkTrigger(event, game);
if (!card.getAbilities().containsKey(ability.getId())) {
if (ability.checkTrigger(event, game)) {
ability.trigger(game, controllerId);
}
}
}
}

4
Mage/src/mage/game/permanent/PermanentImpl.java
View file

@ -180,7 +180,9 @@ public abstract class PermanentImpl<T extends PermanentImpl<T>> extends CardImpl
if (event.getType() == EventType.BEGINNING_PHASE_PRE && game.getActivePlayerId().equals(controllerId))
this.controlledFromStartOfTurn = true;
for (TriggeredAbility ability: abilities.getTriggeredAbilities(Zone.BATTLEFIELD)) {
ability.checkTrigger(event, game);
if (ability.checkTrigger(event, game)) {
ability.trigger(game, controllerId);
}
}
}