Sync with Cajun-Style-Temples, part 2

Add Old Magic Logos to Packs
Add Alias blends to Adventure
Add Ancestral Generic to Devoid
Add Vorthos Box to Future
Fix Split-Fusable border and second face watermarks
Add Symbol Extractor
Update namechecker

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

@@ -340,6 +340,8 @@ extra card field:
 	name: magic logo
 	choice: light
 	choice: dark
+	choice: blue
+	choice: yellow
 	choice: none
 extra card field:
 	type: text
@@ -400,6 +402,8 @@ extra card style:
 		choice images:
 			light: magic_light.png
 			dark: magic_dark.png
+			blue: magic_blue.png
+			yellow: magic_yellow.png
 	small name:
 		left: {if subtitle_deets().0 != "" then subtitle_deets().0 else 8}
 		top: {if subtitle_deets().1 != "" then subtitle_deets().1 else if styling.small_text_over_title then 350 else 400 }

data/magic-booster.mse-style/style

@@ -340,6 +340,8 @@ extra card field:
 	name: magic logo
 	choice: light
 	choice: dark
+	choice: blue
+	choice: yellow
 	choice: none
 extra card field:
 	type: text
@@ -400,6 +402,8 @@ extra card style:
 		choice images:
 			light: magic_light.png
 			dark: magic_dark.png
+			blue: magic_blue.png
+			yellow: magic_yellow.png
 	small name:
 		left: {if subtitle_deets().0 != "" then subtitle_deets().0 else 15}
 		top: {if subtitle_deets().1 != "" then subtitle_deets().1 else if styling.small_text_over_title then 700 else 800 }

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

@@ -82,6 +82,7 @@ init script:
 	shrink_name := {if styling.shrink_name_text != "" then to_int(styling.shrink_name_text) else 0 }
 	use_main_rarity := { contains(set.mainframe_rarity_name, match: ".png")}
 	un_png := replace@(match:".png", replace: "")
+	ancestral_mana := { styling.ancestral_generic_mana}
 
 ############################################################## Set info fields
 set info style:
@@ -127,6 +128,11 @@ styling field:
 	name: remove from autocount
 	description: Removes the automatic card number for specific cards, to allow for overcounted cards like in Planeswalker Decks.
 	initial: no
+styling field:
+	type: boolean
+	name: ancestral generic mana
+	description: Removes the automatic card number for specific cards, to allow for overcounted cards like in Planeswalker Decks.
+	initial: no
 styling field:
 	type: boolean
 	name: grey hybrid name

data/magic-m15-emblem-cajun.mse-style/style

@@ -38,10 +38,6 @@ init script:
 	use_main_rarity := { contains(set.mainframe_rarity_name, match: ".png")}
 	un_png := replace@(match:".png", replace: "")
 	remove_rarity := { styling.remove_rarity_symbol}
-	########## Flavor bar stuff
-	bar_offset := {if styling_offset() == "-" then 0 else if styling_offset() != "" then -styling_offset() else 0}
-	styling_offset := { replace(styling.flavor_bar_offset, match:"(u|d)+", replace: "") }
-	offset_lines := {offset_counter(styling.flavor_bar_offset)}
 
 	normal_mask := {styling.mask == "default"}
 	upload_mask := { styling.mask == "upload"}
@@ -60,6 +56,23 @@ 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: font size
+	description: The font size for the text. The default is 14.
+styling field:
+	type: boolean
+	name: remove from autocount
+	description: Removes the automatic card number for specific cards, to allow for overcounted cards like in Planeswalker Decks.
+	initial: no
+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: always
 styling field:
 	type: choice
 	name: mask
@@ -68,15 +81,6 @@ styling field:
 	choice: custom
 	description: Open the mask field to upload a custom frame mask.
 	initial: default
-styling field:
-	type: boolean
-	name: remove from autocount
-	description: Removes the automatic card number for specific cards, to allow for overcounted cards like in Planeswalker Decks.
-	initial: no
-styling field:
-	type: text
-	name: flavor bar offset
-	description: Move the flavor bar down X pixels. Use negative to move up.
 styling field:
 	type: boolean
 	name: use guild mana symbols
@@ -95,14 +99,6 @@ styling field:
 	choice: modern
 	choice: old
 	choice: diagonal T
-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: short text only
 styling field:
 	type: boolean
 	name: inverted common symbol
@@ -252,21 +248,31 @@ card style:
 		font:
 			name: MPlantin
 			italic name: MPlantin-Italic
-			size: 14
+			size: {if styling.font_size == "" then 14 else styling.font_size}
 			scale down to: 10
 			color: black
 		symbol font:
 			name: { styling.text_box_mana_symbols }
-			size: 14
-		alignment: middle center shrink-overflow
+			size: {if styling.font_size == "" then 14 else styling.font_size}
+		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: 4
 		padding left:   6
 		padding top:    2
 		padding right:  4
 		padding bottom: 2
-		line height hard: 1.2
+		line height hard: {if is_modal(card.rule_text) then 0.9 else 1.2 }
 		line height line: 1.5
 		line height soft: 0.9
+		line height hard max: {if is_modal(card.rule_text) then 1.0 else 1.3 }
+		line height line max: 1.6
 	############################# Card sorting / numbering
 	set code:
 		left: 24
@@ -296,7 +302,7 @@ card style:
 		width: {if set.automatic_copyright then 0 else 140}
 		height: 10
 		z index: 4
-		alignment: middle right shrink-overflow
+		alignment: middle right
 		font:
 			name: Matrix
 			size: 7
@@ -418,7 +424,7 @@ extra card style:
 		width: {if set.automatic_copyright then 140 else 0}
 		height: 10
 		z index: 4
-		alignment: middle right shrink-overflow
+		alignment: middle right
 		font:
 			name: Matrix
 			size: 7

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

@@ -123,9 +123,6 @@ init script:
 	
 	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}
-	bar_offset := {if styling_offset() == "-" then 0 else if styling_offset() != "" then -styling_offset() else 0}
-	styling_offset := { replace(styling.flavor_bar_offset, match:"(u|d)+", replace: "") }
-	offset_lines := {offset_counter(styling.flavor_bar_offset)}
 
 ############################################################## Set info fields
 set info style:
@@ -145,10 +142,6 @@ styling field:
 	type: text
 	name: chop bottom
 	description: Shrinks the textbox X pixels from the bottom.
-styling field:
-	type: text
-	name: flavor bar offset
-	description: Move the flavor bar down X pixels. Use negative to move up.
 styling field:
 	type: boolean
 	name: use holofoil stamps
@@ -614,6 +607,12 @@ extra card field:
 	choice: stamp
 	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
@@ -728,3 +727,15 @@ extra card style:
 		render style: image
 		image: bar.png
 		visible: { card.rule_text != "" and remove_tags(card.flavor_text) != "" and set.use_flavor_bar }
+	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

data/magic-m15-split-fusable.mse-style/style

@@ -489,9 +489,9 @@ card style:
 			color: black
 			separator color: red
 	type 2:
-		left: { if has_identity_2() then "301" else "288" }
+		left: { if has_identity2() then "301" else "288" }
 		top: 211
-		width: { (if has_identity_2() then "204" else "217") - max(16,card_style.rarity.content_width) }
+		width: { (if has_identity2() then "204" else "217") - max(16,card_style.rarity.content_width) }
 		height: 15
 		alignment: top shrink-overflow
 		z index: 1
@@ -684,7 +684,7 @@ card style:
 		render style: image
 		popup style: in place
 		alignment: middle center
-		include file: /magic-watermarks.mse-include/watermarks
+		include file: /magic-watermarks.mse-include/watermarks_back
 	############################# Card sorting / numbering
 	set code:
 		left: 22

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

@@ -183,11 +183,11 @@ card style:
 		default: {default_image(card.card_color)}
 	################H############ Card type
 	type:
-		left: 35
+		left: 32
 		top:
 			{if      text_shape() == "" then 429
 			 else 354}
-		width: { 308 - max(22,card_style.rarity.content_width) }
+		width: { 311 - max(22,card_style.rarity.content_width) }
 		height: 20
 		alignment: top shrink-overflow
 		z index: 1

data/magic-mana-small-abu.mse-symbol-font/symbol-font

@@ -1,4 +1,4 @@
-mse version: 0.3.8
+mse version: 0.3.8
 version: 2015-12-13
 short name: abu
 installer group: magic/Mana symbols/abu style

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

@@ -37,15 +37,19 @@ script:
 	# Because MSE gets mad when there are quotation marks in the card list, remove them for comparison.
 	quote_filter := replace@(match:"”", replace:"")+
 		replace@(match:"“", replace:"")+
-		replace@(match:"’", replace:"'")
+		replace@(match:"[[.quotation-mark.]]", replace:"")
 
+
+	#
+	#
+	# Spacer because long blocks of code with lots of card names are long.
+	#
+	#
+	#
 	
 	matches_name := { to_string(quote_filter(card.name)) } + match@(match: "^{name_list()}$")
 	matches_name_2 := { to_string(quote_filter(card.name_2)) } + match@(match: "^{name_list()}$")
 
-	near_matches_name := { to_string(quote_filter(card.name)) } + match@(match: "^{near_name_list()}$")
-	near_matches_name_2 := { to_string(quote_filter(card.name_2)) } + match@(match: "^{near_name_list()}$")
-
 	art_check := { options.check_for_artists and (card.illustrator == "" or card.illustrator == "([ ]+|[Uu]nknown|[?]+)")}
 	art_check_2 := { card.name_2 != "" and options.check_for_artists and (card.illustrator_2 == "" or card.illustrator_2 == "([ ]+|[Uu]nknown|[?]+)")}
 
@@ -55,8 +59,5 @@ script:
 	write_card_2 := { (if art_check() then card.name + "\n" else "")
 		+ (if art_check_2() then card.name_2 + "\n" else "")
 	}
-	write_card_3 := {(if near_matches_name() and not matches_name() then card.name + "\n" else "")
-		+ (if near_matches_name_2() and not matches_name_2() then card.name_2 + "\n" else "")
-	}
-	write_cards := "----- Exact Matches -----\n\n" + to_text(for each card in cards do write_card()) + "----- Near Matches -----\n\n" + to_text(for each card in cards do write_card_3()) + (if options.check_for_artists then "\n\n-----No Illustrators-----\n\n" + to_text(for each card in cards do write_card_2()))
+	write_cards := "----- Exact Matches -----\n\n" + to_text(for each card in cards do write_card()) + (if options.check_for_artists then "\n\n-----No Illustrators-----\n\n" + to_text(for each card in cards do write_card_2()))
 	to_string(write_cards)

data/magic-namecheck.mse-export-template/other card names.txt

@@ -5,7 +5,7 @@
 |Academy at Tolaria West|Agyrem|Bant|Cliffside Market|Eloren Wilds|Feeding Grounds|Fields of Summer|Glimmervoid Basin|Goldmeadow|Grixis|Immersturm|Isle of Vesuva|Izzet Steam Maze|Krosa|Lethe Lake|Llanowar|Minamo|Murasa|Naar Isle|Naya|Otaria|Panopticon|Pools of Becoming|Raven's Run|Sanctum of Serra|Sea of Sand|Shiv|Skybreen|Sokenzan|Stronghold Furnace|Tazeem|The Æther Flues|The Dark Barony|The Eon Fog|The Fourth Sphere|The Great Forest|The Hippodrome|The Maelstrom|Turri Island|Undercity Reaches|Velis Vel|Celestine Reef|Horizon Boughs|Mirrored Depths|Tember City|Chaotic Æther|Interplanar Tunnel|Morphic Tide|Mutual Epiphany|Planewide Disaster|Reality Shaping|Spatial Merging|Time Distortion|Akoum|Aretopolis|Astral Arena|Bloodhill Bastion|Edge of Malacol|Furnace Layer|Gavony|Glen Elendra|Grand Ossuary|Grove of the Dreampods|Hedron Fields of Agadeem|Jund|Kessig|Kharasha Foothills|Kilnspire District|Lair of the Ashen Idol|Mount Keralia|Nephalia|Norn's Dominion|Onakke Catacomb|Orochi Colony|Orzhova|Prahv|Quicksilver Sea|Selesnya Loft Gardens|Stensia|Takenuma|Talon Gates|Trail of the Mage-Rings|Truga Jungle|Windriddle Palaces|The Zephyr Mage|Stairs to Infinity
 
 -----Schemes-----
-A Display of My Dark Power.All in Good time.All Shall Smolder in My Wake.Approach My Molten Realm.Behold the Power of Destruction.Choose Your Champion.Dance, Pathetic Marionette.Embrace My Diabolical Vision.Every Hope Shall Vanish.Every Last Vestige Shall Rot.Evil Comes to Fruition.Feed the Machine.I Bask in Your Silent Awe.I Call on the Ancient Magics.I Delight in Your Convulsions.I Know All, I See All.Ignite the Cloneforge!.Into the Earthen Maw.Introductions Are in Order.Know Naught but Fire.Look Skyward and Despair.May Civilization Collapse.Mortal Flesh Is Weak.My Crushing Masterstroke.My Genius Knows No Bounds.My Undead Horde Awakens.My Wish Is Your Command.Nature Demands an Offering.Nature Shields Its Own.Nothing Can Stop Me Now.Only Blood Ends Your Nightmares.Realms Befitting My Majesty.Roots of All Evil.Rotted Ones, Lay Siege.Surrender Your Thoughts.The Dead Shall Serve.The Fate of the Flammable.The Iron Guardian Stirs.The Pieces Are Coming Together.The Very Soil Shall Shake.Tooth, Claw, and Tail.Which of You Burns Brightest?.Your Fate Is Thrice Sealed.Your Puny Minds Cannot Fathom.Your Will Is Not Your Own.Plots That Span Centuries.Perhaps You've Met My Cohort.Your Inescapable Doom.Drench The Soil In Their Blood.Imprison This Insolent Wretch
+A Display of My Dark Power|All in Good time|All Shall Smolder in My Wake|Approach My Molten Realm|Behold the Power of Destruction|Choose Your Champion|Dance, Pathetic Marionette|Embrace My Diabolical Vision|Every Hope Shall Vanish|Every Last Vestige Shall Rot|Evil Comes to Fruition|Feed the Machine|I Bask in Your Silent Awe|I Call on the Ancient Magics|I Delight in Your Convulsions|I Know All, I See All|Ignite the Cloneforge!|Into the Earthen Maw|Introductions Are in Order|Know Naught but Fire|Look Skyward and Despair|May Civilization Collapse|Mortal Flesh Is Weak|My Crushing Masterstroke|My Genius Knows No Bounds|My Undead Horde Awakens|My Wish Is Your Command|Nature Demands an Offering|Nature Shields Its Own|Nothing Can Stop Me Now|Only Blood Ends Your Nightmares|Realms Befitting My Majesty|Roots of All Evil|Rotted Ones, Lay Siege|Surrender Your Thoughts|The Dead Shall Serve|The Fate of the Flammable|The Iron Guardian Stirs|The Pieces Are Coming Together|The Very Soil Shall Shake|Tooth, Claw, and Tail|Which of You Burns Brightest?|Your Fate Is Thrice Sealed|Your Puny Minds Cannot Fathom|Your Will Is Not Your Own|Plots That Span Centuries|Perhaps You've Met My Cohort|Your Inescapable Doom|Drench The Soil In Their Blood|Imprison This Insolent Wretch
 
 -----Happy Holidays Cards-----
 |Fruitcake Elemental|Gifts Given|Evil Presents|Season’s Beatings|Snow Mercy|Yule Ooze|Naughty|Nice|Stocking Tiger

data/magic-symbol-extractor.mse-export-template/build.bat

@@ -0,0 +1,7 @@
+cd ..
+
+cd ..
+
+mse --create-installer magic-namecheck.mse-export-template
+
+ren "magic-namecheck.mse-installer" "Magic - Namecheck Export Template.mse-installer"

data/magic-symbol-extractor.mse-export-template/export-template

@@ -0,0 +1,86 @@
+mse version: 2.0.0
+short name: Symbol Printer
+full name: Data Collection
+position hint: 009
+icon: icon.png
+version: 2018-01-11
+installer group: magic/Export/Name Check
+
+depends on:
+	package: magic.mse-game
+	version: 2008-08-08
+
+game: magic
+create directory: true
+file type: *.txt|*.txt|*.*|*.*
+
+option field:
+	type: text
+	name: set code
+	description: The three letter extension of your set name, used as filename.
+option field:
+	type: text
+	name: width
+	description: the width of the symbol images. Default is 25.
+option field:
+	type: text
+	name: height
+	description: the width of the symbol images. Default is 25 or same as width.
+option field:
+	type: boolean
+	name: alternate
+	initial: no
+	description: does this set use an alternate rarity symbol? (choose colors below)
+option field:
+	type: color
+	name: fill highlight
+	initial: rgb(177, 150, 131)
+	description: the highlight of the alternate rarity's fill
+option field:
+	type: color
+	name: fill shadow
+	initial: rgb(83, 67, 53)
+	description: the highlight of the alternate rarity's fill
+option field:
+	type: boolean
+	name: inverted common
+	initial: no
+	description: Export the inverted common symbol
+option field:
+	type: boolean
+	name: special
+	initial: no
+	description: Export the special symbol
+option field:
+	type: boolean
+	name: common
+	initial: yes
+	description: Export the common symbol
+option field:
+	type: boolean
+	name: uncommon
+	initial: yes
+	description: Export the uncommon symbol
+option field:
+	type: boolean
+	name: rare
+	initial: yes
+	description: Export the rare symbol
+option field:
+	type: boolean
+	name: mythic rare
+	initial: yes
+	description: Export the mythic rare symbol
+script:
+	fill_color_1 := {options.fill_highlight}
+	fill_color_2 := {options.fill_shadow}
+	border_color_1 := {rgb(0,  0,  0)}
+	border_color_2 := {rgb(0,  0,  0)}
+	sym_width := { if options.width == "" then 25 else options.width }
+	symbol_height := { if options.height == "" then sym_width() else options.height }
+	symbol_width := { if options.width == "" then symbol_height() else sym_width()}
+
+	bool_map := [options.common, options.inverted_common, options.uncommon, options.rare, options.mythic_rare, options.special, options.alternate]
+	letter_map := ["c", "ic", "u", "r", "m", "s", "a"]
+	var_map := [{symbol_variation(symbol: set.symbol, variation: "common")}, {symbol_variation(symbol: set.symbol, variation: "invertedcommon")}, {symbol_variation(symbol: set.symbol, variation: "uncommon")}, {symbol_variation(symbol: set.symbol, variation: "rare")}, {symbol_variation(symbol: set.symbol, variation: "mythic rare")}, {symbol_variation(symbol: set.symbol, variation: "special")}, {symbol_variation(symbol:set.symbol, border_radius:0.07, fill_type:"linear gradient", fill_color_1:fill_color_1(), fill_color_2:fill_color_2(), border_color_1:border_color_1(), border_color_2:border_color_2(), center_x:0.5, center_y:0.5, end_x:1, end_y:1)}]
+	for i from 0 to 6 do if bool_map[i] then write_image_file(var_map[i](), file: letter_map[i] + set.set_code + ".png", width: symbol_width(), height: symbol_height())

data/magic.mse-game/magic-words.en_US.dic

@@ -172,5 +172,4 @@ earthen
 hedron
 thrull
 arcun
-merfolk
-ziziziz
+merfolk