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

Merge pull request #5937 from reavowed/master

Browse source 
Fix rules text for abilities with up to one target
This commit is contained in:
Oleg Agafonov 2019-08-14 19:07:08 +02:00 • committed by GitHub
commit a280f732f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Mage.Tests/src/test/java/org/mage/test/cards/text/WrennAndSixTest.java Normal file
View file

@ -0,0 +1,17 @@
package org.mage.test.cards.text;
import mage.cards.Card;
import mage.cards.repository.CardRepository;
import org.junit.Assert;
import org.junit.Test;
public class WrennAndSixTest {
@Test
public void testFirstLoyaltyAbilityRulesText() {
Card wrennAndSix = CardRepository.instance.findCard("Wrenn and Six").getCard();
String firstLoyaltyAbilityRulesText = wrennAndSix.getRules().get(0);
Assert.assertEquals(firstLoyaltyAbilityRulesText, "+1: Return up to one target land card from your graveyard to your hand.");
}
}

4
Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToHandTargetEffect.java
View file

@ -56,10 +56,10 @@ public class ReturnFromGraveyardToHandTargetEffect extends OneShotEffect {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
Target target = mode.getTargets().get(0); Target target = mode.getTargets().get(0);
sb.append("return "); sb.append("return ");
if (target.getMaxNumberOfTargets() > 1) {
if (target.getMaxNumberOfTargets() != target.getNumberOfTargets()) { if (target.getMaxNumberOfTargets() != target.getNumberOfTargets()) {
sb.append("up to "); sb.append("up to ");
} sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(' ');
} else if (target.getMaxNumberOfTargets() > 1) {
sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(' '); sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(' ');
} }
if (!mode.getTargets().get(0).getTargetName().startsWith("another")) { if (!mode.getTargets().get(0).getTargetName().startsWith("another")) {