mtgmatcher: Do not duplicate P30H any more

Downstream all adopted the non-JPN version as main.
mtgban · Apr 3, 2024 · ac4b8ab · ac4b8ab
1 parent 5dfb778
commit ac4b8ab
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 24 deletions.
diff --git a/mtgmatcher/backend.go b/mtgmatcher/backend.go
@@ -664,7 +664,6 @@ func NewDatastore(ap mtgjson.AllPrintings) {
 	duplicate(ap.Data, cards, uuids, "Legends Italian", "LEG", "ITA", "1995-09-01")
 	duplicate(ap.Data, cards, uuids, "The Dark Italian", "DRK", "ITA", "1995-08-01")
 	duplicate(ap.Data, cards, uuids, "Alternate Fourth Edition", "4ED", "ALT", "1995-04-01")
-	duplicate(ap.Data, cards, uuids, "30th Anniversary History Japanese Promos", "P30H", "JPN", "2022-09-09")
 
 	duplicateCards(ap.Data, cards, uuids, "SLD", "JPN", sldJPNLangDupes)
 	duplicateCards(ap.Data, cards, uuids, "PURL", "JPN", []string{"1"})

diff --git a/mtgmatcher/callbacks.go b/mtgmatcher/callbacks.go
@@ -190,13 +190,12 @@ var simpleFilterCallbacks = map[string]cardFilterCallback{
 
 	"BOT": shatteredCheck,
 
-	"MAT":     retroCheck,
-	"MH2":     retroCheck,
-	"P30H":    retroCheck,
-	"P30HJPN": retroCheck,
-	"30A":     retroCheck,
-	"PW23":    retroCheck,
-	"RVR":     retroCheck,
+	"MAT":  retroCheck,
+	"MH2":  retroCheck,
+	"P30H": retroCheck,
+	"30A":  retroCheck,
+	"PW23": retroCheck,
+	"RVR":  retroCheck,
 
 	"BRO": babOrBuyaboxRetroCheck,
 

diff --git a/mtgmatcher/filter.go b/mtgmatcher/filter.go
@@ -486,19 +486,11 @@ func filterPrintings(inCard *Card, editions []string) (printings []string) {
 
 		case inCard.Contains("30th"):
 			switch set.Code {
-			case "P30A", "P30H":
-				if inCard.isJPN() && inCard.Name != "Tarmogoyf" {
-					continue
-				}
-			case "P30HJPN":
-				if !inCard.isJPN() {
-					continue
-				}
+			case "P30A", "P30H", "P30M":
 			case "P30T":
-				if inCard.isRetro() {
+				if inCard.isRetro() || !inCard.isJPN() {
 					continue
 				}
-			case "P30M":
 			default:
 				continue
 			}

diff --git a/mtgmatcher/mtgmatcher.go b/mtgmatcher/mtgmatcher.go
@@ -1012,14 +1012,13 @@ func adjustEdition(inCard *Card) {
 			edition = "ignored"
 		}
 
-	// Decouple P30A from P30H and its Japanese version
+	// Decouple P30A from P30H and P30T
 	case inCard.Contains("30th Anniversary") && !inCard.Contains("Edition") && !inCard.Contains("Tokyo") && !inCard.Contains("Misc") && len(MatchInSet(inCard.Name, "P30H")) > 0:
-		edition = backend.Sets["P30H"].Name
-		if inCard.Contains("Japanese") {
-			edition = backend.Sets["P30HJPN"].Name
-		} else if inCard.Name == "Serra Angel" && (!inCard.Contains("History") || ExtractYear(inCard.Variation) != "") {
-			edition = backend.Sets["P30A"].Name
+		maybeEdition := backend.Sets["P30H"].Name
+		if inCard.Name == "Serra Angel" && (!inCard.Contains("History") || ExtractYear(inCard.Variation) != "") {
+			maybeEdition = backend.Sets["P30A"].Name
 		}
+		edition = maybeEdition
 
 	// Oilslick lands may not have the bundle tag attached to them
 	case inCard.isBasicLand() && inCard.isOilSlick() && !inCard.isBundle():