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

Merge pull request #1212 from LoneFox78/master

Browse source 
New cards and fixes
This commit is contained in:
LevelX2 2015-08-19 08:57:17 +02:00
commit 5b49cf8a66
49 changed files with 2106 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/mage/abilities/keyword/TransmuteAbility.java
View file

@ -57,8 +57,8 @@ public class TransmuteAbility extends SimpleActivatedAbility {
@Override
public String getRule() {
return new StringBuilder("Transmute ").append(this.getManaCosts().getText())
.append(" (").append(this.getManaCosts().getText())
.append(", Discard this card: Search your library for a card with the same converted mana cost as this card, reveal it, and put it into your hand. Then shuffle your library. Transmute only as a sorcery.)").toString();
.append(" <i>(").append(this.getManaCosts().getText())
.append(", Discard this card: Search your library for a card with the same converted mana cost as this card, reveal it, and put it into your hand. Then shuffle your library. Transmute only as a sorcery.)</i>").toString();
}
}

9
Mage/src/mage/abilities/keyword/VanishingUpkeepAbility.java
View file

@ -31,9 +31,14 @@ public class VanishingUpkeepAbility extends BeginningOfUpkeepTriggeredAbility {
@Override
public String getRule() {
return "Vanishing " + vanishingAmount
if(vanishingAmount > 0) {
return "Vanishing " + vanishingAmount
+ " <i>(This permanent enters the battlefield with " + CardUtil.numberToText(vanishingAmount)
+ " time counters on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.)<i>";
+ " time counters on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.)</i>";
}
else {
return "Vanishing <i>(At the beginning of your upkeep, remove a time counter from this permanent. When the last is removed, sacrifice it.)</i>";
}
}
}

5
Mage/src/mage/counters/CounterType.java
View file

@ -33,7 +33,7 @@ package mage.counters;
* @author nantuko
*/
public enum CounterType {
AGE("age"),
AIM("aim"),
ARROWHEAD("arrowhead"),
@ -57,6 +57,7 @@ public enum CounterType {
FUSE("fuse"),
GOLD("gold"),
HATCHLING("hatchling"),
HEALING("healing"),
HOOFPRINT("hoofprint"),
ICE("ice"),
JAVELIN("javelin"),
@ -117,7 +118,7 @@ public enum CounterType {
}
/**
* Create instance of counter type with defined amount of counters of the
* Create instance of counter type with defined amount of counters of the
* given type.
*
* @param amount amount of counters of the given type.