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

moved BloodthirstWatcher to player - does not need be added to card anymore

Browse source
This commit is contained in:
BetaSteward 2011-08-19 22:16:31 -04:00
parent 108cd68361
commit 9f64c00dc5
11 changed files with 7 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/magic2012/BloodOgre.java
View file

@ -34,7 +34,6 @@ import mage.MageInt;
import mage.abilities.keyword.BloodthirstAbility;
import mage.abilities.keyword.FirstStrikeAbility;
import mage.cards.CardImpl;
import mage.watchers.common.BloodthirstWatcher;
/**
*
@ -52,7 +51,6 @@ public class BloodOgre extends CardImpl<BloodOgre> {
this.toughness = new MageInt(2);
this.addAbility(new BloodthirstAbility(1));
this.addWatcher(new BloodthirstWatcher());
this.addAbility(FirstStrikeAbility.getInstance());
}

13
Mage.Sets/src/mage/sets/magic2012/BloodlordOfVaasgoth.java
View file

@ -31,13 +31,9 @@ import mage.Constants;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.Abilities;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.common.SpellCastTriggeredAbility;
import mage.abilities.effects.ContinuousEffectImpl;
import mage.abilities.effects.common.DamageTargetEffect;
import mage.abilities.effects.common.continious.GainAbilityTargetEffect;
import mage.abilities.keyword.BloodthirstAbility;
import mage.cards.CardImpl;
import mage.filter.Filter;
@ -45,9 +41,6 @@ import mage.filter.FilterCard;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.game.stack.Spell;
import mage.game.stack.StackObject;
import mage.target.TargetSpell;
import mage.watchers.common.BloodthirstWatcher;
import java.util.UUID;
@ -77,7 +70,6 @@ public class BloodlordOfVaasgoth extends CardImpl<BloodlordOfVaasgoth> {
// Bloodthirst 3
this.addAbility(new BloodthirstAbility(3));
this.addWatcher(new BloodthirstWatcher());
// Whenever you cast a Vampire creature spell, it gains bloodthirst 3.
this.addAbility(new SpellCastTriggeredAbility(new BloodlordOfVaasgothEffect(), filterCard, false, true));
@ -117,10 +109,7 @@ class BloodlordOfVaasgothEffect extends ContinuousEffectImpl {
if (object != null) {
Permanent permanent = game.getPermanent(object.getSourceId());
if (permanent != null) {
Ability bloodthirst = ability.copy();
bloodthirst.newId();
bloodthirst.setSourceId(source.getSourceId());
permanent.addAbility(bloodthirst);
permanent.addAbility(ability);
return true;
}
} else {

2
Mage.Sets/src/mage/sets/magic2012/BloodrageVampire.java
View file

@ -33,7 +33,6 @@ import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.keyword.BloodthirstAbility;
import mage.cards.CardImpl;
import mage.watchers.common.BloodthirstWatcher;
/**
*
@ -51,7 +50,6 @@ public class BloodrageVampire extends CardImpl<BloodrageVampire> {
this.toughness = new MageInt(1);
this.addAbility(new BloodthirstAbility(1));
this.addWatcher(new BloodthirstWatcher());
}
public BloodrageVampire(final BloodrageVampire card) {

2
Mage.Sets/src/mage/sets/magic2012/CarnageWurm.java
View file

@ -34,7 +34,6 @@ import mage.MageInt;
import mage.abilities.keyword.BloodthirstAbility;
import mage.abilities.keyword.TrampleAbility;
import mage.cards.CardImpl;
import mage.watchers.common.BloodthirstWatcher;
/**
*
@ -52,7 +51,6 @@ public class CarnageWurm extends CardImpl<CarnageWurm> {
this.toughness = new MageInt(6);
this.addAbility(new BloodthirstAbility(3));
this.addWatcher(new BloodthirstWatcher());
this.addAbility(TrampleAbility.getInstance());
}

2
Mage.Sets/src/mage/sets/magic2012/DuskhunterBat.java
View file

@ -34,7 +34,6 @@ import mage.MageInt;
import mage.abilities.keyword.BloodthirstAbility;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
import mage.watchers.common.BloodthirstWatcher;
/**
*
@ -52,7 +51,6 @@ public class DuskhunterBat extends CardImpl<DuskhunterBat> {
this.toughness = new MageInt(1);
this.addAbility(new BloodthirstAbility(1));
this.addWatcher(new BloodthirstWatcher());
this.addAbility(FlyingAbility.getInstance());
}

2
Mage.Sets/src/mage/sets/magic2012/FurybornHellkite.java
View file

@ -34,7 +34,6 @@ import mage.MageInt;
import mage.abilities.keyword.BloodthirstAbility;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
import mage.watchers.common.BloodthirstWatcher;
/**
*
@ -52,7 +51,6 @@ public class FurybornHellkite extends CardImpl<FurybornHellkite> {
this.toughness = new MageInt(6);
this.addAbility(new BloodthirstAbility(6));
this.addWatcher(new BloodthirstWatcher());
this.addAbility(FlyingAbility.getInstance());
}

2
Mage.Sets/src/mage/sets/magic2012/GorehornMinotaurs.java
View file

@ -33,7 +33,6 @@ import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.keyword.BloodthirstAbility;
import mage.cards.CardImpl;
import mage.watchers.common.BloodthirstWatcher;
/**
*
@ -52,7 +51,6 @@ public class GorehornMinotaurs extends CardImpl<GorehornMinotaurs> {
this.toughness = new MageInt(3);
this.addAbility(new BloodthirstAbility(2));
this.addWatcher(new BloodthirstWatcher());
}
public GorehornMinotaurs(final GorehornMinotaurs card) {

2
Mage.Sets/src/mage/sets/magic2012/LurkingCrocodile.java
View file

@ -34,7 +34,6 @@ import mage.MageInt;
import mage.abilities.keyword.BloodthirstAbility;
import mage.abilities.keyword.IslandwalkAbility;
import mage.cards.CardImpl;
import mage.watchers.common.BloodthirstWatcher;
/**
*
@ -52,7 +51,6 @@ public class LurkingCrocodile extends CardImpl<LurkingCrocodile> {
this.toughness = new MageInt(2);
this.addAbility(new BloodthirstAbility(1));
this.addWatcher(new BloodthirstWatcher());
this.addAbility(new IslandwalkAbility());
}

2
Mage.Sets/src/mage/sets/magic2012/VampireOutcasts.java
View file

@ -34,7 +34,6 @@ import mage.MageInt;
import mage.abilities.keyword.BloodthirstAbility;
import mage.abilities.keyword.LifelinkAbility;
import mage.cards.CardImpl;
import mage.watchers.common.BloodthirstWatcher;
/**
*
@ -52,7 +51,6 @@ public class VampireOutcasts extends CardImpl<VampireOutcasts> {
this.toughness = new MageInt(2);
this.addAbility(new BloodthirstAbility(2));
this.addWatcher(new BloodthirstWatcher());
this.addAbility(LifelinkAbility.getInstance());
}

5
Mage/src/mage/players/PlayerImpl.java
View file

@ -68,6 +68,8 @@ import mage.game.events.GameEvent;
import mage.game.stack.StackAbility;
import mage.target.common.TargetCardInLibrary;
import mage.target.common.TargetDiscard;
import mage.watchers.Watcher;
import mage.watchers.common.BloodthirstWatcher;
public abstract class PlayerImpl<T extends PlayerImpl<T>> implements Player, Serializable {
@ -171,6 +173,9 @@ public abstract class PlayerImpl<T extends PlayerImpl<T>> implements Player, Ser
this.left = false;
this.passed = false;
this.passedTurn = false;
Watcher bloodthirst = new BloodthirstWatcher();
bloodthirst.setControllerId(playerId);
game.getState().getWatchers().add(bloodthirst);
}
@Override

2
Mage/src/mage/watchers/common/BloodthirstWatcher.java
View file

@ -6,7 +6,7 @@ import mage.game.events.GameEvent;
import mage.watchers.WatcherImpl;
/**
* Must be installed to card for proper Bloodthirst work
* Must be installed to player for proper Bloodthirst work
* @author Loki
*/
public class BloodthirstWatcher extends WatcherImpl<BloodthirstWatcher> {