Add expedition 33 frame (#155)

* Add expedition 33 frame

data/magic-dox-sokrates_750.mse-style/style

@@ -157,15 +157,11 @@ init script:
 	popout_width :=		{ split := split_comma(styling.popout_art_coordinates); if length(split) > 3 and split.2 != "" and split.2 != "-" then clamp(split.2, maximum:1500, minimum:0) else 0 }
 	popout_height :=	{ split := split_comma(styling.popout_art_coordinates); if length(split) > 3 and split.3 != "" and split.3 != "-" then clamp(split.3, maximum:2000, minimum:0) else 0 }
 	
-	art_left :=			{ if styling.stretch_art_to_whole_card or styling.border != "yes" then 0						else 30 }
+	art_left :=			{ if styling.stretch_art_to_whole_card or styling.border != "yes"								then 0						else 30 }
-	art_width :=		{ if styling.stretch_art_to_whole_card or styling.border != "yes" then stylesheet.card_width	else 690 }
+	art_width :=		{ if styling.stretch_art_to_whole_card or styling.border != "yes"								then stylesheet.card_width	else 690 }
-	art_top :=			{ if styling.stretch_art_to_whole_card or styling.border != "yes" then 0						else 30 }
+	art_top :=			{ if styling.stretch_art_to_whole_card or styling.border != "yes"								then 0						else 30 }
-	art_bottom :=		{ if styling.stretch_art_to_whole_card or styling.border == "no" then stylesheet.card_height	else 967 }
+	art_bottom :=		{ if styling.stretch_art_to_whole_card or styling.border == "no" or styling.border == "fade"	then stylesheet.card_height	else 967 }
-	art_mask :=
+	art_mask :=			{ crop("image_mask.png", offset_x: art_left(), offset_y: art_top(), width: art_width(), height: art_bottom() - art_top()) }
-	{
-		mask := "image_mask.png"
-		crop(mask, offset_x: art_left(), offset_y: art_top(), width: art_width(), height: art_bottom() - art_top())
-	}
 
 ############################################################## Extra style options
 styling field:
@@ -203,20 +199,17 @@ include file: /magic-modules.mse-include/rarities/styling_fields
 
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
-styling field:
+include file: /magic-modules.mse-include/foils/styling_fields
-	type:			package choice
+
-	name:			overlay
-	description:	Should there be an overlay applied, such as foil?
-	match:			magic-overlay-*.mse-include
-	required:		false
 styling field:
 	type:			choice
 	name:			border
 	description:	Use a border?
 	choice:			yes
 	choice:			only copyright
+	choice:			fade
 	choice:			no
-	initial:		only copyright
+	initial:		fade
 
 include file: /magic-modules.mse-include/information/styling_fields
 
@@ -249,7 +242,7 @@ card style:
 		height:				{ stylesheet.card_height }
 		z index:			150
 		visible:			{ styling.border != "no" }
-		mask:				{ "border_" + (if styling.border == "only copyright" then "borderless_" else "") + "mask.png" }
+		mask:				{ "border_" + (if styling.border == "only copyright" then "borderless_" else if styling.border == "fade" then "fade_" else "") + "mask.png" }
 	card color:
 		left:				0
 		top:				0
@@ -409,5 +402,5 @@ extra card style:
 		width:				{ stylesheet.card_width }
 		height:				{ stylesheet.card_height }
 		z index:			200
-		visible:			{ styling.border != "no" and is_stamped() }
+		visible:			{ (styling.border == "only copyright" or styling.border == "yes") and is_stamped() }
 		mask:				border_stamp_mask.png

data/magic-expedition-33.mse-style/style

@@ -0,0 +1,385 @@
+mse version:		2.5.6
+game:				magic
+short name:			Expedition 33
+full name:			by TorskeRavn
+icon:				card_sample.png
+position hint:		083
+
+version:			2024-10-01
+depends on:
+	package:			magic.mse-game
+	version:			2014-06-25
+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
+depends on:
+	package:			magic-modules.mse-include
+	version:			2024-10-01
+depends on:
+	package:			magic-mainframe-extras.mse-include
+	version:			2007-09-23
+
+card width:			750
+card height:		1046
+card dpi:			300
+
+### blanks by TorskeRavn and GenevensiS
+### code by GenevensiS
+
+############################################################## Extra scripts
+
+init script:
+	swap_fonts_pt_default :=
+	[
+		name: {"TheSherloks-Vintage"},
+		size: {30.0},
+		color: {"white"},
+		vertical: {0},
+		italic: {""}
+	]
+	
+	swap_fonts_body_default :=
+	[
+		name: {"MPlantin"},
+		size: {27.0},
+		color: {"white"},
+		vertical: {0},
+		italic: {"MPlantin-Italic"}
+	]
+	
+	typeline_offset_top_1 := { 2 }
+	typeline_offset_left_1 := { 34 }
+	typeline_offset_width_1 := { -80 }
+	type_offset_top_1 := { 3 }
+	rarity_offset_top_1 := { 5 }
+	indicator_offset_left_1 := { -4 }
+	swap_fonts_type_default :=
+	[
+		name: {"TrajanPro-Regular"},
+		size: { 26.0 - max(0, (length(to_text(card.type)) - 26) / 2) },
+		color: {"white"},
+		vertical: {0},
+		italic: {""}
+	]
+	
+	transform_symbol_disabled_1 := { true }
+	nameline_offset_top_1 := { 20 }
+	nameline_offset_left_1 := { 17 }
+	nameline_offset_width_1 := { -33 }
+	name_offset_width_1 := { 10 }
+	casting_cost_offset_top_1 := { 3 }
+	swap_fonts_name_default :=
+	[
+		name: {"TrajanPro-Regular"},
+		size: {30.0},
+		color: {"white"},
+		vertical: {0},
+		italic: {""}
+	]
+	
+	card_stamp_offset_top_1 := { if stamp_shape() == "triangle" then 6 else 0 }
+	
+	invert_watermark_1 := { true }
+	
+	template_prefix :=
+	[
+		border:				"border/",
+		card:				"card/",
+		pt:					"pt/",
+		crown:				"crown/",
+		alias:				"alias/",
+		stamp:				"stamp/",
+		nonstamp:			"nonstamp/"
+		identity:			"/magic-modules.mse-include/indicators/",
+		identity2:			"/magic-modules.mse-include/indicators/",
+	]
+	template_suffix :=
+	[
+		border:				".png",
+		card:				".png",
+		pt:					".png",
+		crown:				".png",
+		alias:				".png",
+		stamp:				".png",
+		nonstamp:			".png"
+		identity:			"identity.png",
+		identity2:			"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] }
+	
+	card_border :=		{ color_background(input: card.card_color, type: "border",		base_hybrid: card_hybrid,	multicolor_blend: "white",	hybrid_blend: "white",	artifact_blend: "white") }
+	card_background :=	{ color_background(input: card.card_color, type: "card",		base_hybrid: card_hybrid,	multicolor_blend: "white",	hybrid_blend: "white",	artifact_blend: "white") }
+	card_ptbox :=		{ color_background(input: card.card_color, type: "pt",			base_hybrid: card_hybrid,	multicolor_blend: "white",	hybrid_blend: "white",	artifact_blend: "white") }
+	card_crown :=		{ color_background(input: card.card_color, type: "crown",		base_hybrid: card_hybrid,	multicolor_blend: "white",	hybrid_blend: "white",	artifact_blend: "white") }
+	card_alias :=		{ color_background(input: card.card_color, type: "alias",		base_hybrid: card_hybrid,	multicolor_blend: "white",	hybrid_blend: "white",	artifact_blend: "white") }
+	card_stamp :=		{ color_background(input: card.card_color, type: "stamp",		base_hybrid: card_hybrid,	multicolor_blend: "white",	hybrid_blend: "white",	artifact_blend: "white") }
+	card_nonstamp :=	{ color_background(input: card.card_color, type: "nonstamp",	base_hybrid: card_hybrid,	multicolor_blend: "white",	hybrid_blend: "white",	artifact_blend: "white") }
+	
+	pure_colors :=
+	{
+		sort_text(
+			order: if card_is_wedge(input) then "(wbgur)" else "(wubrg)",
+			(if chosen(card.card_color, choice:"white")	then "w") +
+			(if chosen(card.card_color, choice:"blue")	then "u") +
+			(if chosen(card.card_color, choice:"black")	then "b") +
+			(if chosen(card.card_color, choice:"red")	then "r") +
+			(if chosen(card.card_color, choice:"green")	then "g")
+		)
+	}
+	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
+	pt_colors_canon := { if contains(card.card_color, match: "hybrid") then "land" else "gold" }
+	
+	is_promo := { styling.promo }
+	
+	is_unsorted := { styling.remove_from_autocount }
+	
+	is_crowned := { styling.legend_crown == "yes" or (styling.legend_crown == "if legendary" and lang_setting("is_legendary")(card.super_type)) }
+	
+	foil_mask_added_sections := { [] }
+	foil_mask_removed_sections := { [] }
+	
+	chop_top :=			{ split := split_comma(styling.chop_text_box); if length(split) > 0 and split[0] != "" and split[0] != "-" then clamp(split[0], maximum:500, minimum:-500) else 0 }
+	chop_bottom :=		{ split := split_comma(styling.chop_text_box); if length(split) > 1 and split[1] != "" and split[1] != "-" then clamp(split[1], maximum:500, minimum:-500) else 0 }
+	chop_right :=		{ split := split_comma(styling.chop_text_box); if length(split) > 2 and split[2] != "" and split[2] != "-" then clamp(split[2], maximum:500, minimum:-500) else 0 }
+	
+	popout_left :=		{ split := split_comma(styling.popout_art_coordinates); if length(split) > 3 and split.0 != "" then clamp(split.0, maximum: 1500, minimum: -500) else 0 }
+	popout_top :=		{ split := split_comma(styling.popout_art_coordinates); if length(split) > 3 and split.1 != "" then clamp(split.1, maximum: 2000, minimum: -500) else 0 }
+	popout_width :=		{ split := split_comma(styling.popout_art_coordinates); if length(split) > 3 and split.2 != "" then clamp(split.2, maximum: 1500, minimum: 0) else 0 }
+	popout_height :=	{ split := split_comma(styling.popout_art_coordinates); if length(split) > 3 and split.3 != "" then clamp(split.3, maximum: 2000, minimum: 0) else 0 }
+	
+	art_left :=			{ if styling.stretch_art_to_whole_card or styling.border != "yes"								then 0						else 30 }
+	art_width :=		{ if styling.stretch_art_to_whole_card or styling.border != "yes"								then stylesheet.card_width	else 690 }
+	art_top :=			{ if styling.stretch_art_to_whole_card or styling.border != "yes"								then 0						else 30 }
+	art_bottom :=		{ if styling.stretch_art_to_whole_card or styling.border == "no" or styling.border == "fade"	then stylesheet.card_height	else 956 }
+	art_mask :=			{ crop("image_mask.png", offset_x: art_left(), offset_y: art_top(), width: art_width(), height: art_bottom() - art_top()) }
+
+############################################################## Extra style options
+
+styling field:
+	type:			text
+	name:			popout art coordinates
+	description:	The coordinates for the popout image field, formatted as "left,top,width,height". Used to make the illustration jump in front of the frame.
+styling field:
+	type:			boolean
+	name:			stretch art to whole card
+	description:	Make the image span the whole card instead of just the visible part. Use this to help make popout effects.
+	initial:		no
+
+include file: /magic-modules.mse-include/texts/styling_fields
+
+styling field:
+	type:			choice
+	name:			PT color scheme
+	description:	Use the selected color scheme for the PT box on two color cards. Canon is "land" on hybrid cards, "gold" otherwise.
+	choice:			canon
+	choice:			gold
+	choice:			hybrid
+	choice:			colored
+	choice:			land
+	initial:		canon
+styling field:
+	type:			choice
+	name:			legend crown
+	description:	Use the legend crown?
+	choice:			yes
+	choice:			if legendary
+	choice:			no
+	initial:		if legendary
+
+include file: /magic-modules.mse-include/rarities/styling_fields
+
+include file: /magic-modules.mse-include/watermarks/styling_fields
+
+include file: /magic-modules.mse-include/foils/styling_fields
+
+styling field:
+	type:			choice
+	name:			border
+	description:	Use a border?
+	choice:			yes
+	choice:			only copyright
+	choice:			fade
+	choice:			no
+	initial:		fade
+
+include file: /magic-modules.mse-include/information/styling_fields
+
+include file: /magic-modules.mse-include/symbol-fonts/styling_fields
+
+include file: /magic-modules.mse-include/fonts/styling_fields
+
+############################################################## Card fields
+
+include file: /magic-modules.mse-include/information/card_fields
+
+include file: /magic-modules.mse-include/stamps/card_fields
+
+include file: /magic-modules.mse-include/corners/card_fields
+
+include file: /magic-modules.mse-include/watermarks/card_fields
+
+include file: /magic-modules.mse-include/separators/card_fields
+
+include file: /magic-modules.mse-include/namelines/card_fields
+
+include file: /magic-modules.mse-include/typelines/card_fields
+
+include file: /magic-modules.mse-include/foils/card_fields
+
+card style:
+	############################# Background stuff
+	border color:
+		left:				0
+		top:				0
+		width:				{ stylesheet.card_width }
+		height:				{ stylesheet.card_height }
+		z index:			150
+		visible:			{ styling.border != "no" }
+		mask:				{ "border_" + (if styling.border == "only copyright" then "borderless_" else if styling.border == "fade" then "fade_" else "") + "mask.png" }
+	card color:
+		left:				0
+		top:				0
+		width:				{ stylesheet.card_width }
+		height:				{ stylesheet.card_height }
+		z index:			200
+		popup style:		in place
+		render style:		image
+		image:				{ card_background() }
+		mask:				card_mask.png
+	############################# Image
+	image:
+		left:				{ art_left() }
+		top:				{ art_top() }
+		width:				{ art_width() }
+		bottom:				{ art_bottom() }
+		z index:			100
+		mask:				{ art_mask() }
+	mainframe image:
+		left:				{ popout_left() }
+		top:				{ popout_top() }
+		width:				{ popout_width() }
+		height:				{ popout_height() }
+		z index:			1000
+	############################# Text box
+	text:
+		left:				99
+		top:				{ 667 + chop_top() + body_font_vertical() }
+		right:				{ 651 - chop_right() }
+		bottom:				{ 950 - (if is_stamped() then 10 else 0) - chop_bottom() }
+		z index:			900
+		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
+		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"
+		font:
+			name:				{ body_font() }
+			italic name:		{ body_font_italic() }
+			size:				{ body_font_size() }
+			scale down to:		7
+			color:				{ body_font_color() }
+		symbol font:
+			name:				{ styling.text_box_mana_symbols }
+			size:				{ body_font_size() }
+			scale down to:		7
+	############################# PT
+	pt:
+		left:				582
+		top:				{ 926 + pt_font_vertical() }
+		width:				82
+		height:				41
+		z index:			900
+		alignment:			center middle shrink-overflow
+		font:
+			name:				{ pt_font() }
+			size:				{ pt_font_size() }
+			color:				{ pt_font_color() }
+			separator color:	red
+
+############################################################## Extra card fields
+
+extra card field:
+	type:				choice
+	name:				pt box
+	editable:			false
+	save value:			false
+	show statistics:	false
+	choice:				pt box
+extra card field:
+	type:				choice
+	name:				crown
+	script:				card.card_color
+	editable:			false
+	save value:			false
+	show statistics:	false
+extra card field:
+	type:				choice
+	name:				stamp rim
+	script:				card.card_color
+	editable:			false
+	save value:			false
+	show statistics:	false
+extra card field:
+	type:				color
+	name:				stamp border
+	script:				rgb(0,0,0)
+	editable:			false
+	save value:			false
+	show statistics:	false
+
+extra card style:
+	pt box:
+		left:				0
+		top:				0
+		width:				{ stylesheet.card_width }
+		height:				{ stylesheet.card_height }
+		z index:			800
+		visible:			{ card.pt != "" }
+		render style:		image
+		image:
+			script:
+				pure := pure_colors()
+				count := length(pure)
+				color := pt_colors()
+				if color == "gold" and count > 1 then template("m", type: "pt")
+				else if color == "land" and count > 1 then template("c", type: "pt")
+				else if color == "hybrid" and count == 2 then masked_blend(mask: "special_blend_pt.png", dark: template(pure.0, type: "pt"), light: template(pure.1, type: "pt"))
+				else card_ptbox()
+	crown:
+		left:				0
+		top:				0
+		width:				{ stylesheet.card_width }
+		height:				{ stylesheet.card_height }
+		z index:			190
+		visible:			{ is_crowned() }
+		render style:		image
+		image:				{ card_crown() }
+	stamp rim:
+		left:				0
+		top:				0
+		width:				{ stylesheet.card_width }
+		height:				{ stylesheet.card_height }
+		z index:			200
+		render style:		image
+		image:				{ if is_stamped() then card_stamp() else card_nonstamp() }
+	stamp border:
+		left:				0
+		top:				0
+		width:				{ stylesheet.card_width }
+		height:				{ stylesheet.card_height }
+		z index:			150
+		visible:			{ (styling.border == "only copyright" or styling.border == "yes") and is_stamped() }
+		mask:				stamp_border_mask.png