New update by Coppro to give more control over frame color in flips for both flip styles.

New update mostly by Art_Freak to allow combining two images to make a composite in magic-new-flip.

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

data/magic-firepenguinmaster-flip.mse-style/style

@@ -4,12 +4,12 @@ full name: FPM's Flip Magic
 short name: FPM Flip
 installer group: magic/FirePenguinMaster/Flip cards
 icon: card-sample.png
-position hint: 402
+position hint: 802
 
-version: 2009-07-07
+version: 2010-04-07
 depends on:
 	package: magic.mse-game
-	version: 2008-06-02
+	version: 2010-04-07
 depends on:
 	package: magic-future-common.mse-include
 	version: 2007-09-23
@@ -122,14 +122,21 @@ card style:
 		bottom width: 18
 		z index: 4
 	card color:
-		left:	0
+		left: 0
-		top:	0
+		top: 0
-		width:	375
+		width: 375
-		height:	523
+		height: 262
 		z index: 0
-		render style: image
+		render style: hidden
+		popup style: in place
+	card color 2:
+		left: 0
+		top: 261
+		width: 375
+		height: 262
+		z index: 0
+		render style: hidden
 		popup style: in place
-		image: { card_background() }
 	############################# Name line
 	name:
 		left: 45
@@ -420,7 +427,7 @@ card style:
 		font:
 			name: MPlantin-Italic
 			size: 8
-			color: { font_color(card.card_color) }
+			color: { font_color(card.card_color_2) }
 	copyright line:
 		left: 65
 		top : 493
@@ -431,8 +438,14 @@ card style:
 		font:
 			name: MPlantin
 			size: 7
-			color: { font_color(card.card_color) }
+			color: { font_color(card.card_color_2) }
 ############################################################## Extra card fields
+extra card field:
+	type: choice
+	name: frame
+	script: card.card_color + ":" + card.card_color_2
+	editable: false
+	save value: false
 extra card field:
 	type: choice
 	name: pt symbols
@@ -454,10 +467,18 @@ extra card field:
 extra card field:
 	type: choice
 	name: paintbrush
-	script: paintbrush_color(card.card_color)
+	script: paintbrush_color(card.card_color_2)
 	editable: false
 	save value: false
 extra card style:
+	frame:
+		left: 0
+		top: 0
+		width: 375
+		height: 523
+		z index: 0
+		render style: image
+		image: {flip_background(top: card.card_color, bottom: card.card_color_2)}
 	pt symbols:
 		left:	24
 		top:	340

data/magic-new-flip.mse-style/style

@@ -6,10 +6,10 @@ installer group: magic/new style/flip cards
 icon: card-sample.png
 position hint: 002
 
-version: 2009-07-09
+version: 2010-04-07
 depends on:
 	package: magic.mse-game
-	version: 2008-06-02
+	version: 2010-04-07
 depends on:
 	package: magic-default-image.mse-include
 	version: 2007-09-23
@@ -114,6 +114,11 @@ styling field:
 	description: Should there be an overlay applied, such as foil?
 	match: magic-overlay-*.mse-include
 	required: false
+styling field:
+	type: boolean
+	name: composite image
+	description: Should the art for the card be a composite of two images?
+	initial: no
 styling style:
 	use guild mana symbols:
 		choice images:
@@ -140,24 +145,31 @@ card style:
 	############################# Background stuff
 	border color:
 		left: 0
-		top : 0
+		top: 0
-		width:	375
+		width: 375
-		height:	523
+		height: 523
 		radius: 18
-		left width:   17
+		left width: 17
-		right width:  17
+		right width: 17
-		top width:    17
+		top width: 17
 		bottom width: 18
 		z index: 4
 	card color:
-		left:	0
+		left: 0
-		top:	0
+		top: 0
-		width:	375
+		width: 375
-		height:	523
+		height: 262
 		z index: 0
-		render style: image
+		render style: hidden
+		popup style: in place
+	card color 2:
+		left: 0
+		top: 261
+		width: 375
+		height: 262
+		z index: 0
+		render style: hidden
 		popup style: in place
-		image: { card_background() }
 	############################# Name line
 	name:
 		left:  {if card.card_symbol=="none" then 32  else 51}
@@ -224,11 +236,21 @@ card style:
 			tombstone: tombstone.png
 	############################# Image
 	image:
-		left:	32
+		left:   32
-		top:	162
+		top:   162
-		width:	311
+		width: {if styling.composite_image then 165 else 311}
-		height:	182
+		height:   182
-		z index: 1
+		z index: 10
+		mask: {if styling.composite_image then "imgmask.png" else nil}
+		default: {default_image(card.card_color)}
+	image 2:
+		right: 178
+		bottom:   162
+		width: {if styling.composite_image then 165 else 0}
+		height:   182
+		z index: 10
+		angle: 180
+		mask: {if styling.composite_image then "imgmask.png" else nil}
 		default: {default_image(card.card_color)}
 	############################# Card type
 	type:
@@ -400,7 +422,7 @@ card style:
 		font:
 			name: Matrix
 			size: 10
-			color: { font_color(card.card_color) }
+			color: { font_color(card.card_color_2) }
 	copyright line:
 		left: 26
 		top : 493
@@ -410,8 +432,14 @@ card style:
 		font:
 			name: MPlantin
 			size: 6.5
-			color: { font_color(card.card_color) }
+			color: { font_color(card.card_color_2) }
 ############################################################## Extra card fields
+extra card field:
+	type: choice
+	name: frame
+	script: card.card_color + ":" + card.card_color_2
+	editable: false
+	save value: false
 extra card field:
 	type: choice
 	name: pt box
@@ -421,7 +449,7 @@ extra card field:
 extra card field:
 	type: choice
 	name: pt box 2
-	script: card.card_color
+	script: card.card_color_2
 	save value: false
 	editable: false
 extra card field:
@@ -431,6 +459,14 @@ extra card field:
 	save value: false
 	editable: false
 extra card style:
+	frame:
+		left: 0
+		top: 0
+		width: 375
+		height: 523
+		z index: 0
+		render style: image
+		image: {flip_background(top: card.card_color, bottom: card.card_color_2)}
 	pt box:
 		left:	285
 		top:	123