[274/274] magic-modules rollout (#51)

Add Magic-Modules support to all frames

data/magic-m15-outlaws-planeswalker.mse-style/style

@@ -6,7 +6,7 @@ icon: card-sample.png
 installer group: magic/m15 style/normal cards
 position hint: 096
 
-version: 2018-03-24
+version: 2024-06-07
 depends on:
 	package: magic.mse-game
 	version: 2014-06-25
@@ -14,11 +14,8 @@ 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
+	package: magic-modules.mse-include
+	version: 2024-05-20
 depends on:
 	package: magic-mana-large.mse-symbol-font
 	version: 2007-09-23
@@ -40,8 +37,22 @@ init script:
 	#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: "" bar: "" identity: "/magic-identity-new.mse-include/"]
-	template_suffix := [card: "card.png" pt: "pt.png" bar: "bar.png" stamp: "stamp.png" identity: "identity.png"]
+	template_prefix := [
+		card: ""
+		bar: ""
+		pt: "/magic-modules.mse-include/pts/375 m15/"
+		stamp: "/magic-modules.mse-include/stamps/backs/375 round/"
+		ubstamp: "/magic-modules.mse-include/stamps/backs/375 ub/"
+		identity: "/magic-modules.mse-include/indicators/"
+	]
+	template_suffix := [
+		card: "card.png"
+		bar: "bar.png"
+		pt: "pt.png"
+		stamp: "stamp.png"
+		ubstamp: "stamp.png"
+		identity: "identity.png"
+	]
 	template      := { template_prefix[type] + input + template_suffix[type] }
 	land_template := { template_prefix[type] + (if input == "a" then "c" else input) + template_suffix[type] }
 	# Use land templates for previews because they show more contrast
@@ -59,41 +70,23 @@ init script:
 	
 	# Is the card a promo card?
 	is_promo := { styling.promo }
-	has_identity := { styling.color_indicator_dot }
 	is_unsorted := {styling.remove_from_autocount}
 	loyalty_image := {
 		if      contains(input, match: "+") then "loyalty up"
 		else if contains(input, match: "-") then "loyalty down"
 		else                                     "loyalty naught"
 	}
-	is_stamped := { is_rare() and styling.use_holofoil_stamps }
 	card_shape := {"planeswalker"}
-	lv1_chop_top := { if comma_count(styling.level_1_chop) == ",," then to_int(split_text(match:",", styling.level_1_chop).0) else 0 }
-	lv1_chop_bot := { if comma_count(styling.level_1_chop) == ",," then to_int(split_text(match:",", styling.level_1_chop).1) else 0 }
-	lv2_chop_top := { if comma_count(styling.level_2_chop) == ",," then to_int(split_text(match:",", styling.level_2_chop).0) else 0 }
-	lv2_chop_bot := { if comma_count(styling.level_2_chop) == ",," then to_int(split_text(match:",", styling.level_2_chop).1) else 0 }
-	lv3_chop_top := { if comma_count(styling.level_3_chop) == ",," then to_int(split_text(match:",", styling.level_3_chop).0) else 0 }
-	lv3_chop_bot := { if comma_count(styling.level_3_chop) == ",," then to_int(split_text(match:",", styling.level_3_chop).1) else 0 }
-	lv4_chop_top := { if comma_count(styling.level_4_chop) == ",," then to_int(split_text(match:",", styling.level_4_chop).0) else 0 }
-	lv4_chop_bot := { if comma_count(styling.level_4_chop) == ",," then to_int(split_text(match:",", styling.level_4_chop).1) else 0 }
-	loyal_move := { if styling.move_loyalty_costs != "" and comma_count(styling.move_loyalty_costs) == ",,,," then to_int(split_text(match:",", styling.move_loyalty_costs).0) else 0 }
-	loyal_move2 := { if styling.move_loyalty_costs != "" and comma_count(styling.move_loyalty_costs) == ",,,," then to_int(split_text(match:",", styling.move_loyalty_costs).1) else 0 }
-	loyal_move3 := { if styling.move_loyalty_costs != "" and comma_count(styling.move_loyalty_costs) == ",,,," then to_int(split_text(match:",", styling.move_loyalty_costs).2) else 0 }
-	loyal_move4 := { if styling.move_loyalty_costs != "" and comma_count(styling.move_loyalty_costs) == ",,,," then to_int(split_text(match:",", styling.move_loyalty_costs).3) else 0 }
-	bar_push1 := { if styling.lift_separaters != "" and (comma_count(styling.lift_separaters) == "," or comma_count(styling.lift_separaters) == ",," or comma_count(styling.lift_separaters) == ",,,") then to_int(split_text(match:",", styling.lift_separaters).0) else 0 }
-	bar_push2 := { if styling.lift_separaters != "" and (comma_count(styling.lift_separaters) == ",," or comma_count(styling.lift_separaters) == ",,,") then to_int(split_text(match:",", styling.lift_separaters).1) else 0 }
-	bar_push3 := { if styling.lift_separaters != "" and comma_count(styling.lift_separaters) == ",,," then to_int(split_text(match:",", styling.lift_separaters).2) else 0 }
-	comma_count := filter_text@(match:",")
 	paragraph_count := 
 		replace@(match:"<soft-line>\n", replace:"")+
 		filter_text@(match:"\n")
 
 	text_size := { 14 -(if styling.separated_text_size == "" then 0 else if contains(styling.separated_text_size, match: ".5") then to_int(split_text(match:".5", styling.separated_text_size).0) else styling.separated_text_size) }
-	level_three := { contains(styling.use_separate_textboxes, match: "three") }
-	level_four := { contains(styling.use_separate_textboxes, match: "four") }
-	level_two := { contains(styling.use_separate_textboxes, match: "two") }
 	bar_background := { color_background(type:"bar",     base_hybrid:card_hybrid) }
 	card_shape := {"planeswalker"}
+	watermark_include := "/magic-modules.mse-include/watermarks"
+	include file: /magic-modules.mse-include/loyalty/init_script
+	loyalty_stripe_separator_image := { bar_background(card.card_color) }
 ############################################################## Set info fields
 set info style:
 	symbol:
@@ -104,51 +97,11 @@ set info style:
 			fill color:   rgb(255,255,255)
 			border color: rgb(0,0,0)
 ############################################################## Extra style options
-styling field:
-	type: text
-	name: move loyalty costs
-	description: Moves loyalty costs up the specified amount. Use negative to move down. Formatted as "1,2,3,4," MUST end with a comma.
-styling field:
-	type: text
-	name: lift separaters
-	description: Moves ability bars up the specified amount. Use negative to move down. Formatted as "1,2,3,4," MUST end with a comma.
-styling field:
-	type: choice
-	name: use separate textboxes
-	choice: two
-	choice: three
-	choice: four
-	initial: three
-	description: Uses a separate textbox for each ability, allowing for different sizes
+include file: /magic-modules.mse-include/loyalty/styling_formatting
 styling field:
 	type: text
 	name: separated text size
 	description: Use to standardize the font size of separated abilities. Default is size 14.
-styling field:
-	type: text
-	name: level 1 chop
-	description: Changes the start/stop points of the first textbox. Use negative to move down. Formatted as "1,2," MUST end with a comma.
-styling field:
-	type: text
-	name: level 2 chop
-	description: Changes the start/stop points of the second textbox. Use negative to move down. Formatted as "1,2," MUST end with a comma.
-styling field:
-	type: text
-	name: level 3 chop
-	description: Changes the start/stop points of the third textbox. Use negative to move down. Formatted as "1,2," MUST end with a comma.
-styling field:
-	type: text
-	name: level 4 chop
-	description: Changes the start/stop points of the fourth textbox. Use negative to move down. Formatted as "1,2," MUST end with a comma.
-styling field:
-	type: boolean
-	name: use holofoil stamps
-	description: Change to no to disable rare holofoil stamps
-styling field:
-	type: boolean
-	name: color indicator dot
-	description: Use the color indicator dot
-	initial: no
 styling field:
 	type: boolean
 	name: remove from autocount
@@ -226,6 +179,11 @@ styling style:
 			no:  { symbol_variation(symbol: set.symbol, variation: "common") }
 			yes: { symbol_variation(symbol: set.symbol, variation: "invertedcommon") }
 ############################################################## Card fields
+include file: /magic-modules.mse-include/corners/card_fields
+include file: /magic-modules.mse-include/information/card_fields
+include file: /magic-modules.mse-include/watermarks/card_fields
+include file: /magic-modules.mse-include/loyalty/ability_fields
+include file: /magic-modules.mse-include/loyalty/separator_fields
 card style:
 	############################# Background stuff
 	border color:
@@ -233,7 +191,6 @@ card style:
 		top : 0
 		width:	375
 		height:	523
-		radius: 18
 		left width:   17
 		right width:  17
 		top width:    17
@@ -258,7 +215,7 @@ card style:
 		height: 20
 		alignment: center bottom shrink-overflow
 		padding bottom: 0
-		z index: 3
+		z index: 900
 		font:
 			name: Daisy Regular
 			size: 20
@@ -266,7 +223,7 @@ card style:
 	casting cost:
 		left: 100
 		top: 45
-		width: 176
+		width: 175
 		height: 23
 		alignment: middle center
 		font:
@@ -277,7 +234,7 @@ card style:
 			size: 15
 			alignment: middle right
 		always symbol: true
-		z index: 2
+		z index: 920
 		padding top: 0
 	############################# Image
 	image:
@@ -294,17 +251,17 @@ card style:
 		top: 300
 		width: 17
 		height: 17
-		z index: 2
+		z index: 800
 		render style: image
-		visible: { styling.color_indicator_dot }
-		image: { card_identity() }
+		visible: { has_identity() }
+		image: { module_identity() }
 	type:
 		left: 25
 		top: 297
 		width: 325
 		height: 24
 		alignment: center bottom shrink-overflow
-		z index: 3
+		z index: 900
 		padding top: 2
 		font:
 			name: Daisy Regular
@@ -316,39 +273,25 @@ card style:
 		top: 476
 		width: 44
 		height: 22
-		z index: 2
+		z index: 950
 		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")
-			masterpiece: script: symbol_variation(symbol: set.masterpiece_symbol, variation: "mythic rare")
+		include file: /magic-modules.mse-include/rarities/choice_images
 	############################# Text box
-	level 1 text:
-		left: 58
-		top: { 329-lv1_chop_top() }
-		width: 293
-		bottom: { 375-lv1_chop_bot() }
+	text:
+		left: 50
+		top: 327
+		width: 295
+		bottom: 472
 		font:
 			name: MPlantin
 			italic name: MPlantin-Italic
-			size: { if styling.separated_text_size != "" then styling.separated_text_size else 14 }
+			size: {if styling.separated_text_size != "" then styling.separated_text_size else 14}
 			scale down to: 6
 			color: black
 		symbol font:
 			name: { styling.text_box_mana_symbols }
-			size: { if styling.separated_text_size != "" then styling.separated_text_size else 14 }
+			size: {if styling.separated_text_size != "" then styling.separated_text_size else 14}
 		alignment:
 			script:
 				if (styling.center_text == "short text only" and
@@ -358,69 +301,7 @@ card style:
 				   styling.center_text == "always"
 				then "middle center"
 				else "middle left"
-		z index: 3
-		padding left:   6
-		padding right:  4
-		line height hard: 1.2
-		line height line: 1.3
-		line height soft: 0.9
-		line height hard max: 1.3
-		line height line max: 1.4
-	level 2 text:
-		left: 58
-		top: { 375-lv1_chop_bot()-lv2_chop_top() }
-		width: 293
-		bottom: { 421-lv2_chop_bot() }
-		font:
-			name: MPlantin
-			italic name: MPlantin-Italic
-			size: { if styling.separated_text_size != "" then styling.separated_text_size else 14 }
-			scale down to: 6
-			color: black
-		symbol font:
-			name: { styling.text_box_mana_symbols }
-			size: { if styling.separated_text_size != "" then styling.separated_text_size else 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: 3
-		padding left:   6
-		padding right:  4
-		line height hard: 1.2
-		line height line: 1.3
-		line height soft: 0.9
-		line height hard max: 1.3
-		line height line max: 1.4
-	level 3 text:
-		left: 58
-		top: { 421-lv2_chop_bot()-lv3_chop_top() }
-		width: 293
-		bottom: { 467-lv3_chop_bot() }
-		font:
-			name: MPlantin
-			italic name: MPlantin-Italic
-			size: { if styling.separated_text_size != "" then styling.separated_text_size else 14 }
-			scale down to: 6
-			color: black
-		symbol font:
-			name: { styling.text_box_mana_symbols }
-			size: { if styling.separated_text_size != "" then styling.separated_text_size else 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: 3
+		z index: 900
 		padding left:   6
 		padding right:  4
 		line height hard: 1.2
@@ -429,214 +310,34 @@ card style:
 		line height hard max: 1.3
 		line height line max: 1.4
 	watermark:
-		left: 117
-		top: 321
-		width: 138
-		height: 166
-		z index: 2
+		left: 40
+		top: 329
+		width: 315
+		bottom: 481
+		z index: 700
 		render style: image
-		popup style: in place
 		alignment: middle center
-		include file: /magic-watermarks.mse-include/watermarks
-	############################# Loyalty
-	loyalty:
-		z index: 7
-		left: 326
-		top: 462
-		width: 13.16
-		height:	34.63
-		alignment: center middle
-		font:
-			name: Beleren Bold
-			size: 14
-			color: white
-	loyalty cost 1:
-		z index: 7
-		left: 28
-		top: { -loyal_move() +(if level_four() then 297 else if level_two() then 348 else 333)  }
-		width: 13.16
-		height:	34.63
-		alignment: center middle
-		font:
-			name: Beleren Bold
-			size: 11
-			color: white
-	loyalty cost 2:
-		z index: 7
-		left: 28
-		top: { -loyal_move2() +(if level_four() then 344 else if level_two() then 420 else 379) }
-		width: 13.16
-		height:	34.63
-		alignment: center middle
-		font:
-			name: Beleren Bold
-			size: 11
-			color: white
-	loyalty cost 3:
-		z index: 7
-		left: 28
-		top: { -loyal_move3() +(if level_four() then 391 else 426) }
-		width: 13.16
-		height:	34.63
-		alignment: center middle
-		font:
-			name: Beleren Bold
-			size: 11
-			color: white
-	loyalty cost 4:
-		z index: 7
-		left: 28
-		top: { -loyal_move4() +438 }
-		width: { if level_four() then 13.16 else 0 }
-		height:	{ if level_four() then 34.63 else 0 }
-		alignment: center middle
-		font:
-			name: Beleren Bold
-			size: 11
-			color: white
-	############################# Card sorting / numbering
-	set code:
-		left: 24
-		top: 498
-		width: 40
-		height: 10
-		z index: 2
-		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: 2
-		font:
-			name: Beleren Small Caps Bold
-			size: 7.25
-			color: white
-	copyright:
-		right: 350
-		top: 498
-		width: 140
-		height: 10
-		z index: 2
-		alignment: middle right shrink-overflow
-		visible: {not set.automatic_copyright}
-		font:
-			name: Matrix
-			size: 7
-			color: white
-			weight: bold
+		include file:	/magic.mse-game/watermarks/menu_choice_images
+		image:			{ watermark_image_1() }
 ############################################################## Extra card fields
-extra card field:
-	type: text
-	name: card code
-	save value: false
-	script:
-		if set.automatic_card_numbers and not styling.remove_from_autocount 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: auto copyright
-	script: set.copyright
-	save value: false
-	editable: false
-	show statistics: false
 extra card field:
 	type: text
 	name: replace type
 	editable: false
 	save value: false
 	script: replace(card.type, match: "—", replace: "-")
-extra card field:
-	type: choice
-	name: loyalty cost box 1
-	editable: false
-	script: loyalty_image(card.loyalty_cost_1)
-	save value: false
-extra card field:
-	type: choice
-	name: loyalty cost box 2
-	editable: false
-	script: loyalty_image(card.loyalty_cost_2)
-	save value: false
-extra card field:
-	type: choice
-	name: loyalty cost box 3
-	editable: false
-	script: loyalty_image(card.loyalty_cost_3)
-	save value: false
-extra card field:
-	type: choice
-	name: loyalty cost box 4
-	editable: false
-	script: loyalty_image(card.loyalty_cost_4)
-	save value: false
-extra card field:
-	type: text
-	name: colon 1
-	editable: false
-	script: ":"
-	save value: false
-extra card field:
-	type: text
-	name: colon 2
-	editable: false
-	script: ":"
-	save value: false
-extra card field:
-	type: text
-	name: colon 3
-	editable: false
-	script: ":"
-	save value: false
-extra card field:
-	type: text
-	name: colon 4
-	editable: false
-	script: ":"
-	save value: false
-extra card field:
-	type: choice
-	name: loyalty box
-	editable: false
-	choice: loyalty
-	save value: false
 extra card field:
 	type: text
 	name: bounty
@@ -654,44 +355,13 @@ extra card field:
 	editable: false
 	save value: false
 	choice: target
-extra card field:
-	type: choice
-	name: line1
-	editable: false
-	save value: false
-	script: card.card_color
-extra card field:
-	type: choice
-	name: line2
-	editable: false
-	save value: false
-	script: card.card_color
 extra card style:
-	card code:
-		left: 24
-		top: 488
-		width: 120
-		height: 10
-		z index: 2
-		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: 2
-		render style: image
-		image: artist_arrow.png
 	pt box:
 		left: 273
 		top: 466
 		width: 81
 		height:	42
-		z index: 2
+		z index: 840
 		visible: { card.pt != "" }
 		render style: image
 		image: { card_ptbox() }
@@ -700,146 +370,23 @@ extra card style:
 		top : 0
 		width: 375
 		height: 523
-		z index: 3
+		z index: 1050
 		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" }
-	auto copyright:
-		right: 350
-		top: 498
-		width: 140
-		height: 10
-		z index: 2
-		alignment: middle right shrink-overflow
-		visible: {set.automatic_copyright}
-		font:
-			name: Matrix
-			size: 7
-			color: white
-			weight: bold
 	replace type:
 		left: 25
 		top: 297
 		width: 325
 		height: 24
 		alignment: center bottom shrink-overflow
-		z index: 2
+		z index: 900
 		padding top: 2
 		font:
 			name: Daisy Regular
 			size: 18
 			color: black
 			separator color: red
-	loyalty box:
-		right: 362
-		top: 460
-		width: 60
-		height: 38
-		z index: 6
-		render style: image
-		visible: { card.loyalty != "" }
-		choice images:
-			loyalty: loyalty.png
-	loyalty cost box 1:
-		left: 14
-		top: { -loyal_move() +(if level_four() then 295 else if level_two() then 346 else 331) }
-		width: 42
-		height: 40
-		z index: 6
-		render style: image
-		visible: { card.loyalty_cost_1 != "" }
-		choice images:
-			loyalty up: loyaltyup.png
-			loyalty down: loyaltydown.png
-			loyalty naught: loyaltynaught.png
-	loyalty cost box 2:
-		left: 14
-		top: { -loyal_move2() +(if level_four() then 342 else if level_two() then 417 else 376) }
-		width: 42
-		height: 40
-		z index: 6
-		render style: image
-		visible: { card.loyalty_cost_2 != "" }
-		choice images:
-			loyalty up: loyaltyup.png
-			loyalty down: loyaltydown.png
-			loyalty naught: loyaltynaught.png
-	loyalty cost box 3:
-		left: 14
-		top: { -loyal_move3() +(if level_four() then 389 else 423) }
-		width: 42
-		height: 40
-		z index: 6
-		render style: image
-		visible: { card.loyalty_cost_3 != "" }
-		choice images:
-			loyalty up: loyaltyup.png
-			loyalty down: loyaltydown.png
-			loyalty naught: loyaltynaught.png
-	loyalty cost box 4:
-		left: 14
-		top: { -loyal_move4() +436 }
-		width: { if level_four() then 42 else 0 }
-		height: 40
-		z index: 6
-		render style: image
-		visible: { card.loyalty_cost_4 != "" }
-		choice images:
-			loyalty up: loyaltyup.png
-			loyalty down: loyaltydown.png
-			loyalty naught: loyaltynaught.png
-	colon 1:
-		left: 55
-		top: { -loyal_move() +(if level_four() then 309 else if level_two() then 360 else 345) }
-		width: 5
-		height: 10
-		z index: 6
-		font:
-			name: MPlantin
-			size: 15
-			scale down to: 15
-			color: black
-		alignment: middle center
-		visible: { card.loyalty_cost_1 != "" }
-	colon 2:
-		left: 55
-		top: { -loyal_move2() +(if level_four() then 356 else if level_two() then 431 else 390) }
-		width: 5
-		height: 10
-		z index: 6
-		font:
-			name: MPlantin
-			size: 15
-			scale down to: 15
-			color: black
-		alignment: middle center
-		visible: { card.loyalty_cost_2 != "" }
-	colon 3:
-		left: 55
-		top: { -loyal_move3() +(if level_four() then 403 else 437) }
-		width: 5
-		height: 10
-		z index: 6
-		font:
-			name: MPlantin
-			size: 15
-			scale down to: 15
-			color: black
-		alignment: middle center
-		visible: { card.loyalty_cost_3 != "" }
-	colon 4:
-		left: 55
-		top: { -loyal_move4() +450 }
-		width: { if level_four() then 5 else 0 }
-		height: 10
-		z index: 6
-		font:
-			name: MPlantin
-			size: 15
-			scale down to: 15
-			color: black
-		alignment: middle center
-		visible: { card.loyalty_cost_4 != "" }
 	backboard:
 		left: 0
 		top: 0
@@ -853,7 +400,7 @@ extra card style:
 		top: 0
 		width: 375
 		height: 523
-		z index: 1
+		z index: 720
 		render style: image
 		image: target.png
 	bounty:
@@ -861,26 +408,10 @@ extra card style:
 		top: 64
 		width: 55
 		height: 30
-		z index: 2
+		z index: 900
 		angle: 41
 		alignment: center shrink-overflow
 		font:
 			name: Vanilla Whale
 			size: 20
-			color: rgb(116,104,77)
-	line1:
-		left: 24
-		top: { 370-lv1_chop_bot()-lv2_chop_top()-bar_push1() }
-		width: 325
-		height: 7
-		z index: 5
-		render style: image
-		image: { bar_background() }
-	line2:
-		left: 24
-		top: { 414-lv2_chop_bot()-lv3_chop_top()-bar_push2() }
-		width: 325
-		height: 7
-		z index: 5
-		render style: image
-		image: { bar_background() }
+			color: rgb(116,104,77)