Personal sync, part 2

add m15-black, future-planeswalker, m15-imageupload, token-invention
add dungeon updates
add land TTK frames
lots of little cleanups

data/magic-blends.mse-include/new-blends

@@ -864,8 +864,8 @@ color_background := {
 	         else								"radial"
 	
 	# Determine background (allows styles to hook something else here)
-	color_combination()
-}
+	color_combination(folder:folder)
+}@(folder: "")
 
 color_combination := {
 	# The base hybrid, without the outer frame blended over it
@@ -873,72 +873,72 @@ color_combination := {
 	# Put a frame around it?
 	if land and not colored_lands then
 		masked_blend(
-			mask:  "multicolor_blend_{type}.png",
+			mask:  "{folder}multicolor_blend_{type}.png",
 			dark:  land_template("c"),
 			light: base,
 		)
 	else if land and multi and mask_multi_land_with_color() then
 		masked_blend(
-			mask:  "hybrid_blend_{type}.png",
+			mask:  "{folder}hybrid_blend_{type}.png",
 			dark:  base,
 			light:  land_template("m"),
 		)
 	else if multi and artifact then
 		masked_blend(
-			mask: "artifact_blend_{type}.png",
+			mask: "{folder}artifact_blend_{type}.png",
 			dark: template("a"),
 			light: masked_blend(
-				mask: "multicolor_blend_{type}.png",
+				mask: "{folder}multicolor_blend_{type}.png",
 				dark: template("m"),
 				light: base
 			)
 		)
 	else if multi then 
 		masked_blend(
-			mask:  "multicolor_blend_{type}.png",
+			mask:  "{folder}multicolor_blend_{type}.png",
 			dark:  template("m"),
 			light: base,
 		)
 	else if artifact and color_count > 1 and mask_hybrid_with_land() then 
 		masked_blend(
-			mask:  "artifact_blend_{type}.png",
+			mask:  "{folder}artifact_blend_{type}.png",
 			dark:  template("a"),
 			light: masked_blend(
-				mask: "multicolor_blend_{type}.png",
+				mask: "{folder}multicolor_blend_{type}.png",
 				dark: template("c"),
 				light: base
 			)
 		)
 	else if artifact and color_count > 1 and mask_hybrid_with_gold() then 
 		masked_blend(
-			mask:  "artifact_blend_{type}.png",
+			mask:  "{folder}artifact_blend_{type}.png",
 			dark:  template("a"),
 			light: masked_blend(
-				mask: "multicolor_blend_{type}.png",
+				mask: "{folder}multicolor_blend_{type}.png",
 				dark: template("m"),
 				light: base
 			)
 		)
 	else if artifact then 
 		masked_blend(
-			mask:  "artifact_blend_{type}.png",
+			mask:  "{folder}artifact_blend_{type}.png",
 			dark:  template("a"),
 			light: base,
 		)
 	else if color_count > 1 and mask_hybrid_with_land() then
 		masked_blend(
-			mask:  "hybrid_blend_{type}.png",
+			mask:  "{folder}hybrid_blend_{type}.png",
 			dark:  land_template("c"),
 			light: base,
 		)
 	else if color_count > 1 and mask_hybrid_with_gold() then
 		masked_blend(
-			mask:  "hybrid_blend_{type}.png",
+			mask:  "{folder}hybrid_blend_{type}.png",
 			dark:  land_template("m"),
 			light: base,
 		)
 	else base
-}
+}@(folder: "")
 
 ########################################################################
 # Specific types

data/magic-booster-mini.mse-style/style

@@ -346,6 +346,7 @@ extra card field:
 extra card field:
 	type: text
 	name: small name
+	multi line: true
 extra card field:
 	type: text
 	name: age

data/magic-booster.mse-style/style

@@ -346,6 +346,7 @@ extra card field:
 extra card field:
 	type: text
 	name: small name
+	multi line: true
 extra card field:
 	type: text
 	name: age

data/magic-comicbookguy.mse-style/style

@@ -287,7 +287,7 @@ card style:
 		width: 120
 		height: 10
 		z index: 2
-		alignment: bottom right shrink-overflow
+		alignment: bottom right
 		font:
 			name: MatrixBoldSmallCaps
 			size: 7

data/magic-lackeyccg.mse-export-template/export-template

@@ -693,6 +693,6 @@ script:
 		else if contains(card.shape, match:"leveler") then write_leveler()
 		else write_normal()
 		}
-	write_cards := to_text(for each card in sort_list(cards, order_by: {card.card_number}) do write_card())
+	write_cards := to_text(for each card in cards do write_card())
 	write_images := if options.export_images then for each card in sort_list(cards, order_by: {card.card_number}) do write_image_file(card, directory: "{to_lower(options.set_code)}", file:"{if contains(card.super_type, match:"Token") or contains(card.super_type, match:"Emblem") or contains(card.shape, match:"token") or contains(card.shape, match:"emblem") or card_name() == "Morph" or card_name() == "Manifest" then options.set_code+corrected_card_number() else corrected_card_number()}{if other_face() and not contains(options.dfc_options, match:"Both faces") then "a" else if is_backface() then "b" else ""}{if card.rarity == "special" then "s" else ""}.jpg", width: image_export_width(), height: image_export_height())
 	to_string("Name	Set	ImageFile	Color	Cost	ConvertedCost	Type	Power	Toughness	Rarity	Script	Text\n"+last_replace(write_cards))

data/magic-m15-adventure.mse-style/style

@@ -520,10 +520,10 @@ card style:
 		z index: 2
 		padding left:   6
 		padding right:  4
-		line height hard: 1.2
+		line height hard: {if is_modal(card.rule_text_2) then 0.9 else 1.2 }
 		line height line: 1.5
 		line height soft: 0.9
-		line height hard max: 1.3
+		line height hard max: {if is_modal(card.rule_text_2) then 1.0 else 1.3 }
 		line height line max: 1.6
 	watermark:
 		left: { if is_reversed() then (if is_spot() then 30 else 20) else if is_spot() then 195 else 188}
@@ -587,7 +587,7 @@ card style:
 		width: {if set.automatic_copyright then 0 else 140}
 		height: 10
 		z index: 2
-		alignment: middle right shrink-overflow
+		alignment: middle right
 		font:
 			name: Matrix
 			size: 7

data/magic-m15-augment.mse-style/style

@@ -225,7 +225,7 @@ card style:
 		top: 300
 		width: 17
 		height: 17
-		z index: 1
+		z index: 2
 		render style: image
 		visible: { has_identity() }
 		image: { card_identity() }

data/magic-m15-black.mse-style/build.bat

@@ -0,0 +1,7 @@
+cd ..
+
+cd ..
+
+mse --create-installer magic-m15.mse-style magic.mse-game magic-blends.mse-include magic-mana-small.mse-symbol-font magic-mana-large.mse-symbol-font magic-watermarks.mse-include magic-default-image.mse-include magic-identity-new.mse-include
+
+ren "magic-m15.mse-installer" "Magic - M15 Style.mse-installer"

data/magic-m15-black.mse-style/style

@@ -0,0 +1,493 @@
+mse version: 2.0.0
+game: magic
+short name: M15 Black Promo
+full name: M15 Sleek
+icon: card-sample.png
+installer group: magic/m15 style/normal cards
+position hint: 001
+
+version: 2015-12-20
+depends on:
+	package: magic.mse-game
+	version: 2014-06-25
+depends on:
+	package: magic-default-image.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-watermarks.mse-include
+	version: 2007-09-23
+depends on:
+	package: magic-identity-new.mse-include
+	version: 2012-01-22
+depends on:
+	package: magic-mana-large.mse-symbol-font
+	version: 2007-09-23
+depends on:
+	package: magic-mana-small.mse-symbol-font
+	version: 2007-09-23
+
+card width: 375
+card height: 523
+card dpi: 150
+############################################################## Extra scripts
+init script:
+	# Load scripts for image box
+	include file: /magic-default-image.mse-include/scripts
+	
+	# Should hybrids have a grey name?
+	mask_hybrid_with_land := { styling.grey_hybrid_name }
+	
+	#Should multicolor lands with basic land types have a colored name?
+	mask_multi_land_with_color := { styling.colored_multicolor_land_name }
+	
+	template_prefix := [card: "" pt: "" stamp: "" identity: "/magic-identity-new.mse-include/"]
+	template_suffix := [card: "card.jpg" pt: "pt.png", stamp: "stamp.jpg" identity: "identity.png"]
+	template      := { template_prefix[type] + input + template_suffix[type] }
+	land_template := { template_prefix[type] + (if input == "a" then "c" else input) + "l" + template_suffix[type] }
+	# Use land templates for previews because they show more contrast
+	hybrid_previews := "land,hybrid"
+	
+	# Use the normal tap symbol
+	mana_t := {
+		if      styling.tap_symbol == "old"        then "old"
+		else if styling.tap_symbol == "diagonal T" then "older"
+		else                                            "new"
+	}
+	
+	# Use guild mana symbols?
+	guild_mana := { styling.use_guild_mana_symbols }
+	
+	# Is the card a promo card?
+	is_promo := { styling.promo }
+	has_identity := { styling.color_indicator_dot }
+	chop_top := {if styling.chop_top == "" then 0 else if comma_count(styling.chop_top) == "," or comma_count(styling.chop_top) == ",," then split_text(match:",", styling.chop_top).0 else styling.chop_top}
+	chop_bot := {if comma_count(styling.chop_top) == ",," then split_text(match:",", styling.chop_top).1 else if styling.chop_bottom == "" then 0 else styling.chop_bottom}
+	custom_watermark_a := {if styling.card_watermark == "" or not contains(styling.card_watermark, match:".png") then "/magic-watermarks.mse-include/planeswalker.png" else "/magic-watermarks.mse-include/" + styling.card_watermark}
+############################################################## Set info fields
+set info style:
+	symbol:
+		variation:
+			name: invertedcommon
+			border radius: 0.10
+			fill type: solid
+			fill color:   rgb(255,255,255)
+			border color: rgb(0,0,0)
+############################################################## Extra style options
+styling field:
+	type: text
+	name: chop top
+	description: Shrinks the textbox X pixels from the top OR shrinks "top,bottom,"
+styling field:
+	type: text
+	name: chop bottom
+	description: Shrinks the textbox X pixels from the bottom.
+styling field:
+	type: text
+	name: popout image style
+	description: The styling instructions for the popout image field, formatted as "left,top,width,height,". The text MUST end with a comma.
+styling field:
+	type: text
+	name: card watermark
+	description: Filename in magic-watermarks to use for standalone card watermark
+styling field:
+	type: boolean
+	name: color indicator dot
+	description: Use the color indicator dot for this card.
+	initial: no
+styling field:
+	type: boolean
+	name: grey hybrid name
+	description: Use a grey background for the name and type line on hybrid cards. This is done on real cards.
+styling field:
+	type: boolean
+	name: colored multicolor land name
+	description: Use a colored background for the name and type on multicolor land cards with a basic land type. This is done on real cards.
+styling field:
+	type: boolean
+	name: use guild mana symbols
+	description: Use the Ravnica guild symbols instead of the official half/half circles for hybrid mana.
+	initial: no
+styling field:
+	type: choice
+	name: tap symbol
+	description: What tap and untap symbols should be used on cards?
+	initial: modern
+	choice: modern
+	choice: old
+	choice: diagonal T
+styling field:
+	type: package choice
+	name: text box mana symbols
+	match: magic-mana-*.mse-symbol-font
+	initial: magic-mana-small.mse-symbol-font
+styling field:
+	type: choice
+	name: center text
+	description: When to center text (short text only means only on one-line cards with no flavor text)
+	choice: always
+	choice: short text only
+	choice: never
+	initial: never
+styling field:
+	type: boolean
+	name: promo
+	description: Is this card a promo card, with the "P" rarity?
+	initial: no
+styling field:
+	type: boolean
+	name: inverted common symbol
+	description: Should the common rarity symbol be inverted, like in Coldsnap?
+	initial: no
+styling field:
+	type: package choice
+	name: overlay
+	description: Should there be an overlay applied, such as foil?
+	match: magic-overlay-*.mse-include
+	required: false
+styling style:
+	use guild mana symbols:
+		choice images:
+			yes: /magic-mana-small.mse-symbol-font/mana_guild_rg.png
+			no:  /magic-mana-small.mse-symbol-font/mana_rg.png
+	tap symbol:
+		render style: both
+		choice images:
+			modern:     /magic-mana-large.mse-symbol-font/mana_t.png
+			old:        /magic-mana-large.mse-symbol-font/mana_t_old.png
+			diagonal T: /magic-mana-large.mse-symbol-font/mana_t_older.png
+	center text:
+		render style: both
+		choice images:
+			always:          /magic.mse-game/icons/center-all-text.png
+			short text only: /magic.mse-game/icons/center-short-text.png
+			never:           /magic.mse-game/icons/center-no-text.png
+	inverted common symbol:
+		choice images:
+			no:  { symbol_variation(symbol: set.symbol, variation: "common") }
+			yes: { symbol_variation(symbol: set.symbol, variation: "invertedcommon") }
+############################################################## Card fields
+card style:
+	############################# Background stuff
+	border color:
+		left: 0
+		top : 0
+		width:	375
+		height:	523
+		radius: 18
+		left width:   17
+		right width:  17
+		top width:    17
+		bottom width: 18
+		z index: 4
+		mask: border_mask.png
+	card color:
+		left:	0
+		top:	0
+		width:	375
+		height:	523
+		z index: 0
+		render style: image
+		popup style: in place
+		image: { card_background() }
+		mask: corner_mask.jpg
+	############################# Name line
+	name:
+		left: { if card.card_symbol=="none" then 32 else 50 }
+		top: 30
+		right:  { 341 - card_style.casting_cost.content_width }
+		height: 23
+		alignment: bottom shrink-overflow
+		padding bottom: 0
+		z index: 1
+		font:
+			name: Beleren Bold
+			size: 16
+			color: rgb(140,140,140)
+	casting cost:
+		right: 346
+		top: 29
+		width: { max(30, card_style.casting_cost.content_width) + 5 }
+		height: 23
+		alignment: middle right
+		font:
+			name: MPlantin
+			size: 15
+		symbol font:
+			name: magic-mana-large
+			size: 15
+			alignment: middle right
+		always symbol: true
+		z index: 2
+		padding top: 0
+	card symbol:
+		left: {if card.card_symbol=="none" then 20 else 30}
+		top: 29
+		height: 20
+		width: 14
+		z index: 1
+		render style: image
+		choice images:
+			tombstone: tombstone.png
+	############################# Image
+	image:
+		left: 29
+		top: 60
+		width: 316
+		height:	231
+		z index: 1
+		default: {default_image(card.card_color)}
+	mainframe image:
+		left: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).0 else "0"}
+		top: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).1 else "0"}
+		width: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).2 else "0"}
+		height: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).3 else "0"}
+		z index: 8
+	############################# Card type
+	indicator:
+		left: 31
+		top: 300
+		width: 17
+		height: 17
+		z index: 2
+		render style: image
+		visible: { has_identity() }
+		image: { card_identity() }
+	type:
+		left: { if has_identity() then "52" else "32" }
+		top: 296
+		width: { (if has_identity() then "290" else "310") - max(22,card_style.rarity.content_width) }
+		height: 20
+		alignment: top shrink-overflow
+		z index: 1
+		padding top: 2
+		font:
+			name: Beleren Bold
+			size: 13
+			color: rgb(140,140,140)
+			separator color: red
+	rarity:
+		right: 344
+		top: 297
+		width: 44
+		height: 22
+		z index: 2
+		render style: image
+		alignment: middle right
+		choice images:
+			# Images based on the set symbol
+			basic land:
+				script:
+					if styling.inverted_common_symbol then symbol_variation(symbol: set.symbol, variation: "invertedcommon")
+					else symbol_variation(symbol: set.symbol, variation: "common")
+			common:
+				script:
+					if styling.inverted_common_symbol then symbol_variation(symbol: set.symbol, variation: "invertedcommon")
+					else symbol_variation(symbol: set.symbol, variation: "common")
+			uncommon:   script: symbol_variation(symbol: set.symbol, variation: "uncommon")
+			rare:       script: symbol_variation(symbol: set.symbol, variation: "rare")
+			mythic rare:       script: symbol_variation(symbol: set.symbol, variation: "mythic rare")
+			special:    script: symbol_variation(symbol: set.symbol, variation: "special")
+	############################# Text box
+	text:
+		left: 29
+		top : { 327 - (-chop_top()) }
+		width: 314
+		bottom: { 481 - chop_bot()}
+		font:
+			name: MPlantin
+			italic name: MPlantin-Italic
+			size: 14
+			scale down to: 6
+			color: rgb(140,140,140)
+		symbol font:
+			name: { styling.text_box_mana_symbols }
+			size: 14
+		alignment:
+			script:
+				if (styling.center_text == "short text only" and
+				   not contains(match:"\n", card.rule_text) and
+				   card.flavor_text == "<i-flavor></i-flavor>" and
+				   card_style.text.content_lines <= 2) or
+				   styling.center_text == "always"
+				then "middle center"
+				else "middle left"
+		z index: 2
+		padding left:   6
+		padding right:  4
+		line height hard: 1.2
+		line height line: 1.5
+		line height soft: 0.9
+		line height hard max: 1.3
+		line height line max: 1.6
+	watermark:
+		left: 19
+		top: 330
+		width: 334
+		height: 152
+		z index: 1
+		render style: image
+		popup style: in place
+		alignment: middle center
+		include file: /magic-watermarks.mse-include/watermarks
+	############################# PT
+	pt:
+		z index: 2
+		left: 286
+		top: 469
+		width: 60
+		height:	28
+		alignment: center middle shrink-overflow
+		font:
+			name: Beleren Bold
+			size: 16
+			color: rgb(140,140,140)
+			separator color: red
+	############################# Card sorting / numbering
+	set code:
+		left: 24
+		top: 498
+		width: 40
+		height: 10
+		z index: 1
+		font:
+			name: Relay-Medium
+			size: 7
+			color: white
+			weight: bold
+	############################# Copyright stuff
+	illustrator:
+		left: { 44 + card_style.set_code.content_width }
+		top: 497.5
+		width: 200
+		height: 10
+		z index: 1
+		font:
+			name: Beleren Small Caps Bold
+			size: 7.25
+			color: white
+	copyright:
+		right: 350
+		top: { if card.pt != "" then 500 else 488 }
+		width: 140
+		height: 10
+		z index: 2
+		alignment: middle right shrink-overflow
+		font:
+			name: Matrix
+			size: 7
+			color: white
+			weight: bold
+############################################################## Extra card fields
+extra card field:
+	type: text
+	name: card code
+	save value: false
+	script:
+		if set.automatic_card_numbers then
+			forward_editor(prefix: card_number_m15() + "/" + card_count_m15() + " " + rarity_code() + " ", field: card.card_code_text)
+		else
+			combined_editor(field1: card.custom_card_number, separator: " " + rarity_code() + " ", field2: card.card_code_text)
+extra card field:
+	type: choice
+	name: artist arrow
+	editable: false
+	save value: false
+	choice: white
+extra card field:
+	type: choice
+	name: pt box
+	script: card.card_color
+	editable: false
+	save value: false
+extra card field:
+	type: choice
+	name: stamp
+	script: card.card_color
+	editable: false
+	save value: false
+extra card field:
+	type: choice
+	name: foil stamp
+	choice: stamp
+	save value: false
+	editable: false
+extra card field:
+	type: choice
+	name: foil layer
+	choice: foil
+	save value: false
+	editable: false
+extra card field:
+	type: text
+	name: vorthos box
+	save value: true
+	editable: true
+	description: Where they put mtgstory.com on story spotlights.
+extra card style:
+	card code:
+		left: 24
+		top: 488
+		width: 120
+		height: 10
+		z index: 1
+		font:
+			name: Relay-Medium
+			size: 7
+			color: white
+			weight: bold
+	artist arrow:
+		left: { 28 + card_style.set_code.content_width }
+		top: 500
+		width: 12
+		height: 7
+		z index: 1
+		render style: image
+		image: artist_arrow.png
+	pt box:
+		left: 273
+		top: 466
+		width: 81
+		height:	42
+		z index: 1
+		visible: { card.pt != "" }
+		render style: image
+		image: { card_ptbox() }
+	stamp:
+		left: 165
+		top: 472
+		width: 46
+		height: 26
+		z index: 1
+		visible: { is_rare() }
+		render style: image
+		image: { card_stamp() }
+	foil stamp:
+		left: 165
+		top: 472
+		width: 46
+		height: 26
+		z index: 1
+		visible: { is_rare() }
+		render style: image
+		image: foil_stamp.png
+	foil layer:
+		left: 0
+		top : 0
+		width: 375
+		height: 523
+		z index: 3
+		render style: image
+		image: {if styling.overlay == "" then nil else styling.overlay + "/overlay.png"}
+		mask: { if is_rare() then "foil_mask_rare.png" else "foil_mask.png" }
+	vorthos box:
+		right: { if card.pt != "" then 275 else 350 }
+		top: 488
+		left: 210
+		height: 10
+		z index: 3
+		alignment: middle right
+		font:
+			name: Relay-Medium
+			size: 7
+			color: white
+			weight: bold