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

* Fixed missing abilities (Goblin Racketeer, Marauding Maulhorn, SadisticAugermage);

Browse source
This commit is contained in:
Oleg Agafonov 2018-09-05 02:46:35 +04:00
parent 747f3030e2
commit 58d4ede19f
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Mage.Sets/src/mage/cards/g/GoblinRacketeer.java
View file

@ -2,6 +2,7 @@
package mage.cards.g; package mage.cards.g;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.AttacksTriggeredAbility; import mage.abilities.common.AttacksTriggeredAbility;
@ -16,7 +17,6 @@ import mage.game.Game;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
/** /**
*
* @author TheElk801 * @author TheElk801
*/ */
public final class GoblinRacketeer extends CardImpl { public final class GoblinRacketeer extends CardImpl {
@ -35,6 +35,7 @@ public final class GoblinRacketeer extends CardImpl {
Ability ability = new AttacksTriggeredAbility(new GoadTargetEffect(), true, "Whenever {this} attacks, you may goad target creature defending player controls"); Ability ability = new AttacksTriggeredAbility(new GoadTargetEffect(), true, "Whenever {this} attacks, you may goad target creature defending player controls");
ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature defending player controls"))); ability.addTarget(new TargetCreaturePermanent(new FilterCreaturePermanent("creature defending player controls")));
originalId = ability.getOriginalId(); originalId = ability.getOriginalId();
this.addAbility(ability);
} }
public GoblinRacketeer(final GoblinRacketeer card) { public GoblinRacketeer(final GoblinRacketeer card) {

11
Mage.Sets/src/mage/cards/m/MaraudingMaulhorn.java
View file

@ -2,22 +2,20 @@
package mage.cards.m; package mage.cards.m;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
import mage.abilities.decorator.ConditionalRequirementEffect; import mage.abilities.decorator.ConditionalRequirementEffect;
import mage.abilities.effects.Effect; import mage.abilities.effects.Effect;
import mage.abilities.effects.common.combat.AttacksIfAbleSourceEffect; import mage.abilities.effects.common.combat.AttacksIfAbleSourceEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.*;
import mage.constants.SubType;
import mage.constants.ComparisonType;
import mage.constants.Duration;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.mageobject.NamePredicate;
/** /**
*
* @author jeffwadsworth * @author jeffwadsworth
*/ */
public final class MaraudingMaulhorn extends CardImpl { public final class MaraudingMaulhorn extends CardImpl {
@ -29,7 +27,7 @@ public final class MaraudingMaulhorn extends CardImpl {
} }
public MaraudingMaulhorn(UUID ownerId, CardSetInfo setInfo) { public MaraudingMaulhorn(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}{R}");
this.subtype.add(SubType.BEAST); this.subtype.add(SubType.BEAST);
this.power = new MageInt(5); this.power = new MageInt(5);
@ -40,6 +38,7 @@ public final class MaraudingMaulhorn extends CardImpl {
new AttacksIfAbleSourceEffect(Duration.WhileOnBattlefield, true), new AttacksIfAbleSourceEffect(Duration.WhileOnBattlefield, true),
new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.FEWER_THAN, 1)); new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.FEWER_THAN, 1));
effect.setText("{this} attacks each combat if able unless you control a creature named Advocate of the Beast"); effect.setText("{this} attacks each combat if able unless you control a creature named Advocate of the Beast");
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
} }
public MaraudingMaulhorn(final MaraudingMaulhorn card) { public MaraudingMaulhorn(final MaraudingMaulhorn card) {

11
Mage.Sets/src/mage/cards/s/SadisticAugermage.java
View file

@ -2,8 +2,10 @@
package mage.cards.s; package mage.cards.s;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.DiesTriggeredAbility;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.cards.Card; import mage.cards.Card;
import mage.cards.CardImpl; import mage.cards.CardImpl;
@ -17,13 +19,12 @@ import mage.players.Player;
import mage.target.common.TargetCardInHand; import mage.target.common.TargetCardInHand;
/** /**
*
* @author LevelX2 * @author LevelX2
*/ */
public final class SadisticAugermage extends CardImpl { public final class SadisticAugermage extends CardImpl {
public SadisticAugermage(UUID ownerId, CardSetInfo setInfo) { public SadisticAugermage(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{B}"); super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}");
this.subtype.add(SubType.HUMAN); this.subtype.add(SubType.HUMAN);
this.subtype.add(SubType.WIZARD); this.subtype.add(SubType.WIZARD);
@ -31,7 +32,7 @@ public final class SadisticAugermage extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// When Sadistic Augermage dies, each player puts a card from their hand on top of their library. // When Sadistic Augermage dies, each player puts a card from their hand on top of their library.
this.getSpellAbility().addEffect(null); this.addAbility(new DiesTriggeredAbility(new WidespreadPanicEffect()));
} }
public SadisticAugermage(final SadisticAugermage card) { public SadisticAugermage(final SadisticAugermage card) {
@ -64,7 +65,7 @@ class WidespreadPanicEffect extends OneShotEffect {
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId()); Player controller = game.getPlayer(source.getControllerId());
if (controller != null) { if (controller != null) {
for (UUID playerId: game.getState().getPlayersInRange(controller.getId(), game)) { for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) {
Player player = game.getPlayer(playerId); Player player = game.getPlayer(playerId);
if (player != null) { if (player != null) {
if (!player.getHand().isEmpty()) { if (!player.getHand().isEmpty()) {
@ -76,7 +77,7 @@ class WidespreadPanicEffect extends OneShotEffect {
player.moveCardToLibraryWithInfo(card, source.getSourceId(), game, Zone.HAND, true, false); player.moveCardToLibraryWithInfo(card, source.getSourceId(), game, Zone.HAND, true, false);
} }
} }
} }
} }
return true; return true;
} }