mirror of
https://github.com/correl/mage.git
synced 2024-12-28 11:14:13 +00:00
fixed some targeted cards
This commit is contained in:
parent
d96c983778
commit
33a5a23d33
3 changed files with 26 additions and 22 deletions
|
@ -92,7 +92,8 @@ class CyclopsGladiatorEffect extends OneShotEffect<CyclopsGladiatorEffect> {
|
||||||
filter.getControllerId().add(defenderId);
|
filter.getControllerId().add(defenderId);
|
||||||
TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
|
TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
|
||||||
Player player = game.getPlayer(source.getControllerId());
|
Player player = game.getPlayer(source.getControllerId());
|
||||||
player.choose(Outcome.Damage, target, game);
|
if (target.canChoose(source.getSourceId(), source.getControllerId(), game)) {
|
||||||
|
if (player.chooseTarget(Outcome.Detriment, target, source, game)) {
|
||||||
Permanent permanent = game.getPermanent(target.getFirstTarget());
|
Permanent permanent = game.getPermanent(target.getFirstTarget());
|
||||||
Permanent cyclops = game.getPermanent(source.getSourceId());
|
Permanent cyclops = game.getPermanent(source.getSourceId());
|
||||||
if (permanent != null && cyclops != null) {
|
if (permanent != null && cyclops != null) {
|
||||||
|
@ -101,6 +102,8 @@ class CyclopsGladiatorEffect extends OneShotEffect<CyclopsGladiatorEffect> {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -161,8 +161,8 @@ class NecroticPlagueEffect2 extends OneShotEffect<NecroticPlagueEffect2> {
|
||||||
Player controller = game.getPlayer(source.getControllerId());
|
Player controller = game.getPlayer(source.getControllerId());
|
||||||
if (controller != null) {
|
if (controller != null) {
|
||||||
TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
|
TargetCreaturePermanent target = new TargetCreaturePermanent(filter);
|
||||||
if (target.canChoose(source.getControllerId(), game)) {
|
if (target.canChoose(source.getSourceId(), source.getControllerId(), game)) {
|
||||||
if (controller.choose(Outcome.Detriment, target, game)) {
|
if (controller.chooseTarget(Outcome.Detriment, target, source, game)) {
|
||||||
Card card = game.getCard(cardId);
|
Card card = game.getCard(cardId);
|
||||||
if (card != null) {
|
if (card != null) {
|
||||||
card.putOntoBattlefield(game, Zone.GRAVEYARD, source.getId(), source.getControllerId());
|
card.putOntoBattlefield(game, Zone.GRAVEYARD, source.getId(), source.getControllerId());
|
||||||
|
|
|
@ -85,7 +85,8 @@ class GoblinArsonistEffect extends OneShotEffect<GoblinArsonistEffect> {
|
||||||
public boolean apply(Game game, Ability source) {
|
public boolean apply(Game game, Ability source) {
|
||||||
TargetCreatureOrPlayer target = new TargetCreatureOrPlayer();
|
TargetCreatureOrPlayer target = new TargetCreatureOrPlayer();
|
||||||
Player player = game.getPlayer(source.getControllerId());
|
Player player = game.getPlayer(source.getControllerId());
|
||||||
player.choose(Outcome.Damage, target, game);
|
if (target.canChoose(source.getSourceId(), source.getControllerId(), game)) {
|
||||||
|
player.chooseTarget(Outcome.Damage, target, source, game);
|
||||||
|
|
||||||
Permanent permanent = game.getPermanent(target.getFirstTarget());
|
Permanent permanent = game.getPermanent(target.getFirstTarget());
|
||||||
if (permanent != null) {
|
if (permanent != null) {
|
||||||
|
@ -98,7 +99,7 @@ class GoblinArsonistEffect extends OneShotEffect<GoblinArsonistEffect> {
|
||||||
targetPlayer.damage(1, source.getSourceId(), game, true, false);
|
targetPlayer.damage(1, source.getSourceId(), game, true, false);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue