From ab7895cdbc3a4f66f1ff2c71617df01cd9ef77db Mon Sep 17 00:00:00 2001 From: cajun <12363371+CajunAvenger@users.noreply.github.com> Date: Sat, 10 Aug 2024 15:03:56 -0500 Subject: [PATCH] fix masterpiece counting & pt-br instant --- data/magic.mse-game/script | 12 ++++++------ data/magic.mse-game/word_lists | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/magic.mse-game/script b/data/magic.mse-game/script index b5fb0a41e..a2e0b4827 100644 --- a/data/magic.mse-game/script +++ b/data/magic.mse-game/script @@ -789,11 +789,11 @@ set_filter := { else if is_masterpiece() and not token_shape(card.shape) then { is_masterpiece() and not token_shape(card.shape) } else if set.sort_special_rarity != "separate numbering" then - { not is_unsorted() and not token_shape(card.shape) } + { not is_unsorted() and not token_shape(card.shape) and not is_masterpiece() } else if card.rarity == "special" then - { not is_unsorted() and not token_shape(card.shape) and card.rarity == "special" } + { not is_unsorted() and not token_shape(card.shape) and card.rarity == "special" and not is_masterpiece() } else - { not is_unsorted() and not token_shape(card.shape) and card.rarity != "special" } + { not is_unsorted() and not token_shape(card.shape) and card.rarity != "special" and not is_masterpiece() } } #### over-partition cards need to be counted during the card number count #### but need to be skipped during the card count count @@ -812,11 +812,11 @@ set_filter_under_partition := { else if is_masterpiece() and not token_shape(card.shape) then { is_masterpiece() and not token_shape(card.shape) and not over_partition() } else if set.sort_special_rarity != "separate numbering" then - { not is_unsorted() and not token_shape(card.shape) and not over_partition() } + { not is_unsorted() and not token_shape(card.shape) and not over_partition() and not is_masterpiece() } else if card.rarity == "special" then - { not is_unsorted() and not token_shape(card.shape) and card.rarity == "special" and not over_partition() } + { not is_unsorted() and not token_shape(card.shape) and card.rarity == "special" and not over_partition() and not is_masterpiece() } else - { not is_unsorted() and not token_shape(card.shape) and card.rarity != "special" and not over_partition() } + { not is_unsorted() and not token_shape(card.shape) and card.rarity != "special" and not over_partition() and not is_masterpiece() } } #### user configurable additions to the set totals diff --git a/data/magic.mse-game/word_lists b/data/magic.mse-game/word_lists index cc6a3158f..d49708ae5 100644 --- a/data/magic.mse-game/word_lists +++ b/data/magic.mse-game/word_lists @@ -349,7 +349,7 @@ word list: word: Criatura Artefato word: Encantamento word: Criatura Encantamento - word: Mágica Istantaneo + word: Mágica Instantânea word: Feitiço word: Terreno word: Planeswalker