From 0ebf7cc1f1cdc7a3ff99970604115e1213d7e170 Mon Sep 17 00:00:00 2001 From: pichoro Date: Tue, 5 Aug 2008 16:48:18 +0000 Subject: [PATCH] Undid previous change of better token sorting for Magic; was causing big problems. git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1062 0fc631ac-6414-0410-93d0-97cfa31319b6 --- data/magic.mse-game/game | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game index ad7a357b..a424aca7 100644 --- a/data/magic.mse-game/game +++ b/data/magic.mse-game/game @@ -182,6 +182,7 @@ init script: # The code consists of 4 parts: # normal/token, color, shifted, split sort_index := { + (if contains(card.shape, match:"token") then "T" else " ") + # Tokens come last color_of_card() + (if contains(card.shape, match:"shifted") then "S" else " ") + # planeshifted cards come after normal ones (if contains(card.shape, match:"split") then "S" else " ") + # split cards come after normal ones @@ -249,24 +250,13 @@ init script: ) } - #rarity_sort := { - # if set.sort_special_rarity == "with the rest" or card.rarity != "special" then " " else "S" - #} rarity_sort := { - if card.shape == "token" then "T" - else if set.sort_special_rarity == "with the rest" or card.rarity != "special" then " " - else "S" + if set.sort_special_rarity == "with the rest" or card.rarity != "special" then " " else "S" } - #set_filter := { - # if set.sort_special_rarity != "separate numbering" then nil - # else if card.rarity == "special" then { card.rarity == "special" } - # else { card.rarity != "special" } - #} set_filter := { - if card.shape == "token" then { card.shape == "token" } - else if set.sort_special_rarity != "separate numbering" then { card.shape != "token" and card.shape != "rulestip" } - else if card.rarity == "special" then { card.shape != "token" and card.shape != "rulestip" and card.rarity == "special" } - else { card.shape != "token" and card.shape != "rulestip" and card.rarity != "special" } + if set.sort_special_rarity != "separate numbering" then nil + else if card.rarity == "special" then { card.rarity == "special" } + else { card.rarity != "special" } } card_number := {