external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Synchronize nomenclature of Generic Cost

Browse Source 
- Add new Colorless Cost
- Start displaying of colorless mana with new symbol (with backwards compatibility for existing scripts that produce "{1}" instead of "{C}")
This commit is contained in:
Sol
2015-12-29 16:37:22 +00:00
parent 3cc5f6495b
commit ff73eb78eb
31 changed files with 129 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-desktop/src/main/java/forge/itemmanager/views/ColorSetRenderer.java
View File

@@ -56,7 +56,7 @@ public class ColorSetRenderer extends ItemCellRenderer {
final int offsetIfNoSpace = cntGlyphs > 1 ? (cellWidth - padding0 - elemtWidth) / (cntGlyphs - 1) : elemtWidth + elemtGap;
final int dx = Math.min(elemtWidth + elemtGap, offsetIfNoSpace);
// Display colorless mana before colored mana
// Display generic mana before colored mana
if (cntGlyphs == 0) {
CardFaceSymbols.drawSymbol(ManaCostShard.X.getImageKey(), g, x, y);
x += dx;

2
forge-gui-desktop/src/main/java/forge/itemmanager/views/ManaCostRenderer.java
View File

@@ -116,7 +116,7 @@ public class ManaCostRenderer extends ItemCellRenderer {
}
}
// Display colorless mana before colored mana
// Display generic mana before colored mana
if (hasGeneric) {
final String sGeneric = Integer.toString(genericManaCost);
CardFaceSymbols.drawSymbol(sGeneric, g, x, y);

1
forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java
View File

@@ -55,6 +55,7 @@ public class CardFaceSymbols {
MANA_IMAGES.put("X", FSkin.getImage(FSkinProp.IMG_MANA_X, manaImageSize, manaImageSize));
MANA_IMAGES.put("Y", FSkin.getImage(FSkinProp.IMG_MANA_Y, manaImageSize, manaImageSize));
MANA_IMAGES.put("Z", FSkin.getImage(FSkinProp.IMG_MANA_Z, manaImageSize, manaImageSize));
MANA_IMAGES.put("C", FSkin.getImage(FSkinProp.IMG_MANA_COLORLESS, manaImageSize, manaImageSize));
MANA_IMAGES.put("B", FSkin.getImage(FSkinProp.IMG_MANA_B, manaImageSize, manaImageSize));
MANA_IMAGES.put("BG", FSkin.getImage(FSkinProp.IMG_MANA_HYBRID_BG, manaImageSize, manaImageSize));

2
forge-gui-desktop/src/test/java/forge/RunTest.java
View File

@@ -62,7 +62,7 @@ public class RunTest {
this.check("24", !manaCost.isPaid());
manaCost.payMana(MagicColor.Constant.BLUE);
this.check("25", !manaCost.isPaid());
manaCost.payMana(MagicColor.Constant.COLORLESS);
manaCost.payMana(MagicColor.Constant.GENERIC);
this.check("26", !manaCost.isPaid());
manaCost.payMana(MagicColor.Constant.GREEN);
this.check("27", !manaCost.isPaid());

2
forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java
View File

@@ -273,7 +273,7 @@ public class PlayerControllerForTests extends PlayerController {
}
@Override
public CardCollectionView chooseCardsToDelve(int colorLessAmount, CardCollection grave) {
public CardCollectionView chooseCardsToDelve(int genericAmount, CardCollection grave) {
return CardCollection.EMPTY;
}