Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Fix text [CHK] [BOK] [SOK] (#10355)

Browse source 
* Fix text: duplicate ("you control") in Champion ability

* New static filter "artifacts and enchantments"

* Text fixes [CHK] [BOK] [SOK]

* Fix Genju text without breaking the effect this time
This commit is contained in:
xenohedron 2023-06-02 12:33:48 +03:00 • committed by GitHub
parent a7c3cb9797
commit 5c8b5f23bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
48 changed files with 91 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java
View file

@ -207,6 +207,7 @@ public abstract class TriggeredAbilityImpl extends AbilityImpl implements Trigge
|| ruleLow.startsWith("change")
|| ruleLow.startsWith("counter")
|| ruleLow.startsWith("destroy")
|| ruleLow.startsWith("distribute")
|| ruleLow.startsWith("sacrifice")
|| ruleLow.startsWith("exchange")
|| ruleLow.startsWith("exile")

5
Mage/src/main/java/mage/abilities/effects/common/PreventDamageToAttachedEffect.java
View file

@ -8,6 +8,7 @@ import mage.game.Game;
import mage.game.events.DamageEvent;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.util.CardUtil;
/**
*
@ -61,14 +62,14 @@ public class PreventDamageToAttachedEffect extends PreventionEffectImpl {
sb.append("combat ");
}
sb.append("damage that would be dealt to ");
sb.append(attachmentType.verb()).append(" creature");
sb.append(CardUtil.getTextWithFirstCharLowerCase(attachmentType.verb())).append(" creature");
} else {
sb.append("If a source would deal ");
if (onlyCombat) {
sb.append("combat ");
}
sb.append("damage to ");
sb.append(attachmentType.verb());
sb.append(CardUtil.getTextWithFirstCharLowerCase(attachmentType.verb()));
sb.append(" creature, prevent ").append(amountToPrevent);
sb.append(" of that damage");
}

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

@ -85,7 +85,7 @@ public class SetPlayerLifeAllEffect extends OneShotEffect {
default:
throw new UnsupportedOperationException("Not supported value for targetController");
}
sb.append(" 's life total becomes ");
sb.append("'s life total becomes ");
sb.append(amount.toString());
return sb.toString();
}

2
Mage/src/main/java/mage/abilities/keyword/ChampionAbility.java
View file

@ -69,7 +69,7 @@ public class ChampionAbility extends StaticAbility {
case 1:
SubType subType = subTypes.get(0);
this.objectDescription = subType.getDescription();
filter = new FilterControlledPermanent(subType, "another " + subType + " you control");
filter = new FilterControlledPermanent(subType, "another " + subType);
filter.add(AnotherPredicate.instance);
break;
case 2:

5
Mage/src/main/java/mage/filter/StaticFilters.java
View file

@ -291,6 +291,11 @@ public final class StaticFilters {
FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT.setLockedFilter(true);
}
public static final FilterArtifactOrEnchantmentPermanent FILTER_PERMANENT_ARTIFACTS_AND_ENCHANTMENTS = new FilterArtifactOrEnchantmentPermanent("artifacts and enchantments");
static {
FILTER_PERMANENT_ARTIFACTS_AND_ENCHANTMENTS.setLockedFilter(true);
}
public static final FilterControlledPermanent FILTER_PERMANENT_CONTROLLED_ARTIFACT_OR_ENCHANTMENT = new FilterControlledPermanent("artifact or enchantment you control");