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

* Dire Fleet Warmonger - fixed that it asks user two times, fixed text (#6643);

Browse source
This commit is contained in:
Oleg Agafonov 2020-08-14 15:12:59 +04:00
parent 27b5c920f7
commit b89c1c03ca
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Mage.Sets/src/mage/cards/d/DireFleetWarmonger.java
View file

@ -33,13 +33,11 @@ public final class DireFleetWarmonger extends CardImpl {
// At the beginning of combat on your turn, you may sacrifice another creature. If you do, Dire Fleet Warmonger gets +2/+2 and gains trample until end of turn. // At the beginning of combat on your turn, you may sacrifice another creature. If you do, Dire Fleet Warmonger gets +2/+2 and gains trample until end of turn.
this.addAbility(new BeginningOfCombatTriggeredAbility(new DoIfCostPaid( this.addAbility(new BeginningOfCombatTriggeredAbility(new DoIfCostPaid(
new BoostSourceEffect(2, 2, Duration.EndOfTurn), new BoostSourceEffect(2, 2, Duration.EndOfTurn).setText("{this} gets +2/+2"),
new SacrificeTargetCost(new TargetControlledPermanent( new SacrificeTargetCost(new TargetControlledPermanent(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE))
StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE ).addEffect(new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn)
)) .concatBy("and").setText("gains trample until end of turn")),
).addEffect(new GainAbilitySourceEffect( TargetController.YOU, false));
TrampleAbility.getInstance(), Duration.EndOfTurn
)), TargetController.YOU, true));
} }
private DireFleetWarmonger(final DireFleetWarmonger card) { private DireFleetWarmonger(final DireFleetWarmonger card) {

2
Mage.Tests/src/test/java/org/mage/test/cards/single/m21/DireFleetWarmongerTest.java
View file

@ -15,9 +15,9 @@ public class DireFleetWarmongerTest extends CardTestPlayerBase {
addCard(Zone.BATTLEFIELD, playerA, "Dire Fleet Warmonger"); addCard(Zone.BATTLEFIELD, playerA, "Dire Fleet Warmonger");
addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears"); addCard(Zone.BATTLEFIELD, playerA, "Grizzly Bears");
setChoice(playerA, "Yes");
setChoice(playerA, "Yes"); setChoice(playerA, "Yes");
setChoice(playerA, "Grizzly Bears"); setChoice(playerA, "Grizzly Bears");
setStopAt(1, PhaseStep.POSTCOMBAT_MAIN); setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
setStrictChooseMode(true); setStrictChooseMode(true);
execute(); execute();

4
Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
View file

@ -471,7 +471,7 @@ public class VerifyCardDataTest {
System.out.println("* MTG sets: " + MtgJson.sets().size() + ", cards: " + mtgCards); System.out.println("* MTG sets: " + MtgJson.sets().size() + ", cards: " + mtgCards);
System.out.println("* Implemented sets: " + mtgSets + ", cards: " + xmageCards); System.out.println("* Implemented sets: " + mtgSets + ", cards: " + xmageCards);
System.out.println("* Unsupported sets: " + unsupportedSets + ", cards: " + unsupportedCards); System.out.println("* Unsupported sets: " + unsupportedSets + ", cards: " + unsupportedCards);
System.out.println("* TODO: " + (MtgJson.sets().size() - mtgSets - unsupportedSets) + ", cards: " + (mtgCards - xmageCards - unsupportedCards)); System.out.println("* TODO sets: " + (MtgJson.sets().size() - mtgSets - unsupportedSets) + ", cards: " + (mtgCards - xmageCards - unsupportedCards));
System.out.println(); System.out.println();
System.out.println("Unofficial sets implementation stats:"); System.out.println("Unofficial sets implementation stats:");
System.out.println("* Implemented sets: " + xmageUnofficialSets + ", cards: " + xmageUnofficialCards); System.out.println("* Implemented sets: " + xmageUnofficialSets + ", cards: " + xmageUnofficialCards);
@ -1216,7 +1216,7 @@ public class VerifyCardDataTest {
public void test_showCardInfo() throws Exception { public void test_showCardInfo() throws Exception {
// debug only: show direct card info (takes it from class file, not from db repository) // debug only: show direct card info (takes it from class file, not from db repository)
// can check multiple cards at once, example: name1;name2;name3 // can check multiple cards at once, example: name1;name2;name3
String cardNames = "Armed // Dangerous;Beacon Behemoth;Grizzly Bears"; String cardNames = "Dire Fleet Warmonger";
CardScanner.scan(); CardScanner.scan();
Arrays.stream(cardNames.split(";")).forEach(cardName -> { Arrays.stream(cardNames.split(";")).forEach(cardName -> {
cardName = cardName.trim(); cardName = cardName.trim();