From d17fe8347462efd83ac2bb78596ac3b0b94ad8fc Mon Sep 17 00:00:00 2001 From: pichoro Date: Sun, 23 Sep 2007 19:33:05 +0000 Subject: [PATCH] Upgraded font colors for future-textless. Added "trim" step to separate_word script for Magic. Changed card.full_name field to recognize "shifted splits" as splits. Corrected an error in split sorting. U // 1U was sorting as multicolor split. git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@749 0fc631ac-6414-0410-93d0-97cfa31319b6 --- data/magic-future-textless.mse-style/style | 4 ++-- data/magic.mse-game/game | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/magic-future-textless.mse-style/style b/data/magic-future-textless.mse-style/style index 8db29e68..e98cc0cb 100644 --- a/data/magic-future-textless.mse-style/style +++ b/data/magic-future-textless.mse-style/style @@ -189,7 +189,7 @@ card style: else if contains(card.card_color, match:"land") and contains(card.card_color, match:"multicolor") then rgb(0,0,0) else if styling.grey_hybrid_name and contains(card.card_color, match:"hybrid") then rgb(0,0,0) - else if contains(card.card_color, match:"artifact") then ( + else if contains(card.card_color, match:"artifact") or contains(card.card_color, match:"land") then ( if contains(card.card_color, match:"blue") or contains(card.card_color, match:"black") or contains(card.card_color, match:"red") or @@ -267,7 +267,7 @@ card style: else if contains(card.card_color, match:"land") and contains(card.card_color, match:"multicolor") then rgb(0,0,0) else if styling.grey_hybrid_name and contains(card.card_color, match:"hybrid") then rgb(0,0,0) - else if contains(card.card_color, match:"artifact") then ( + else if contains(card.card_color, match:"artifact") or contains(card.card_color, match:"land") then ( if contains(card.card_color, match:"blue") or contains(card.card_color, match:"black") or contains(card.card_color, match:"red") or diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game index 727c05ac..e3d5ae86 100644 --- a/data/magic.mse-game/game +++ b/data/magic.mse-game/game @@ -193,7 +193,7 @@ init script: card_color := card.card_color casting_cost := card.casting_cost if card.shape == "split" and - casting_cost != card.casting_cost_2 then "H" # Diff Color Splits + card_color != card.card_color_2 then "H" # Diff Color Splits else if chosen(choice: "land", card_color) then ( if card.rarity != "basic land" then "K" # Nonbasic Land else basic_land_sort() @@ -245,7 +245,7 @@ init script: # replaces — correctly add := "" # default is nothing - separate_words := remove_tags + replace_rule(match:" ", replace: " and/or ") + separate_words := remove_tags + trim + replace_rule(match:" ", replace: " and/or ") for_mana_costs := format_cost := { if input.separator_before == "—" and contains(input.param, match: " ") then ( if contains(input.param, match:",") then ( @@ -639,7 +639,7 @@ card field: card list column: 1 card list width: 150 description: The name of the card - script: if card_shape() == "split" then card.name + " // " + card.name_2 else card.name + script: if contains(card.shape, match:"split") then card.name + " // " + card.name_2 else card.name ############################# Background stuff card field: