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

Various text fixes (#10251)

Browse source 
* Fix text: Invigorate (fixes #8708) - override

* Fix text: sacrifice multiple permanents (as cost)

* Fix text: Coral Colony - override and add hint

* Fix text: Corpse Harvester (fixes #7837) - override

* Fix text: Solitary Camel, Sidewinder Naga

* Fix text: Malicious Advice

* Fix text: Ray of Command

* Fix text: Retreat to Hagra

* Fix reminder text for "End the turn."

* Fix text: Elspeth, Undaunted Hero

* Fix text: Gideon, Champion of Justice

* Fix text generation for condition: no counters

* Fix text: PhantasmalSphere

* Fix text: Retaliation

* Fix text generation for additional cost: discard X cards

* Fix text: Soul Separator

* Fix text: Thundermaw Hellkite

* Fix text: Torment of Hailfire

* Fix text: Twilight Prophet

* Fix text: ETB cantrips next turn's upkeep

* Fix text: Venser's Journal
This commit is contained in:
xenohedron 2023-04-25 15:30:00 -04:00 • committed by GitHub
parent 0bb56e99fd
commit 9abaa75bd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
33 changed files with 93 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Mage/src/main/java/mage/abilities/condition/common/SourceHasCounterCondition.java
View file

@ -69,10 +69,16 @@ public class SourceHasCounterCondition implements Condition {
@Override
public String toString() {
if (from != -1) {
if (to == Integer.MAX_VALUE) {
return "{this} has equal to or more than " + from + " " + this.counterType.toString() + " counters";
if (from == 0) {
if (to == 0) {
return "{this} has no " + this.counterType.toString() + " counters on it";
}
return "{this} has " + CardUtil.numberToText(to) + " or fewer " + this.counterType.toString() + " counters on it";
}
return "{this} has between " + from + " and " + to + " " + this.counterType.toString() + " counters";
if (to == Integer.MAX_VALUE) {
return "{this} has " + CardUtil.numberToText(from) + " or more " + this.counterType.toString() + " counters on it";
}
return "{this} has between " + from + " and " + to + " " + this.counterType.toString() + " counters on it";
} else {
return "{this} has " + CardUtil.numberToText(amount) + " or more " + this.counterType.toString() + " counters on it";
}

2
Mage/src/main/java/mage/abilities/costs/common/DiscardXTargetCost.java
View file

@ -23,7 +23,7 @@ public class DiscardXTargetCost extends VariableCostImpl {
public DiscardXTargetCost(FilterCard filter, boolean useAsAdditionalCost) {
super(useAsAdditionalCost ? VariableCostType.ADDITIONAL : VariableCostType.NORMAL,
filter.getMessage() + " to discard");
this.text = (useAsAdditionalCost ? "as an additional cost to cast this spell, discard " : "Discard ") + xText + ' ' + filter.getMessage();
this.text = (useAsAdditionalCost ? "discard " : "Discard ") + xText + ' ' + filter.getMessage();
this.filter = filter;
}

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

@ -10,7 +10,7 @@ public class EndTurnEffect extends OneShotEffect {
public EndTurnEffect() {
super(Outcome.Detriment);
staticText = "End the turn. <i>(Exile all spells and abilities on the stack, including this card. The player whose turn it is discards down to their maximum hand size. Damage wears off, and \"this turn\" and \"until end of turn\" effects end.)</i>";
staticText = "End the turn. <i>(Exile all spells and abilities from the stack, including this card. The player whose turn it is discards down to their maximum hand size. Damage wears off, and \"this turn\" and \"until end of turn\" effects end.)</i>";
}
public EndTurnEffect(EndTurnEffect effect) {