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

Merge pull request #8189 from kevlahnota/nyxDesktop

Browse Source 
add nyx effect to desktop card renders
This commit is contained in:
kevlahnota
2025-07-31 05:45:46 +08:00
committed by GitHub
parent dfda04f7ba 3fcb9e7a3c
commit 81ff72f1f2
5 changed files with 55 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
forge-gui/res/defaults/stars.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 155 KiB

12
forge-gui/src/main/java/forge/gui/card/CardDetailUtil.java
View File

@@ -67,20 +67,20 @@ public class CardDetailUtil {
public static DetailColors getBorderColor(final CardStateView card, final boolean canShow) {
if (card == null) {
return getBorderColors(null, false, false, false).iterator().next();
return getBorderColors(null, false, false, false, false).iterator().next();
}
return getBorderColors(card.getColors(), card.isLand(), canShow, false).iterator().next();
return getBorderColors(card.getColors(), card.isLand(), canShow, false, card.isEnchantment()).iterator().next();
}
public static List<DetailColors> getBorderColors(final CardStateView card, final boolean canShow) {
if (card == null) {
return getBorderColors(null, false, false, true);
return getBorderColors(null, false, false, true, false);
}
return getBorderColors(card.getColors(), card.isLand(), canShow, true);
return getBorderColors(card.getColors(), card.isLand(), canShow, true, card.isEnchantment());
}
public static List<DetailColors> getBorderColors(final ColorSet colorSet) {
return getBorderColors(colorSet, false, true, true);
return getBorderColors(colorSet, false, true, true, false);
}
private static List<DetailColors> getBorderColors(final ColorSet cardColors, final boolean isLand, final boolean canShow, final boolean supportMultiple) {
private static List<DetailColors> getBorderColors(final ColorSet cardColors, final boolean isLand, final boolean canShow, final boolean supportMultiple, final boolean isEnchantment) {
final List<DetailColors> borderColors = new ArrayList<>();
if (cardColors == null || !canShow) {

1
forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java
View File

@@ -279,6 +279,7 @@ public final class ForgeConstants {
// data that has defaults in the program dir but overrides/additions in the user dir
private static final String _DEFAULTS_DIR = RES_DIR + "defaults" + PATH_SEPARATOR;
public static final String NO_CARD_FILE = _DEFAULTS_DIR + "no_card.jpg";
public static final String STARS_FILE = _DEFAULTS_DIR + "stars.png";
public static final FileLocation WINDOW_LAYOUT_FILE = new FileLocation(_DEFAULTS_DIR, USER_PREFS_DIR, "window.xml");
public static final FileLocation MATCH_LAYOUT_FILE = new FileLocation(_DEFAULTS_DIR, USER_PREFS_DIR, "match.xml");
public static final FileLocation WORKSHOP_LAYOUT_FILE = new FileLocation(_DEFAULTS_DIR, USER_PREFS_DIR, "workshop.xml");