From 88dedfd77d287dde0097483b657f697cffc29fdc Mon Sep 17 00:00:00 2001
From: cajun <kajunkittyavenger@gmail.com>
Date: Sun, 19 Nov 2023 16:07:45 -0600
Subject: [PATCH] symbol font updates

Fix #22
Fix white_text/v_mana_loc errors on sister games
---
 .../symbol-font                               | 12 +++---
 data/planechase.mse-game/game                 |  3 +-
 data/saga.mse-game/game                       | 37 ++++++++++++++++++
 data/space.mse-game/script                    | 11 ++++++
 data/space.mse-game/set_fields                | 27 +++++++++++++
 data/vanguard.mse-game/game                   | 38 +++++++++++++++++++
 6 files changed, 121 insertions(+), 7 deletions(-)

diff --git a/data/magic-mana-small.mse-symbol-font/symbol-font b/data/magic-mana-small.mse-symbol-font/symbol-font
index 9f7d947ac..5ad9fbfd3 100644
--- a/data/magic-mana-small.mse-symbol-font/symbol-font
+++ b/data/magic-mana-small.mse-symbol-font/symbol-font
@@ -223,7 +223,7 @@ symbol:
 ###################################################################################### Loyalty Symbols
 symbol:
 	image: empty_loyaltyup_w.png
-	code: ([+][XYZ1-9])
+	code: ([+][XYZ1-9][0-9]?)
 	regex: yes
 	draw text: 1
 	text margin left:   -.10
@@ -239,7 +239,7 @@ symbol:
 	enabled: {white_text()}
 symbol:
 	image: empty_loyaltydown_w.png
-	code: ([-][XYZ1-9])
+	code: ([-][XYZ1-9][0-9]?)
 	regex: yes
 	draw text: 1
 	text margin left:   -.10
@@ -255,7 +255,7 @@ symbol:
 	enabled: {white_text()}
 symbol:
 	image: empty_loyaltynaught_w.png
-	code: [+=]([0-9XYZ])
+	code: [+=]([0-9XYZ][0-9]?)
 	regex: yes
 	draw text: 1
 	text margin left:   -.10
@@ -271,7 +271,7 @@ symbol:
 	enabled: {white_text()}
 symbol:
 	image: empty_loyaltyup.png
-	code: ([+][XYZ1-9])
+	code: ([+][XYZ1-9][0-9]?)
 	regex: yes
 	draw text: 1
 	text margin left:   -.10
@@ -286,7 +286,7 @@ symbol:
 	image font size: 100
 symbol:
 	image: empty_loyaltydown.png
-	code: ([-][XYZ1-9])
+	code: ([-][XYZ1-9][0-9]?)
 	regex: yes
 	draw text: 1
 	text margin left:   -.10
@@ -301,7 +301,7 @@ symbol:
 	image font size: 100
 symbol:
 	image: empty_loyaltynaught.png
-	code: [+=]([0-9XYZ])
+	code: [+=]([0-9XYZ][0-9]?)
 	regex: yes
 	draw text: 1
 	text margin left:   -.10
diff --git a/data/planechase.mse-game/game b/data/planechase.mse-game/game
index 9d6e46776..34e130133 100644
--- a/data/planechase.mse-game/game
+++ b/data/planechase.mse-game/game
@@ -270,6 +270,7 @@ init script:
 	}
 	card_shape := { "plane card" }
 	is_nom := {card.supertype == "Phenomenon"}
+
 	ancestral_mana := {"false"}
 	use_v_mana := {contains(set.custom_mana_symbol_name, match:".png")}
 	use_large_v_mana := { use_v_mana() and contains(set.mana_symbol_options, match:"casting")}
@@ -278,7 +279,7 @@ init script:
 	use_hybrid_v_mana := { use_v_mana() and contains(set.mana_symbol_options, match:"hybrid")}
 	v_mana_name := {if not use_v_mana() then "" else replace(set.custom_mana_symbol_name, match:"(.+/|\\.png)", replace:"")}
 	v_mana_loc := {if not use_v_mana() then "" else replace(set.custom_mana_symbol_name, match:"{v_mana_name()}\\.png", replace:"")}
-
+	white_text := {false}
 ############################################################## Set fields
 set field:
 	type: info
diff --git a/data/saga.mse-game/game b/data/saga.mse-game/game
index 270587405..3a8f5d1f1 100644
--- a/data/saga.mse-game/game
+++ b/data/saga.mse-game/game
@@ -258,6 +258,17 @@ init script:
 	# Common errors on cards; can be replaced by style
 	has_error := { contains(card.rule_text, match:"<error-spelling") or contains(card.name, match:"[[.quotation-mark.]]") or to_lower(card.name) == card.name or card.copyright == "" or card.subtype == "" or card.illustrator == "" or contains(card.rule_text, match:"^[\n]") or contains(card.rule_text, match:"[[A-Z,a-z,0-9 ]*[\n]]") }
 	
+	# Mana font scripts
+	ancestral_mana := {false}
+	use_v_mana := {contains(set.custom_mana_symbol_name, match:".png")}
+	use_large_v_mana := { use_v_mana() and contains(set.mana_symbol_options, match:"casting")}
+	use_small_v_mana := { use_v_mana() and contains(set.mana_symbol_options, match:"text")}
+	use_color_v_mana := { use_v_mana() and contains(set.mana_symbol_options, match:"colored") and not use_hybrid_v_mana()}
+	use_hybrid_v_mana := { use_v_mana() and contains(set.mana_symbol_options, match:"hybrid")}
+	v_mana_name := {if not use_v_mana() then "" else replace(set.custom_mana_symbol_name, match:"(.+/|\\.png)", replace:"")}
+	v_mana_loc := {if not use_v_mana() then "" else replace(set.custom_mana_symbol_name, match:"{v_mana_name()}\\.png", replace:"")}
+	white_text := {false}
+
 ############################################################## Set fields
 set field:
 	type: info
@@ -322,6 +333,32 @@ set field:
 	type: boolean
 	name: mark errors
 	description: Marks errors on cards, for example wording and spelling errors, non unique card names, etc.
+set field:
+	type: text
+	name: custom mana symbol name
+	description: Use mana symbols from magic-mainframe-extras.mse-include. Input NAME.png here, check help below for file instructions.
+set field:
+	type: multiple choice
+	name: mana symbol options
+	choice: enable in casting costs
+	choice: enable in text boxes
+	choice: colored mana symbols
+	choice: hybrid with colors
+set field:
+	type: choice
+	name: mana symbol help
+	choice: Click here for mana symbol help!
+	choice: In your mainframe-extrasfolder, create folders named "large" and/or "small" depending on your usage
+	choice: Large is for only mana costs, small for only text, create both if you use both
+	choice: Additionally, you can create a "future" folder for M15 Future mana costs
+	choice: Save NAME.png to the relevant folders. Remember that large symbols have dropshadows
+	choice: For the name option above, set the address of the image, minus mainframe-extras and large/small/future
+	choice: Ex: magic-mainframe-extras/cajun/large/hazard.png would use cajun/hazard.png
+	choice: Standard size is 160x160 for small, 200x200 for small hybrid and future, 165x178 for large, 205x218 for large hybrid
+	choice: If your symbol mixes with colors (such as Phyrexian mana): Save NAME_w.png, NAME_u.png, etc to those folders too.
+	choice: If your symbol hybrids with colors (like 2/W): [Note, doesn't work on M15 Future mana costs.]
+	choice: Save NAME_h.png to those folders too. See mana_bb.png and similar for how this image should look.
+	choice: Your mana symbol will now be keyed to V (and V/W, V/U, etc. for colored/hybrid symbols).
 ############################# Default style
 default set style:
 	title:
diff --git a/data/space.mse-game/script b/data/space.mse-game/script
index c076b071d..3e6410bab 100644
--- a/data/space.mse-game/script
+++ b/data/space.mse-game/script
@@ -470,3 +470,14 @@ primary_card_color := {
 }
 
 word_count := break_text@(match:"[^[:space:]]+") + length
+
+# Mana font scripts
+ancestral_mana := {false}
+use_v_mana := {contains(set.custom_mana_symbol_name, match:".png")}
+use_large_v_mana := { use_v_mana() and contains(set.mana_symbol_options, match:"casting")}
+use_small_v_mana := { use_v_mana() and contains(set.mana_symbol_options, match:"text")}
+use_color_v_mana := { use_v_mana() and contains(set.mana_symbol_options, match:"colored") and not use_hybrid_v_mana()}
+use_hybrid_v_mana := { use_v_mana() and contains(set.mana_symbol_options, match:"hybrid")}
+v_mana_name := {if not use_v_mana() then "" else replace(set.custom_mana_symbol_name, match:"(.+/|\\.png)", replace:"")}
+v_mana_loc := {if not use_v_mana() then "" else replace(set.custom_mana_symbol_name, match:"{v_mana_name()}\\.png", replace:"")}
+white_text := {false}
diff --git a/data/space.mse-game/set_fields b/data/space.mse-game/set_fields
index fd9f6d41a..92824aa88 100644
--- a/data/space.mse-game/set_fields
+++ b/data/space.mse-game/set_fields
@@ -80,6 +80,33 @@ set field:
 	choice: no
 	description: Use gradients on multicolor cards by default, you can always change it be clicking on the card border.
 	initial: no
+set field:
+	type: text
+	name: custom mana symbol name
+	description: Use mana symbols from magic-mainframe-extras.mse-include. Input NAME.png here, check help below for file instructions.
+set field:
+	type: multiple choice
+	name: mana symbol options
+	choice: enable in casting costs
+	choice: enable in text boxes
+	choice: colored mana symbols
+	choice: hybrid with colors
+set field:
+	type: choice
+	name: mana symbol help
+	choice: Click here for mana symbol help!
+	choice: In your mainframe-extrasfolder, create folders named "large" and/or "small" depending on your usage
+	choice: Large is for only mana costs, small for only text, create both if you use both
+	choice: Additionally, you can create a "future" folder for M15 Future mana costs
+	choice: Save NAME.png to the relevant folders. Remember that large symbols have dropshadows
+	choice: For the name option above, set the address of the image, minus mainframe-extras and large/small/future
+	choice: Ex: magic-mainframe-extras/cajun/large/hazard.png would use cajun/hazard.png
+	choice: Standard size is 160x160 for small, 200x200 for small hybrid and future, 165x178 for large, 205x218 for large hybrid
+	choice: If your symbol mixes with colors (such as Phyrexian mana): Save NAME_w.png, NAME_u.png, etc to those folders too.
+	choice: If your symbol hybrids with colors (like 2/W): [Note, doesn't work on M15 Future mana costs.]
+	choice: Save NAME_h.png to those folders too. See mana_bb.png and similar for how this image should look.
+	choice: Your mana symbol will now be keyed to V (and V/W, V/U, etc. for colored/hybrid symbols).
+
 ############################# Default style
 default set style:
 	title:
diff --git a/data/vanguard.mse-game/game b/data/vanguard.mse-game/game
index 98c1bc292..db12e6662 100644
--- a/data/vanguard.mse-game/game
+++ b/data/vanguard.mse-game/game
@@ -203,6 +203,17 @@ init script:
 	word_count := break_text@(match:"[^[:space:]]+") + length
 	line_count := split_text@(match:"\n+",include_empty:false) + length
 	
+	# Mana font scripts
+	ancestral_mana := {false}
+	use_v_mana := {contains(set.custom_mana_symbol_name, match:".png")}
+	use_large_v_mana := { use_v_mana() and contains(set.mana_symbol_options, match:"casting")}
+	use_small_v_mana := { use_v_mana() and contains(set.mana_symbol_options, match:"text")}
+	use_color_v_mana := { use_v_mana() and contains(set.mana_symbol_options, match:"colored") and not use_hybrid_v_mana()}
+	use_hybrid_v_mana := { use_v_mana() and contains(set.mana_symbol_options, match:"hybrid")}
+	v_mana_name := {if not use_v_mana() then "" else replace(set.custom_mana_symbol_name, match:"(.+/|\\.png)", replace:"")}
+	v_mana_loc := {if not use_v_mana() then "" else replace(set.custom_mana_symbol_name, match:"{v_mana_name()}\\.png", replace:"")}
+	white_text := {false}
+
 ############################################################## Set fields
 set field:
 	type: info
@@ -259,6 +270,33 @@ set field:
 	name: automatic card numbers
 	initial: no
 	description: Should card numbers be shown on the cards?
+set field:
+	type: text
+	name: custom mana symbol name
+	description: Use mana symbols from magic-mainframe-extras.mse-include. Input NAME.png here, check help below for file instructions.
+set field:
+	type: multiple choice
+	name: mana symbol options
+	choice: enable in casting costs
+	choice: enable in text boxes
+	choice: colored mana symbols
+	choice: hybrid with colors
+set field:
+	type: choice
+	name: mana symbol help
+	choice: Click here for mana symbol help!
+	choice: In your mainframe-extrasfolder, create folders named "large" and/or "small" depending on your usage
+	choice: Large is for only mana costs, small for only text, create both if you use both
+	choice: Additionally, you can create a "future" folder for M15 Future mana costs
+	choice: Save NAME.png to the relevant folders. Remember that large symbols have dropshadows
+	choice: For the name option above, set the address of the image, minus mainframe-extras and large/small/future
+	choice: Ex: magic-mainframe-extras/cajun/large/hazard.png would use cajun/hazard.png
+	choice: Standard size is 160x160 for small, 200x200 for small hybrid and future, 165x178 for large, 205x218 for large hybrid
+	choice: If your symbol mixes with colors (such as Phyrexian mana): Save NAME_w.png, NAME_u.png, etc to those folders too.
+	choice: If your symbol hybrids with colors (like 2/W): [Note, doesn't work on M15 Future mana costs.]
+	choice: Save NAME_h.png to those folders too. See mana_bb.png and similar for how this image should look.
+	choice: Your mana symbol will now be keyed to V (and V/W, V/U, etc. for colored/hybrid symbols).
+
 ############################# Default style
 default set style:
 	title: