github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-17 17:00:08 -09:00
Code Issues Projects Releases Packages Wiki Activity

fixed conflicts

Browse source
This commit is contained in:
Evan Kranzler 2017-09-08 18:30:42 -04:00
parent 3cc178196e
commit aa4b5f38c5
5 changed files with 5 additions and 5 deletions

2
Mage.Sets/src/mage/cards/m/MarduHordechief.java
View file

@ -47,7 +47,7 @@ import mage.watchers.common.PlayerAttackedWatcher;
public class MarduHordechief extends CardImpl {
public MarduHordechief(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}");
this.subtype.add(SubType.HUMAN);
this.subtype.add(SubType.WARRIOR);

2
Mage.Sets/src/mage/cards/m/MarduWarshrieker.java
View file

@ -47,7 +47,7 @@ import mage.watchers.common.PlayerAttackedWatcher;
public class MarduWarshrieker extends CardImpl {
public MarduWarshrieker(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}");
this.subtype.add(SubType.ORC);
this.subtype.add(SubType.SHAMAN);

2
Mage.Sets/src/mage/cards/p/PerfectedForm.java
View file

@ -42,7 +42,7 @@ import mage.constants.SubType;
public class PerfectedForm extends CardImpl {
public PerfectedForm(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "");
this.subtype.add(SubType.INSECT);
this.subtype.add(SubType.HORROR);
this.power = new MageInt(5);

2
Mage.Sets/src/mage/cards/t/TimelyHordemate.java
View file

@ -57,7 +57,7 @@ public class TimelyHordemate extends CardImpl {
}
public TimelyHordemate(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}");
this.subtype.add(SubType.HUMAN);
this.subtype.add(SubType.WARRIOR);

2
Mage.Sets/src/mage/cards/w/WarNameAspirant.java
View file

@ -58,7 +58,7 @@ public class WarNameAspirant extends CardImpl {
}
public WarNameAspirant(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}");
this.subtype.add(SubType.HUMAN);
this.subtype.add(SubType.WARRIOR);