mirror of
https://github.com/correl/mage.git
synced 2024-12-25 03:00:15 +00:00
merge
This commit is contained in:
commit
7bab7de0e4
3 changed files with 9 additions and 9 deletions
|
@ -25,7 +25,7 @@
|
|||
<dependency>
|
||||
<groupId>org.mage</groupId>
|
||||
<artifactId>Mage-Sets</artifactId>
|
||||
<version>0.6</version>
|
||||
<version>0.7</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.googlecode.jspf</groupId>
|
||||
|
|
|
@ -42,7 +42,7 @@ import mage.cards.CardImpl;
|
|||
public class MarisisTwinclaws extends CardImpl<MarisisTwinclaws> {
|
||||
|
||||
public MarisisTwinclaws (UUID ownerId) {
|
||||
super(ownerId, 140, "Marisi's Twinclaws", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}R/W{G}");
|
||||
super(ownerId, 140, "Marisi's Twinclaws", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{R/W}{G}");
|
||||
this.expansionSetCode = "ARB";
|
||||
this.subtype.add("Cat");
|
||||
this.subtype.add("Warrior");
|
||||
|
|
|
@ -244,13 +244,13 @@ $mana{'Green'} = '{G}';
|
|||
$mana{'Red'} = '{R}';
|
||||
$mana{'White'} = '{W}';
|
||||
$mana{'Variable Colorless'} = '{X}';
|
||||
$mana{'White or Black'} = 'W/B';
|
||||
$mana{'Green or White'} = 'G/W';
|
||||
$mana{'Black or Green'} = 'B/G';
|
||||
$mana{'Black or Red'} = 'B/R';
|
||||
$mana{'Blue or Red'} = 'U/R';
|
||||
$mana{'Red or Green'} = 'R/G';
|
||||
$mana{'Red or White'} = 'R/W';
|
||||
$mana{'White or Black'} = '{W/B}';
|
||||
$mana{'Green or White'} = '{G/W}';
|
||||
$mana{'Black or Green'} = '{B/G}';
|
||||
$mana{'Black or Red'} = '{B/R}';
|
||||
$mana{'Blue or Red'} = '{U/R}';
|
||||
$mana{'Red or Green'} = '{R/G}';
|
||||
$mana{'Red or White'} = '{R/W}';
|
||||
|
||||
my %manatocolor;
|
||||
$manatocolor{'Black'} = " this.color.setBlack(true);";
|
||||
|
|
Loading…
Reference in a new issue