github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 11:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2020-06-26 18:16:51 +02:00
commit 9ad11e653a
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/cards/b/BlessedSanctuary.java
View file

@ -20,14 +20,14 @@ import java.util.UUID;
public class BlessedSanctuary extends CardImpl {
private static final FilterPermanent filterYourCreatures = new FilterControlledCreaturePermanent("creatures you control");
private static final FilterControlledCreaturePermanent filterNontoken = new FilterControlledCreaturePermanent("nontoken creature");
private static final FilterControlledCreaturePermanent filterNontoken = new FilterControlledCreaturePermanent("a nontoken creature");
static {
filterNontoken.add(Predicates.not(TokenPredicate.instance));
}
public BlessedSanctuary(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{W}{W}");
super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{W}{W}");
//Prevent all noncombat damage that would be dealt to you and creatures you control.
this.addAbility(new SimpleStaticAbility(new PreventAllNonCombatDamageToAllEffect(

10
Mage.Sets/src/mage/cards/i/InniazTheGaleForce.java
View file

@ -34,9 +34,9 @@ import java.util.UUID;
public final class InniazTheGaleForce extends CardImpl {
private static final FilterCreaturePermanent filter
= new FilterCreaturePermanent("attacking creatures with flying");
= new FilterCreaturePermanent("Attacking creatures with flying");
private static final FilterCreaturePermanent filter2
= new FilterCreaturePermanent("creatures you control with flying");
= new FilterCreaturePermanent("three or more creatures you control with flying");
static {
filter.add(AttackingPredicate.instance);
@ -60,7 +60,8 @@ public final class InniazTheGaleForce extends CardImpl {
1, 1, Duration.EndOfTurn, filter, false
), new ManaCostsImpl("{2}{W/U}")));
// Whenever three or more creatures you control with flying attack, each player gains control of a nonland permanent of your choice controlled by the player to their right.
// Whenever three or more creatures you control with flying attack, each player gains control
// of a nonland permanent of your choice controlled by the player to their right.
this.addAbility(new AttacksWithCreaturesTriggeredAbility(
new InniazTheGaleForceEffect(), 3, filter2
));
@ -79,6 +80,7 @@ public final class InniazTheGaleForce extends CardImpl {
class InniazTheGaleForceEffect extends OneShotEffect {
private static final class PlayerPair {
private final Player leftPlayer;
private final Player rightPlayer;
private final FilterPermanent filter;
@ -94,7 +96,7 @@ class InniazTheGaleForceEffect extends OneShotEffect {
private FilterPermanent makeFilter() {
FilterPermanent filter = new FilterNonlandPermanent(
"nonland permanent controlled by " + rightPlayer.getName()
+ " to give to " + leftPlayer.getName()
+ " to give to " + leftPlayer.getName()
);
filter.add(new ControllerIdPredicate(rightPlayer.getId()));
return filter;

6
Mage.Sets/src/mage/cards/o/OrmosArchiveKeeper.java
View file

@ -65,8 +65,8 @@ class OrmosArchiveKeeperEffect extends ReplacementEffectImpl {
OrmosArchiveKeeperEffect() {
super(Duration.WhileOnBattlefield, Outcome.Benefit);
staticText = "If you would draw a card while your library has no cards in it, " +
"instead put five +1/+1 counters on {this}";
staticText = "If you would draw a card while your library has no cards in it, "
+ "instead put five +1/+1 counters on {this}";
}
private OrmosArchiveKeeperEffect(final OrmosArchiveKeeperEffect effect) {
@ -111,7 +111,7 @@ class OrmosArchiveKeeperEffect extends ReplacementEffectImpl {
class OrmosArchiveKeeperTarget extends TargetCardInHand {
private static final FilterCard filter = new FilterCard("3 cards with different names");
private static final FilterCard filter = new FilterCard("three cards with different names");
OrmosArchiveKeeperTarget() {
super(3, filter);

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

@ -1,5 +1,3 @@
package mage.abilities.effects.common;
import mage.abilities.Ability;
@ -27,7 +25,7 @@ public class PreventAllNonCombatDamageToAllEffect extends PreventionEffectImpl {
super(duration, Integer.MAX_VALUE, false);
this.filter = filter;
this.andToYou = andToYou;
staticText = "Prevent all non combat damage that would be dealt to " + (andToYou ? "you and " : "") + filter.getMessage();
staticText = "Prevent all noncombat damage that would be dealt to " + (andToYou ? "you and " : "") + filter.getMessage();
if (duration != Duration.WhileOnBattlefield) {
staticText += ' ' + duration.toString();