External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-09 12:22:10 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Game: fixed that search by card name was able to return a wrong card (example: cheat command)

Browse source
This commit is contained in:
Oleg Agafonov 2023-05-08 22:58:30 +04:00
parent 6144dc64b7
commit 1dea98cf1f
13 changed files with 39 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/abilities/effects/common/ConjureCardEffect.java
View file

@ -56,7 +56,7 @@ public class ConjureCardEffect extends OneShotEffect {
}
CardInfo cardInfo = CardRepository
.instance
.findCards(new CardCriteria().nameExact(cardName))
.findCards(new CardCriteria().name(cardName))
.stream()
.findFirst()
.orElse(null);

2
Mage/src/main/java/mage/abilities/effects/common/DraftFromSpellbookEffect.java
View file

@ -62,7 +62,7 @@ public class DraftFromSpellbookEffect extends OneShotEffect {
}
CardInfo cardInfo = CardRepository
.instance
.findCards(new CardCriteria().nameExact(cardName))
.findCards(new CardCriteria().name(cardName))
.stream()
.findFirst()
.orElse(null);

6
Mage/src/main/java/mage/cards/decks/importer/CardLookup.java
View file

@ -1,12 +1,12 @@
package mage.cards.decks.importer;
import java.util.List;
import java.util.Optional;
import mage.cards.repository.CardCriteria;
import mage.cards.repository.CardInfo;
import mage.cards.repository.CardRepository;
import java.util.List;
import java.util.Optional;
public class CardLookup {
public static final CardLookup instance = new CardLookup();

11
Mage/src/main/java/mage/cards/decks/importer/DraftLogImporter.java
View file

@ -2,10 +2,8 @@ package mage.cards.decks.importer;
import mage.cards.decks.DeckCardInfo;
import mage.cards.decks.DeckCardLists;
import mage.cards.repository.CardCriteria;
import mage.cards.repository.CardInfo;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -28,14 +26,7 @@ public class DraftLogImporter extends PlainTextDeckImporter {
Matcher pickMatcher = PICK_PATTERN.matcher(line);
if (pickMatcher.matches()) {
String name = pickMatcher.group(1);
List<CardInfo> cards = getCardLookup().lookupCardInfo(new CardCriteria().setCodes(currentSet).name(name));
CardInfo card = null;
if (!cards.isEmpty()) {
card = cards.get(0);
} else {
card = getCardLookup().lookupCardInfo(name).orElse(null);
}
CardInfo card = getCardLookup().lookupCardInfo(name, currentSet).orElse(null);
if (card != null) {
deckList.getCards().add(new DeckCardInfo(card.getName(), card.getCardNumber(), card.getSetCode()));
} else {

17
Mage/src/main/java/mage/cards/decks/importer/MWSDeckImporter.java
View file

@ -2,11 +2,7 @@ package mage.cards.decks.importer;
import mage.cards.decks.DeckCardInfo;
import mage.cards.decks.DeckCardLists;
import mage.cards.repository.CardCriteria;
import mage.cards.repository.CardInfo;
import mage.util.RandomUtil;
import java.util.List;
/**
* @author BetaSteward_at_googlemail.com
@ -37,16 +33,9 @@ public class MWSDeckImporter extends PlainTextDeckImporter {
try {
int num = Integer.parseInt(lineNum);
CardInfo cardInfo = null;
if (!setCode.isEmpty()) {
CardCriteria criteria = new CardCriteria();
criteria.name(lineName);
criteria.setCodes(setCode);
List<CardInfo> cards = getCardLookup().lookupCardInfo(criteria);
if (!cards.isEmpty()) {
cardInfo = cards.get(RandomUtil.nextInt(cards.size()));
}
}
if (cardInfo == null) {
if (setCode.isEmpty()) {
cardInfo = getCardLookup().lookupCardInfo(lineName, setCode).orElse(null);
} else {
cardInfo = getCardLookup().lookupCardInfo(lineName).orElse(null);
}

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

@ -18,8 +18,8 @@ import java.util.List;
*/
public class CardCriteria {
private String nameContains;
private String name;
private String nameExact;
private String rules;
private final List<String> setCodes;
private final List<String> ignoreSetCodes; // sets to ignore, use with little amount of sets (example: ignore sets with snow lands)
@ -119,13 +119,13 @@ public class CardCriteria {
return this;
}
public CardCriteria name(String name) {
this.name = name;
public CardCriteria nameContains(String str) {
this.nameContains = str;
return this;
}
public CardCriteria nameExact(String nameExact) {
this.nameExact = nameExact;
public CardCriteria name(String name) {
this.name = name;
return this;
}
@ -220,12 +220,12 @@ public class CardCriteria {
where.eq("nightCard", nightCard);
where.eq("splitCardHalf", false);
int clausesCount = 2;
if (name != null) {
where.like("name", new SelectArg('%' + name + '%'));
if (nameContains != null) {
where.like("name", new SelectArg('%' + nameContains + '%'));
clausesCount++;
}
if (nameExact != null) {
where.like("name", new SelectArg(nameExact));
if (name != null) {
where.eq("name", new SelectArg(name));
clausesCount++;
}
if (rules != null) {
@ -397,12 +397,12 @@ public class CardCriteria {
return this;
}
public String getName() {
return name;
public String getNameContains() {
return nameContains;
}
public String getNameExact() {
return nameExact;
public String getName() {
return name;
}
public String getRules() {

2
Mage/src/main/java/mage/util/TournamentUtil.java
View file

@ -68,7 +68,7 @@ public final class TournamentUtil {
} else {
criteria.ignoreSetsWithSnowLands();
}
criteria.rarities(Rarity.LAND).nameExact(landName);
criteria.rarities(Rarity.LAND).name(landName);
List<CardInfo> lands = CardRepository.instance.findCards(criteria);
List<Card> cards = new ArrayList<>();
if (!lands.isEmpty()) {