Skip to content

MagicColor: add LandType to Color #9570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Hanmac wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −7
Open

MagicColor: add LandType to Color #9570

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions forge-core/src/main/java/forge/card/MagicColor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,22 +146,24 @@ private Constant() {
}

public enum Color implements ITranslatable {
WHITE(Constant.WHITE, MagicColor.WHITE, "W", "lblWhite"),
BLUE(Constant.BLUE, MagicColor.BLUE, "U", "lblBlue"),
BLACK(Constant.BLACK, MagicColor.BLACK, "B", "lblBlack"),
RED(Constant.RED, MagicColor.RED, "R", "lblRed"),
GREEN(Constant.GREEN, MagicColor.GREEN, "G", "lblGreen"),
COLORLESS(Constant.COLORLESS, MagicColor.COLORLESS, "C", "lblColorless");
WHITE(Constant.WHITE, MagicColor.WHITE, "W", "Plains", "lblWhite"),
BLUE(Constant.BLUE, MagicColor.BLUE, "U", "Island", "lblBlue"),
BLACK(Constant.BLACK, MagicColor.BLACK, "B", "Swamp", "lblBlack"),
RED(Constant.RED, MagicColor.RED, "R", "Mountain", "lblRed"),
GREEN(Constant.GREEN, MagicColor.GREEN, "G", "Forest", "lblGreen"),
COLORLESS(Constant.COLORLESS, MagicColor.COLORLESS, "C", null, "lblColorless");

private final String name, shortName, symbol;
private final String basicLand;
private final String label;
private final byte colormask;

Color(String name0, byte colormask0, String shortName, String label) {
Color(String name0, byte colormask0, String shortName, String basicLand, String label) {
name = name0;
colormask = colormask0;
this.shortName = shortName;
symbol = "{" + shortName + "}";
this.basicLand = basicLand;
this.label = label;
}

Expand Down Expand Up @@ -194,6 +196,10 @@ public String getShortName() {
return shortName;
}

public String getBasicLand() {
return basicLand;
}

@Override
public String getTranslatedName() {
return Localizer.getInstance().getMessage(label);
Expand Down