From 147c787eb3b00c16faa37c59edf927aa2cea5c4c Mon Sep 17 00:00:00 2001 From: pichoro Date: Fri, 21 Sep 2007 23:35:29 +0000 Subject: [PATCH] Typeline adjustment in magic-new. Fixed hybrid sorting. Fixed part of hybrid futureshift p/t colors. git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@741 0fc631ac-6414-0410-93d0-97cfa31319b6 --- data/magic-future-textless.mse-style/style | 6 ++++-- data/magic-future.mse-style/style | 6 ++++-- data/magic-new.mse-style/style | 2 +- data/magic.mse-game/game | 1 + 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/data/magic-future-textless.mse-style/style b/data/magic-future-textless.mse-style/style index 5daa6547..8db29e68 100644 --- a/data/magic-future-textless.mse-style/style +++ b/data/magic-future-textless.mse-style/style @@ -318,14 +318,16 @@ card style: not contains(card.card_color, match:"multicolor") then rgb(0,0,0) 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 ( if contains(card.card_color, match:"blue") or contains(card.card_color, match:"black") or contains(card.card_color, match:"red") or contains(card.card_color, match:"green") then rgb(255,255,255) else rgb(0,0,0) - ) else font_color(card.card_color) + ) else if contains(card.card_color, match:"hybrid") and contains(card.card_color, match:"white") and + not contains(card.card_color, match:"red") and not contains(card.card_color, match:"green") then rgb(255,255,255) + else if contains(card.card_color, match:"hybrid") and contains(card.card_color, match:"white") then rgb(0,0,0) + else font_color(card.card_color) separator color: rgb(200,0,0) ############################# Card sorting / numbering ############################# Copyright stuff diff --git a/data/magic-future.mse-style/style b/data/magic-future.mse-style/style index cd09a97b..b02b2030 100644 --- a/data/magic-future.mse-style/style +++ b/data/magic-future.mse-style/style @@ -420,14 +420,16 @@ card style: not contains(card.card_color, match:"multicolor") then rgb(0,0,0) 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 ( if contains(card.card_color, match:"blue") or contains(card.card_color, match:"black") or contains(card.card_color, match:"red") or contains(card.card_color, match:"green") then rgb(255,255,255) else rgb(0,0,0) - ) else font_color(card.card_color) + ) else if contains(card.card_color, match:"hybrid") and contains(card.card_color, match:"white") and + not contains(card.card_color, match:"red") and not contains(card.card_color, match:"green") then rgb(255,255,255) + else if contains(card.card_color, match:"hybrid") and contains(card.card_color, match:"white") then rgb(0,0,0) + else font_color(card.card_color) separator color: rgb(200,0,0) ############################# Card sorting / numbering ############################# Copyright stuff diff --git a/data/magic-new.mse-style/style b/data/magic-new.mse-style/style index 975e8897..8994eb82 100644 --- a/data/magic-new.mse-style/style +++ b/data/magic-new.mse-style/style @@ -224,7 +224,7 @@ card style: type: left: 35 - top : 298 + top : 299 width: { 308 - max(22,card_style.rarity.content_width) } height: 20 alignment: top shrink-overflow diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game index 4605ec28..e2dfaa42 100644 --- a/data/magic.mse-game/game +++ b/data/magic.mse-game/game @@ -214,6 +214,7 @@ init script: else if colors == "B" then "C" # Black else if colors == "R" then "D" # Red else if colors == "G" then "E" # Green + else if contains(casting_cost, match:"/") then "G" #Hybrid else "F" # Multicolor ) }