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-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() }