External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 21:29:17 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

various fixes from checking text discrepancies

Browse source
This commit is contained in:
xenohedron 2024-09-12 21:08:42 -04:00
parent c222e707bf
commit 0db5c1696d
21 changed files with 68 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage/src/main/java/mage/abilities/decorator/ConditionalTriggeredAbility.java
View file

@ -10,6 +10,7 @@ import mage.abilities.effects.Effects;
import mage.constants.EffectType;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.util.CardUtil;
import mage.watchers.Watcher;
import java.util.List;
@ -71,7 +72,9 @@ public class ConditionalTriggeredAbility extends TriggeredAbilityImpl {
if (abilityText == null || abilityText.isEmpty()) {
return ability.getRule();
}
return abilityText;
return (flavorWord != null ? CardUtil.italicizeWithEmDash(flavorWord) : "") +
(abilityWord != null ? abilityWord.formatWord() : "") +
abilityText + (abilityText.endsWith(".") || abilityText.endsWith("\"") || abilityText.endsWith(">") ? "" : ".");
}
@Override

9
Mage/src/main/java/mage/filter/common/FilterLandCard.java
View file

@ -1,9 +1,6 @@
package mage.filter.common;
import mage.constants.CardType;
import mage.constants.SuperType;
import mage.filter.FilterCard;
/**
@ -20,12 +17,6 @@ public class FilterLandCard extends FilterCard {
this.add(CardType.LAND.getPredicate());
}
public static FilterLandCard basicLandCard() {
FilterLandCard filter = new FilterLandCard("basic land card");
filter.add(SuperType.BASIC.getPredicate());
return filter;
}
protected FilterLandCard(final FilterLandCard filter) {
super(filter);
}

31
Mage/src/main/java/mage/game/permanent/token/InsectBlackGreenFlyingToken.java Normal file
View file

@ -0,0 +1,31 @@
package mage.game.permanent.token;
import mage.MageInt;
import mage.abilities.keyword.FlyingAbility;
import mage.constants.CardType;
import mage.constants.SubType;
/**
* @author TheElk801
*/
public final class InsectBlackGreenFlyingToken extends TokenImpl {
public InsectBlackGreenFlyingToken() {
super("Insect Token", "1/1 black and green Insect creature token with flying");
cardType.add(CardType.CREATURE);
color.setBlack(true);
color.setGreen(true);
subtype.add(SubType.INSECT);
power = new MageInt(1);
toughness = new MageInt(1);
this.addAbility(FlyingAbility.getInstance());
}
private InsectBlackGreenFlyingToken(final InsectBlackGreenFlyingToken token) {
super(token);
}
public InsectBlackGreenFlyingToken copy() {
return new InsectBlackGreenFlyingToken(this);
}
}