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

images: added support of meld cards, fixed #11778 (#12083)

Browse source
This commit is contained in:
Susucre 2024-04-08 21:57:13 +02:00 • committed by GitHub
parent 9ea9621acd
commit a69583dbfc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 45 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Mage/src/main/java/mage/cards/repository/CardCriteria.java
View file

@ -32,7 +32,7 @@ public class CardCriteria {
private Boolean variousArt;
private Boolean doubleFaced;
private Boolean modalDoubleFaced;
private boolean nightCard;
private Boolean nightCard;
private boolean black;
private boolean blue;
private boolean green;
@ -114,7 +114,7 @@ public class CardCriteria {
return this;
}
public CardCriteria nightCard(boolean nightCard) {
public CardCriteria nightCard(Boolean nightCard) {
this.nightCard = nightCard;
return this;
}
@ -217,9 +217,14 @@ public class CardCriteria {
optimize();
Where where = qb.where();
where.eq("nightCard", nightCard);
int clausesCount = 0;
if (nightCard != null) {
where.eq("nightCard", nightCard);
clausesCount++;
}
where.eq("splitCardHalf", false);
int clausesCount = 2;
clausesCount++;
if (nameContains != null) {
where.like("name", new SelectArg('%' + nameContains + '%'));
clausesCount++;

7
Mage/src/main/java/mage/cards/repository/CardInfo.java
View file

@ -100,6 +100,8 @@ public class CardInfo {
@DatabaseField(indexName = "nightCard_index")
protected boolean nightCard;
@DatabaseField
protected boolean meldCard;
@DatabaseField
protected String flipCardName;
@DatabaseField
protected String secondSideName;
@ -149,6 +151,7 @@ public class CardInfo {
this.doubleFaced = card.isTransformable() && card.getSecondCardFace() != null;
this.nightCard = card.isNightCard();
this.meldCard = card instanceof MeldCard;
Card secondSide = card.getSecondCardFace();
if (secondSide != null) {
this.secondSideName = secondSide.getName();
@ -458,6 +461,10 @@ public class CardInfo {
return nightCard;
}
public boolean isMeldCard() {
return meldCard;
}
public String getSecondSideName() {
return secondSideName;
}