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

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2018-06-06 23:50:03 +02:00
commit 1ed85cef4d
19 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage/src/main/java/mage/abilities/common/BeginningOfCombatTriggeredAbility.java
View file

@ -77,11 +77,11 @@ public class BeginningOfCombatTriggeredAbility extends TriggeredAbilityImpl {
public String getRule() {
switch (targetController) {
case YOU:
return "At the beginning of combat on your turn, " + generateZoneString() + getEffects().getText(modes.getMode());
return "At the beginning of combat on your turn, " + generateZoneString() + super.getRule();
case OPPONENT:
return "At the beginning of each opponent's combat step, " + generateZoneString() + getEffects().getText(modes.getMode());
return "At the beginning of each opponent's combat step, " + generateZoneString() + super.getRule();
case ANY:
return "At the beginning of each combat, " + generateZoneString() + getEffects().getText(modes.getMode());
return "At the beginning of each combat, " + generateZoneString() + super.getRule();
}
return "";
}

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

@ -28,10 +28,10 @@ public class DrawDiscardTargetEffect extends OneShotEffect {
this.cardsToDiscard = cardsToDiscard;
staticText = new StringBuilder("Target player draws ")
.append(cardsToDraw == 1?"a": CardUtil.numberToText(cardsToDraw))
.append(" card").append(cardsToDraw == 1?" ": "s")
.append(" card").append(cardsToDraw == 1?"": "s")
.append(", then discards ")
.append(cardsToDiscard == 1?"a": CardUtil.numberToText(cardsToDiscard))
.append(" card").append(cardsToDiscard == 1?" ": "s").toString();
.append(" card").append(cardsToDiscard == 1?"": "s").toString();
}
public DrawDiscardTargetEffect(final DrawDiscardTargetEffect effect) {

2
Mage/src/main/java/mage/abilities/effects/common/GainLifeTargetEffect.java
View file

@ -60,7 +60,7 @@ public class GainLifeTargetEffect extends OneShotEffect {
String message = life.getMessage();
if (!mode.getTargets().isEmpty()) {
sb.append("Target ").append(mode.getTargets().get(0).getTargetName());
sb.append("target ").append(mode.getTargets().get(0).getTargetName());
} else {
sb.append("that player");
}

2
Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllEffect.java
View file

@ -147,7 +147,7 @@ public class BoostAllEffect extends ContinuousEffectImpl {
protected void setText() {
StringBuilder sb = new StringBuilder();
if (excludeSource) {
sb.append("Other ");
sb.append("other ");
}
sb.append(filter.getMessage()).append(" get ");
String p = power.toString();