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

3
Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
View file

@ -9,6 +9,7 @@ import mage.client.plugins.impl.Plugins;
import mage.client.util.audio.AudioManager;
import mage.constants.CardType;
import mage.constants.EnlargeMode;
import mage.constants.SubType;
import mage.constants.SuperType;
import mage.view.AbilityView;
import mage.view.CardView;
@ -681,7 +682,7 @@ public abstract class CardPanel extends MagePermanent implements MouseListener,
if (!card.getSubTypes().isEmpty()) {
sbType.append("- ");
for (String subType : card.getSubTypes()) {
for (SubType subType : card.getSubTypes()) {
sbType.append(subType).append(' ');
}
}

3
Mage.Client/src/main/java/org/mage/card/arcane/CardPanelRenderImpl.java
View file

@ -3,6 +3,7 @@ package org.mage.card.arcane;
import com.google.common.collect.MapMaker;
import mage.cards.action.ActionCallback;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.SuperType;
import mage.view.CardView;
import mage.view.CounterView;
@ -161,7 +162,7 @@ public class CardPanelRenderImpl extends CardPanel {
for (SuperType s : this.view.getSuperTypes()) {
sb.append(s);
}
for (String s : this.view.getSubTypes()) {
for (SubType s : this.view.getSubTypes()) {
sb.append(s);
}
for (String s : this.view.getManaCost()) {

3
Mage.Client/src/main/java/org/mage/card/arcane/CardRenderer.java
View file

@ -9,6 +9,7 @@ import mage.cards.ArtRect;
import mage.client.dialog.PreferencesDialog;
import mage.constants.AbilityType;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.SuperType;
import mage.view.CardView;
import mage.view.CounterView;
@ -428,7 +429,7 @@ public abstract class CardRenderer {
}
if (!cardView.getSubTypes().isEmpty()) {
sbType.append("- ");
for (String subType : cardView.getSubTypes()) {
for (SubType subType : cardView.getSubTypes()) {
sbType.append(subType).append(' ');
}
}

6
Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java
View file

@ -11,6 +11,8 @@ import mage.cards.FrameStyle;
import mage.client.dialog.PreferencesDialog;
import mage.constants.CardType;
import mage.constants.MageObjectType;
import mage.constants.SubType;
import mage.util.SubTypeList;
import mage.view.CardView;
import mage.view.PermanentView;
import org.apache.log4j.Logger;
@ -1024,8 +1026,8 @@ public class ModernCardRenderer extends CardRenderer {
// Determine which background paint to use from a set of colors
// and the current card.
protected static Paint getBackgroundPaint(ObjectColor colors, Collection<CardType> types, Collection<String> subTypes) {
if (subTypes.contains("Vehicle")) {
protected static Paint getBackgroundPaint(ObjectColor colors, Collection<CardType> types, SubTypeList subTypes) {
if (subTypes.contains(SubType.VEHICLE)) {
return BG_TEXTURE_VEHICLE;
} else if (types.contains(CardType.LAND)) {
return BG_TEXTURE_LAND;