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

text fixes

Browse source
This commit is contained in:
xenohedron 2023-09-22 23:28:07 -04:00
parent 79157a7219
commit cd5ee1c31d
9 changed files with 15 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,8 +10,6 @@ import mage.constants.Zone;
import mage.game.Game;
import mage.game.stack.Spell;
import mage.players.Player;
import mage.target.Target;
import mage.util.CardUtil;
import java.util.*;
@ -63,7 +61,7 @@ public class ReturnToHandTargetEffect extends OneShotEffect {
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
return "return " + getTargetPointer().describeTargets(mode.getTargets(), "") +
return "return " + getTargetPointer().describeTargets(mode.getTargets(), "that creature") +
(getTargetPointer().isPlural(mode.getTargets()) ? " to their owners' hands" : " to its owner's hand");
}
}

29
Mage/src/main/java/mage/abilities/effects/common/continuous/GainControlTargetEffect.java
View file

@ -12,8 +12,6 @@ import mage.constants.SubLayer;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.Target;
import mage.util.CardUtil;
import java.util.UUID;
@ -128,31 +126,10 @@ public class GainControlTargetEffect extends ContinuousEffectImpl {
@Override
public String getText(Mode mode) {
if (!staticText.isEmpty()) {
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
if (mode.getTargets().isEmpty()) {
return "gain control of target permanent";
}
Target target = mode.getTargets().get(0);
StringBuilder sb = new StringBuilder("gain control of ");
if (target.getMaxNumberOfTargets() > 1) {
if (target.getMinNumberOfTargets() == 0) {
sb.append("up to ");
}
sb.append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(" target ");
} else if (!target.getTargetName().startsWith("another")) {
if (target.getMinNumberOfTargets() == 0) {
sb.append("up to one ");
}
sb.append("target ");
}
sb.append(mode.getTargets().get(0).getTargetName());
if (!duration.toString().isEmpty() && duration != Duration.EndOfGame) {
sb.append(' ').append(duration.toString());
}
return sb.toString();
return "gain control of " + getTargetPointer().describeTargets(mode.getTargets(), "that creature")
+ (duration.toString().isEmpty() || duration == Duration.EndOfGame ? "" : " " + duration.toString());
}
}