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

Merge branch 'master' of https://github.com/magefree/mage

Browse source
This commit is contained in:
Evan Kranzler 2019-01-11 11:37:39 -05:00
commit 8bb082cbea
4 changed files with 18 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Mage.Sets/src/mage/cards/b/BurningTreeShaman.java
View file

@ -1,7 +1,5 @@
package mage.cards.b;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.dynamicvalue.common.StaticValue;
@ -19,14 +17,15 @@ import mage.game.events.GameEvent.EventType;
import mage.game.stack.StackAbility;
import mage.target.targetpointer.FixedTarget;
import java.util.UUID;
/**
*
* @author Loki
*/
public final class BurningTreeShaman extends CardImpl {
public BurningTreeShaman(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{G}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}{G}");
this.subtype.add(SubType.CENTAUR, SubType.SHAMAN);
this.power = new MageInt(3);
@ -49,7 +48,7 @@ public final class BurningTreeShaman extends CardImpl {
class BurningTreeShamanTriggeredAbility extends TriggeredAbilityImpl {
BurningTreeShamanTriggeredAbility() {
super(Zone.BATTLEFIELD, new DamageTargetEffect(new StaticValue(1), false, "that player", true));
super(Zone.BATTLEFIELD, new DamageTargetEffect(new StaticValue(1), true, "that player", true));
}
BurningTreeShamanTriggeredAbility(final BurningTreeShamanTriggeredAbility ability) {

7
Mage.Sets/src/mage/cards/h/HarshMentor.java
View file

@ -1,7 +1,5 @@
package mage.cards.h;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.dynamicvalue.common.StaticValue;
@ -20,8 +18,9 @@ import mage.game.events.GameEvent.EventType;
import mage.game.stack.StackAbility;
import mage.target.targetpointer.FixedTarget;
import java.util.UUID;
/**
*
* @author spjspj
*/
public final class HarshMentor extends CardImpl {
@ -51,7 +50,7 @@ public final class HarshMentor extends CardImpl {
class HarshMentorTriggeredAbility extends TriggeredAbilityImpl {
HarshMentorTriggeredAbility() {
super(Zone.BATTLEFIELD, new DamageTargetEffect(new StaticValue(2), false, "that player", true));
super(Zone.BATTLEFIELD, new DamageTargetEffect(new StaticValue(2), true, "that player", true));
}
HarshMentorTriggeredAbility(final HarshMentorTriggeredAbility ability) {

2
Mage.Sets/src/mage/cards/i/ImmolationShaman.java
View file

@ -69,7 +69,7 @@ public final class ImmolationShaman extends CardImpl {
class ImmolationShamanTriggeredAbility extends TriggeredAbilityImpl {
ImmolationShamanTriggeredAbility() {
super(Zone.BATTLEFIELD, new DamageTargetEffect(new StaticValue(1), false, "that player", true));
super(Zone.BATTLEFIELD, new DamageTargetEffect(new StaticValue(1), true, "that player", true));
}
private ImmolationShamanTriggeredAbility(final ImmolationShamanTriggeredAbility ability) {

20
Mage.Sets/src/mage/cards/t/TormentOfHailfire.java
View file

@ -1,4 +1,3 @@
package mage.cards.t;
import java.util.UUID;
@ -20,19 +19,19 @@ import mage.target.TargetPermanent;
* @author LevelX2
*/
public final class TormentOfHailfire extends CardImpl {
public TormentOfHailfire(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{B}{B}");
// Repeat the following process X times. Each opponent loses 3 life unless he or she sacrifices a nonland permanent or discards a card.
this.getSpellAbility().addEffect(new TormentOfHailfireEffect());
}
public TormentOfHailfire(final TormentOfHailfire card) {
super(card);
}
@Override
public TormentOfHailfire copy() {
return new TormentOfHailfire(this);
@ -40,21 +39,21 @@ public final class TormentOfHailfire extends CardImpl {
}
class TormentOfHailfireEffect extends OneShotEffect {
public TormentOfHailfireEffect() {
super(Outcome.LoseLife);
this.staticText = "Repeat the following process X times. Each opponent loses 3 life unless he or she sacrifices a nonland permanent or discards a card";
}
public TormentOfHailfireEffect(final TormentOfHailfireEffect effect) {
super(effect);
}
@Override
public TormentOfHailfireEffect copy() {
return new TormentOfHailfireEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
@ -68,6 +67,7 @@ class TormentOfHailfireEffect extends OneShotEffect {
if (permanents > 0 && opponent.chooseUse(outcome, "Sacrifices a nonland permanent? (Iteration " + i + " of " + repeat + ")",
"Otherwise you have to discard a card or lose 3 life.", "Sacrifice", "Discard or life loss", source, game)) {
Target target = new TargetPermanent(StaticFilters.FILTER_CONTROLLED_PERMANENT_NON_LAND);
target.setNotTarget(true);
if (opponent.choose(outcome, target, source.getSourceId(), game)) {
Permanent permanent = game.getPermanent(target.getFirstTarget());
if (permanent != null) {
@ -85,7 +85,7 @@ class TormentOfHailfireEffect extends OneShotEffect {
opponent.loseLife(3, game, false);
}
}
}
return true;
}