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

merge cleanup

Browse source
This commit is contained in:
xenohedron 2023-12-07 21:54:11 -05:00
parent 2a90e8256e
commit 2422d187b9
5 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/cards/b/BroadsideBombardiers.java
View file

@ -39,10 +39,10 @@ public final class BroadsideBombardiers extends CardImpl {
// Boast — Sacrifice another creature or artifact: Broadside Bombardiers deals damage equal to 2 plus the sacrificed permanent’s mana value to any target.
Ability ability = new BoastAbility(new DamageTargetEffect(
new IntPlusDynamicValue(2, SacrificeCostManaValue.PERMANENT)),
new IntPlusDynamicValue(2, SacrificeCostManaValue.PERMANENT))
.setText("{this} deals damage equal to 2 plus the sacrificed permanent's mana value to any target."),
new SacrificeTargetCost(new TargetControlledPermanent(
StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE_OR_ARTIFACT_SHORT_TEXT))
.setText("{this} deals damage equal to 2 plus the sacrificed permanent's mana value to any target.")
);
ability.addTarget(new TargetAnyTarget());
this.addAbility(ability);

2
Mage.Sets/src/mage/cards/c/CommanderMustard.java
View file

@ -53,7 +53,7 @@ public final class CommanderMustard extends CardImpl {
this.addAbility(new SimpleActivatedAbility(new GainAbilityControlledEffect(new AttacksTriggeredAbility(
new DamageTargetEffect(1), false, "Whenever this creature attacks, " +
"it deals 1 damage to defending player.", SetTargetPointer.PLAYER
), Duration.WhileOnBattlefield, filter, true), new ManaCostsImpl<>("{2}{R}{W}")));
), Duration.EndOfTurn, filter, true).withDurationRuleAtStart(true), new ManaCostsImpl<>("{2}{R}{W}")));
}
private CommanderMustard(final CommanderMustard card) {

12
Mage.Sets/src/mage/cards/h/HakbalOfTheSurgingSoul.java
View file

@ -7,6 +7,7 @@ import mage.abilities.Ability;
import mage.abilities.common.AttacksTriggeredAbility;
import mage.abilities.common.BeginningOfCombatTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.keyword.ExploreSourceEffect;
import mage.cards.Card;
import mage.constants.*;
import mage.cards.CardImpl;
@ -20,8 +21,6 @@ import mage.target.TargetPermanent;
import mage.target.common.TargetCardInHand;
import mage.target.common.TargetControlledCreaturePermanent;
import static mage.abilities.effects.keyword.ExploreSourceEffect.explorePermanent;
/**
*
* @author Grath
@ -57,7 +56,8 @@ public final class HakbalOfTheSurgingSoul extends CardImpl {
class HakbalOfTheSurgingSoulExploreEffect extends OneShotEffect {
HakbalOfTheSurgingSoulExploreEffect( ) {
super(Outcome.Untap);
super(Outcome.Benefit);
staticText = "each Merfolk creature you control explores";
}
HakbalOfTheSurgingSoulExploreEffect(HakbalOfTheSurgingSoulExploreEffect effect ) {
@ -76,11 +76,11 @@ class HakbalOfTheSurgingSoulExploreEffect extends OneShotEffect {
target.withChooseHint("the order in which to explore (first selected will explore first)");
player.choose(outcome, target, source, game);
for (UUID targetId : target.getTargets()) {
explorePermanent(game, targetId, source, 1);
ExploreSourceEffect.explorePermanent(game, targetId, source, 1);
}
} else {
for (Permanent creature : creatures) {
explorePermanent(game, creature.getId(), source, 1);
ExploreSourceEffect.explorePermanent(game, creature.getId(), source, 1);
}
}
@ -135,4 +135,4 @@ class HakbalOfTheSurgingSoulEffect extends OneShotEffect {
public HakbalOfTheSurgingSoulEffect copy() {
return new HakbalOfTheSurgingSoulEffect(this);
}
}
}

2
Mage.Sets/src/mage/cards/s/SenatorPeacock.java
View file

@ -39,7 +39,7 @@ public final class SenatorPeacock extends CardImpl {
// Artifacts you control are Clues in addition to their other types and have "{2}, Sacrifice this artifact: Draw a card."
Ability ability = new SimpleStaticAbility(new AddCardSubtypeAllEffect(
StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACTS, SubType.CLUE, null
));
).setText("artifacts you control are Clues in addition to their other types"));
ability.addEffect(new GainAbilityAllEffect(
new ClueAbility(false), Duration.WhileOnBattlefield,
StaticFilters.FILTER_CONTROLLED_PERMANENT_ARTIFACT,

5
Mage.Sets/src/mage/cards/t/TaintedSpecter.java
View file

@ -62,7 +62,7 @@ public final class TaintedSpecter extends CardImpl {
class TaintedSpecterEffect extends OneShotEffect {
public TaintedSpecterEffect() {
TaintedSpecterEffect() {
super(Outcome.Detriment);
staticText = "Target player discards a card unless they put a card from their hand on top of their library. "
+ "If that player discards a card this way, {this} deals 1 damage to each creature and each player";
@ -78,11 +78,9 @@ class TaintedSpecterEffect extends OneShotEffect {
if (targetPlayer == null) {
return false;
}
if (targetPlayer.getHand().isEmpty()) {
return true;
}
final String message = "Discard a card, or put a card from your hand on top of your library?";
if (targetPlayer.chooseUse(outcome, message, null, "Discard a card", "Put a card from your hand on top", source, game)) {
// Discard a card
@ -95,7 +93,6 @@ class TaintedSpecterEffect extends OneShotEffect {
} else {
// Put a card from your hand on top of your library
TargetCardInHand target = new TargetCardInHand();
target.withNotTarget(true);
target.setTargetName("a card from your hand to put on top of your library");
targetPlayer.choose(Outcome.Detriment, target, source, game);
Card card = targetPlayer.getHand().get(target.getFirstTarget(), game);