External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Avacynian Missionaries - Fixed tooltip text (fixes #1731).

Browse source
This commit is contained in:
LevelX2 2016-04-05 17:15:42 +02:00
parent 98f9565212
commit 4fef593c8e
14 changed files with 44 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -156,7 +156,7 @@ public class BeginningOfEndStepTriggeredAbility extends TriggeredAbilityImpl {
private String generateConditionString() {
if (interveningIfClauseCondition != null) {
return new StringBuilder(interveningIfClauseCondition.toString()).append(", ").toString();
return "if {this} is " + interveningIfClauseCondition.toString() + ", ";
}
switch (getZone()) {
case GRAVEYARD:

15
Mage/src/main/java/mage/abilities/condition/common/EnchantedCondition.java → Mage/src/main/java/mage/abilities/condition/common/EnchantedSourceCondition.java
View file

@ -28,9 +28,9 @@
package mage.abilities.condition.common;
import java.util.UUID;
import mage.constants.CardType;
import mage.abilities.Ability;
import mage.abilities.condition.Condition;
import mage.constants.CardType;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -38,15 +38,15 @@ import mage.game.permanent.Permanent;
*
* @author North
*/
public class EnchantedCondition implements Condition {
public class EnchantedSourceCondition implements Condition {
private int numberOfEnchantments;
public EnchantedCondition() {
public EnchantedSourceCondition() {
this(1);
}
public EnchantedCondition(int numberOfEnchantments) {
public EnchantedSourceCondition(int numberOfEnchantments) {
this.numberOfEnchantments = numberOfEnchantments;
}
@ -58,7 +58,7 @@ public class EnchantedCondition implements Condition {
for (UUID uuid : permanent.getAttachments()) {
Permanent attached = game.getBattlefield().getPermanent(uuid);
if (attached != null && attached.getCardType().contains(CardType.ENCHANTMENT)) {
if (++numberOfFoundEnchantments >= numberOfEnchantments) {
if (++numberOfFoundEnchantments >= numberOfEnchantments) {
return true;
}
}
@ -66,4 +66,9 @@ public class EnchantedCondition implements Condition {
}
return (numberOfFoundEnchantments >= numberOfEnchantments);
}
@Override
public String toString() {
return "enchanted";
}
}

10
Mage/src/main/java/mage/abilities/condition/common/EquippedCondition.java → Mage/src/main/java/mage/abilities/condition/common/EquippedSourceCondition.java
View file

@ -38,9 +38,9 @@ import mage.game.permanent.Permanent;
*
* @author nantuko
*/
public class EquippedCondition implements Condition {
public class EquippedSourceCondition implements Condition {
private static final EquippedCondition fInstance = new EquippedCondition();
private static final EquippedSourceCondition fInstance = new EquippedSourceCondition();
public static Condition getInstance() {
return fInstance;
@ -59,4 +59,10 @@ public class EquippedCondition implements Condition {
}
return false;
}
@Override
public String toString() {
return "equipped";
}
}