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

Add Magic-Modules support to all frames

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

@@ -351,64 +351,153 @@
 		remove_tag@(tag: "<b-auto>")   +
 		remove_tag@(tag: "<error-spelling") +
 		remove_tag@(tag: "<nospellcheck") +
-		# step 2 : reminder text for keywords
+		remove_tag@(tag: "<li>") +
+		remove_tag@(tag: "<bullet>") +
+		remove_tag@(tag: "<align") +
+		remove_tag@(tag: "<margin") +
+		#### step 1b : remove zero-width space used for level spacers
+		replace@(match:"​", replace:"") +
+		#### step 2a : temp fix for formatting buttons
+		replace@(
+			match:"<b></b>",
+			replace:"BOLDAROUND"
+		) +
+		replace@(
+			match:"<i></i>",
+			replace:"ITALAROUND"
+		) +
+		replace@(
+			match:"<sym></sym>",
+			replace:"SYMAROUND"
+		) +
+		#### step 2a : reminder text for keywords
 		expand_keywords@(
 			condition: {
 				correct_case or (mode != "pseudo" and not used_placeholders)
 			}
 			default_expand: {
-				chosen(choice:if correct_case then mode else "lower case", set.automatic_reminder_text)
+				chosen(choice:if correct_case or mode == "action" then mode else "lower case", set.automatic_reminder_text) and chosen(choice:mode, set.automatic_reminder_text)
 			},
 			combine: {
-				keyword  := "<nospellcheck>{keyword}</nospellcheck>"
+				keyword := "<nospellcheck>{keyword}</nospellcheck>"
 				reminder := process_english_hints(reminder)
 				if mode == "pseudo" then "<i-auto>{keyword}</i-auto>"
-				else keyword + if expand then "<atom-reminder-{mode}> ({reminder})</atom-reminder-{mode}>"
-			}) +
-		# step 2b : move action keywords' reminder text to the end of the line
+				else keyword + if expand then "<atom-reminder-{mode}> ({reminder})</atom-reminder-{mode}>" else ""
+			}
+		) +
+		#### step 2b : apply face_code
 		replace@(
-			match: "(<atom-reminder-action>(?:(?!<kw-).)*</atom-reminder-action></kw[^>]*>)(((?!<atom-reminder| ?<kw-)[^\n(])+)",
+			match: "face_(.*?)_end",
+			replace: {face_code(_1)}
+		) +
+		#### step 2c : move action keywords' reminder text to the end of the line
+		replace@(
+			match: "(<atom-reminder-[^>]+> (?:(?!</kw).*?)</atom-reminder-[^>]+></kw[^>]*>)([^\n]*)", #### removed "| ?<kw-" from lookahead
 			replace: "\\2\\1"
-			) +
-		# step 2c : remove duplicate reminder text
+		) +
+		#### step 2d : when there's an action keyword and another one, then move that to the end of the line
+		replace@(
+			match: "(<atom-reminder-[^>]+> (?:(?!</kw)[^\n]*?)</atom-reminder-[^>]+></kw[^>]*>)([^\n]*?)(<atom-reminder-[^>]+> (?:(?!</kw).*?)</atom-reminder-[^>]+></kw[^>]*>)([^\n]*)",
+			replace: "\\2\\4\\3\\1"
+		) +
+		#### step 2e : allow a sentence after lowercase reminder text for equips etc.
+		#replace@(
+		#	match: "(<kw[^>]+><nospellcheck>[a-z][^<]+</nospellcheck>)(<atom-reminder-(?:expert|custom|old|core)>(?:(?!<kw-).)*</atom-reminder-(?:expert|custom|old|core)></kw[^>]*>)([^\n]+)$",
+		#	replace: "\\1\\3\\2"
+		#	) +
+		#### step 2f : remove duplicate reminder text
 		replace@(
 			match: "(<atom-reminder-[^>]*>[^)]+[)]</atom-reminder-[^>]*>)([^\n]+)\\1"
 			replace: "\\2\\1"
-			) +
-		# step 3a : expand shortcut word CARDNAME
+		) +
+		#### step 2g : combine reminder texts
 		replace@(
-			match: "CARDNAME",
-			in_context: "(^|[[:space:]]|\\()<match>", # TODO: Allow any punctuation before
+			match: "[)](</atom-reminder-[^>]+></kw-[^>]><atom-reminder-[^>]+> )[(]"
+			replace: "\\1"
+		) +
+		#### step 2h : temp fix for formatting buttons
+		replace@(
+			match:"BOLDAROUND",
+			replace:"<b></b>"
+		) +
+		replace@(
+			match:"ITALAROUND",
+			replace:"<i></i>"
+		) +
+		replace@(
+			match:"SYMAROUND",
+			replace:"<sym></sym>"
+		) +
+		replace@(
+			match:"-\n-"
+			replace:"<soft-line>\n</soft-line>"
+		) +
+		#### step 3a : expand shortcut word CARDNAME
+		replace@(
+			match: "CARDNAME>?", #### >? is here so after replacement, the mouse snaps to the end of </atom>
+			in_context: "(^|[[:space:]]|\\(|,|\\.|:|“|\"|'|‘|-|—|/|​)<match>", #### TODO: Allow any punctuation before
 			replace: "<atom-cardname></atom-cardname>"
-			) +
-		# step 3b : expand shortcut word LEGENDNAME
+		) +
+		#### step 3b : expand shortcut word LEGENDNAME
 		replace@(
-			match: "LEGENDNAME",
-			in_context: "(^|[[:space:]]|\\()<match>", # TODO: Allow any punctuation before
+			match: "LEGENDNAME>?",
+			in_context: "(^|[[:space:]]|\\(|,|\\.|:|“|\"|'|‘|/|​)<match>", #### TODO: Allow any punctuation before
 			replace: "<atom-legname></atom-legname>"
-			) +
-		# step 3c : fill in atom fields
+		) +
+		#### step 3c : fill in atom fields
 		tag_contents@(
 			tag: "<atom-cardname>",
-			contents: { "<nospellcheck>" + (if card_name=="" then "CARDNAME" else card_name) + "</nospellcheck>" }
-			) +
+			contents: { "<nospellcheck>" + (if card_name=="" then "CARDNAME" else strip_card_codes(card_name, atom:true)) + "</nospellcheck>" }
+		) +
 		tag_contents@(
 			tag: "<atom-legname>",
-			contents: { "<nospellcheck>" + (if card_name=="" then "LEGENDNAME" else legend_filter(card_name)) + "</nospellcheck>" }
-			) +
+			contents: { "<nospellcheck>" + (if card_name=="" then "LEGENDNAME" else legend_filter(strip_card_codes(card_name, atom:true))) + "</nospellcheck>" }
+		) +
+		replace@(
+			match: "INS([1-9])",
+			in_context: "(^|[[:space:]]|\\(|,|\\.|:|“|\"|'|‘|/|​)<match>",
+			replace: "<atom-insert\\1></atom-insert\\1>"
+		) +
+		{
+			out := input
+			for x from 1 to inserts_count() do
+				out := tag_contents(out,
+					tag: "<atom-insert"+x+">",
+					contents: { "<nospellcheck>" + (if inserts_values()[x-1] == "" then "INS"+x else inserts_values()[x-1]) + "</nospellcheck>" }
+				)
+			out
+		} +
 		# step 4 : explict non mana symbols
 		replace@(
-			match: "\\][HSATQXYZ∞WUBRGPLOEK0-9/|]+\\[",
+			match: "\\][-+=]?[VHSCATQXYZ∞WUBRGPK0-9/|]+\\[",
 			replace: {"<nosym>" + mana_filter_t() + "</nosym>"} ) +
-		# step 5 : add mana & tap symbols
+		#### step 5 : add mana & tap symbols
 		replace@(
-			match: "\\b[HSATQXYZ∞WUBRGPLOEK0-9/|]+\\b",
+			match: "(?<!\\/)([+=-][XYZ0-9|]+)(?!\\/)",
 			in_context: mana_context,
-			replace: {"<sym-auto>" + mana_filter_t() + "</sym-auto>"} ) +
-		# step 5b : add explict mana symbols
+			replace: {"<sym-auto>" + _1 + "</sym-auto>"}
+		) +
 		replace@(
-			match: "\\[[HSATQXYZ∞WUBRGPLOEK0-9/|]+\\]",
-			replace: {"<sym>" + mana_filter_t() + "</sym>"} ) +
+			match: "\\b((TK)+)(T)?\\b",
+			in_context: mana_context,
+			replace: {"<sym-auto>" + _1 + "</sym-auto>" + _3}
+		) +
+		replace@(
+			match: "\\b[VHSCATQXYZ∞WUBRGPK0-9/|]+\\b",
+			in_context: mana_context,
+			replace: {"<sym-auto>" + mana_filter_t() + "</sym-auto>"}
+		) +
+		#### step 5b : remove false positive mana & tap symbols
+		replace@(
+			match: "<sym-auto>([VHSCATQXYZ∞WUBRGPK0-9/|]+)</sym-auto>",
+			in_context: mana_un_context,
+			replace: "\\1"
+		) +
+		#### step 5c : add explicit mana symbols
+		replace@(
+			match: "\\[[-+=]?[VHSCATQXYZ∞WUBRGPK0-9/|]+\\]",
+			replace: {"<sym>" + mana_filter_t() + "</sym>"}
+		) +
 		# step 6a : curly double quotes
 		replace@(
 			match: "[[.quotation-mark.]]|”",
@@ -422,21 +511,43 @@
 		 	match: "[(]([^)\n]|[(][^)\n]*[)])*[)]?",
 			in_context: "(^|[[:space:]])<match>|<atom-keyword><match></",
 		 	replace: "<i-auto>&</i-auto>") +
-		# step 8 : automatic capitalization, but not after "("
+		#### step 7b : indent bullets
 		replace@(
-			match: "([ ]*: |—| — )" # preceded by this
-			     + "([[:lower:]])" # match this
-			     + "(?![)])",      # not followed by this
-			replace: { _1 + to_upper(_2) }) +
-		#curly_quotes +
-		# step 9 : spellcheck
-		{ if set.mark_errors then
+			match: "^(• |[+] ?)([^\n]+\n?)",
+			replace: {"<li><bullet>" + _1 + "</bullet>" + _2 + "</li>"}
+		) +
+		#### step 7c : clean up modals
+		{
+			if is_modal(input)
+				then bump_text(softline_ripper(input))
+			else input
+		} +
+		#### step 8 : automatic capitalization, but not after "("
+		#replace@(
+		#	match: "([ ]*: |—| — )" #### preceded by this
+		#	     + "([[:lower:]])"  #### match this
+		#	     + "(?![)])",       #### not followed by this
+		#	replace: { _1 + to_upper(_2) }) +
+		#### step 9 : spellcheck
+		{
+			if set.auto_correct then
+				auto_correct(input)
+			else input
+		} +
+		{
+			if set.auto_errata then
+				auto_errata(input)
+			else input
+		} +
+		{
+			if language().code == "ja" or language().code == "zht" or language().code == "zhs" then input
+			else if set.mark_errors then
 			check_spelling(
 				language: language().spellcheck_code,
-				extra_dictionary: "/magic.mse-game/magic-words",
+				extra_dictionary: "/magic.mse-game/dictionary/magic-words",
 				extra_match: additional_text_words
 			)
-		  else input
+			else input
 		}
 	
 	############################################################## Other boxes

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

@@ -6,7 +6,7 @@ icon: card-sample.png
 installer group: magic/m15 style/normal cards/udelude
 position hint: 050
 
-version: 2018-02-09
+version: 2024-06-06
 depends on:
 	package: magic.mse-game
 	version: 2015-04-08
@@ -22,6 +22,10 @@ depends on:
 depends on:
 	package: magic-pt-symbols-extra-m15.mse-symbol-font
 	version: 2014-03-20
+depends on:
+	package: magic-modules.mse-include
+	version: 2024-05-20
+
 
 card width: 375
 card height: 523
@@ -49,13 +53,28 @@ init script:
 	#Should multicolor lands with basic land types have a colored name?
 	mask_multi_land_with_color := { contains(styling.regular_options, match:"colored multicolor land names") }
 	
-	template_prefix := [card: "" card2: "" pt: "" stamp: "" identity: ""]
-	template_suffix := [card: "card.jpg" card2: "card2.jpg" pt: "pt.png" stamp: "stamp.jpg" identity: "identity.png"]
+	template_prefix := [
+		card: ""
+		card2: ""
+		pt: ""
+		stamp: "stamps/"
+		ubstamp: "ubstamps/"
+		identity: ""
+	]
+	template_suffix := [
+		card: "card.jpg"
+		card2: "card2.jpg"
+		pt: "pt.png"
+		stamp: "stamp.png"
+		ubstamp: "stamp.png"
+		identity: "identity.png"
+	]
 	template      := { template_prefix[type] + input + template_suffix[type] }
 	land_template := { template_prefix[type] + (if input == "a" or input == "s" then "c" else input) + "l" + template_suffix[type] }
 	# Use land templates for previews because they show more contrast
 	hybrid_previews := "land,hybrid"
-	
+	card_ubstamp := { color_background(type:"ubstamp",	base_hybrid:stamp_hybrid) }
+
 	# Use the normal tap symbol
 	mana_t := {
 		if      styling.tap_symbol == "old"        then "old"
@@ -134,11 +153,9 @@ styling field:
 	name: regular options
 	description: Which regular styling options would you like to use?
 	choice: center text
-	choice: color indicator dot
 	choice: colored multicolor land names
 	choice: grey hybrid names
 	choice: guild mana symbols
-	choice: holofoil stamped rares
 	choice: promo rarity
 	choice: inverted common symbol
 	choice: remove from autocount
@@ -262,6 +279,10 @@ styling style:
 		render style: checklist
 		direction: vertical
 ############################################################## Card fields
+include file: /magic-modules.mse-include/corners/card_fields
+include file: /magic-modules.mse-include/information/card_fields
+include file: /magic-modules.mse-include/stamps/card_fields
+include file: /magic-modules.mse-include/separators/card_fields
 card style:
 	############################# Background stuff
 	############################# Name line
@@ -301,15 +322,15 @@ card style:
 	card symbol:
 		left:
 			{if card.card_symbol == "none" then 20
-			else if card.type_symbol == "none" or not contains(styling.extras, match:"type symbol with name") then 30
+			else if card.type_symbol == "none" or not contains(styling.extras, match:"type symbol with name") then 26
 			else 50}
 		top: {if card.card_symbol == "none" then 40 else 29}
-		height: 20
-		width: 14
+		height: 21
+		width: 23
 		z index: 1
 		render style: image
-		choice images:
-			tombstone: tombstone.png
+		include file:		/magic.mse-game/card-symbols/menu_choice_images
+		image:				{ card_symbol_image(face: 1) }
 	type symbol:
 		left: {if card.type_symbol == "none" or not contains(styling.extras, match:"type symbol with name") then 18 else 27}
 		top: {if card.type_symbol == "none" or not contains(styling.extras, match:"type symbol with name") then 20 else 30}
@@ -342,7 +363,7 @@ card style:
 		top: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).1 else "0"}
 		width: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).2 else "0"}
 		height: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).3 else "0"}
-		z index: 1
+		z index: 1010
 	############################# Card type
 	indicator:
 		left: 31
@@ -375,21 +396,7 @@ card style:
 		z index: 2
 		render style: image
 		alignment: middle right
-		choice images:
-			# Images based on the set symbol
-			basic land:
-				script:
-					if contains(styling.regular_options, match:"inverted common symbol") then symbol_variation(symbol: set.symbol, variation: "invertedcommon")
-					else symbol_variation(symbol: set.symbol, variation: "common")
-			common:
-				script:
-					if contains(styling.regular_options, match:"inverted common symbol") then symbol_variation(symbol: set.symbol, variation: "invertedcommon")
-					else symbol_variation(symbol: set.symbol, variation: "common")
-			uncommon:   script: symbol_variation(symbol: set.symbol, variation: "uncommon")
-			rare:       script: symbol_variation(symbol: set.symbol, variation: "rare")
-			mythic rare:       script: symbol_variation(symbol: set.symbol, variation: "mythic rare")
-			special:    script: symbol_variation(symbol: set.symbol, variation: "special")
-			masterpiece: script: symbol_variation(symbol: set.masterpiece_symbol, variation: "mythic rare")
+		include file: /magic-modules.mse-include/rarities/choice_images
 	############################# Text box
 	text:
 		left: 29
@@ -436,59 +443,7 @@ card style:
 			name: {styling.pt_box_symbols}
 			size: 8
 			alignment: middle right
-	############################# Card sorting / numbering
-	set code:
-		left: 24
-		top: 498
-		width: 40
-		height: 10
-		z index: 1
-		font:
-			name: Relay-Medium
-			size: 7
-			color: white
-			weight: bold
-	############################# Copyright stuff
-	illustrator:
-		left: { 44 + card_style.set_code.content_width }
-		top: 497.5
-		width: 200
-		height: 10
-		z index: 1
-		font:
-			name: Beleren Small Caps Bold
-			size: 7.5
-			color: white
-	copyright:
-		right: 350
-		top: { if card.pt != "" then 500 else 488 }
-		width: 140
-		height: 10
-		z index: 2
-		visible: {not set.automatic_copyright}
-		alignment: middle right shrink-overflow
-		font:
-			name: Matrix
-			size: 7
-			color: white
-			weight: bold
 ############################################################## Extra card fields
-extra card field:
-	type: text
-	name: card code
-	save value: false
-	script:
-		if set.automatic_card_numbers and not is_unsorted() then
-			forward_editor(prefix: card_number_m15() + "/" + card_count_m15() + " " + rarity_code() + " ", field: card.card_code_text)
-		else
-			combined_editor(field1: card.custom_card_number, separator: " " + rarity_code() + " ", field2: card.card_code_text)
-extra card field:
-	type: choice
-	name: artist arrow
-	editable: false
-	save value: false
-	choice: white
-	save value: false
 extra card field:
 	type: multiple choice
 	name: stamp
@@ -575,12 +530,6 @@ 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: choice
-	name: foil stamp
-	choice: stamp
-	save value: false
-	editable: false
 extra card field:
 	type: choice
 	name: foil layer
@@ -676,42 +625,16 @@ extra card field:
 	save value: false
 	editable: false
 	script: "runes"
-extra card field:
-	type: text
-	name: auto copyright
-	script: set.copyright
-	save value: false
-	editable: false
-	show statistics: false
 extra card style:
-	card code:
-		left: 24
-		top: 488
-		width: 120
-		height: 10
-		z index: 1
-		font:
-			name: Relay-Medium
-			size: 7
-			color: white
-			weight: bold
-	artist arrow:
-		left: { 28 + card_style.set_code.content_width }
-		top: 500
-		width: 12
-		height: 7
-		z index: 1
-		render style: image
-		image: artist_arrow.png
 	stamp:
-		left: 165
-		top: 472
-		width: 46
+		left: 159
+		top: 471
+		width: 56
 		height: 26
 		z index: 1
-		visible: { is_rare() and contains(styling.regular_options, match:"holofoil stamped rares") }
+		visible: { card.card_stamp != "none" and not card_stamp_disabled_1() }
 		render style: image
-		image: { card_stamp() }
+		image: { if stamp_shape() == "triangle" then card_ubstamp() else card_stamp() }
 	pt box:
 		left: 273
 		top: 466
@@ -721,21 +644,12 @@ extra card style:
 		visible: { card.pt != "" }
 		render style: image
 		image: { card_ptbox() }
-	foil stamp:
-		left: 165
-		top: 472
-		width: 46
-		height: 26
-		z index: 1
-		visible: { is_rare() and contains(styling.regular_options, match:"holofoil stamped rares") }
-		render style: image
-		image: foil_stamp.png
 	foil layer:
 		left: 0
 		top : 0
 		width: 375
 		height: 523
-		z index: 3
+		z index: 1050
 		render style: image
 		image: {if styling.overlay == "" then nil else styling.overlay + "/overlay.png"}
 		mask: { if is_rare() then "masks/foil_mask_rare.png" else "masks/foil_mask.png" }
@@ -831,16 +745,3 @@ extra card style:
 		image: runes.png
 		visible: { contains(styling.extras, match: "runes") }
 		mask: masks/rune_mask.png
-	auto copyright:
-		right: 350
-		top: { if card.pt != "" then 500 else 488 }
-		width: 140
-		height: 10
-		z index: 2
-		alignment: middle right shrink-overflow
-		visible: {set.automatic_copyright}
-		font:
-			name: Matrix
-			size: 7
-			color: white
-			weight: bold