External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 02:30:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge fix

Browse source
This commit is contained in:
Oleg Agafonov 2025-05-24 20:12:53 +04:00
parent f3ba897536
commit ef4431e7f2
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/src/main/java/mage/client/components/EdhPowerLevelLegalityLabel.java
View file

@ -59,7 +59,7 @@ public class EdhPowerLevelLegalityLabel extends LegalityLabel {
// use 60% font for better and compatible list // use 60% font for better and compatible list
int infoFontSize = Math.round(GUISizeHelper.cardTooltipFont.getSize() * 0.6f); int infoFontSize = Math.round(GUISizeHelper.cardTooltipFont.getSize() * 0.6f);
int maxLimit = 25; int maxLimit = 25;
String extraInfo = this.foundPowerCards.size() <= maxLimit ? "" : String.format("<li style=\"margin-bottom: 2px;\">and %d more cards</li>", maxLimit - this.foundPowerCards.size()); String extraInfo = this.foundPowerCards.size() <= maxLimit ? "" : String.format("<li style=\"margin-bottom: 2px;\">and %d more cards</li>", this.foundPowerCards.size() - maxLimit);
return foundInfo.stream() return foundInfo.stream()
.limit(maxLimit) .limit(maxLimit)
.reduce("<html><body>" .reduce("<html><body>"

1
Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AbstractCommander.java
View file

@ -260,6 +260,7 @@ public abstract class AbstractCommander extends Constructed {
@Override @Override
public int getEdhPowerLevel(Deck deck, List<String> foundPowerCards, List<String> foundInfo) { public int getEdhPowerLevel(Deck deck, List<String> foundPowerCards, List<String> foundInfo) {
// calculate power level and find all related cards with it to show in hints (see deck validation in deck editor) // calculate power level and find all related cards with it to show in hints (see deck validation in deck editor)
// example: https://edhpowerlevel.com
int edhPowerLevel = 0; int edhPowerLevel = 0;
int commanderColors = 0; int commanderColors = 0;
int numberInfinitePieces = 0; int numberInfinitePieces = 0;