External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-29 06:52:02 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #36 from magefree/master

Browse source 
merge
This commit is contained in:
theelk801 2017-08-20 09:56:24 -04:00 • committed by GitHub
commit ecf899ca3e
4 changed files with 291 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Mage.Sets/src/mage/cards/g/GisaAndGeralf.java
View file

@ -57,7 +57,7 @@ import java.util.UUID;
public class GisaAndGeralf extends CardImpl {
public GisaAndGeralf(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{B}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}{B}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add("Human");
this.subtype.add("Wizard");
@ -107,6 +107,9 @@ class GisaAndGeralfContinuousEffect extends ContinuousEffectImpl {
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
if (player != null) {
if (!game.getActivePlayerId().equals(player.getId())) {
return false;
}
for (Card card : player.getGraveyard().getCards(filter, game)) {
ContinuousEffect effect = new GisaAndGeralfCastFromGraveyardEffect();
effect.setTargetPointer(new FixedTarget(card.getId()));
@ -166,10 +169,10 @@ class GisaAndGeralfWatcher extends Watcher {
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.SPELL_CAST && event.getZone() == Zone.GRAVEYARD) {
if (event.getType() == GameEvent.EventType.SPELL_CAST && event.getZone() == Zone.GRAVEYARD) {
Spell spell = (Spell) game.getObject(event.getTargetId());
if (spell.isCreature() && spell.hasSubtype(SubType.ZOMBIE, game)) {
abilityUsed = true;
abilityUsed = true;
}
}
}
@ -188,4 +191,4 @@ class GisaAndGeralfWatcher extends Watcher {
public boolean isAbilityUsed() {
return abilityUsed;
}
}
}

13
Mage.Sets/src/mage/cards/k/KaradorGhostChieftain.java
View file

@ -56,7 +56,7 @@ import mage.watchers.Watcher;
public class KaradorGhostChieftain extends CardImpl {
public KaradorGhostChieftain(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}{G}{W}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{B}{G}{W}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add("Centaur");
this.subtype.add("Spirit");
@ -66,7 +66,7 @@ public class KaradorGhostChieftain extends CardImpl {
// Karador, Ghost Chieftain costs {1} less to cast for each creature card in your graveyard.
this.addAbility(new SimpleStaticAbility(Zone.STACK, new KaradorGhostChieftainCostReductionEffect()));
// During each of your turns, you may cast one creature card from your graveyard.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new KaradorGhostChieftainContinuousEffect()), new KaradorGhostChieftainWatcher());
}
@ -137,6 +137,9 @@ class KaradorGhostChieftainContinuousEffect extends ContinuousEffectImpl {
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
if (player != null) {
if (!game.getActivePlayerId().equals(player.getId())) {
return false;
}
for (Card card : player.getGraveyard().getCards(new FilterCreatureCard(), game)) {
ContinuousEffect effect = new KaradorGhostChieftainCastFromGraveyardEffect();
effect.setTargetPointer(new FixedTarget(card.getId()));
@ -196,10 +199,10 @@ class KaradorGhostChieftainWatcher extends Watcher {
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.SPELL_CAST && event.getZone() == Zone.GRAVEYARD) {
if (event.getType() == GameEvent.EventType.SPELL_CAST && event.getZone() == Zone.GRAVEYARD) {
Spell spell = (Spell) game.getObject(event.getTargetId());
if (spell.isCreature()) {
abilityUsed = true;
abilityUsed = true;
}
}
}
@ -218,4 +221,4 @@ class KaradorGhostChieftainWatcher extends Watcher {
public boolean isAbilityUsed() {
return abilityUsed;
}
}
}