Scatter plots

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@363 0fc631ac-6414-0410-93d0-97cfa31319b6

data/en.mse-locale/locale

@@ -112,10 +112,13 @@ help:
 	redo:				Redoes the last action
 	cut:				Move the selected text to the clipboard
 	cut card:			Move the selected card to the clipboard
+	cut keyword:		Move the selected keyword to the clipboard
 	copy:				Place the selected text on the clipboard
 	copy card:			Place the selected card on the clipboard
+	copy keyword:		Place the selected keyword on the clipboard
 	paste:				Inserts the text from the clipboard
 	paste card:			Inserts the card from the clipboard
+	paste keyword:		Inserts the keyword from the clipboard
 	preferences:		Change the configuration of Magic Set Editor
 	
 	cards:
@@ -273,6 +276,7 @@ tooltip:
 	new set:			New set
 	open set:			Open set
 	save set:			Save set
+	export:				Export set
 	
 	cut:				Cut
 	copy:				Copy

data/magic-blends.mse-include/card-colors

@@ -176,6 +176,7 @@ choice colors:
 	artifact		: rgb(188,192,195)
 	multicolor		: rgb(255,188,14)
 	land			: rgb(109,62,39)
+	hybrid			: rgb(243,26,136) # purple
 	# Sub menus, same colors
 	multicolor 2 color white / blue			: rgb(255,188,14)
 	multicolor 2 color blue / black			: rgb(255,188,14)

data/magic.mse-game/game

@@ -971,31 +971,31 @@ card field:
 
 ############################################################## Statistics categories
 
-statistics dimension:
-	name:   card color2
-	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)
-	group: white
-	group: blue
-	group: black
-	group: red
-	group: green
-	group: colorless
-	group: artifact
-	group: multicolor
-	group: land
-	group: hybrid
+#statistics dimension:
+#	name:   card color2
+#	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)
+#	group: white
+#	group: blue
+#	group: black
+#	group: red
+#	group: green
+#	group: colorless
+#	group: artifact
+#	group: multicolor
+#	group: land
+#	group: hybrid
 
 statistics dimension:
 	name:   converted mana cost
@@ -1010,11 +1010,16 @@ statistics dimension:
 	icon: stats/colored_casting_cost.png
 
 #statistics dimension:
-#	name: power2
-#	script: card.power
+#	name: p/t
+#	script: card.pt
 #	numeric: true
 #	icon: stats/power.png
 
+#statistics dimension:
+#	name: word count
+#	type: word count
+#	display: list
+
 #statistics dimension:
 #	name: toughness2
 #	script: card.toughness
@@ -1024,14 +1029,20 @@ statistics dimension:
 statistics category:
 	name: color / rarity
 	type: stack
-	dimension: card color2
+	dimension: card color
 	dimension: rarity
 
-#statistics category:
-#	name: power / toughness
-#	type: scatter
-#	dimension: power2
-#	dimension: toughness2
+statistics category:
+	name: power / toughness
+	type: scatter
+	dimension: power
+	dimension: toughness
+
+statistics category:
+	name: color / cost
+	type: scatter
+	dimension: card color
+	dimension: converted mana cost
 
 #statistics field:
 #	name: creature type