fixes and cleanup

This commit is contained in:
BetaSteward 2010-11-09 03:38:55 +00:00
parent 304b7404cf
commit f13c9bc3bb
16 changed files with 75 additions and 35 deletions

View file

@ -100,7 +100,7 @@ class FinestHourAbility extends TriggeredAbilityImpl<FinestHourAbility> {
if (event.getType() == EventType.DECLARED_ATTACKERS) {
if (game.getCombat().attacksAlone()) {
this.addTarget(new TargetCreaturePermanent());
this.targets.get(0).addTarget(game.getCombat().getAttackers().get(0), this, game);
this.targets.get(0).add(game.getCombat().getAttackers().get(0), game);
trigger(game, event.getPlayerId());
return true;
}

View file

@ -88,7 +88,7 @@ class FontOfMythosAbility extends TriggeredAbilityImpl<FontOfMythosAbility> {
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == EventType.DRAW_STEP_PRE) {
this.addTarget(new TargetPlayer());
this.targets.get(0).addTarget(event.getPlayerId(), this, game);
this.targets.get(0).add(event.getPlayerId(),game);
trigger(game, event.getPlayerId());
return true;
}

View file

@ -89,7 +89,10 @@ class MartialCoupEffect extends OneShotEffect<MartialCoupEffect> {
@Override
public boolean apply(Game game, Ability source) {
int amount = source.getCosts().getVariableCosts().get(0).getAmount();
int amount = 0;
if (source.getCosts().getVariableCosts().size() > 0) {
amount = source.getCosts().getVariableCosts().get(0).getAmount();
}
if (amount > 4) {
for (Permanent permanent: game.getBattlefield().getActivePermanents(FilterCreaturePermanent.getDefault(), source.getControllerId(), game)) {

View file

@ -87,7 +87,7 @@ class HowlingMineAbility extends TriggeredAbilityImpl<HowlingMineAbility> {
public boolean checkTrigger(GameEvent event, Game game) {
if (event.getType() == EventType.DRAW_STEP_PRE) {
this.addTarget(new TargetPlayer());
this.targets.get(0).addTarget(event.getPlayerId(), null, game);
this.targets.get(0).add(event.getPlayerId(), game);
trigger(game, event.getPlayerId());
return true;
}

View file

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

View file

@ -101,7 +101,7 @@ class RafiqOfTheManyAbility extends TriggeredAbilityImpl<RafiqOfTheManyAbility>
if (event.getType() == EventType.DECLARED_ATTACKERS && game.getActivePlayerId().equals(this.controllerId) ) {
if (game.getCombat().attacksAlone()) {
this.addTarget(new TargetCreaturePermanent());
this.targets.get(0).addTarget(game.getCombat().getAttackers().get(0), null, game);
this.targets.get(0).add(game.getCombat().getAttackers().get(0), game);
trigger(game, event.getPlayerId());
return true;
}