card_fields rewrite and magic-modules.mse-include (#21)

Overhauls the card_fields file to allow for template designers more freedom in manipulating data.

Adds magic-modules.mse-include, a large scale include file for building templates in a standardized way. Applying this to existing frames will be coming in future updates.

data/magic.mse-game/card-symbols/menu_choice_images

@@ -0,0 +1,5 @@
+choice images:
+	none:							{ "" }
+	tombstone:						/magic.mse-game/card-symbols/tombstone.png
+	alchemy:						/magic.mse-game/card-symbols/alchemy.png
+	alchemy old:					/magic.mse-game/card-symbols/alchemy old.png

data/magic.mse-game/corners/menu_choice_images

@@ -0,0 +1,5 @@
+choice images:
+	none:						/magic.mse-game/corners/none.png
+	rounded and antialiased:	/magic.mse-game/corners/rounded_antialiased.png
+	rounded:					/magic.mse-game/corners/rounded.png
+	diagonal:					/magic.mse-game/corners/diagonal.png

data/magic.mse-game/counters/menu_choice_images

@@ -0,0 +1,50 @@
+choice images:
+	none:           /magic.mse-game/counters/none.png
+	custom:         /magic.mse-game/counters/none.png
+	+1/+1:          /magic.mse-game/counters/+1+1.png
+	-1/-1:          /magic.mse-game/counters/-1-1.png
+	acorn:          /magic.mse-game/counters/acorn.png
+	aether:         /magic.mse-game/counters/aether.png
+	arrow:          /magic.mse-game/counters/arrow.png
+	awakening:      /magic.mse-game/counters/awakening.png
+	bounty:         /magic.mse-game/counters/bounty.png
+	charge:         /magic.mse-game/counters/charge.png
+	corpse:         /magic.mse-game/counters/corpse.png
+	deathtouch alt: /magic.mse-game/counters/deathtouch alt.png
+	deathtouch:     /magic.mse-game/counters/deathtouch.png
+	defender:       /magic.mse-game/counters/defender.png
+	doom:           /magic.mse-game/counters/doom.png
+	double strike:  /magic.mse-game/counters/double strike.png
+	egg:            /magic.mse-game/counters/egg.png
+	energy:         /magic.mse-game/counters/energy.png
+	experience:     /magic.mse-game/counters/experience.png
+	finality:       /magic.mse-game/counters/finality.png
+	first strike:   /magic.mse-game/counters/first strike.png
+	flame:          /magic.mse-game/counters/flame.png
+	flood:          /magic.mse-game/counters/flood.png
+	flying:         /magic.mse-game/counters/flying.png
+	goaded:         /magic.mse-game/counters/goaded.png
+	haste:          /magic.mse-game/counters/haste.png
+	hexproof alt:   /magic.mse-game/counters/hexproof alt.png
+	hexproof:       /magic.mse-game/counters/hexproof.png
+	indestructible: /magic.mse-game/counters/indestructible.png
+	lifelink alt:   /magic.mse-game/counters/lifelink alt.png
+	lifelink:       /magic.mse-game/counters/lifelink.png
+	lore:           /magic.mse-game/counters/lore.png
+	menace:         /magic.mse-game/counters/menace.png
+	oil:            /magic.mse-game/counters/oil.png
+	omen:           /magic.mse-game/counters/omen.png
+	poison:         /magic.mse-game/counters/poison.png
+	rad:            /magic.mse-game/counters/rad.png
+	reach:          /magic.mse-game/counters/reach.png
+	shield:         /magic.mse-game/counters/shield.png
+	solved:         /magic.mse-game/counters/solved.png
+	spore:          /magic.mse-game/counters/spore.png
+	stun:           /magic.mse-game/counters/stun.png
+	suspected:      /magic.mse-game/counters/suspected.png
+	ticket:         /magic.mse-game/counters/ticket.png
+	time:           /magic.mse-game/counters/time.png
+	trample:        /magic.mse-game/counters/trample.png
+	unlock:         /magic.mse-game/counters/unlock.png
+	vigilance:      /magic.mse-game/counters/vigilance.png
+	void:           /magic.mse-game/counters/void.png

data/magic.mse-game/information/menu_choice_images

@@ -0,0 +1,11 @@
+choice images:
+	none:			/magic.mse-game/information/none.png
+	art:			/magic.mse-game/information/art.png
+	art old:		/magic.mse-game/information/art_old.png
+	flavor:			/magic.mse-game/information/flavor.png
+	mechanics:		/magic.mse-game/information/mechanics.png
+	template:		/magic.mse-game/information/template.png
+	wide art:		/magic.mse-game/information/art.png
+	wide flavor:	/magic.mse-game/information/flavor.png
+	wide mechanics:	/magic.mse-game/information/mechanics.png
+	wide template:	/magic.mse-game/information/template.png

data/magic.mse-game/information/menu_choice_images_the_list

@@ -0,0 +1,3 @@
+choice images:
+	none:			/magic.mse-game/information/none.png
+	the list:		/magic.mse-game/information/the_list.png

data/magic.mse-game/language

@@ -1323,7 +1323,7 @@ localized_phy_reminder :=
 	else if	input == "ru" then	russian_phy_reminder(costs, phy_matches: phy_matches, multiple: multiple)
 	else if	input == "ko" then	korean_phy_reminder(costs, phy_matches: phy_matches, multiple: multiple)
 	else if	input == "zht" then	chinese_traditional_phy_reminder(costs, phy_matches: phy_matches, multiple: multiple)
-	else 						english_phy_reminder(costs, phy_matches: phy_matches, multiple: multiple))
+	else						english_phy_reminder(costs, phy_matches: phy_matches, multiple: multiple))
 }
 english_phy_reminder :=
 {

data/magic.mse-game/language_map

@@ -60,10 +60,10 @@ languages := [
 		is_devoid		  : match@(match: "(?i)Fahl")
 
 		mana_symbol_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\b(Erzeuge|Erhöhe) [^(\n|^).]*<match>", match:"<sym[^>]*>[^<]+<\\/sym[^>]*>")
-		gold_mana_production 	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\b(Erzeuge|Erhöhe) [^(\n|^).]*<match>", match:"einer beliebigen Farbe|unterschiedlichen Farben|beliebigen Kombination von Farben")
+		gold_mana_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\b(Erzeuge|Erhöhe) [^(\n|^).]*<match>", match:"einer beliebigen Farbe|unterschiedlichen Farben|beliebigen Kombination von Farben")
 		chosen_mana_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\b(Erzeuge|Erhöhe) [^(\n|^).]*<match>", match:"jener Farbe|bestimmten Farben?")
 
-		triggered_cost_filter   : remove_tag@(tag:"<error-spelling") + break_text@(match:"(?i) du .+?bezahlen(\\.|,| )", in_context: "(?i)(wenn|zu Beginn|am Ende).+?kannst<match> ?(falls|wenn) ")
+		triggered_cost_filter	: remove_tag@(tag:"<error-spelling") + break_text@(match:"(?i) du .+?bezahlen(\\.|,| )", in_context: "(?i)(wenn|zu Beginn|am Ende).+?kannst<match> ?(falls|wenn) ")
 
 		is_white          : match@(match: "(?i)weiß(e|em|en|er|es)?")
 		is_blue           : match@(match: "(?i)blau(e|em|en|er|es)?")
@@ -793,10 +793,10 @@ languages := [
 		is_devoid		  : match@(match: "(?i)Devoid")
 
 		mana_symbol_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bAdd [^(\n|^).]*<match>", match:"<sym[^>]*>[^<]+<\\/sym[^>]*>")
-		gold_mana_production 	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bAdd [^(\n|^).]*<match>", match:"(any( one)?|different|combination of) color")
+		gold_mana_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bAdd [^(\n|^).]*<match>", match:"(any( one)?|different|combination of) color")
 		chosen_mana_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bAdd [^(\n|^).]*<match>", match:"that color|chosen color")
 
-		triggered_cost_filter   : remove_tag@(tag:"<error-spelling") + break_text@(match:"(?i) pay .+?(\\.|,| )", in_context: "(?i)(when|at).+?may<match> ?(when|if|to) ")
+		triggered_cost_filter	: remove_tag@(tag:"<error-spelling") + break_text@(match:"(?i) pay .+?(\\.|,| )", in_context: "(?i)(when|at).+?may<match> ?(when|if|to) ")
 
 		is_white          : match@(match: "(?i)white")
 		is_blue           : match@(match: "(?i)blue")
@@ -1542,10 +1542,10 @@ languages := [
 		is_devoid		  : match@(match: "(?i)Vacío")
 
 		mana_symbol_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bAgrega [^(\n|^).]*<match>", match:"<sym[^>]*>[^<]+<\\/sym[^>]*>")
-		gold_mana_production 	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bAgrega [^(\n|^).]*<match>", match:"cualquier (combinación de )?color|colores distintos")
+		gold_mana_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bAgrega [^(\n|^).]*<match>", match:"cualquier (combinación de )?color|colores distintos")
 		chosen_mana_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bAgrega [^(\n|^).]*<match>", match:"ese color|color(es)? elegido")
 
-		triggered_cost_filter   : remove_tag@(tag:"<error-spelling") + break_text@(match:"(?i) pagar .+?(\\.|,| )", in_context: "(?i)(cuando|siempre que|al ).+?puedes<match> ?(si|cuando) ")
+		triggered_cost_filter	: remove_tag@(tag:"<error-spelling") + break_text@(match:"(?i) pagar .+?(\\.|,| )", in_context: "(?i)(cuando|siempre que|al ).+?puedes<match> ?(si|cuando) ")
 
 		is_white          : match@(match: "(?i)blanc(o|a)")
 		is_blue           : match@(match: "(?i)azul")
@@ -2261,10 +2261,10 @@ languages := [
 		is_devoid		  : match@(match: "(?i)Carence")
 
 		mana_symbol_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bAjoutez [^(\n|^).]*<match>", match:"<sym[^>]*>[^<]+<\\/sym[^>]*>")
-		gold_mana_production 	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bAjoutez [^(\n|^).]*<match>", match:"couleur de votre choix|couleurs différentes|combinaison de mana coloré de votre choix")
+		gold_mana_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bAjoutez [^(\n|^).]*<match>", match:"couleur de votre choix|couleurs différentes|combinaison de mana coloré de votre choix")
 		chosen_mana_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bAjoutez [^(\n|^).]*<match>", match:"cette couleur|couleurs? choisie")
 
-		triggered_cost_filter   : remove_tag@(tag:"<error-spelling") + break_text@(match:"(?i) payer .+?(\\.|,| )", in_context: "(?i)(quand|à chaque fois que|au début de).+?pouvez<match> ?(si|quand) ")
+		triggered_cost_filter	: remove_tag@(tag:"<error-spelling") + break_text@(match:"(?i) payer .+?(\\.|,| )", in_context: "(?i)(quand|à chaque fois que|au début de).+?pouvez<match> ?(si|quand) ")
 
 		is_white          : match@(match: "(?i)blanc(he)?")
 		is_blue           : match@(match: "(?i)bleue?")
@@ -2983,10 +2983,10 @@ languages := [
 		is_devoid		  : match@(match: "(?i)Vacuità")
 
 		mana_symbol_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bAggiungi [^(\n|^).]*<match>", match:"<sym[^>]*>[^<]+<\\/sym[^>]*>")
-		gold_mana_production 	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bAggiungi [^(\n|^).]*<match>", match:"qualsiasi colore|colori diversi|qualsiasi combinazione di colori")
+		gold_mana_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bAggiungi [^(\n|^).]*<match>", match:"qualsiasi colore|colori diversi|qualsiasi combinazione di colori")
 		chosen_mana_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bAggiungi [^(\n|^).]*<match>", match:"quel colore|color[ei] scelt[oi]")
 
-		triggered_cost_filter   : remove_tag@(tag:"<error-spelling") + break_text@(match:"(?i) pagare .+?(\\.|,| )", in_context: "(?i)(quando|ogniqualvolta|all.inizio di|alla fine di).+?puoi<match> ?(se|quando) ")
+		triggered_cost_filter	: remove_tag@(tag:"<error-spelling") + break_text@(match:"(?i) pagare .+?(\\.|,| )", in_context: "(?i)(quando|ogniqualvolta|all.inizio di|alla fine di).+?puoi<match> ?(se|quando) ")
 
 		is_white          : match@(match: "(?i)bianc(o|a)")
 		is_blue           : match@(match: "(?i)blu")
@@ -3704,10 +3704,10 @@ languages := [
 		is_devoid		  : match@(match: "(?i)欠色")
 
 		mana_symbol_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)<match>[^(\n|^).。]*を加える", match:"<sym[^>]*>[^<]+<\\/sym[^>]*>")
-		gold_mana_production 	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)<match>[^(\n|^).。]*を加える", match:"好きな色１色のマナ|異なる色のマナ|望む色の組み合わせのマナ")
+		gold_mana_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)<match>[^(\n|^).。]*を加える", match:"好きな色１色のマナ|異なる色のマナ|望む色の組み合わせのマナ")
 		chosen_mana_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)<match>[^(\n|^).。]*を加える", match:"その色のマナ|その選ばれた色のマナ")
 
-		triggered_cost_filter   : remove_tag@(tag:"<error-spelling") + break_text@(match:"(?i)たは.+?を支払ってもよい(\\.|,|、|，|。)", in_context: "(?i)(とき|たび|時).+?あな<match>(そうしたとき|そうしたなら)")
+		triggered_cost_filter	: remove_tag@(tag:"<error-spelling") + break_text@(match:"(?i)たは.+?を支払ってもよい(\\.|,|、|，|。)", in_context: "(?i)(とき|たび|時).+?あな<match>(そうしたとき|そうしたなら)")
 
 		is_white          : match@(match: "(?i)白")
 		is_blue           : match@(match: "(?i)青")
@@ -4493,10 +4493,10 @@ languages := [
 		is_devoid		  : match@(match: "(?i)결여")
 
 		mana_symbol_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)<match>[^(\n|^).]* 추가한다", match:"<sym[^>]*>[^<]+<\\/sym[^>]*>")
-		gold_mana_production 	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)<match>[^(\n|^).]* 추가한다", match:"원하는 (한 가지 )?색의 마나 [두한] 개|서로 다른 색인 마나|원하는 색의 조합으로 마나")
+		gold_mana_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)<match>[^(\n|^).]* 추가한다", match:"원하는 (한 가지 )?색의 마나 [두한] 개|서로 다른 색인 마나|원하는 색의 조합으로 마나")
 		chosen_mana_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)<match>[^(\n|^).]* 추가한다", match:"그 색의|선택된 색의")
 
-		triggered_cost_filter   : remove_tag@(tag:"<error-spelling") + break_text@(match:"(?i)신은.+?(을|를) 지불할 수 있다(\\.|,| )", in_context: "(?i)(때마다|때|시작에).+?당<match> ?(그렇게 한다면|그렇게 할 때)")
+		triggered_cost_filter	: remove_tag@(tag:"<error-spelling") + break_text@(match:"(?i)신은.+?(을|를) 지불할 수 있다(\\.|,| )", in_context: "(?i)(때마다|때|시작에).+?당<match> ?(그렇게 한다면|그렇게 할 때)")
 
 		is_white          : match@(match: "(?i)백색")
 		is_blue           : match@(match: "(?i)청색")
@@ -5171,10 +5171,10 @@ languages := [
 		is_devoid		  : match@(match: "(?i)Desprovido")
 
 		mana_symbol_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bAdicione [^(\n|^).]*<match>", match:"<sym[^>]*>[^<]+<\\/sym[^>]*>")
-		gold_mana_production 	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bAdicione [^(\n|^).]*<match>", match:"qualquer cor|cores diferentes")
+		gold_mana_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bAdicione [^(\n|^).]*<match>", match:"qualquer cor|cores diferentes")
 		chosen_mana_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bAdicione [^(\n|^).]*<match>", match:"daquela cor|cor(es)? escolhidas?")
 
-		triggered_cost_filter   : remove_tag@(tag:"<error-spelling") + break_text@(match:"(?i) pagar .+?(\\.|,| )", in_context: "(?i)(quando|toda vez que|no ).+?pode<match> ?(quando|se) ")
+		triggered_cost_filter	: remove_tag@(tag:"<error-spelling") + break_text@(match:"(?i) pagar .+?(\\.|,| )", in_context: "(?i)(quando|toda vez que|no ).+?pode<match> ?(quando|se) ")
 
 		is_white          : match@(match: "(?i)branc(o|a)")
 		is_blue           : match@(match: "(?i)azul")
@@ -5890,10 +5890,10 @@ languages := [
 		is_devoid		  : match@(match: "(?i)Лишение")
 
 		mana_symbol_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bдобавьте [^(\n|^).]*<match>", match:"<sym[^>]*>[^<]+<\\/sym[^>]*>")
-		gold_mana_production 	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bдобавьте [^(\n|^).]*<match>", match:"любого цвета?|различных цветов")
+		gold_mana_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bдобавьте [^(\n|^).]*<match>", match:"любого цвета?|различных цветов")
 		chosen_mana_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)\\bдобавьте [^(\n|^).]*<match>", match:"того цвета?|выбранн(ого|ый|ые) цвета?")
 
-		triggered_cost_filter   : remove_tag@(tag:"<error-spelling") + break_text@(match:"(?i) заплатить .+?(\\.|,| )", in_context: "(?i)(когда|каждый раз|в ).+?можете<match> ?(когда|если) ")
+		triggered_cost_filter	: remove_tag@(tag:"<error-spelling") + break_text@(match:"(?i) заплатить .+?(\\.|,| )", in_context: "(?i)(когда|каждый раз|в ).+?можете<match> ?(когда|если) ")
 
 		is_white          : match@(match: "(?i)бел\\w\{1,3\}")
 		is_blue           : match@(match: "(?i)син\\w\{1,3\}")
@@ -6591,10 +6591,10 @@ languages := [
 		is_devoid		  : match@(match: "(?i)虚色")
 
 		mana_symbol_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)(?<!增)加[^(\n|^).。]*<match>", match:"<sym[^>]*>[^<]+<\\/sym[^>]*>")
-		gold_mana_production 	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)(?<!增)加[^(\n|^).。]*<match>", match:"意颜色的法术力|不同颜色的法术力|其颜色组合由你选择")
+		gold_mana_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)(?<!增)加[^(\n|^).。]*<match>", match:"意颜色的法术力|不同颜色的法术力|其颜色组合由你选择")
 		chosen_mana_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)(?<!增)加[^(\n|^).。]*<match>", match:"(选颜|该)色的法术力")
 
-		triggered_cost_filter   : remove_tag@(tag:"<error-spelling") + break_text@(match:"(?i)以支付.+?(\\.|,|、|，|。)", in_context: "(?i)(当|每当|在).+?你可<match>(当你如此作时|若你如此作)")
+		triggered_cost_filter	: remove_tag@(tag:"<error-spelling") + break_text@(match:"(?i)以支付.+?(\\.|,|、|，|。)", in_context: "(?i)(当|每当|在).+?你可<match>(当你如此作时|若你如此作)")
 
 		is_white          : match@(match: "(?i)白色")
 		is_blue           : match@(match: "(?i)蓝色")
@@ -7294,10 +7294,10 @@ languages := [
 		is_devoid		  : match@(match: "(?i)虛色")
 
 		mana_symbol_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)(?<!增)加[^(\n|^).。]*<match>", match:"<sym[^>]*>[^<]+<\\/sym[^>]*>")
-		gold_mana_production 	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)(?<!增)加[^(\n|^).。]*<match>", match:"任意顏色的魔法力|不同顏色的魔法力|其顏色組合由你選擇")
+		gold_mana_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)(?<!增)加[^(\n|^).。]*<match>", match:"任意顏色的魔法力|不同顏色的魔法力|其顏色組合由你選擇")
 		chosen_mana_production	: remove_tag@(tag:"<error-spelling") + filter_text@(in_context:"(?i)(?<!增)加[^(\n|^).。]*<match>", match:"(選顏|該)色的魔法力")
 
-		triggered_cost_filter   : remove_tag@(tag:"<error-spelling") + break_text@(match:"(?i)以支付.+?(\\.|,|、|，|。)", in_context: "(?i)(每當|當|在).+?你可<match>(當你如此作時|若你如此作)")
+		triggered_cost_filter	: remove_tag@(tag:"<error-spelling") + break_text@(match:"(?i)以支付.+?(\\.|,|、|，|。)", in_context: "(?i)(每當|當|在).+?你可<match>(當你如此作時|若你如此作)")
 
 		is_white          : match@(match: "(?i)白色")
 		is_blue           : match@(match: "(?i)藍色")

data/magic.mse-game/loyalty/menu_choice_images

@@ -0,0 +1,5 @@
+choice images:
+	none:				/magic.mse-game/loyalty/none.png
+	loyalty:			/magic.mse-game/loyalty/loyalty.png
+	defense:			/magic.mse-game/loyalty/defense.png
+	shadow:				/magic.mse-game/loyalty/shadow.png

data/magic.mse-game/loyalty/menu_choice_images_cost

@@ -0,0 +1,8 @@
+choice images:
+	none:		/magic.mse-game/loyalty/none.png
+	anti ult:	/magic.mse-game/loyalty/loyalty cost anti ult.png
+	+:			/magic.mse-game/loyalty/loyalty cost +.png
+	0:			/magic.mse-game/loyalty/loyalty cost 0.png
+	-:			/magic.mse-game/loyalty/loyalty cost -.png
+	ult:		/magic.mse-game/loyalty/loyalty cost ult.png
+	shadow:		/magic.mse-game/loyalty/loyalty cost shadow.png

data/magic.mse-game/set_fields

@@ -18,6 +18,10 @@ set field:
 set field:
 	type: text
 	name: copyright
+set field:
+	type: text
+	name: secondary copyright
+	description: Typically for Universes Beyond sets.
 set field:
 	type: text
 	name: set code
@@ -29,179 +33,23 @@ set field:
 set field:
 	type: text
 	name: masterpiece set code
-	description: The letter code for masterpieces, typically MSP
+	description: The letter code for Masterpiece rarity cards.
 set field:
 	type: symbol
 	name: symbol
-	description: The symbol for this set, double click to edit
+	description: The symbol for this set, double click to edit.
 set field:
 	type: symbol
 	name: masterpiece symbol
-	description: The symbol for this sets masterpieces, click to edit
-set field:
-	type: boolean
-	name: shorten types for rarity
-	description: Makes the typeline not run into the rarity symbol. Disable if you don't use rarity symbols.
+	description: The symbol for this sets Masterpiece rarity cards, click to edit.
+
 set field:
 	type: info
-	name: Watermark links
-set field:
-	type: text
-	name: custom watermark 1
-	description: Set this image in magic-watermarks.mse-include as Custom Watermark 1
-set field:
-	type: text
-	name: custom watermark 2
-	description: Set this image in magic-watermarks.mse-include as Custom Watermark 2
-set field:
-	type: text
-	name: custom watermark 3
-	description: Set this image in magic-watermarks.mse-include as Custom Watermark 3
-set field:
-	type: text
-	name: custom watermark 4
-	description: Set this image in magic-watermarks.mse-include as Custom Watermark 4
-set field:
-	type: text
-	name: custom watermark 5
-	description: Set this image in magic-watermarks.mse-include as Custom Watermark 5
-set field:
-	type: text
-	name: custom watermark 6
-	description: Set this image in magic-watermarks.mse-include as Custom Watermark 6
-set field:
-	type: text
-	name: custom watermark 7
-	description: Set this image in magic-watermarks.mse-include as Custom Watermark 7
-set field:
-	type: text
-	name: custom watermark 8
-	description: Set this image in magic-watermarks.mse-include as Custom Watermark 8
-set field:
-	type: text
-	name: custom watermark 9
-	description: Set this image in magic-watermarks.mse-include as Custom Watermark 9
-set field:
-	type: text
-	name: custom watermark 10
-	description: Set this image in magic-watermarks.mse-include as Custom Watermark 10
-set field:
-	type: boolean
-	name: blend with colors
-	initial: no
-	description: Only works for 500x500 px watermarks. For best results, use a solid black watermark. Blend watermarks with card colors instead of a solid color.
-set field:
-	type: info
-	name: Defaults and Automation
-set field:
-	type: text
-	name: inserts
-	description: List of strings, separated by ;, that replaces INS1, INS2, ... INS9. May need to reload MSE for changes to take effect.
-set field:
-	type: color
-	name: border color
-	description: The default border color for cards
-	choice:
-		name: black
-		color: rgb(0,0,0)
-	choice:
-		name: white
-		color: rgb(255,255,255)
-	choice:
-		name: silver
-		color: rgb(200,200,200)
-	choice:
-		name: gold
-		color: rgb(200,180,0)
-set field:
-	type: multiple choice
-	name: automatic reminder text
-	choice: old
-	choice: core
-	choice: expert
-	choice: pseudo
-	choice: action
-	choice: custom
-	choice: lower case
-	initial: old, expert, pseudo, action, custom, lower case
-	# Convert from older mse versions
-	script:
-		if value == "yes" then "old, core, expert, custom, lower case"
-		else if value == "no" then ""
-		else value
-	description: For which kinds of keywords should reminder text be added by default? Note: you can enable/disable reminder text by right clicking the keyword.
-set field:
-	type: boolean
-	name: automatic card numbers
-	description: Should card numbers be shown on the cards?
-set field:
-	type: choice
-	name: card number style
-	description: What style of automatic card numbers should be used?
-	choice: 0001
-	choice: 001/099
-	choice: 001
-	choice: 1/99
-	choice: 1
-	choice: 0001/0099
-set field:
-	type: text
-	name: last main partition
-	description: Card Number Partitions after this one aren't counted as the main part of the set, ex "301" or "301/300" rather than "301/900". Default is M.
-set field:
-	type: choice
-	name: over partition display
-	description: How to display card numbers larger than the main set?
-	choice: 100
-	choice: 100/099
-set field:
-	type: text
-	name: card number offsets
-	description: Add this number to the card numbers. Formatted as "start,total"
-set field:
-	type: boolean
-	name: automatic copyright
-	description: Should the copyright line above be shown on the cards?
-set field:
-	type: boolean
-	name: rarity codes
-	description: Show rarity codes on M15 frames?
-set field:
-	type: boolean
-	name: curly quotes
-	description: converts quotes to curly quotes.
-set field:
-	type: choice
-	name: sort special rarity
-	description: Determines how cards with special rarity are sorted.
-	choice: with the rest
-	choice: after other cards
-	choice: separate numbering
-	initial: after other cards
-set field:
-	type: boolean
-	name: sort multicolor in pairs
-	description: Should multicolor cards be sorted according to pairs like in Shards block?
-	initial: no
-set field:
-	type: boolean
-	name: sort hybrid in pairs
-	description: Should hybrid cards be sorted according to pairs like in Shadowmoor block?
-	initial: no
-set field:
-	type: choice
-	name: mana cost sorting
-	description: Should mana costs be sorted by Tarkir standard (WBG), Apocalypse standard (BGW), or left unsorted?
-	choice: tarkir wedge sorting
-	choice: apocalypse wedge sorting
-	choice: unsorted
-	#typo that stood for way too long
-	script:
-		if value == "apocalype wedge sorting" then "apocalypse wedge sorting" else value
+	name: Language
 set field:
 	type: choice
 	name: card language
-	description: Language for the cards
+	description: Language for the cards.
 	choice: English
 	choice: English (British)
 	choice: English (Canadian)
@@ -231,13 +79,83 @@ set field:
 	initial: no
 set field:
 	type: boolean
-	name: remove card codes
-	description: Remove card codes from all card names.
-	initial: no
+	name: curly quotes
+	description: converts quotes to curly quotes.
+set field:
+	type: boolean
+	name: alphabetical type column
+	description: Sorts the type column alphabetically including supertypes. Disable to sort by card type.
+
+
+set field:
+	type: info
+	name: Defaults and Automation
+set field:
+	type: multiple choice
+	name: automatic reminder text
+	choice: old
+	choice: core
+	choice: expert
+	choice: pseudo
+	choice: action
+	choice: custom
+	choice: lower case
+	initial: old, expert, pseudo, action, custom, lower case
+	# Convert from older mse versions
+	script:
+		if value == "yes" then "old, core, expert, custom, lower case"
+		else if value == "no" then ""
+		else value
+	description: For which kinds of keywords should reminder text be added by default? Note: you can enable/disable reminder text by right clicking the keyword.
+set field:
+	type: choice
+	name: mana cost sorting
+	description: Should mana costs be sorted by Tarkir standard (WBG), Apocalypse standard (BGW), or left unsorted?
+	choice: tarkir wedge sorting
+	choice: apocalypse wedge sorting
+	choice: unsorted
+	#typo that stood for way too long
+	script:
+		if value == "apocalype wedge sorting" then "apocalypse wedge sorting" else value
+set field:
+	type: color
+	name: border color
+	description: The default border color for cards
+	choice:
+		name: black
+		color: rgb(0,0,0)
+	choice:
+		name: white
+		color: rgb(255,255,255)
+	choice:
+		name: silver
+		color: rgb(200,200,200)
+	choice:
+		name: gold
+		color: rgb(200,180,0)
+set field:
+	type: choice
+	name: corner shape
+	description: The default shape of corners for cards. Not universally supported yet.
+	include file: /magic-modules.mse-include/corners/choices
+set field:
+	type: color
+	name: copyright text color
+	description: The default color for set code, artist credit and copyright. Not universally supported yet.
+	choice:
+		name: white
+		color: rgb(255,255,255)
+	choice:
+		name: black
+		color: rgb(0,0,0)
+set field:
+	type: text
+	name: inserts
+	description: List of strings, separated by ;, that replaces INS1, INS2, ... INS9. May need to reload MSE for changes to take effect.
 set field:
 	type: boolean
 	name: alias as cardname
-	description: Replaces CARDNAME with a card's alias instead of card name.
+	description: Replaces CARDNAME with a card's alias instead of its main name.
 set field:
 	type: choice
 	name: use gradient multicolor
@@ -246,11 +164,194 @@ set field:
 	choice: no
 	description: Use gradients on multicolor cards by default, you can always change it be clicking on the card border.
 	initial: only for two color cards
+set field:
+	type: choice
+	name: use blended watermarks
+	choice: blend with colors
+	choice: shadow
+	choice: glow
+	choice: no
+	description: Blend the default watermarks with the card color, with a dropshadow, or unblended.
 set field:
 	type: boolean
-	name: wedge mana costs
-	description: Depreciated. Should three color mana costs sort in wedge order like in Khans block?
+	name: shorten types for rarity
+	description: Makes the typeline not run into the rarity symbol. Disable if you don't use rarity symbols.
+set field:
+	type: boolean
+	name: inverted common symbol
+	description: Should the common rarity symbol be inverted, like in Coldsnap?
 	initial: no
+set field:
+	type: boolean
+	name: rarity codes
+	description: Show rarity codes on M15 frames?
+set field:
+	type: boolean
+	name: automatic copyright
+	description: Should the copyright line above be shown on the cards?
+set field:
+	type: boolean
+	name: adaptive language height
+	description: Should the language code be pushed down when the card has multiple credit lines?
+	initial: no
+set field:
+	type: boolean
+	name: remove card codes
+	description: Remove card codes from all card names. THIS CANNOT BE UNDONE, if you save it is permanent.
+	initial: no
+
+
+set field:
+	type: info
+	name: Card Numbering
+set field:
+	type: boolean
+	name: automatic card numbers
+	description: Should card numbers be shown on the cards?
+set field:
+	type: choice
+	name: card number style
+	description: What style of automatic card numbers should be used? Not universally supported yet.
+	choice: 0001
+	choice: 001/099
+	choice: 001
+	choice: 1/99
+	choice: 1
+	choice: 0001/0099
+set field:
+	type: text
+	name: last main partition
+	description: Card Number Partitions after this one aren't counted as the main part of the set, ex "301" or "301/300" rather than "301/900". Default is M.
+set field:
+	type: choice
+	name: over partition display
+	description: How to display card numbers larger than the main set?
+	choice: 100
+	choice: 100/099
+set field:
+	type: text
+	name: card number offsets
+	description: Add this number to the card numbers. Formatted as "start,total"
+set field:
+	type: choice
+	name: sort special rarity
+	description: Determines how cards with special rarity are sorted.
+	choice: with the rest
+	choice: after other cards
+	choice: separate numbering
+	initial: after other cards
+set field:
+	type: boolean
+	name: sort multicolor in pairs
+	description: Should multicolor cards be sorted according to pairs like in Shards block?
+	initial: no
+set field:
+	type: boolean
+	name: sort hybrid in pairs
+	description: Should hybrid cards be sorted according to pairs like in Shadowmoor block?
+	initial: no
+	
+set field:
+	type: info
+	name: Card stamps. Not universally supported yet.
+set field:
+	type: choice
+	name: default stamp
+	include file: /magic-modules.mse-include/stamps/set_choices
+	description: The default stamp setup to use on supported frames.
+set field:
+	type: choice
+	name: stamp behavior
+	include file: /magic-modules.mse-include/stamps/behavior_choices
+	initial: Standard, rares holostamped
+	description: How should stamps behave across rarities?
+set field:
+	type: text
+	name: custom stamp name
+	description: Set this image in magic-mainframe-extras.mse-include as Custom Stamp, such as "examples/stamp/heart.png". For flat stamps, name the image like "heart flat.png"
+set field:
+	type: choice
+	name: custom stamp shape
+	description: What backing shape should be used for the Custom Stamp?
+	choice: round
+	choice: triangle
+
+
+set field:
+	type: info
+	name: Watermark links
+set field:
+	type: text
+	name: custom watermark 1
+	description: Set this image in magic-watermarks.mse-include as Custom Watermark 1. If smaller than 500x500, add ";length;height;" to the end, ex ".png;400;400;"
+set field:
+	type: text
+	name: custom watermark 2
+	description: Set this image in magic-watermarks.mse-include as Custom Watermark 2. If smaller than 500x500, add ";length;height;" to the end, ex ".png;400;400;"
+set field:
+	type: text
+	name: custom watermark 3
+	description: Set this image in magic-watermarks.mse-include as Custom Watermark 3. If smaller than 500x500, add ";length;height;" to the end, ex ".png;400;400;"
+set field:
+	type: text
+	name: custom watermark 4
+	description: Set this image in magic-watermarks.mse-include as Custom Watermark 4. If smaller than 500x500, add ";length;height;" to the end, ex ".png;400;400;"
+set field:
+	type: text
+	name: custom watermark 5
+	description: Set this image in magic-watermarks.mse-include as Custom Watermark 5. If smaller than 500x500, add ";length;height;" to the end, ex ".png;400;400;"
+set field:
+	type: text
+	name: custom watermark 6
+	description: Set this image in magic-watermarks.mse-include as Custom Watermark 6. If smaller than 500x500, add ";length;height;" to the end, ex ".png;400;400;"
+set field:
+	type: text
+	name: custom watermark 7
+	description: Set this image in magic-watermarks.mse-include as Custom Watermark 7. If smaller than 500x500, add ";length;height;" to the end, ex ".png;400;400;"
+set field:
+	type: text
+	name: custom watermark 8
+	description: Set this image in magic-watermarks.mse-include as Custom Watermark 8. If smaller than 500x500, add ";length;height;" to the end, ex ".png;400;400;"
+set field:
+	type: text
+	name: custom watermark 9
+	description: Set this image in magic-watermarks.mse-include as Custom Watermark 9. If smaller than 500x500, add ";length;height;" to the end, ex ".png;400;400;"
+set field:
+	type: text
+	name: custom watermark 10
+	description: Set this image in magic-watermarks.mse-include as Custom Watermark 10. If smaller than 500x500, add ";length;height;" to the end, ex ".png;400;400;"
+set field:
+	type: choice
+	name: blend with colors
+	choice: yes
+	choice: no
+	choice: shadow
+	choice: glow
+	initial: no
+	description: For 500x500 px watermarks or smaller. Blend watermarks with card colors instead of a solid color. For best results, use a solid black watermark.
+
+
+set field:
+	type: info
+	name: Symbol links
+set field:
+	type: text
+	name: custom symbol 1
+	description: Set this image in magic-symbols.mse-include as Custom Symbol 1
+set field:
+	type: text
+	name: custom symbol 2
+	description: Set this image in magic-symbols.mse-include as Custom Symbol 2
+set field:
+	type: text
+	name: custom symbol 3
+	description: Set this image in magic-symbols.mse-include as Custom Symbol 3
+set field:
+	type: text
+	name: custom symbol 4
+	description: Set this image in magic-symbols.mse-include as Custom Symbol 4
+
+
 set field:
 	type: info
 	name: Statistics
@@ -298,6 +399,8 @@ set field:
 	type: text
 	name: global_variable_average_opening_hand
 	script: global_variable_average_opening_hand_statistic()
+
+
 set field:
 	type: info
 	name: Mainframe Template Options
@@ -309,21 +412,6 @@ set field:
 	type: boolean
 	name: use flavor bar
 	description: Enables the flavor bar on Mainframe templates.
-set field:
-	type: choice
-	name: default stamp
-	choice: standard
-	choice: none
-	choice: acorn
-	choice: universes beyond
-	choice: alchemy
-	choice: alchemy old
-	choice: custom
-	description: The default stamp setup to use. Only works on new cards, not supported on all frames.
-set field:
-	type: text
-	name: custom stamp name
-	description: The filename of the custom stamp image in magic-mainframe-extras
 set field:
 	type: boolean
 	name: auto legends
@@ -439,7 +527,7 @@ default set style:
 			name: watermark
 			border radius: 0.10
 			fill type: solid
-			fill color:   rgb(255,255,255)
+			fill color:   rgb(0,0,0)
 			border color: rgba(0,0,0,0)
 	masterpiece symbol:
 		max aspect ratio: 2.5
@@ -487,6 +575,13 @@ default set style:
 			fill type: solid
 			fill color:   rgb(255,255,255)
 			border color: rgba(0,0,0,0)
+	corner shape:
+		render style: both
+		choice images:
+			rounded and antialiased:	/magic.mse-game/corners/rounded_antialiased.png
+			rounded:					/magic.mse-game/corners/rounded.png
+			diagonal:					/magic.mse-game/corners/diagonal.png
+			none:						/magic.mse-game/corners/none.png
 	automatic reminder text:
 		render style: checklist
 		direction: vertical
@@ -526,9 +621,20 @@ default set style:
 	default stamp:
 		render style: both
 		choice images:
-			standard: /magic.mse-game/stamps/foil.png
-			acorn: /magic.mse-game/stamps/acorn.png
-			universes beyond: /magic.mse-game/stamps/ub.png
-			alchemy: /magic.mse-game/stamps/alchemy.png
-			alchemy old: /magic.mse-game/stamps/alchemy_old.png
-			custom: {if contains(set.custom_stamp_name, match:".png") then "/magic-mainframe-extras.mse-include/"+set.custom_stamp_name else ""}
+			standard:			/magic.mse-game/stamps/oval.png
+			none:				/magic.mse-game/stamps/none.png
+			acorn:				/magic.mse-game/stamps/acorn.png
+			heart:				/magic.mse-game/stamps/heart.png
+			universes beyond:	/magic.mse-game/stamps/ub.png
+			alchemy:			/magic.mse-game/stamps/alchemy.png
+			alchemy old:		/magic.mse-game/stamps/alchemy_old.png
+			custom:				/magic.mse-game/stamps/heart.png
+	stamp behavior:
+		render style: both
+		choice images:
+			All holostamped:							/magic.mse-game/stamps/oval.png
+			Standard, rares holostamped:				/magic.mse-game/stamps/nonfoil.png
+			UB, rares holostamped, others flatstamped:	/magic.mse-game/stamps/onlyrare.png
+			All flatstamped:							/magic.mse-game/stamps/flat_oval.png
+			All unstamped:								/magic.mse-game/stamps/none.png
+