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

[NCC] various text fixes

Browse source
This commit is contained in:
Evan Kranzler 2022-09-22 22:29:39 -04:00
parent fd16f2a16b
commit b0ebf4ad5b
16 changed files with 61 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Mage/src/main/java/mage/abilities/common/SpellCastControllerTriggeredAbility.java
View file

@ -36,6 +36,7 @@ public class SpellCastControllerTriggeredAbility extends TriggeredAbilityImpl {
public SpellCastControllerTriggeredAbility(Effect effect, FilterSpell filter, boolean optional, Zone fromZone) {
this(effect, filter, optional, false);
this.fromZone = fromZone;
makeTriggerPhrase();
}
public SpellCastControllerTriggeredAbility(Effect effect, FilterSpell filter, boolean optional, String rule) {
@ -56,7 +57,7 @@ public class SpellCastControllerTriggeredAbility extends TriggeredAbilityImpl {
this.filter = filter;
this.rememberSource = rememberSource;
this.rememberSourceAsCard = rememberSourceAsCard;
setTriggerPhrase("Whenever you cast " + filter.getMessage() + (fromZone != Zone.ALL ? "from your " + fromZone.toString().toLowerCase() : "") + ", ");
makeTriggerPhrase();
}
public SpellCastControllerTriggeredAbility(final SpellCastControllerTriggeredAbility ability) {
@ -100,4 +101,8 @@ public class SpellCastControllerTriggeredAbility extends TriggeredAbilityImpl {
public SpellCastControllerTriggeredAbility copy() {
return new SpellCastControllerTriggeredAbility(this);
}
private void makeTriggerPhrase() {
setTriggerPhrase("Whenever you cast " + filter.getMessage() + (fromZone != Zone.ALL ? " from your " + fromZone.toString().toLowerCase() : "") + ", ");
}
}

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

@ -25,7 +25,7 @@ public class AddCounterChoiceSourceEffect extends OneShotEffect {
private final List<CounterType> counterTypes;
public AddCounterChoiceSourceEffect(CounterType ... counterTypes) {
public AddCounterChoiceSourceEffect(CounterType... counterTypes) {
super(Outcome.Benefit);
this.counterTypes = Arrays.stream(counterTypes).collect(Collectors.toList());
this.createStaticText();
@ -48,7 +48,7 @@ public class AddCounterChoiceSourceEffect extends OneShotEffect {
break;
default:
List<String> strings = this.counterTypes.stream().map(CounterType::toString).collect(Collectors.toList());
this.staticText = CardUtil.concatWithOr(strings);
this.staticText = "with your choice of a " + CardUtil.concatWithOr(strings) + " counter on it";
break;
}
}

10
Mage/src/main/java/mage/abilities/keyword/CasualtyAbility.java
View file

@ -24,6 +24,7 @@ public class CasualtyAbility extends StaticAbility implements OptionalAdditional
private static final String keywordText = "Casualty";
private final String promptString;
private final String rule;
protected OptionalAdditionalCost additionalCost;
@ -39,9 +40,10 @@ public class CasualtyAbility extends StaticAbility implements OptionalAdditional
super(Zone.STACK, null);
String reminderText = "As you cast this spell, you may sacrifice a creature with power " +
number + " or greater. When you do, copy this spell.";
this.promptString = "Sacrifice a creature with power " + number + " or greater?";
this.additionalCost = new OptionalAdditionalCostImpl(keywordText, reminderText, new SacrificeTargetCost(makeFilter(number)));
this.additionalCost.setRepeatable(false);
this.promptString = "Sacrifice a creature with power " + number + " or greater?";
this.rule = additionalCost.getName() + ' ' + number + ' ' + additionalCost.getReminderText();
this.setRuleAtTheTop(true);
}
@ -49,6 +51,7 @@ public class CasualtyAbility extends StaticAbility implements OptionalAdditional
super(ability);
this.additionalCost = ability.additionalCost;
this.promptString = ability.promptString;
this.rule = ability.rule;
}
public void resetCasualty() {
@ -92,4 +95,9 @@ public class CasualtyAbility extends StaticAbility implements OptionalAdditional
public String getCastMessageSuffix() {
return additionalCost == null ? "" : additionalCost.getCastSuffixMessage(0);
}
@Override
public String getRule() {
return rule;
}
}