mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-12 13:37:00 -04:00
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
This commit is contained in:
@@ -318,14 +318,16 @@ card style:
|
|||||||
not contains(card.card_color, match:"multicolor") then rgb(0,0,0)
|
not contains(card.card_color, match:"multicolor") then rgb(0,0,0)
|
||||||
else if contains(card.card_color, match:"land") and
|
else if contains(card.card_color, match:"land") and
|
||||||
contains(card.card_color, match:"multicolor") then rgb(0,0,0)
|
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") then (
|
||||||
if contains(card.card_color, match:"blue") or
|
if contains(card.card_color, match:"blue") or
|
||||||
contains(card.card_color, match:"black") or
|
contains(card.card_color, match:"black") or
|
||||||
contains(card.card_color, match:"red") or
|
contains(card.card_color, match:"red") or
|
||||||
contains(card.card_color, match:"green") then rgb(255,255,255)
|
contains(card.card_color, match:"green") then rgb(255,255,255)
|
||||||
else rgb(0,0,0)
|
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)
|
separator color: rgb(200,0,0)
|
||||||
############################# Card sorting / numbering
|
############################# Card sorting / numbering
|
||||||
############################# Copyright stuff
|
############################# Copyright stuff
|
||||||
|
|||||||
@@ -420,14 +420,16 @@ card style:
|
|||||||
not contains(card.card_color, match:"multicolor") then rgb(0,0,0)
|
not contains(card.card_color, match:"multicolor") then rgb(0,0,0)
|
||||||
else if contains(card.card_color, match:"land") and
|
else if contains(card.card_color, match:"land") and
|
||||||
contains(card.card_color, match:"multicolor") then rgb(0,0,0)
|
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") then (
|
||||||
if contains(card.card_color, match:"blue") or
|
if contains(card.card_color, match:"blue") or
|
||||||
contains(card.card_color, match:"black") or
|
contains(card.card_color, match:"black") or
|
||||||
contains(card.card_color, match:"red") or
|
contains(card.card_color, match:"red") or
|
||||||
contains(card.card_color, match:"green") then rgb(255,255,255)
|
contains(card.card_color, match:"green") then rgb(255,255,255)
|
||||||
else rgb(0,0,0)
|
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)
|
separator color: rgb(200,0,0)
|
||||||
############################# Card sorting / numbering
|
############################# Card sorting / numbering
|
||||||
############################# Copyright stuff
|
############################# Copyright stuff
|
||||||
|
|||||||
@@ -224,7 +224,7 @@ card style:
|
|||||||
|
|
||||||
type:
|
type:
|
||||||
left: 35
|
left: 35
|
||||||
top : 298
|
top : 299
|
||||||
width: { 308 - max(22,card_style.rarity.content_width) }
|
width: { 308 - max(22,card_style.rarity.content_width) }
|
||||||
height: 20
|
height: 20
|
||||||
alignment: top shrink-overflow
|
alignment: top shrink-overflow
|
||||||
|
|||||||
@@ -214,6 +214,7 @@ init script:
|
|||||||
else if colors == "B" then "C" # Black
|
else if colors == "B" then "C" # Black
|
||||||
else if colors == "R" then "D" # Red
|
else if colors == "R" then "D" # Red
|
||||||
else if colors == "G" then "E" # Green
|
else if colors == "G" then "E" # Green
|
||||||
|
else if contains(casting_cost, match:"/") then "G" #Hybrid
|
||||||
else "F" # Multicolor
|
else "F" # Multicolor
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user