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-m15-ttk-frames.mse-style/style

@@ -1,12 +1,12 @@
 mse version: 2.0.0
 game: magic
-short name: M15 TTK Conspiracy
-full name: M15 Take the Crown Conspiracy Style
+short name: M15 TTK Style
+full name: M15 Take the Crown Style
 icon: card-sample.png
 installer group: magic/m15 conspiracy style/normal cards
 position hint: 013
 
-version: 2018-02-08
+version: 2018-02-09
 depends on:
 	package: magic.mse-game
 	version: 2014-06-25
@@ -46,11 +46,7 @@ init script:
 	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"
-	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}	
-	shrink_type := {if styling.shrink_typeline_text != "" then to_int(styling.shrink_typeline_text) else 0 }
-	shrink_name := {if styling.shrink_name_text != "" then to_int(styling.shrink_name_text) else 0 }
-
+	
 	# Use the normal tap symbol
 	mana_t := {
 		if      styling.tap_symbol == "old"        then "old"
@@ -63,9 +59,8 @@ init script:
 	
 	# Is the card a promo card?
 	is_promo := { styling.promo }
-	has_identity := {styling.color_indicator_dot}
+	has_identity := { styling.color_indicator_dot }
 	is_unsorted := {styling.remove_from_autocount}
-	
 ############################################################## Set info fields
 set info style:
 	symbol:
@@ -79,19 +74,11 @@ set info style:
 styling field:
 	type: text
 	name: chop top
-	description: Shrinks the textbox X pixels from the top OR shrinks "top,bottom,"
+	description: Shrinks the textbox from the top.
 styling field:
 	type: text
 	name: chop bottom
-	description: Shrinks the textbox X pixels from the bottom.
-styling field:
-	type: text
-	name: shrink name text
-	description: Reduces the name text N points.
-styling field:
-	type: text
-	name: shrink typeline text
-	description: Reduces the typeline text N points.
+	description: Shrinks the textbox from the bottom.
 styling field:
 	type: boolean
 	name: use holofoil stamps
@@ -206,13 +193,13 @@ card style:
 		left: { if card.card_symbol=="none" then 32 else 50 }
 		top: 30
 		right:  { 341 - card_style.casting_cost.content_width }
-		height: { 23 - (0.5 * shrink_name()) }
+		height: 23
 		alignment: bottom shrink-overflow
 		padding bottom: 0
 		z index: 1
 		font:
 			name: Beleren Bold
-			size: { 16 - shrink_name() }
+			size: 16
 			color: black
 	casting cost:
 		right: 346
@@ -253,7 +240,7 @@ card style:
 		top: 300
 		width: 17
 		height: 17
-		z index: 1
+		z index: 2
 		render style: image
 		visible: { has_identity() }
 		image: { card_identity() }
@@ -261,13 +248,13 @@ card style:
 		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 - shrink_type() }
+		height: 20
 		alignment: top shrink-overflow
 		z index: 1
 		padding top: 2
 		font:
 			name: Beleren Bold
-			size: { 13 - shrink_name() }
+			size: 13
 			color: black
 			separator color: red
 	rarity:
@@ -295,10 +282,10 @@ card style:
 			masterpiece: script: symbol_variation(symbol: set.masterpiece_symbol, variation: "mythic rare")
 	############################# Text box
 	text:
-		top: {327 - (-chop_top()) }
-		bottom: {481 - chop_bot() }
 		left: 29
+		top: { if styling.chop_top != "" then (327 - (-styling.chop_top)) else 327 }
 		width: 314
+		bottom: { if styling.chop_bottom != "" then (481 - styling.chop_bottom) else 481 }
 		font:
 			name: MPlantin
 			italic name: MPlantin-Italic
@@ -466,7 +453,7 @@ extra card style:
 		width: 46
 		height: 26
 		z index: 1
-		visible: { is_rare() and styling.use_holofoil_stamps}
+		visible: { is_rare() and styling.use_holofoil_stamps }
 		render style: image
 		image: { card_stamp() }
 	foil stamp:
@@ -475,7 +462,7 @@ extra card style:
 		width: 46
 		height: 26
 		z index: 1
-		visible: { is_rare() and styling.use_holofoil_stamps}
+		visible: { is_rare() and styling.use_holofoil_stamps }
 		render style: image
 		image: foil_stamp.png
 	foil layer: