Added support for custom colors for graphs;

Moved 'choice colors' from styel to field, split into 'choice colors' and 'choice colors cardlist';
Added support for pie graphs (no gui to use them, though);
Fixed bugs caused by selecting a card before the set was changed on all panels.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@336 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2007-05-11 14:10:29 +00:00
parent f9eade95eb
commit 3b6743b110
33 changed files with 634 additions and 186 deletions
@@ -133,16 +133,3 @@ choice images:
hybrid vertical black / artifact : script: card_hybrid_2v("ba")
hybrid vertical red / artifact : script: card_hybrid_2v("ra")
hybrid vertical green / artifact : script: card_hybrid_2v("ga")
# Also define colors for card list
card list colors: true
choice colors:
white : rgb(130,130,110)
blue : rgb(0,64,168)
black : rgb(0,0,0)
red : rgb(168,0,0)
green : rgb(0,168,0)
colorless : rgb(72,90,100)
artifact : rgb(72,90,100)
multicolor : rgb(120,120,0)
land : rgb(84,84,60)
+148 -1
View File
@@ -163,4 +163,151 @@ choice:
choice: artifact / blue
choice: artifact / black
choice: artifact / red
choice: artifact / green
choice: artifact / green
# Also define colors for statistics
choice colors:
white : rgb(255,237,202)
blue : rgb(42,141,255)
black : rgb(33,33,33)
red : rgb(255,52,0)
green : rgb(138,230,0)
colorless : rgb(122,85,85)
artifact : rgb(188,192,195)
multicolor : rgb(255,188,14)
land : rgb(109,62,39)
# Sub menus, same colors
multicolor 2 color white / blue : rgb(255,188,14)
multicolor 2 color blue / black : rgb(255,188,14)
multicolor 2 color black / red : rgb(255,188,14)
multicolor 2 color red / green : rgb(255,188,14)
multicolor 2 color green / white : rgb(255,188,14)
multicolor 2 color white / black : rgb(255,188,14)
multicolor 2 color blue / red : rgb(255,188,14)
multicolor 2 color black / green : rgb(255,188,14)
multicolor 2 color red / white : rgb(255,188,14)
multicolor 2 color green / blue : rgb(255,188,14)
multicolor 3 color white / blue / black : rgb(255,188,14)
multicolor 3 color blue / black / red : rgb(255,188,14)
multicolor 3 color black / red / green : rgb(255,188,14)
multicolor 3 color red / green / white : rgb(255,188,14)
multicolor 3 color green / white / blue : rgb(255,188,14)
multicolor 3 color white / black / red : rgb(255,188,14)
multicolor 3 color blue / red / green : rgb(255,188,14)
multicolor 3 color black / green / white : rgb(255,188,14)
multicolor 3 color red / white / blue : rgb(255,188,14)
multicolor 3 color green / blue / black : rgb(255,188,14)
multicolor 4 color white / blue / black / red : rgb(255,188,14)
multicolor 4 color blue / black / red / green : rgb(255,188,14)
multicolor 4 color black / red / green / white : rgb(255,188,14)
multicolor 4 color red / green / white / blue : rgb(255,188,14)
multicolor 4 color green / white / blue / black : rgb(255,188,14)
multicolor 5 color white / blue / black / red / green : rgb(255,188,14)
multicolor 5 color horizontal white / blue / black / red / green: rgb(255,188,14)
land 1 color white : rgb(109,62,39)
land 1 color blue : rgb(109,62,39)
land 1 color black : rgb(109,62,39)
land 1 color red : rgb(109,62,39)
land 1 color green : rgb(109,62,39)
land 1 color multicolor : rgb(109,62,39)
land 2 color white / blue : rgb(109,62,39)
land 2 color blue / black : rgb(109,62,39)
land 2 color black / red : rgb(109,62,39)
land 2 color red / green : rgb(109,62,39)
land 2 color green / white : rgb(109,62,39)
land 2 color white / black : rgb(109,62,39)
land 2 color blue / red : rgb(109,62,39)
land 2 color black / green : rgb(109,62,39)
land 2 color red / white : rgb(109,62,39)
land 2 color green / blue : rgb(109,62,39)
hybrid 2 color white / blue : rgb(243,26,136) # purple
hybrid 2 color blue / black : rgb(243,26,136)
hybrid 2 color black / red : rgb(243,26,136)
hybrid 2 color red / green : rgb(243,26,136)
hybrid 2 color green / white : rgb(243,26,136)
hybrid 2 color white / black : rgb(243,26,136)
hybrid 2 color blue / red : rgb(243,26,136)
hybrid 2 color black / green : rgb(243,26,136)
hybrid 2 color red / white : rgb(243,26,136)
hybrid 2 color green / blue : rgb(243,26,136)
hybrid 2 color artifact / white : rgb(243,26,136)
hybrid 2 color artifact / blue : rgb(243,26,136)
hybrid 2 color artifact / black : rgb(243,26,136)
hybrid 2 color artifact / red : rgb(243,26,136)
hybrid 2 color artifact / green : rgb(243,26,136)
hybrid 3 color white / blue / black : rgb(243,26,136)
hybrid 3 color blue / black / red : rgb(243,26,136)
hybrid 3 color black / red / green : rgb(243,26,136)
hybrid 3 color red / green / white : rgb(243,26,136)
hybrid 3 color green / white / blue : rgb(243,26,136)
hybrid 3 color white / black / red : rgb(243,26,136)
hybrid 3 color blue / red / green : rgb(243,26,136)
hybrid 3 color black / green / white : rgb(243,26,136)
hybrid 3 color red / white / blue : rgb(243,26,136)
hybrid 3 color green / blue / black : rgb(243,26,136)
hybrid 3 color horizontal white / blue / black : rgb(243,26,136)
hybrid 3 color horizontal blue / black / red : rgb(243,26,136)
hybrid 3 color horizontal black / red / green : rgb(243,26,136)
hybrid 3 color horizontal red / green / white : rgb(243,26,136)
hybrid 3 color horizontal green / white / blue : rgb(243,26,136)
hybrid 3 color horizontal white / black / red : rgb(243,26,136)
hybrid 3 color horizontal blue / red / green : rgb(243,26,136)
hybrid 3 color horizontal black / green / white : rgb(243,26,136)
hybrid 3 color horizontal red / white / blue : rgb(243,26,136)
hybrid 3 color horizontal green / blue / black : rgb(243,26,136)
hybrid 4 color white / blue / black / red : rgb(243,26,136)
hybrid 4 color blue / black / red / green : rgb(243,26,136)
hybrid 4 color black / red / green / white : rgb(243,26,136)
hybrid 4 color red / green / white / blue : rgb(243,26,136)
hybrid 4 color green / white / blue / black : rgb(243,26,136)
hybrid 4 color horizontal white / blue / black / red : rgb(243,26,136)
hybrid 4 color horizontal blue / black / red / green : rgb(243,26,136)
hybrid 4 color horizontal black / red / green / white : rgb(243,26,136)
hybrid 4 color horizontal red / green / white / blue : rgb(243,26,136)
hybrid 4 color horizontal green / white / blue / black : rgb(243,26,136)
hybrid 5 color white / blue / black / red / green : rgb(243,26,136)
hybrid 5 color horizontal white / blue / black / red / green : rgb(243,26,136)
hybrid vertical white / blue : rgb(243,26,136)
hybrid vertical white / black : rgb(243,26,136)
hybrid vertical white / red : rgb(243,26,136)
hybrid vertical white / green : rgb(243,26,136)
hybrid vertical blue / white : rgb(243,26,136)
hybrid vertical blue / black : rgb(243,26,136)
hybrid vertical blue / red : rgb(243,26,136)
hybrid vertical blue / green : rgb(243,26,136)
hybrid vertical black / white : rgb(243,26,136)
hybrid vertical black / blue : rgb(243,26,136)
hybrid vertical black / red : rgb(243,26,136)
hybrid vertical black / green : rgb(243,26,136)
hybrid vertical red / white : rgb(243,26,136)
hybrid vertical red / blue : rgb(243,26,136)
hybrid vertical red / black : rgb(243,26,136)
hybrid vertical red / green : rgb(243,26,136)
hybrid vertical green / white : rgb(243,26,136)
hybrid vertical green / blue : rgb(243,26,136)
hybrid vertical green / red : rgb(243,26,136)
hybrid vertical green / black : rgb(243,26,136)
hybrid vertical artifact / white : rgb(243,26,136)
hybrid vertical artifact / blue : rgb(243,26,136)
hybrid vertical artifact / black : rgb(243,26,136)
hybrid vertical artifact / red : rgb(243,26,136)
hybrid vertical artifact / green : rgb(243,26,136)
hybrid vertical white / artifact : rgb(243,26,136)
hybrid vertical blue / artifact : rgb(243,26,136)
hybrid vertical black / artifact : rgb(243,26,136)
hybrid vertical red / artifact : rgb(243,26,136)
hybrid vertical green / artifact : rgb(243,26,136)
# TODO : Add the rest
# ... and for the card list
choice colors cardlist:
white : rgb(130,130,110)
blue : rgb(0,64,168)
black : rgb(0,0,0)
red : rgb(168,0,0)
green : rgb(0,168,0)
colorless : rgb(72,90,100)
artifact : rgb(72,90,100)
multicolor : rgb(120,120,0)
land : rgb(84,84,60)
# TODO : Add the rest
+23
View File
@@ -333,6 +333,7 @@ init script:
number_of_items(in: sort(order: "WUBRG")) # colored mana
- number_of_items(in: sort(order:"/")) # guild mana, W/U -> 2 - 1
}
primary_card_color := filter_rule(match:"^[^ ]+")
# TODO : somewhere else?
#card to conversion:
@@ -624,6 +625,12 @@ card field:
card list visible: true
card list column: 6
description: The rarity of the card, to edit the symbol switch to the 'set info' tab
choice colors:
basic land: rgb(109,62,39)
common: rgb(33,33,33)
uncommon: rgb(224,224,224)
rare: rgb(214,196,94)
special: rgb(58,7,80)
############################# Text box
card field:
@@ -947,6 +954,22 @@ card field:
############################################################## Statistics categories
statistics dimension:
name: card color
script: primary_card_color(card.card_color)
icon: stats/card_color.png
colors:
white : rgb(255,237,202)
blue : rgb(42,141,255)
black : rgb(33,33,33)
red : rgb(255,52,0)
green : rgb(138,230,0)
colorless : rgb(122,85,85)
artifact : rgb(188,192,195)
multicolor : rgb(255,188,14)
land : rgb(109,62,39)
hybrid : rgb(243,26,136)
statistics dimension:
name: converted mana cost
script: cmc(card.casting_cost)
-9
View File
@@ -34,15 +34,6 @@ card style:
equipment: card-equipment.jpg
location: card-location.jpg
plot twist: card-plot-twist.jpg
colors card list: true
choice colors:
character: rgb(120,18,0)
character dual: rgb(120,18,0)
concealed: rgb(26,26,26)
concealed dual: rgb(26,26,26)
equipment: rgb(80,80,80)
location: rgb(30,110,0)
plot twist: rgb(10,0,110)
############################# Name line
name:
-9
View File
@@ -32,15 +32,6 @@ card style:
equipment: card-equipment.jpg
location: card-location.jpg
plot twist: card-plot-twist.jpg
colors card list: true
choice colors:
character: rgb(120,18,0)
character dual: rgb(120,18,0)
concealed: rgb(26,26,26)
concealed dual: rgb(26,26,26)
equipment: rgb(80,80,80)
location: rgb(30,110,0)
plot twist: rgb(10,0,110)
############################# Name line
name:
+16 -1
View File
@@ -186,7 +186,22 @@ card field:
choice: location
choice: plot twist
default: card_type()
show statistics: false
choice colors:
character: rgb(240,36,0)
character dual: rgb(240,36,0)
concealed: rgb(33,33,33)
concealed dual: rgb(33,33,33)
equipment: rgb(160,160,160)
location: rgb(60,220,0)
plot twist: rgb(20,0,220)
choice colors cardlist:
character: rgb(120,18,0)
character dual: rgb(120,18,0)
concealed: rgb(26,26,26)
concealed dual: rgb(26,26,26)
equipment: rgb(80,80,80)
location: rgb(30,110,0)
plot twist: rgb(10,0,110)
############################# Name line
card field:
-12
View File
@@ -34,18 +34,6 @@ card style:
legendary dragons: card-dragons.jpg
spell card: card-spell.jpg
trap card: card-trap.jpg
colors card list: true
choice colors:
normal monster: rgb(120,18,0)
effect monster: rgb(120,18,0)
ritual monster: rgb(26,26,26)
fusion monster: rgb(26,26,26)
obelisk: rgb(26,26,26)
slifer: rgb(26,26,26)
ra: rgb(26,26,26)
legendary dragons: rgb(26,26,26)
spell card: rgb(80,80,80)
trap card: rgb(30,110,0)
############################# Name line
name:
+11
View File
@@ -147,6 +147,17 @@ card field:
choice: spell card
choice: trap card
default: card_type()
choice colors cardlist:
normal monster: rgb(120,18,0)
effect monster: rgb(120,18,0)
ritual monster: rgb(26,26,26)
fusion monster: rgb(26,26,26)
obelisk: rgb(26,26,26)
slifer: rgb(26,26,26)
ra: rgb(26,26,26)
legendary dragons: rgb(26,26,26)
spell card: rgb(80,80,80)
trap card: rgb(30,110,0)
############################# Name line
card field: