Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

huge rework on subtypes (#3668)

Browse source 
* huge rework on subtypes

* update for coat of arms

* fix test
This commit is contained in:
ingmargoudt 2017-07-16 23:57:39 +02:00 • committed by Jeff Wadsworth
parent 81fb4b5d92
commit 09f0c9ad97
185 changed files with 1068 additions and 906 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Mage/src/main/java/mage/game/stack/Spell.java
View file

@ -57,6 +57,12 @@ import mage.game.permanent.Permanent;
import mage.game.permanent.PermanentCard;
import mage.players.Player;
import mage.util.GameLog;
import mage.util.SubTypeList;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
import java.util.UUID;
import java.util.ArrayList;
import java.util.EnumSet;
@ -472,10 +478,9 @@ public class Spell extends StackObjImpl implements Card {
}
@Override
public List<String> getSubtype(Game game) {
public SubTypeList getSubtype(Game game) {
if (this.getSpellAbility() instanceof BestowAbility) {
List<String> subtypes = new ArrayList<>();
subtypes.addAll(card.getSubtype(game));
SubTypeList subtypes = card.getSubtype(game);
subtypes.add("Aura");
return subtypes;
}
@ -483,10 +488,9 @@ public class Spell extends StackObjImpl implements Card {
}
@Override
public boolean hasSubtype(String subtype, Game game) {
public boolean hasSubtype(SubType subtype, Game game) {
if (this.getSpellAbility() instanceof BestowAbility) { // workaround for Bestow (don't like it)
List<String> subtypes = new ArrayList<>();
subtypes.addAll(card.getSubtype(game));
SubTypeList subtypes = card.getSubtype(game);
subtypes.add("Aura");
if (subtypes.contains(subtype)) {
return true;
@ -918,4 +922,10 @@ public class Spell extends StackObjImpl implements Card {
game.fireEvent(new GameEvent(EventType.COPIED_STACKOBJECT, copy.getId(), this.getId(), newControllerId));
return copy;
}
public boolean isAllCreatureTypes(){
return false;
}
public void setIsAllCreatureTypes(boolean value){}
}