From b11cb78cd82b10ff2cc0d644e8f7240dcf616145 Mon Sep 17 00:00:00 2001 From: CCTV-1 Date: Mon, 17 Feb 2020 11:37:16 +0800 Subject: [PATCH] card catalog support use localization card text search. --- .../src/main/java/forge/card/CardRulesPredicates.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/forge-core/src/main/java/forge/card/CardRulesPredicates.java b/forge-core/src/main/java/forge/card/CardRulesPredicates.java index 6679b3ad673..1a1c99bac4a 100644 --- a/forge-core/src/main/java/forge/card/CardRulesPredicates.java +++ b/forge-core/src/main/java/forge/card/CardRulesPredicates.java @@ -8,6 +8,7 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; +import forge.util.CardTranslation; import forge.util.ComparableOp; import forge.util.PredicateString; @@ -350,14 +351,14 @@ public final class CardRulesPredicates { boolean shouldContain; switch (this.field) { case NAME: - return op(card.getName(), this.operand); + return (op(CardTranslation.getTranslatedName(card.getName()), this.operand) || op(card.getName(), this.operand)); case SUBTYPE: shouldContain = (this.getOperator() == StringOp.CONTAINS) || (this.getOperator() == StringOp.EQUALS); return shouldContain == card.getType().hasSubtype(this.operand); case ORACLE_TEXT: - return op(card.getOracleText(), operand); + return (op(CardTranslation.getTranslatedOracle(card.getName()), operand) || op(card.getOracleText(), this.operand)); case JOINED_TYPE: - return op(card.getType().toString(), operand); + return (op(CardTranslation.getTranslatedType(card.getName(), card.getType().toString()), operand) || op(card.getType().toString(), operand)); case COST: final String cost = card.getManaCost().toString(); return op(cost, operand);