Indicator update (#76)

* update indicator script and remove color indicator dot styling options

---------

Co-authored-by: cajun <12363371+CajunAvenger@users.noreply.github.com>

data/magic-agclassic-indicator.mse-include/include

@@ -22,14 +22,6 @@ version: 2015-12-20
 #
 #...
 #
-#styling field:
-#	type: boolean
-#	name: use color indicator
-#	description: Use color indicator symbol on typeline.
-#	initial: no
-#
-#...
-#
 #	############################# Card type
 #	indicator:
 #		left: 20
@@ -38,5 +30,5 @@ version: 2015-12-20
 #		height: 15
 #		z index: 2
 #		render style: image
-#		visible: { styling.use_color_indicator == "yes" }
+#		visible: { has_identity() }
 #		image: { card_indicator() }

data/magic-counter-sheet_744.mse-style/style

@@ -37,9 +37,6 @@ init script:
 	card_full_name := { value }
 	card_full_name_default := { "Counter Sheet" }
 	
-	has_identity :=		{ false }
-	has_identity_2 :=	{ false }
-	
 	is_promo :=			{ styling.promo }
 	
 	is_unsorted :=		{ styling.remove_from_autocount }

data/magic-genevensis-00-main.mse-style/style

@@ -171,11 +171,6 @@ init script:
 		not (styling.symbol == "none")
 	}
 	
-	has_identity :=
-	{
-		styling.color_indicator_dot and length(color_to_base_prefix()) > 0
-	}
-	
 	has_custom_rarity :=
 	{
 		contains(set.mainframe_rarity_name, match: ".png")
@@ -1212,15 +1207,6 @@ styling field:
 #		fr: Images de la barre de choix
 #	localized description:
 #		fr: Les chemins de jusqu'à sept images '.png' à utiliser dans la barre de choix. Format: "image1.png, image2.png, etc..."
-styling field:
-	type: boolean
-	name: color indicator dot
-	description: Use the color indicator dot?
-#	localized caption:
-#		fr: Indicateur de couleur
-#	localized description:
-#		fr: Utiliser un indicateur de couleur, par exemple sur les cartes sans coût de lancement?
-	initial: no
 styling field:
 	type: text
 	name: alt rarity color

data/magic-genevensis-01-planeswalker.mse-style/style

@@ -187,11 +187,6 @@ init script:
 		not (styling.symbol == "none")
 	}
 	
-	has_identity :=
-	{
-		styling.color_indicator_dot and length(color_to_base_prefix()) > 0
-	}
-	
 	has_custom_rarity :=
 	{
 		contains(set.mainframe_rarity_name, match: ".png")
@@ -1146,15 +1141,6 @@ styling field:
 #	localized description:
 #		fr: Utiliser un champ de texte sur la gauche de la carte?
 	initial: no
-styling field:
-	type: boolean
-	name: color indicator dot
-	description: Use the color indicator dot?
-#	localized caption:
-#		fr: Indicateur de couleur
-#	localized description:
-#		fr: Utiliser un indicateur de couleur, par exemple sur les cartes sans coût de lancement?
-	initial: no
 styling field:
 	type: text
 	name: alt rarity color

data/magic-genevensis-02-leveler.mse-style/style

@@ -184,11 +184,6 @@ init script:
 		not (styling.symbol == "none")
 	}
 	
-	has_identity :=
-	{
-		styling.color_indicator_dot and length(color_to_base_prefix()) > 0
-	}
-	
 	has_custom_rarity :=
 	{
 		contains(set.mainframe_rarity_name, match: ".png")
@@ -880,15 +875,6 @@ styling field:
 #	localized description:
 #		fr: Utiliser un champ de texte sur la gauche de la carte?
 	initial: no
-styling field:
-	type: boolean
-	name: color indicator dot
-	description: Use the color indicator dot?
-#	localized caption:
-#		fr: Indicateur de couleur
-#	localized description:
-#		fr: Utiliser un indicateur de couleur, par exemple sur les cartes sans coût de lancement?
-	initial: no
 styling field:
 	type: text
 	name: alt rarity color

data/magic-genevensis-03-adventure.mse-style/style

@@ -208,16 +208,6 @@ init script:
 		not (styling.symbol == "none")
 	}
 	
-	has_identity :=
-	{
-		styling.color_indicator_dot and length(color_to_base_prefix()) > 0
-	}
-	
-	has_adventure_color_indicator :=
-	{
-		styling.adventure_color_indicator_dot and length(color_to_base_prefix_2()) > 0
-	}
-	
 	has_custom_rarity :=
 	{
 		contains(set.mainframe_rarity_name, match: ".png")
@@ -1111,24 +1101,6 @@ styling field:
 #	localized description:
 #		fr: Utiliser un champ de texte sur la gauche de la carte?
 	initial: no
-styling field:
-	type: boolean
-	name: color indicator dot
-	description: Use the color indicator dot?
-#	localized caption:
-#		fr: Indicateur de couleur
-#	localized description:
-#		fr: Utiliser un indicateur de couleur, par exemple sur les cartes sans coût de lancement?
-	initial: no
-styling field:
-	type: boolean
-	name: adventure color indicator dot
-	description: Use the color indicator dot for the adventure?
-#	localized caption:
-#		fr: Indicateur de couleur sur l'aventure
-#	localized description:
-#		fr: Utiliser un indicateur de couleur sur l'aventure, par exemple si elle n'a pas de coût de lancement?
-	initial: no
 styling field:
 	type: text
 	name: alt rarity color
@@ -1520,9 +1492,9 @@ card style:
 			color: { type_font_color() }
 			separator color: red
 	type 2:
-		left: { if has_adventure_color_indicator() then 100 else 70 }
+		left: { if has_identity_2() then 100 else 70 }
 		top: { 713 + type2_font_vertical() }
-		right: { 354 - if styling.center_adventure_type and has_adventure_color_indicator() then 30 else 0 }
+		right: { 354 - if styling.center_adventure_type and has_identity_2() then 30 else 0 }
 		height: 29
 		alignment: { if styling.center_adventure_type then "center middle shrink-overflow" else "left middle shrink-overflow" }
 		z index: 42
@@ -2108,7 +2080,7 @@ extra card style:
 		width: 30
 		height: 30
 		z index: 40
-		visible: { has_adventure_color_indicator() }
+		visible: { has_identity_2() }
 		render style: image
 		image: { adventure_color_indicator_dot_image() }
 	illustrator brush:
@@ -2282,7 +2254,7 @@ extra card style:
 		z index: 41
 		mask: { border("identity") }
 	adventure color indicator dot border:
-		visible: { set.border_color != rgb(0,0,0) and has_adventure_color_indicator() }
+		visible: { set.border_color != rgb(0,0,0) and has_identity_2() }
 		left: 68
 		top: 712
 		width: 30

data/magic-genevensis-10-saga.mse-style/style

@@ -174,11 +174,6 @@ init script:
 		not (styling.symbol == "none")
 	}
 	
-	has_identity :=
-	{
-		styling.color_indicator_dot and length(color_to_base_prefix()) > 0
-	}
-	
 	has_custom_rarity :=
 	{
 		contains(set.mainframe_rarity_name, match: ".png")
@@ -1101,15 +1096,6 @@ styling field:
 #	localized description:
 #		fr: Utiliser un champ de texte sur la gauche de la carte?
 	initial: no
-styling field:
-	type: boolean
-	name: color indicator dot
-	description: Use the color indicator dot?
-#	localized caption:
-#		fr: Indicateur de couleur
-#	localized description:
-#		fr: Utiliser un indicateur de couleur, par exemple sur les cartes sans coût de lancement?
-	initial: no
 styling field:
 	type: text
 	name: alt rarity color

data/magic-genevensis-11-class.mse-style/style

@@ -187,11 +187,6 @@ init script:
 		not (styling.symbol == "none")
 	}
 	
-	has_identity :=
-	{
-		styling.color_indicator_dot and length(color_to_base_prefix()) > 0
-	}
-	
 	has_custom_rarity :=
 	{
 		contains(set.mainframe_rarity_name, match: ".png")
@@ -1237,15 +1232,6 @@ styling field:
 #	localized description:
 #		fr: Utiliser un champ de texte sur la droite de la carte?
 	initial: no
-styling field:
-	type: boolean
-	name: color indicator dot
-	description: Use the color indicator dot?
-#	localized caption:
-#		fr: Indicateur de couleur
-#	localized description:
-#		fr: Utiliser un indicateur de couleur, par exemple sur les cartes sans coût de lancement?
-	initial: no
 styling field:
 	type: text
 	name: alt rarity color

data/magic-genevensis-20-battle.mse-style/style

@@ -187,11 +187,6 @@ init script:
 		not (styling.symbol == "none")
 	}
 	
-	has_identity :=
-	{
-		styling.color_indicator_dot and length(color_to_base_prefix()) > 0
-	}
-	
 	has_custom_rarity :=
 	{
 		contains(set.mainframe_rarity_name, match: ".png")
@@ -977,15 +972,6 @@ styling field:
 #	localized description:
 #		fr: Utiliser un champ de texte sur la gauche de la carte?
 	initial: no
-styling field:
-	type: boolean
-	name: color indicator dot
-	description: Use the color indicator dot?
-#	localized caption:
-#		fr: Indicateur de couleur
-#	localized description:
-#		fr: Utiliser un indicateur de couleur, par exemple sur les cartes sans coût de lancement?
-	initial: no
 styling field:
 	type: text
 	name: alt rarity color

data/magic-genevensis-70-token.mse-style/style

@@ -184,11 +184,6 @@ init script:
 		contains(set.mainframe_rarity_name, match: ".png")
 	}
 	
-	has_identity :=
-	{
-		styling.color_indicator_dot and length(color_to_base_prefix()) > 0
-	}
-	
 	image_left := { if has_extended_art() then 0 else 54 }
 	image_top := { if styling.type_location == "under the name" then 175 else 114 }
 	image_width := { if has_extended_art() then 750 else if styling.transformation_reminder == "notch" then (if card.pt == "" then 654 else 656) else 642 }
@@ -392,7 +387,7 @@ init script:
 	has_only_banner_in_type_left :=
 	{
 		styling.banner and
-		( not styling.color_indicator_dot or styling.color_indicator_dot_location != "type line left" ) and
+		( not has_identity() or styling.color_indicator_dot_location != "type line left" ) and
 		( not styling.rarity or styling.rarity_location != "type line left" )
 	}
 	
@@ -1073,15 +1068,6 @@ styling field:
 #	localized description:
 #		fr: Utiliser un champ de texte sur la gauche de la carte?
 	initial: no
-styling field:
-	type: boolean
-	name: color indicator dot
-	description: Use the color indicator dot?
-#	localized caption:
-#		fr: Indicateur de couleur
-#	localized description:
-#		fr: Utiliser un indicateur de couleur, par exemple sur les cartes sans coût de lancement?
-	initial: no
 styling field:
 	type: choice
 	name: color indicator dot location

data/magic-genevensis-80-planechase.mse-style/style

@@ -177,11 +177,6 @@ init script:
 		not (styling.symbol == "none")
 	}
 	
-	has_identity :=
-	{
-		styling.color_indicator_dot and length(color_to_base_prefix()) > 0
-	}
-	
 	has_custom_rarity :=
 	{
 		contains(set.mainframe_rarity_name, match: ".png")
@@ -992,15 +987,6 @@ styling field:
 #	localized description:
 #		fr: Utiliser un champ de texte sur la gauche de la carte?
 	initial: no
-styling field:
-	type: boolean
-	name: color indicator dot
-	description: Use the color indicator dot?
-#	localized caption:
-#		fr: Indicateur de couleur
-#	localized description:
-#		fr: Utiliser un indicateur de couleur, par exemple sur les cartes sans coût de lancement?
-	initial: no
 styling field:
 	type: text
 	name: alt rarity color

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

@@ -85,9 +85,6 @@ init script:
 	template := { template_prefix[type] + input + template_suffix[type] }
 	land_template := { template_prefix[type] + (if input == "a" then "c" else input) + template_suffix[type] }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -170,8 +167,6 @@ styling field:
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-extra-udelude.mse-style/game_scripts

@@ -596,7 +596,43 @@
 	
 	# This script has been modified to check a styling menu choice instead.
 	
-	has_identity := { contains(styling.regular_options, match:"color indicator dot") }
+	colors_from_mana_symbols := {
+		str := []
+		if contains(input, match:"W") then str := str + ["white"]
+		if contains(input, match:"U") then str := str + ["blue"]
+		if contains(input, match:"B") then str := str + ["black"]
+		if contains(input, match:"R") then str := str + ["red"]
+		if contains(input, match:"G") then str := str + ["green"]
+		if contains(input, match:"E") then str := str + ["brown"]
+		if contains(input, match:"K") then str := str + ["pink"]
+		if contains(input, match:"P") then str := str + ["purple"]
+		if contains(input, match:"L") then str := str + ["yellow"]
+		if contains(input, match:"O") then str := str + ["orange"]
+
+		join(str, sep:", ")
+	}
+	has_identity_general := {
+		tag := if face == 1 then "" else "_" + face
+		indicator_field := extra_card.extra_indicator
+		culled_indicator := cull_noncolors(cull_directions(indicator_field))
+		color_field 	:= extra_card.frame
+		cost_field 		:= card["casting_cost"+tag]
+		culled_color	:= cull_directions(cull_noncolors(color_field))
+
+		default_from_casting_cost := colors_from_mana_symbols(cost_field)
+		default_from_card_color := if chosen(color_field, choice:"colorless")
+				then ""							## colorless
+			else if default_from_casting_cost == "" and chosen(color_field, choice:"land")
+				then ""							## land
+			else if chosen(color_field, choice:"multicolor") and culled_color == ""
+				then default_from_casting_cost	## 3+ multicolor
+			else culled_color					## normal color
+		#default_from_card_color := if chosen(color_field, choice:"colorless") then "" else if default_from_casting_cost == "" and chosen(color_field, choice:"land") then "" else if chosen(color_field, choice:"multicolor") and culled_color == "" then default_from_casting_cost else culled_color
+		color_cost_disagree := default_from_card_color != default_from_casting_cost
+		color_indicator_disagree := default_from_card_color != culled_indicator and indicator_field != color_field
+
+		color_cost_disagree or color_indicator_disagree
+	}
 
 	############################################################## Statistics utilities
 	# Converted mana cost

data/magic-m15-extra-udelude.mse-style/style

@@ -1,4 +1,4 @@
-mse version: 2.0.0
+mse version: 2.5.0
 game: magic
 short name: M15 Extra Udelude
 full name: Udelude's M15 Template
@@ -365,15 +365,6 @@ card style:
 		height: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).3 else "0"}
 		z index: 1010
 	############################# Card type
-	indicator:
-		left: 31
-		top: 300
-		width: 17
-		height: 17
-		z index: 2
-		render style: image
-		visible: { has_identity() }
-		image: { card_identity() }
 	type:
 		left: { if has_identity() then "52" else "32" }
 		top: { font_field(field: "type", value: "top")}
@@ -601,6 +592,49 @@ extra card field:
 		name: reversed
 	script: card_color_filter(value)
 	default: card_color(casting_cost: card.casting_cost, rules_text: card.rule_text, type: card.super_type, watermark: card.watermark, card_name: card.name)
+extra card field:
+	type: multiple choice
+	name: extra indicator
+	empty choice: colorless
+	choice: white
+	choice: blue
+	choice: black
+	choice: red
+	choice: green
+	choice: purple
+	choice: yellow
+	choice: orange
+	choice: brown
+	choice:
+		name: pink
+		line below: true
+	choice: artifact
+	choice: snow
+	choice: land
+	choice: multicolor
+	choice: spectral
+	choice:
+		name: hybrid
+		line below: true
+	choice:
+		name: horizontal
+		type: radio
+	choice:
+		name: vertical
+		type: radio
+	choice:
+		name: radial
+		type: radio
+	choice:
+		name: diagonal
+		type: radio
+	choice:
+		name: overlay
+		type: radio
+	choice:
+		name: reversed
+	script: card_color_filter(value)
+	default: extra_card.frame
 extra card field:
 	type: choice
 	name: clock watermark
@@ -745,3 +779,12 @@ extra card style:
 		image: runes.png
 		visible: { contains(styling.extras, match: "runes") }
 		mask: masks/rune_mask.png
+	extra indicator:
+		left: 31
+		top: 300
+		width: 17
+		height: 17
+		z index: 2
+		render style: image
+		visible: { has_identity() }
+		image: { card_identity() }

data/magic-m15-extra.mse-style/game_scripts

@@ -596,7 +596,41 @@
 	
 	# This script has been modified to check a styling menu choice instead.
 	
-	has_identity := { contains(styling.regular_options, match:"color indicator dot") }
+	colors_from_mana_symbols := {
+		str := []
+		if contains(input, match:"W") then str := str + ["white"]
+		if contains(input, match:"U") then str := str + ["blue"]
+		if contains(input, match:"B") then str := str + ["black"]
+		if contains(input, match:"R") then str := str + ["red"]
+		if contains(input, match:"G") then str := str + ["green"]
+		if contains(input, match:"E") then str := str + ["brown"]
+		if contains(input, match:"K") then str := str + ["pink"]
+		if contains(input, match:"P") then str := str + ["purple"]
+
+		join(str, sep:", ")
+	}
+	has_identity_general := {
+		tag := if face == 1 then "" else "_" + face
+		indicator_field := extra_card.extra_indicator
+		culled_indicator := cull_noncolors(cull_directions(indicator_field))
+		color_field 	:= extra_card.frame
+		cost_field 		:= card["casting_cost"+tag]
+		culled_color	:= cull_directions(cull_noncolors(color_field))
+
+		default_from_casting_cost := colors_from_mana_symbols(cost_field)
+		default_from_card_color := if chosen(color_field, choice:"colorless")
+				then ""							## colorless
+			else if default_from_casting_cost == "" and chosen(color_field, choice:"land")
+				then ""							## land
+			else if chosen(color_field, choice:"multicolor") and culled_color == ""
+				then default_from_casting_cost	## 3+ multicolor
+			else culled_color					## normal color
+		#default_from_card_color := if chosen(color_field, choice:"colorless") then "" else if default_from_casting_cost == "" and chosen(color_field, choice:"land") then "" else if chosen(color_field, choice:"multicolor") and culled_color == "" then default_from_casting_cost else culled_color
+		color_cost_disagree := default_from_card_color != default_from_casting_cost
+		color_indicator_disagree := default_from_card_color != culled_indicator and indicator_field != color_field
+
+		color_cost_disagree or color_indicator_disagree
+	}
 	
 	############################################################## Statistics utilities
 	# Converted mana cost

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

@@ -1,4 +1,4 @@
-mse version: 2.0.0
+mse version: 2.5.0
 game: magic
 short name: M15 Extra
 full name: M15 with Extra Features
@@ -370,15 +370,6 @@ card style:
 		height: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).3 else "0"}
 		z index: 1010
 	############################# Card type
-	indicator:
-		left: 31
-		top: 300
-		width: 17
-		height: 17
-		z index: 2
-		render style: image
-		visible: { has_identity() }
-		image: { card_identity() }
 	type:
 		left: { if has_identity() then "52" else "32" }
 		top: { font_field(field: "type", value: "top")}
@@ -601,6 +592,47 @@ extra card field:
 		name: reversed
 	script: card_color_filter(value)
 	default: card_color(casting_cost: card.casting_cost, rules_text: card.rule_text, type: card.super_type, watermark: card.watermark, card_name: card.name)
+	
+extra card field:
+	type: multiple choice
+	name: extra indicator
+	empty choice: colorless
+	choice: white
+	choice: blue
+	choice: black
+	choice: red
+	choice: green
+	choice: purple
+	choice:
+		name: pink
+		line below: true
+	choice: artifact
+	choice: snow
+	choice: land
+	choice: multicolor
+	choice: spectral
+	choice:
+		name: hybrid
+		line below: true
+	choice:
+		name: horizontal
+		type: radio
+	choice:
+		name: vertical
+		type: radio
+	choice:
+		name: radial
+		type: radio
+	choice:
+		name: diagonal
+		type: radio
+	choice:
+		name: overlay
+		type: radio
+	choice:
+		name: reversed
+	script: card_color_filter(value)
+	default: extra_card.frame
 extra card field:
 	type: choice
 	name: clock watermark
@@ -771,3 +803,12 @@ extra card style:
 		render style: image
 		image: bar.png
 		visible: { card.rule_text != "" and remove_tags(card.flavor_text) != "" and set.use_flavor_bar }
+	extra indicator:
+		left: 31
+		top: 300
+		width: 17
+		height: 17
+		z index: 2
+		render style: image
+		visible: { has_identity() }
+		image: { card_identity() }

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

@@ -178,8 +178,6 @@ init script:
 		else if contains(input, match: "-") then "loyalty down"
 		else                                     "loyalty naught"
 	}
-	has_identity := { false }
-	has_identity_2 := { false }
 	is_unsorted := {styling.remove_from_autocount}
 	is_hybrid := {contains(card.card_color, match:"hybrid")}
 	is_legend := { styling.legendary_symbol }

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

@@ -173,7 +173,6 @@ init script:
 		else if contains(input, match: "-") then "loyalty down"
 		else                                     "loyalty naught"
 	}
-	has_identity := { styling.color_indicator_dot }
 	is_unsorted := {styling.remove_from_autocount}
 	is_hybrid := {contains(card.card_color, match:"hybrid")}
 ############################################################## Set info fields

data/magic-m15-kamigawa-full-art-basics.mse-style/style

@@ -174,9 +174,6 @@ init script:
 		none:		", none"
 	]
 	
-	has_identity := { false }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }

data/magic-m15-secret-lair-gatewatch.mse-style/style

@@ -170,9 +170,6 @@ init script:
 	card_stamprim :=	{ color_background(input: card.card_color, type: "stamprim",	base_hybrid: card_hybrid) }@(offset:0)
 	card_logo :=		{ color_background(input: card.card_color, type: "logo",		base_hybrid: card_hybrid) }@(offset:0)
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -352,8 +349,6 @@ styling field:
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:
@@ -585,7 +580,7 @@ card style:
 		visible:			{ (not typeline_disabled_1()) and (not indicator_disabled_1()) and has_identity() }
 		image:				{ module_identity(card.indicator) }
 	type:
-		left:				{ if styling.rarity then (if styling.color_indicator_dot then 854 else 809) else 862 }
+		left:				{ if styling.rarity then (if has_identity() then 854 else 809) else 862 }
 		top:				{ 861 + type_font_vertical() }
 		right:				{ if styling.rarity then (if set.shorten_types_for_rarity then max(1100,min(1425, rarity_left()-3)) else 1425) else 1372 }
 		height:				53
@@ -1016,7 +1011,7 @@ extra card style:
 		height:				{ face_coordinates_map(2).height }
 		z index:			210
 		render style:		image
-		image:				{ if styling.rarity or styling.color_indicator_dot then "" else "back_star_left.png" }
+		image:				{ if styling.rarity or has_identity() then "" else "back_star_left.png" }
 	back star right:
 		left:				{ face_coordinates_map(2).left }
 		top:				{ face_coordinates_map(2).top }

data/magic-m15-showcase-assassins-creed-memory-corridor.mse-style/style

@@ -124,9 +124,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "colored" else "gold" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -182,8 +179,6 @@ styling field:
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-bloomburrow-borderless-anime.mse-style/style

@@ -158,9 +158,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "colored" else "gold" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -341,8 +338,6 @@ include file: /magic-modules.mse-include/rarities/styling_fields
 
 include file: /magic-modules.mse-include/stamps/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-bloomburrow-woodland.mse-style/style

@@ -194,9 +194,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "land" else "gold" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -260,7 +257,6 @@ include file: /magic-modules.mse-include/rarities/styling_fields
 include file: /magic-modules.mse-include/stamps/styling_fields
 
 include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-capenna-art-deco-walker.mse-style/style

@@ -170,9 +170,6 @@ init script:
 		)
 	}
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	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)) }
@@ -321,8 +318,6 @@ styling field:
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-capenna-art-deco.mse-style/style

@@ -159,9 +159,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "land" else "gold" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	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)) }
@@ -212,8 +209,6 @@ styling field:
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-capenna-golden-age.mse-style/style

@@ -117,9 +117,6 @@ init script:
 		)
 	}
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	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)) }
@@ -175,8 +172,6 @@ styling field:
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-capenna-skyscraper.mse-style/style

@@ -117,9 +117,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "land" else "gold" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	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)) }
@@ -181,8 +178,6 @@ include file: /magic-modules.mse-include/stamps/styling_fields
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-doctor-who-tardis.mse-style/style

@@ -98,9 +98,6 @@ init script:
 	card_background := { color_background(input: card.card_color, type: "card",			base_hybrid: card_hybrid)}@(offset: 0)
 	card_crown := { color_background(input: card.card_color, type: "crown",		base_hybrid: card_hybrid)}@(offset: 0)
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -148,8 +145,6 @@ include file: /magic-modules.mse-include/stamps/styling_fields_ub
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-dominaria-stained-glass.mse-style/style

@@ -103,9 +103,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "land" else "gold" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -169,8 +166,6 @@ styling field:
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-duskmourn-paranormal.mse-style/style

@@ -165,9 +165,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "land" else "gold" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -224,8 +221,6 @@ styling field:
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-eldraine-tales.mse-style/style

@@ -123,9 +123,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "land" else "gold" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -182,8 +179,6 @@ include file: /magic-modules.mse-include/stamps/styling_fields
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-fallout-pipboy.mse-style/style

@@ -94,9 +94,6 @@ init script:
 	card_background := { color_background(input: card.card_color, type: "card",			base_hybrid: card_hybrid)}@(offset: 0)
 	card_crown := { color_background(input: card.card_color, type: "crown",		base_hybrid: card_hybrid)}@(offset: 0)
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -173,8 +170,6 @@ include file: /magic-modules.mse-include/stamps/styling_fields_ub
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-ikoria-crystal.mse-style/style

@@ -102,9 +102,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { "discolored" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -164,8 +161,6 @@ styling field:
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-innistrad-double-feature-walker.mse-style/style

@@ -131,9 +131,6 @@ init script:
 		)
 	}
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo :=			{ styling.promo }
 	is_unsorted :=		{ styling.remove_from_autocount }
 	
@@ -183,8 +180,6 @@ include file: /magic-modules.mse-include/texts/styling_fields
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-innistrad-double-feature.mse-style/style

@@ -126,9 +126,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "land" else "gold" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	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)) }
@@ -182,8 +179,6 @@ styling field:
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-innistrad-mid.mse-style/style

@@ -166,9 +166,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "land" else "gold" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -240,8 +237,6 @@ include file: /magic-modules.mse-include/stamps/styling_fields
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-innistrad-vow.mse-style/style

@@ -122,9 +122,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "land" else "gold" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -174,8 +171,6 @@ styling field:
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-ixalan-caverns.mse-style/style

@@ -101,9 +101,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "land" else "gold" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -167,8 +164,6 @@ include file: /magic-modules.mse-include/stamps/styling_fields
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-ixalan-legends.mse-style/style

@@ -117,9 +117,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "land" else "gold" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -195,8 +192,6 @@ include file: /magic-modules.mse-include/stamps/styling_fields
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-ixalan-treasure.mse-style/style

@@ -99,9 +99,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "land" else "gold" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -167,8 +164,6 @@ include file: /magic-modules.mse-include/stamps/styling_fields
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-kamigawa-neon.mse-style/style

@@ -122,9 +122,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if lang_setting("is_vehicle")(card.sub_type) then "vehicle" else if is_hybrid_cost() then "land" else "gold" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -288,8 +285,6 @@ include file: /magic-modules.mse-include/stamps/styling_fields
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-kamigawa-ninja.mse-style/style

@@ -131,9 +131,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "land" else "gold" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -264,8 +261,6 @@ include file: /magic-modules.mse-include/stamps/styling_fields
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-kamigawa-samurai.mse-style/style

@@ -120,9 +120,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "land" else "gold" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -254,8 +251,6 @@ include file: /magic-modules.mse-include/stamps/styling_fields
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-lotr-scroll-saga.mse-style/style

@@ -143,9 +143,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "land" else "gold" }
 	
-	has_identity :=		{ styling.color_indicator_dot }
-	has_identity_2 :=	{ false }
-	
 	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)) }
@@ -427,8 +424,6 @@ include file: /magic-modules.mse-include/stamps/styling_fields_ub
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-lotr-scroll.mse-style/style

@@ -144,9 +144,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "land" else "gold" }
 	
-	has_identity :=		{ styling.color_indicator_dot }
-	has_identity_2 :=	{ false }
-	
 	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)) }
@@ -332,8 +329,6 @@ include file: /magic-modules.mse-include/stamps/styling_fields_ub
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-lotr.mse-style/style

@@ -99,9 +99,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "land" else "gold" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -159,8 +156,6 @@ include file: /magic-modules.mse-include/stamps/styling_fields_ub
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-ravnica-city-mural.mse-style/style

@@ -126,9 +126,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "land" else "gold" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -186,8 +183,6 @@ include file: /magic-modules.mse-include/stamps/styling_fields
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-ravnica-dossier.mse-style/style

@@ -89,9 +89,6 @@ init script:
 	card_background := { color_background(input: card.card_color, type: "card",			base_hybrid: card_hybrid)}@(offset: 0)
 	card_crown := { color_background(input: card.card_color, type: "crown",		base_hybrid: card_hybrid)}@(offset: 0)
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -138,8 +135,6 @@ include file: /magic-modules.mse-include/stamps/styling_fields
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-tarkir-dragon-wing.mse-style/style

@@ -125,9 +125,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "land" else "gold" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -190,8 +187,6 @@ include file: /magic-modules.mse-include/stamps/styling_fields
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-theros-constellation.mse-style/style

@@ -111,9 +111,6 @@ init script:
 	card_stamp := { color_background(input: card.card_color, type: "stamp",	base_hybrid: card_hybrid)}@(offset: 0)
 	mask_hybrid_with_land := { true }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -155,8 +152,6 @@ styling field:
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-thunder-junction-breaking-news.mse-style/style

@@ -149,9 +149,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "land" else "gold" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -205,8 +202,6 @@ include file: /magic-modules.mse-include/stamps/styling_fields
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-thunder-junction-vault.mse-style/style

@@ -148,9 +148,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { if is_hybrid_cost() then "land" else "gold" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -209,8 +206,6 @@ include file: /magic-modules.mse-include/stamps/styling_fields
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-thunder-junction-wanted-poster.mse-style/style

@@ -143,9 +143,6 @@ init script:
 	pt_colors := { if styling.PT_color_scheme == "canon" then pt_colors_canon() else styling.PT_color_scheme }
 	pt_colors_canon := { "colored" }
 	
-	has_identity := { styling.color_indicator_dot }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }
@@ -190,8 +187,6 @@ include file: /magic-modules.mse-include/stamps/styling_fields
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-showcase-unfinity.mse-style/style

@@ -116,8 +116,6 @@ init script:
 	
 	is_crowned := { styling.legend_crown == "yes" or (styling.legend_crown == "if legendary" and lang_setting("is_legendary")(card.super_type)) }
 	
-	has_identity := { styling.color_indicator_dot }
-	
 	chop_top := { split := split_comma(styling.chop_text_box); if length(split) > 0 and split.0 != "" then clamp(split.0, maximum: 1500, minimum: -1500) else 0 }
 	chop_bot := { split := split_comma(styling.chop_text_box); if length(split) > 1 and split.1 != "" then clamp(split.1, maximum: 1500, minimum: -1500) else 0 }
 	
@@ -169,8 +167,6 @@ include file: /magic-modules.mse-include/stamps/styling_fields
 
 include file: /magic-modules.mse-include/rarities/styling_fields
 
-include file: /magic-modules.mse-include/indicators/styling_fields
-
 include file: /magic-modules.mse-include/watermarks/styling_fields
 
 styling field:

data/magic-m15-ttk-frames.mse-style/style

@@ -59,7 +59,6 @@ init script:
 	
 	# Is the card a promo card?
 	is_promo := { styling.promo }
-	has_identity := { styling.color_indicator_dot }
 	is_unsorted := {styling.remove_from_autocount}
 	
 	is_cons := {
@@ -108,11 +107,6 @@ styling field:
 	type: text
 	name: alt rarity color
 	description: Use a custom color for the rarity symbol. Formatted as "R1,G1,B1:R2,G2,B2:...:X:" 1 and 2 are fill color, 3 and 4 border color, X is border thickness. For example, rare is 214,196,94:95,84,40:0,0,0:0,0,0:0.07
-styling field:
-	type: boolean
-	name: color indicator dot
-	description: Use the color indicator dot
-	initial: no
 styling field:
 	type: boolean
 	name: remove from autocount

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

@@ -50,8 +50,6 @@ init script:
 	comma_count := filter_text@(match:",")
 	is_token := { styling.token == "text" or styling.token == "textless" }
 	is_blank_token := { styling.token == "textless" }
-	has_identity := { false }
-	has_identity_2 := { false }
 	ancestral_mana := { styling.ancestral_mana_symbols }
 
 	shrink_type := {if styling.shrink_typeline_text != "" then to_int(styling.shrink_typeline_text) else 0 }

data/magic-new-extra.mse-style/style

@@ -1,4 +1,4 @@
-mse version: 2.0.0
+mse version: 2.5.0
 game: magic
 short name: Modern Extra
 full name: Modern w/ Extra Colors
@@ -113,7 +113,44 @@ init script:
 	comma_count := filter_text@(match:",")
 	
 	# Should the card have a color indicator?
-	has_identity := { styling.color_indicator }
+	colors_from_mana_symbols := {
+		str := []
+		if contains(input, match:"W") then str := str + ["white"]
+		if contains(input, match:"U") then str := str + ["blue"]
+		if contains(input, match:"B") then str := str + ["black"]
+		if contains(input, match:"R") then str := str + ["red"]
+		if contains(input, match:"G") then str := str + ["green"]
+		if contains(input, match:"E") then str := str + ["brown"]
+		if contains(input, match:"K") then str := str + ["pink"]
+		if contains(input, match:"P") then str := str + ["purple"]
+		if contains(input, match:"L") then str := str + ["yellow"]
+		if contains(input, match:"O") then str := str + ["orange"]
+
+		join(str, sep:", ")
+	}
+	has_identity_general := {
+		tag := if face == 1 then "" else "_" + face
+		indicator_field := extra_card.identity
+		culled_indicator := cull_noncolors(cull_directions(indicator_field))
+		color_field 	:= extra_card.frame
+		cost_field 		:= card["casting_cost"+tag]
+		culled_color	:= cull_directions(cull_noncolors(color_field))
+
+		default_from_casting_cost := colors_from_mana_symbols(cost_field)
+		default_from_card_color := if chosen(color_field, choice:"colorless")
+				then ""							## colorless
+			else if default_from_casting_cost == "" and chosen(color_field, choice:"land")
+				then ""							## land
+			else if chosen(color_field, choice:"multicolor") and culled_color == ""
+				then default_from_casting_cost	## 3+ multicolor
+			else culled_color					## normal color
+		#default_from_card_color := if chosen(color_field, choice:"colorless") then "" else if default_from_casting_cost == "" and chosen(color_field, choice:"land") then "" else if chosen(color_field, choice:"multicolor") and culled_color == "" then default_from_casting_cost else culled_color
+		color_cost_disagree := default_from_card_color != default_from_casting_cost
+		color_indicator_disagree := default_from_card_color != culled_indicator and indicator_field != color_field
+
+		color_cost_disagree or color_indicator_disagree
+	}
+
 	
 	############################################################################################################ Scripts from Blends Package
 	## Scripts being overwritten from /magic-blends.mse-include/new-blends
@@ -1596,11 +1633,6 @@ styling field:
 	name: alpha style blending
 	description: Use Alpha-style dual blending
 	initial: no
-styling field:
-	type: boolean
-	name: color indicator
-	description: Should there be a color indicator dot?
-	initial: no
 styling field:
 	type: boolean
 	name: inverted common symbol
@@ -2036,7 +2068,7 @@ extra card field:
 	choice:
 		name: reversed
 	script: card_color_filter(value)
-	default: card_color(casting_cost: card.casting_cost, rules_text: card.rule_text, type: card.super_type, watermark: card.watermark, card_name: card.name)
+	default: extra_card.frame
 extra card field:
 	type: multiple choice
 	name: pt box

data/magic-scifi.mse-style/altered modal backup

@@ -110,7 +110,6 @@ init script:
 	# Is the card a promo card?
 	is_promo := { styling.promo }
 	is_stamped := {styling.use_holofoil_stamps and (card.rarity ==  "rare" or card.rarity == "mythic rare")}
-	has_identity := { styling.color_indicator_dot }
 	shrink_type := {if styling.shrink_typeline_text != "" then to_int(styling.shrink_typeline_text) else if length(remove_tags(card.type)) > 41 then 2 else if length(remove_tags(card.type)) > 38 then 1 else 0 }
 	shrink_name := {if styling.shrink_name_text != "" then to_int(styling.shrink_name_text) else 0 }
 	is_unsorted := {styling.remove_from_autocount}
@@ -337,11 +336,6 @@ 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
@@ -533,12 +527,12 @@ card style:
 		height: 17
 		z index: 2
 		render style: image
-		visible: { styling.color_indicator_dot }
+		visible: { has_identity() }
 		image: { card_identity() }
 	type:
-		left: { if is_map() then 85 else if is_season() then (if styling.color_indicator_dot then "64" else "44") else if styling.color_indicator_dot then "52" else "32" }
+		left: { if is_map() then 85 else if is_season() then (if has_identity() then "64" else "44") else if has_identity() then "52" else "32" }
 		top: { (if is_map() then 297.5 else if is_clear() then 294 else if is_thbland() then 444 else if is_full_art() then 329 else 296) + shrink_type() }
-		width: { if is_map() then 205 else (if styling.color_indicator_dot then "290" else "310") - max(22,card_style.rarity.content_width) - (if is_season() then 12 else 0) }
+		width: { if is_map() then 205 else (if has_identity() then "290" else "310") - max(22,card_style.rarity.content_width) - (if is_season() then 12 else 0) }
 		height: { (if is_map() then 18 else 20) - shrink_type() }
 		alignment: { if is_map() then "center top shrink-overflow" else "top shrink-overflow"}
 		z index: 5

data/magic-the-ring-rule-card_744.mse-style/style

@@ -62,9 +62,6 @@ init script:
 	
 	invert_watermark_1 := { true }
 	
-	has_identity := { false }
-	has_identity_2 := { false }
-	
 	is_promo := { styling.promo }
 	
 	is_unsorted := { styling.remove_from_autocount }

data/magic.mse-game/script

@@ -144,10 +144,11 @@ fill_len := {
 
 #### simple array join function
 join := {
-	if i >= length(input) then ""
+	len := length(input)-1
-	else if i == length(input)-1 then input[i]
+	if len < 0
-	else input[i]+sep+join(input, i: i+1, sep: sep)
+		then ""
-}@(i: 0, sep:"")
+	else for x from 0 to len do input[x] + (if x == len then "" else sep)
+}@(sep:",")
 #### join array into list format
 join_list := {
 	string := ""
@@ -333,47 +334,48 @@ is_legend :=
 	lang_setting("is_legendary")(type_field(face))
 }@(face:1) 
 ############################################################## Identity
-#### Indicators never appear if the indicator would be colorless, colorless land, or colorless artifact.
+cull_directions := replace@(match:", (horizontal|vertical|radial|overlay|reversed)", replace:"")
-#### Indicators do appear if the chosen frame doesn't match the default.
+cull_noncolors := replace@(match:"(, )?(artifact|land|multicolor|hybrid|colorless)", replace:"")
-#### Indicators do appear if the chosen color for the indicator doesn't match the default.
+colors_from_mana_symbols := {
-blank_indentity := {
+	str := []
-	case input of
+	if contains(input, match:"W") then str := str + ["white"]
-		"colorless": true,
+	if contains(input, match:"U") then str := str + ["blue"]
-		"land": true,
+	if contains(input, match:"B") then str := str + ["black"]
-		"artifact": true,
+	if contains(input, match:"R") then str := str + ["red"]
-		else: false;
+	if contains(input, match:"G") then str := str + ["green"]
+	
+	join(str, sep:", ")
 }
-cull_directions := replace@(match:", (horizontal|vertical|radial|overlay)", replace:"")
+has_identity_general := {
-has_identity := {
+	tag := if face == 1 then "" else "_" + face
-	default := card_color(casting_cost: card.casting_cost, rules_text: card.rule_text, type: card.super_type, watermark: card.watermark, card_name: card.name, default: "colorless")
+	indicator_field := card["indicator"+tag]
-	if blank_indentity(card.indicator)
+	culled_indicator := cull_noncolors(cull_directions(indicator_field))
-		then false
+
-	else if cull_directions(card.indicator) != default
+	if culled_indicator == ""
-		then true
+		then false ## invalid indicator, don't show it
-	else if cull_directions(card.card_color) != default
+	else (
-		then true
+		color_field 	:= card["card_color"+tag]
-	else false
+		cost_field 		:= card["casting_cost"+tag]
-}
+		culled_color	:= cull_directions(cull_noncolors(color_field))
-has_identity_2 := {
+
-	default := card_color(casting_cost: card.casting_cost_2, rules_text: card.rule_text_2, type: card.super_type_2, watermark: card.watermark_2, card_name: card.name_2, default: "colorless")
+		default_from_casting_cost := colors_from_mana_symbols(cost_field)
-	if blank_indentity(card.indicator)
+		default_from_card_color := if chosen(color_field, choice:"colorless")
-		then false
+				then ""							## colorless
-	else if cull_directions(card.indicator_2) != default
+			else if default_from_casting_cost == "" and chosen(color_field, choice:"land")
-		then true
+				then ""							## land
-	else if cull_directions(card.card_color_2) != default
+			else if chosen(color_field, choice:"multicolor") and culled_color == ""
-		then true
+				then default_from_casting_cost	## 3+ multicolor
-	else false
+			else culled_color					## normal color
-}
+		
-has_identity_3 := {
+		color_cost_disagree := default_from_card_color != default_from_casting_cost
-	default := card_color(casting_cost: card.casting_cost_3, rules_text: card.rule_text_3, type: card.super_type_3, watermark: card.watermark_3, card_name: card.name_3, default: "colorless")
+		color_indicator_disagree := default_from_card_color != culled_indicator and indicator_field != color_field
-	if blank_indentity(card.indicator)
+
-		then false
+		color_cost_disagree or color_indicator_disagree
-	else if cull_directions(card.indicator_3) != default
+	)
-		then true
-	else if cull_directions(card.card_color_3) != default
-		then true
-	else false
 }
+has_identity   := { has_identity_general(face:1) }
+has_identity_2 := { has_identity_general(face:2) }
+has_identity_3 := { has_identity_general(face:3) }
 ############################################################## Exporter utility
 exporter_num_filter := filter_text@(match:"!num [^\n!]+")
 exporter_num_grabber := replace@(match:"!num ", replace:"")