3.1.0 final touches

changelog.txt

@@ -76,11 +76,7 @@ Thanks to GenevensiS for his continued work on keeping up with the Showcases!
 • Added Sam Boosalis's Big Text frame
 
 __Other Updates__
-<<<<<<< main
-• Updated types and keywords to Teenage Mutant Ninja Turtles
-=======
 • Updated types and keywords to Secrets of Strixhaven
->>>>>>> main
 • Aanginer has improved the Inverted+Borderless+Frameless template to better replicate the Secret Lair frame.
 • GenevensiS has updated the Mystical Archive frame with the new PT box and an alternate black backing. The old PT can be used with PT color scheme set to Flat.
 • Added word_lists_linux as a workaround for Linux users having issues with generated word_lists.
@@ -99,6 +95,7 @@ __Template Code Updates__
 
 __Bug Fixes__
 • Fixed a bug where UB Sagas were too dark.
+• Fixed a bug where hybrid alias was broken on Mainframe Planeswalkers.
 • Fixed a bug where hybrid Adventure pages were blending incorrectly.
 • Fixed a bug where the Hybrid Name option wasn't functional.
 • Fixed a bug where the Set tab Inverted Common Symbol wasn't working on most frames.

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

@@ -410,6 +410,21 @@ init script:
 			multicolor_blend: "black"
 		)
 	}
+
+	alias_colors := {
+		if is_clear() then rgba(200, 200, 200, 80) else 
+		[
+			w: rgb(255, 255, 255),
+			u: rgb(0, 131, 197),
+			b: rgb(39, 38, 36),
+			r: rgb(239, 64, 31),
+			g: rgb(0, 128, 69),
+			a: rgb(255, 255, 255),
+			m: rgb(243, 210, 105),
+			c: rgb(255, 255, 255)
+		][input]
+	}
+
 ############################################################## Set info fields
 set info style:
 	symbol:
@@ -627,7 +642,7 @@ card style:
 			color: black
 	alias: 
 		left: {if is_skinned() then 45 else 36}
-		top: 47
+		top: 48
 		width: {if is_skinned() then 285 else if use_evobar() then max(100, card_style.alias.content_width) else 0}
 		height: 20
 		alignment: { (if is_skinned() then "center") + "bottom shrink-overflow"}
@@ -1526,14 +1541,14 @@ extra card style:
 		visible: {styling.opacity != ""}
 	alias bar:
 		left: 34
-		top: 49
+		top: {if is_clear() then 51 else 50}
 		width: 307
 		height: 24
 		z index: 880
 		render style: image
-		image: {if is_clear() then "alias/xalias.png" else alias_bar()}
+		image: {module_alias()}
 		visible: {is_skinned() and not use_evobar()}
-
+		mask: alias_mask.png
 	evobar:
 		left: 40
 		top: 51

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

@@ -51,8 +51,20 @@ init script:
 		ubstamp: "stamp.png"
 		identity: "identity.png"
 	]
-	template      := { template_prefix[type] + input + template_suffix[type] }
-	land_template := { template_prefix[type] + (if input == "a" then "c" else input) + "l" + template_suffix[type] }
+	template := { 
+		if type_name(harder_script[type] or else nil) != type_name(nil)
+			then harder_script[type](input, land:false)
+		else template_prefix[type] + input + template_suffix[type]
+	}
+	land_template := {
+		if type_name(harder_script[type] or else nil) != type_name(nil)
+			then harder_script[type](input, land:true)
+		else template_prefix[type] + input + (if input == "a" then "" else "l") + template_suffix[type]
+	}
+
+	harder_script := [
+		crown: module_crown_template
+	]
 	# Use land templates for previews because they show more contrast
 	hybrid_previews := "land,hybrid"
 
@@ -140,6 +152,7 @@ styling field:
 	description: Should there be an overlay applied, such as foil?
 	match: magic-overlay-*.mse-include
 	required: false
+include file: /magic-modules.mse-include/crowns/styling_fields
 styling style:
 	use guild mana symbols:
 		choice images:
@@ -167,6 +180,7 @@ include file: /magic-modules.mse-include/information/card_fields
 include file: /magic-modules.mse-include/card-symbols/card_fields
 include file: /magic-modules.mse-include/stamps/card_fields
 include file: /magic-modules.mse-include/stamps/stamp_back
+include file: /magic-modules.mse-include/crowns/card_fields
 card style:
 	############################# Background stuff
 	border color:
@@ -180,7 +194,7 @@ card style:
 		top width:    17
 		bottom width: 18
 		z index: 4
-		mask: border_mask.png
+		mask: { if not crown_disabled_1() then "crown_border.png" else "border_mask.png" }
 	card color:
 		left:	0
 		top:	0
@@ -198,7 +212,7 @@ card style:
 		height: 23
 		alignment: bottom shrink-overflow
 		padding bottom: 0
-		z index: 1
+		z index: 900
 		font:
 			name: Beleren Bold
 			size: 16
@@ -217,7 +231,7 @@ card style:
 			size: 15
 			alignment: middle right
 		always symbol: true
-		z index: 2
+		z index: 910
 		padding top: 0
 	############################# Image
 	image:
@@ -232,7 +246,7 @@ card style:
 		top: 332
 		width: 17
 		height: 17
-		z index: 3
+		z index: 920
 		render style: image
 		visible: { has_identity() and styling.visible_text}
 		image: { module_identity() }
@@ -243,7 +257,7 @@ card style:
 		height: 20
 		visible: {styling.visible_text}
 		alignment: top shrink-overflow
-		z index: 3
+		z index: 900
 		padding top: 2
 		font:
 			name: Beleren Bold
@@ -258,7 +272,7 @@ card style:
 		top: 329
 		width: 44
 		height: 22
-		z index: 3
+		z index: 720
 		render style: image
 		alignment: middle right
 		visible: {styling.visible_text}
@@ -290,7 +304,7 @@ card style:
 				   styling.center_text == "always"
 				then "middle center"
 				else "middle left"
-		z index: 4
+		z index: 900
 		padding left:   6
 		padding right:  4
 		line height hard: 1.2
@@ -304,15 +318,15 @@ card style:
 		top: 328
 		width: 331
 		height: 142
-		z index: 3
+		z index: 710
 		render style: image
 		popup style: in place
 		alignment: middle center
 		include file:	/magic.mse-game/watermarks/menu_choice_images
 		image:			{ watermark_image_1() }
 	############################# PT
 	pt:
-		z index: 4
+		z index: 900
 		left: 286
 		top: 469
 		width: 60

data/magic-modules.mse-include/crowns/readme.txt

@@ -6,10 +6,10 @@ depends on:
 #### Add this, unindented in the styling fields section:
 include file: /magic-modules.mse-include/crowns/styling_fields
 #### And this, unindented, before the card style section:
-include file: /magic-modules.mse-include/corners/card_fields
+include file: /magic-modules.mse-include/crowns/card_fields
 #### For DFC or TFC templates, instead override the faces_coordinates function, and use:
-include file: /magic-modules.mse-include/corners/card_fields_dfc
-include file: /magic-modules.mse-include/corners/card_fields_tfc
+include file: /magic-modules.mse-include/crowns/card_fields_dfc
+include file: /magic-modules.mse-include/crowns/card_fields_tfc
 
 #### Finally, the template script must be adjusted like so:
 

data/magic-xml.mse-export-template/export-template

@@ -34,6 +34,7 @@ option field:
 
 script:
 	MSEcard := {"  
card>\n"
+			+"    
index>"+to_text(position(of:card, in:set))+"
/index>\n"
 			+"    
name>"+to_text(card.name)+"
/name>\n"
 			+"    
cost>"+to_text(card.casting_cost)+"
/cost>\n"
 			+"    
type>\n"

data/magic.mse-game/keywords_en

@@ -2145,6 +2145,16 @@ keyword:
 #Marvel Superheroes
 keyword:
 	keyword: Power-up
-	match: Power-up — <atom-param>cost</atom-param>: <atom-param>action</atom-param>
+	match: Power-up — <atom-param>cost</atom-param>
 	mode: expert
 	reminder: Activate each power-up ability only once. Reduce the cost by {this_or_that("creature")}'s mana cost if it entered this turn.
+keyword:
+	keyword: Teamwork
+	match: Teamwork <atom-param>number</atom-param>
+	mode: expert
+	reminder: As an additional cost to cast this spell, you may tap any number of creatures you control with total power {param1} or more.
+keyword:
+	keyword: worthy
+	match: worthy
+	mode: expert
+	reminder: A creature is worthy if it's a legendary non-Villain that's red and/or white.

data/magic.mse-game/script

@@ -33,7 +33,7 @@ include file: language
 include file: statistics_script
 include file: /magic-blends.mse-include/new-blends
 ############################################################## Versioning
-version_date := {"2025-02-01 Template Pack 3.1.e: Mainframe Battles - Prototype"}
+version_date := {"2025-02-01 Template Pack 3.1.0: Mainframe Battles"}
 version := version_date
 ############################################################## Common filters
 ############################################################## Utility