diff --git a/data/magic-blends.mse-include/blend-scripts b/data/magic-blends.mse-include/blend-scripts index 25c1d91f..55235a69 100644 --- a/data/magic-blends.mse-include/blend-scripts +++ b/data/magic-blends.mse-include/blend-scripts @@ -15,6 +15,10 @@ land_template := { input + "lcard.jpg" } card_template := { input + "card.jpg" } pt_template := { input + "pt.jpg" } pt2_template := { input + "pt2.jpg" } +typeline_template := { input + "typeline.png" } +typelineland_template := { input + "ltypeline.png" } +textbox_template := { input + "textbox.png" } +textboxland_template := { input + "ltextbox.png" } ######################################################################## # Hybrid blends @@ -77,19 +81,56 @@ card_hybrid_4 := { ) ) } -# 'star' 5 color hybrid +# 'star' 5 color hybrid, fixed for 6 colors card_hybrid_5 := { card_hybrid_nt( linear_blend( image1: linear_blend( - image1: card_hybrid("gb"), - image2: card_hybrid("wu"), + image1: card_hybrid(input[0] + input[1]), + image2: card_hybrid(input[2] + input[3]), x1: 0, y1: 0.19 x2: 0, y2: 0.35 ), - image2: card_template("r"), - x1: 0, y1: 0.677 - x2: 0, y2: 0.837 + image2: card_template(input[4]), + x1: 0, y1: 0.777 + x2: 0, y2: 0.937 + ) + ) +} +# 'star' 6 color hybrid +card_hybrid_6 := { + card_hybrid_nt( + linear_blend( + image1: linear_blend( + image1: card_hybrid(input[0] + input[1]), + image2: card_hybrid(input[2] + input[3]), + x1: 0, y1: 0.19 + x2: 0, y2: 0.35 + ), + image2: card_hybrid(input[4] + input[5]), + x1: 0, y1: 0.777 + x2: 0, y2: 0.937 + ) + ) +} +# 'star' 7 color hybrid +card_hybrid_7 := { + card_hybrid_nt( + linear_blend( + image1: linear_blend( + image1: linear_blend( + image1: card_hybrid(input[0] + input[1]), + image2: card_hybrid(input[2] + input[3]), + x1: 0, y1: 0.34 + x2: 0, y2: 0.50 + ), + image2: card_hybrid(input[4] + input[5]), + x1: 0, y1: 0.877 + x2: 0, y2: 0.937 + ), + image2: card_template(input[6]), + x1: 0, y1: 1.140 + x2: 0, y2: 1.300 ) ) } @@ -128,29 +169,87 @@ card_hybrid_4h := { ))) ) } -# horizontal 5 color hybrid +# horizontal 5 color hybrid, fixed for 6 colors card_hybrid_5h := { card_hybrid_nt( linear_blend( - image1: card_template("w") + image1: card_template(input[0]) x1: 2.0 / 15, y1: 0 x2: 4.0 / 15, y2: 0 image2: linear_blend( - image1: card_template("u") + image1: card_template(input[1]) x1: 5.0 / 15, y1: 0 x2: 7.0 / 15, y2: 0 image2: linear_blend( - image1: card_template("b") + image1: card_template(input[2]) x1: 8.0 / 15, y1: 0 x2: 10.0 / 15, y2: 0 image2: linear_blend( - image1: card_template("r") + image1: card_template(input[3]) x1: 11.0 / 15, y1: 0 x2: 13.0 / 15, y2: 0 - image2: card_template("g") + image2: card_template(input[4]) )))) ) } +# horizontal 6 color hybrid +card_hybrid_6h := { + card_hybrid_nt( + linear_blend( + image1: card_template(input[0]) + x1: 1.5 / 15, y1: 0 + x2: 3.1 / 15, y2: 0 + image2: linear_blend( + image1: card_template(input[1]) + x1: 4.1 / 15, y1: 0 + x2: 5.7 / 15, y2: 0 + image2: linear_blend( + image1: card_template(input[2]) + x1: 6.7 / 15, y1: 0 + x2: 8.3 / 15, y2: 0 + image2: linear_blend( + image1: card_template(input[3]) + x1: 9.3 / 15, y1: 0 + x2: 10.9 / 15, y2: 0 + image2: linear_blend( + image1: card_template(input[4]) + x1: 11.9 / 15, y1: 0 + x2: 13.5 / 15, y2: 0 + image2: card_template(input[5]) + ))))) + ) +} +# horizontal 7 color hybrid +card_hybrid_7h := { + card_hybrid_nt( + linear_blend( + image1: card_template(input[0]) + x1: 1.3 / 15, y1: 0 + x2: 2.7 / 15, y2: 0 + image2: linear_blend( + image1: card_template(input[1]) + x1: 3.5 / 15, y1: 0 + x2: 4.9 / 15, y2: 0 + image2: linear_blend( + image1: card_template(input[2]) + x1: 5.7 / 15, y1: 0 + x2: 7.1 / 15, y2: 0 + image2: linear_blend( + image1: card_template(input[3]) + x1: 7.9 / 15, y1: 0 + x2: 9.3 / 15, y2: 0 + image2: linear_blend( + image1: card_template(input[4]) + x1: 10.1 / 15, y1: 0 + x2: 11.5 / 15, y2: 0 + image2: linear_blend( + image1: card_template(input[5]) + x1: 12.3 / 15, y1: 0 + x2: 13.7 / 15, y2: 0 + image2: card_template(input[6]) + )))))) + ) +} ######################################################################## # Multicolor blends @@ -180,9 +279,1098 @@ land_hybrid_2 := { ) ) } +land_hybrid_3 := { + card_hybrid_nt( + linear_blend( + image1: land_hybrid_2(input[0] + input[1]), + image2: land_template(input[2]), + x1: 0, y1: 0.55 + x2: 0, y2: 0.77 + ) + ) +} +# 'star' 4 color hybrid +land_hybrid_4 := { + card_hybrid_nt( + linear_blend( + image1: land_hybrid_2(input[0] + input[1]) + image2: land_hybrid_2(input[2] + input[3]) + x1: 0, y1: 0.4 + x2: 0, y2: 0.62 + ) + ) +} +# 'star' 5 color hybrid, fixed for 6 colors +land_hybrid_5 := { + card_hybrid_nt( + linear_blend( + image1: linear_blend( + image1: land_hybrid_2(input[0] + input[1]), + image2: land_hybrid_2(input[2] + input[3]), + x1: 0, y1: 0.19 + x2: 0, y2: 0.35 + ), + image2: land_template(input[4]), + x1: 0, y1: 0.777 + x2: 0, y2: 0.937 + ) + ) +} +# 'star' 6 color hybrid +land_hybrid_6 := { + card_hybrid_nt( + linear_blend( + image1: linear_blend( + image1: land_hybrid_2(input[0] + input[1]), + image2: land_hybrid_2(input[2] + input[3]), + x1: 0, y1: 0.19 + x2: 0, y2: 0.35 + ), + image2: land_hybrid_2(input[4] + input[5]), + x1: 0, y1: 0.777 + x2: 0, y2: 0.937 + ) + ) +} +# 'star' 7 color hybrid +land_hybrid_7 := { + card_hybrid_nt( + linear_blend( + image1: linear_blend( + image1: linear_blend( + image1: land_hybrid_2(input[0] + input[1]), + image2: land_hybrid_2(input[2] + input[3]), + x1: 0, y1: 0.34 + x2: 0, y2: 0.50 + ), + image2: land_hybrid_2(input[4] + input[5]), + x1: 0, y1: 0.877 + x2: 0, y2: 0.937 + ), + image2: land_template(input[6]), + x1: 0, y1: 1.140 + x2: 0, y2: 1.300 + ) + ) +} +# horizontal 3 color hybrid +land_hybrid_3h := { + card_hybrid_nt( + linear_blend( + image1: land_template(input[0]) + x1: 0.22, y1: 0 + x2: 0.4, y2: 0 + image2: linear_blend( + image1: land_template(input[1]) + x1: 0.6, y1: 0 + x2: 0.78, y2: 0 + image2: land_template(input[2]) + )) + ) +} +# horizontal 4 color hybrid +land_hybrid_4h := { + card_hybrid_nt( + linear_blend( + # blend = 0.16 + image1: land_template(input[0]) + x1: 0.15, y1: 0 + x2: 0.31, y2: 0 + image2: linear_blend( + image1: land_template(input[1]) + x1: 0.42, y1: 0 + x2: 0.58, y2: 0 + image2: linear_blend( + image1: land_template(input[2]) + x1: 0.69, y1: 0 + x2: 0.85, y2: 0 + image2: land_template(input[3]) + ))) + ) +} +# horizontal 5 color hybrid, fixed for 6 colors +land_hybrid_5h := { + card_hybrid_nt( + linear_blend( + image1: land_template(input[0]) + x1: 2.0 / 15, y1: 0 + x2: 4.0 / 15, y2: 0 + image2: linear_blend( + image1: land_template(input[1]) + x1: 5.0 / 15, y1: 0 + x2: 7.0 / 15, y2: 0 + image2: linear_blend( + image1: land_template(input[2]) + x1: 8.0 / 15, y1: 0 + x2: 10.0 / 15, y2: 0 + image2: linear_blend( + image1: land_template(input[3]) + x1: 11.0 / 15, y1: 0 + x2: 13.0 / 15, y2: 0 + image2: land_template(input[4]) + )))) + ) +} +# horizontal 6 color hybrid +land_hybrid_6h := { + card_hybrid_nt( + linear_blend( + image1: land_template(input[0]) + x1: 1.5 / 15, y1: 0 + x2: 3.1 / 15, y2: 0 + image2: linear_blend( + image1: land_template(input[1]) + x1: 4.1 / 15, y1: 0 + x2: 5.7 / 15, y2: 0 + image2: linear_blend( + image1: land_template(input[2]) + x1: 6.7 / 15, y1: 0 + x2: 8.3 / 15, y2: 0 + image2: linear_blend( + image1: land_template(input[3]) + x1: 9.3 / 15, y1: 0 + x2: 10.9 / 15, y2: 0 + image2: linear_blend( + image1: land_template(input[4]) + x1: 11.9 / 15, y1: 0 + x2: 13.5 / 15, y2: 0 + image2: land_template(input[5]) + ))))) + ) +} +# horizontal 7 color hybrid +land_hybrid_7h := { + card_hybrid_nt( + linear_blend( + image1: land_template(input[0]) + x1: 1.3 / 15, y1: 0 + x2: 2.7 / 15, y2: 0 + image2: linear_blend( + image1: land_template(input[1]) + x1: 3.5 / 15, y1: 0 + x2: 4.9 / 15, y2: 0 + image2: linear_blend( + image1: land_template(input[2]) + x1: 5.7 / 15, y1: 0 + x2: 7.1 / 15, y2: 0 + image2: linear_blend( + image1: land_template(input[3]) + x1: 7.9 / 15, y1: 0 + x2: 9.3 / 15, y2: 0 + image2: linear_blend( + image1: land_template(input[4]) + x1: 10.1 / 15, y1: 0 + x2: 11.5 / 15, y2: 0 + image2: linear_blend( + image1: land_template(input[5]) + x1: 12.3 / 15, y1: 0 + x2: 13.7 / 15, y2: 0 + image2: land_template(input[6]) + )))))) + ) +} ######################################################################## -# Power/thoughness boxes +# Multicolor blends for Typelines +######################################################################## + +# Make a hybrid blend into a multicolor blend +multi_hybrid_typeline := { + masked_blend( + mask: "multicolor_dual_blend_typeline.png", + dark: "mtypeline.png", + light: input, + ) +} + +######################################################################## +# Land blends for Typelines +######################################################################## + +land_hybrid_2_typeline := { + card_hybrid_nt_typeline( + linear_blend( + image1: typelineland_template(input[0]) + image2: typelineland_template(input[1]) + x1: 0.4, y1: 0 + x2: 0.6, y2: 0 + ) + ) +} +land_hybrid_3_typeline := { + card_hybrid_nt_typeline( + linear_blend( + image1: land_hybrid_2_typeline(input[0] + input[1]), + image2: typelineland_template(input[2]), + x1: 0, y1: 0.55 + x2: 0, y2: 0.77 + ) + ) +} +# 'star' 4 color hybrid +land_hybrid_4_typeline := { + card_hybrid_nt_typeline( + linear_blend( + image1: land_hybrid_2_typeline(input[0] + input[1]) + image2: land_hybrid_2_typeline(input[2] + input[3]) + x1: 0, y1: 0.4 + x2: 0, y2: 0.62 + ) + ) +} +# 'star' 5 color hybrid +land_hybrid_5_typeline := { + card_hybrid_nt_typeline( + linear_blend( + image1: linear_blend( + image1: land_hybrid_2_typeline(input[0] + input[1]), + image2: land_hybrid_2_typeline(input[2] + input[3]), + x1: 0, y1: 0.19 + x2: 0, y2: 0.35 + ), + image2: typelineland_template(input[4]), + x1: 0, y1: 0.777 + x2: 0, y2: 0.937 + ) + ) +} +# 'star' 6 color hybrid +land_hybrid_6_typeline := { + card_hybrid_nt_typeline( + linear_blend( + image1: linear_blend( + image1: land_hybrid_2_typeline(input[0] + input[1]), + image2: land_hybrid_2_typeline(input[2] + input[3]), + x1: 0, y1: 0.19 + x2: 0, y2: 0.35 + ), + image2: land_hybrid_2_typeline(input[4] + input[5]), + x1: 0, y1: 0.777 + x2: 0, y2: 0.937 + ) + ) +} +# 'star' 7 color hybrid +land_hybrid_7_typeline := { + card_hybrid_nt( + linear_blend( + image1: linear_blend( + image1: linear_blend( + image1: land_hybrid_2_typeline(input[0] + input[1]), + image2: land_hybrid_2_typeline(input[2] + input[3]), + x1: 0, y1: 0.34 + x2: 0, y2: 0.50 + ), + image2: land_hybrid_2_typeline(input[4] + input[5]), + x1: 0, y1: 0.877 + x2: 0, y2: 0.937 + ), + image2: typelineland_template(input[6]), + x1: 0, y1: 1.140 + x2: 0, y2: 1.300 + ) + ) +} +# horizontal 3 color hybrid +land_hybrid_3h_typeline := { + card_hybrid_nt_typeline( + linear_blend( + image1: typelineland_template(input[0]) + x1: 0.22, y1: 0 + x2: 0.4, y2: 0 + image2: linear_blend( + image1: typelineland_template(input[1]) + x1: 0.6, y1: 0 + x2: 0.78, y2: 0 + image2: typelineland_template(input[2]) + )) + ) +} +# horizontal 4 color hybrid +land_hybrid_4h_typeline := { + card_hybrid_nt_typeline( + linear_blend( + # blend = 0.16 + image1: typelineland_template(input[0]) + x1: 0.15, y1: 0 + x2: 0.31, y2: 0 + image2: linear_blend( + image1: typelineland_template(input[1]) + x1: 0.42, y1: 0 + x2: 0.58, y2: 0 + image2: linear_blend( + image1: typelineland_template(input[2]) + x1: 0.69, y1: 0 + x2: 0.85, y2: 0 + image2: typelineland_template(input[3]) + ))) + ) +} +# horizontal 5 color hybrid +land_hybrid_5h_typeline := { + card_hybrid_nt_typeline( + linear_blend( + image1: typelineland_template(input[0]) + x1: 2.0 / 15, y1: 0 + x2: 4.0 / 15, y2: 0 + image2: linear_blend( + image1: typelineland_template(input[1]) + x1: 5.0 / 15, y1: 0 + x2: 7.0 / 15, y2: 0 + image2: linear_blend( + image1: typelineland_template(input[2]) + x1: 8.0 / 15, y1: 0 + x2: 10.0 / 15, y2: 0 + image2: linear_blend( + image1: typelineland_template(input[3]) + x1: 11.0 / 15, y1: 0 + x2: 13.0 / 15, y2: 0 + image2: typelineland_template(input[4]) + )))) + ) +} +# horizontal 6 color hybrid +land_hybrid_6h_typeline := { + card_hybrid_nt( + linear_blend( + image1: typelineland_template(input[0]) + x1: 1.5 / 15, y1: 0 + x2: 3.1 / 15, y2: 0 + image2: linear_blend( + image1: typelineland_template(input[1]) + x1: 4.1 / 15, y1: 0 + x2: 5.7 / 15, y2: 0 + image2: linear_blend( + image1: typelineland_template(input[2]) + x1: 6.7 / 15, y1: 0 + x2: 8.3 / 15, y2: 0 + image2: linear_blend( + image1: typelineland_template(input[3]) + x1: 9.3 / 15, y1: 0 + x2: 10.9 / 15, y2: 0 + image2: linear_blend( + image1: typelineland_template(input[4]) + x1: 11.9 / 15, y1: 0 + x2: 13.5 / 15, y2: 0 + image2: typelineland_template(input[5]) + ))))) + ) +} +# horizontal 7 color hybrid +card_hybrid_7h_typeline := { + card_hybrid_nt( + linear_blend( + image1: typelineland_template(input[0]) + x1: 1.3 / 15, y1: 0 + x2: 2.7 / 15, y2: 0 + image2: linear_blend( + image1: typelineland_template(input[1]) + x1: 3.5 / 15, y1: 0 + x2: 4.9 / 15, y2: 0 + image2: linear_blend( + image1: typelineland_template(input[2]) + x1: 5.7 / 15, y1: 0 + x2: 7.1 / 15, y2: 0 + image2: linear_blend( + image1: typelineland_template(input[3]) + x1: 7.9 / 15, y1: 0 + x2: 9.3 / 15, y2: 0 + image2: linear_blend( + image1: typelineland_template(input[4]) + x1: 10.1 / 15, y1: 0 + x2: 11.5 / 15, y2: 0 + image2: linear_blend( + image1: typelineland_template(input[5]) + x1: 12.3 / 15, y1: 0 + x2: 13.7 / 15, y2: 0 + image2: typelineland_template(input[6]) + )))))) + ) +} + +######################################################################## +# Multicolor blends for Textboxes +######################################################################## + +# Make a hybrid blend into a multicolor blend +multi_hybrid_textbox := { + masked_blend( + mask: "multicolor_dual_blend_textbox.png", + dark: "mtextbox.png", + light: input, + ) +} + + +######################################################################## +# Land blends for Textboxes +######################################################################## + +land_hybrid_2_textbox := { + card_hybrid_nt_textbox( + linear_blend( + image1: textboxland_template(input[0]) + image2: textboxland_template(input[1]) + x1: 0.4, y1: 0 + x2: 0.6, y2: 0 + ) + ) +} +land_hybrid_3_textbox := { + card_hybrid_nt_textbox( + linear_blend( + image1: land_hybrid_2_textbox(input[0] + input[1]), + image2: textboxland_template(input[2]), + x1: 0, y1: 0.55 + x2: 0, y2: 0.77 + ) + ) +} +# 'star' 4 color hybrid +land_hybrid_4_textbox := { + card_hybrid_nt_textbox( + linear_blend( + image1: land_hybrid_2_textbox(input[0] + input[1]) + image2: land_hybrid_2_textbox(input[2] + input[3]) + x1: 0, y1: 0.4 + x2: 0, y2: 0.62 + ) + ) +} +# 'star' 5 color hybrid +land_hybrid_5_textbox := { + card_hybrid_nt_textbox( + linear_blend( + image1: linear_blend( + image1: land_hybrid_2_textbox(input[0] + input[1]), + image2: land_hybrid_2_textbox(input[2] + input[3]), + x1: 0, y1: 0.19 + x2: 0, y2: 0.35 + ), + image2: textboxland_template(input[4]), + x1: 0, y1: 0.777 + x2: 0, y2: 0.937 + ) + ) +} +# 'star' 6 color hybrid +land_hybrid_6_textbox := { + card_hybrid_nt_textbox( + linear_blend( + image1: linear_blend( + image1: land_hybrid_2_textbox(input[0] + input[1]), + image2: land_hybrid_2_textbox(input[2] + input[3]), + x1: 0, y1: 0.19 + x2: 0, y2: 0.35 + ), + image2: land_hybrid_2_textbox(input[4] + input[5]), + x1: 0, y1: 0.777 + x2: 0, y2: 0.937 + ) + ) +} +# 'star' 7 color hybrid +land_hybrid_7_textbox := { + card_hybrid_nt( + linear_blend( + image1: linear_blend( + image1: linear_blend( + image1: land_hybrid_2_textbox(input[0] + input[1]), + image2: land_hybrid_2_textbox(input[2] + input[3]), + x1: 0, y1: 0.34 + x2: 0, y2: 0.50 + ), + image2: land_hybrid_2_textbox(input[4] + input[5]), + x1: 0, y1: 0.877 + x2: 0, y2: 0.937 + ), + image2: textboxland_template(input[6]), + x1: 0, y1: 1.140 + x2: 0, y2: 1.300 + ) + ) +} +# horizontal 3 color hybrid +land_hybrid_3h_textbox := { + card_hybrid_nt_textbox( + linear_blend( + image1: textboxland_template(input[0]) + x1: 0.22, y1: 0 + x2: 0.4, y2: 0 + image2: linear_blend( + image1: textboxland_template(input[1]) + x1: 0.6, y1: 0 + x2: 0.78, y2: 0 + image2: textboxland_template(input[2]) + )) + ) +} +# horizontal 4 color hybrid +land_hybrid_4h_textbox := { + card_hybrid_nt_textbox( + linear_blend( + # blend = 0.16 + image1: textboxland_template(input[0]) + x1: 0.15, y1: 0 + x2: 0.31, y2: 0 + image2: linear_blend( + image1: textboxland_template(input[1]) + x1: 0.42, y1: 0 + x2: 0.58, y2: 0 + image2: linear_blend( + image1: textboxland_template(input[2]) + x1: 0.69, y1: 0 + x2: 0.85, y2: 0 + image2: textboxland_template(input[3]) + ))) + ) +} +# horizontal 5 color hybrid +land_hybrid_5h_textbox := { + card_hybrid_nt_textbox( + linear_blend( + image1: textboxland_template(input[0]) + x1: 2.0 / 15, y1: 0 + x2: 4.0 / 15, y2: 0 + image2: linear_blend( + image1: textboxland_template(input[1]) + x1: 5.0 / 15, y1: 0 + x2: 7.0 / 15, y2: 0 + image2: linear_blend( + image1: textboxland_template(input[2]) + x1: 8.0 / 15, y1: 0 + x2: 10.0 / 15, y2: 0 + image2: linear_blend( + image1: textboxland_template(input[3]) + x1: 11.0 / 15, y1: 0 + x2: 13.0 / 15, y2: 0 + image2: textboxland_template(input[4]) + )))) + ) +} +# horizontal 6 color hybrid +land_hybrid_6h_textbox := { + card_hybrid_nt( + linear_blend( + image1: textboxland_template(input[0]) + x1: 1.5 / 15, y1: 0 + x2: 3.1 / 15, y2: 0 + image2: linear_blend( + image1: textboxland_template(input[1]) + x1: 4.1 / 15, y1: 0 + x2: 5.7 / 15, y2: 0 + image2: linear_blend( + image1: textboxland_template(input[2]) + x1: 6.7 / 15, y1: 0 + x2: 8.3 / 15, y2: 0 + image2: linear_blend( + image1: textboxland_template(input[3]) + x1: 9.3 / 15, y1: 0 + x2: 10.9 / 15, y2: 0 + image2: linear_blend( + image1: textboxland_template(input[4]) + x1: 11.9 / 15, y1: 0 + x2: 13.5 / 15, y2: 0 + image2: textboxland_template(input[5]) + ))))) + ) +} +# horizontal 7 color hybrid +card_hybrid_7h_textbox := { + card_hybrid_nt( + linear_blend( + image1: textboxland_template(input[0]) + x1: 1.3 / 15, y1: 0 + x2: 2.7 / 15, y2: 0 + image2: linear_blend( + image1: textboxland_template(input[1]) + x1: 3.5 / 15, y1: 0 + x2: 4.9 / 15, y2: 0 + image2: linear_blend( + image1: textboxland_template(input[2]) + x1: 5.7 / 15, y1: 0 + x2: 7.1 / 15, y2: 0 + image2: linear_blend( + image1: textboxland_template(input[3]) + x1: 7.9 / 15, y1: 0 + x2: 9.3 / 15, y2: 0 + image2: linear_blend( + image1: textboxland_template(input[4]) + x1: 10.1 / 15, y1: 0 + x2: 11.5 / 15, y2: 0 + image2: linear_blend( + image1: textboxland_template(input[5]) + x1: 12.3 / 15, y1: 0 + x2: 13.7 / 15, y2: 0 + image2: textboxland_template(input[6]) + )))))) + ) +} + +######################################################################## +# Typelines +######################################################################## + +# Make parts of the input grey (land color) +card_hybrid_nt_typeline := { + if mask_hybrid_with_land() then + masked_blend( + mask: "hybrid_blend_nt_typeline.png", + dark: typelineland_template(""), + light: input, + ) + else input +} + +# Card hybrid without land blending +card_hybrid_typeline := { + linear_blend( + image1: typeline_template(input[0]) + image2: typeline_template(input[1]) + x1: 0.4, y1: 0 + x2: 0.6, y2: 0 + ) +} + + +card_hybrid_2_typeline := card_hybrid_typeline + card_hybrid_nt_typeline + +# vertical 2 color hybrid +card_hybrid_2v_typeline := { + card_hybrid_nt_typeline( + linear_blend( + image1: typeline_template(input[0]) + image2: typeline_template(input[1]) + x1: 0, y1: 0.4 + x2: 0, y2: 0.62 + ) + ) +} +# 'star' 3 color hybrid +card_hybrid_3_typeline := { + card_hybrid_nt_typeline( + linear_blend( + image1: card_hybrid_typeline(input[0] + input[1]), + image2: typeline_template(input[2]), + x1: 0, y1: 0.55 + x2: 0, y2: 0.77 + ) + ) +} +# 'star' 4 color hybrid +card_hybrid_4_typeline := { + card_hybrid_nt_typeline( + linear_blend( + image1: card_hybrid_typeline(input[0] + input[1]) + image2: card_hybrid_typeline(input[2] + input[3]) + x1: 0, y1: 0.4 + x2: 0, y2: 0.62 + ) + ) +} +# 'star' 5 color hybrid +card_hybrid_5_typeline := { + card_hybrid_nt_typeline( + linear_blend( + image1: linear_blend( + image1: card_hybrid_typeline(input[0] + input[1]), + image2: card_hybrid_typeline(input[2] + input[3]), + x1: 0, y1: 0.19 + x2: 0, y2: 0.35 + ), + image2: typeline_template(input[4]), + x1: 0, y1: 0.777 + x2: 0, y2: 0.937 + ) + ) +} +# 'star' 6 color hybrid +card_hybrid_6_typeline := { + card_hybrid_nt_typeline( + linear_blend( + image1: linear_blend( + image1: card_hybrid_typeline(input[0] + input[1]), + image2: card_hybrid_typeline(input[2] + input[3]), + x1: 0, y1: 0.19 + x2: 0, y2: 0.35 + ), + image2: card_hybrid_typeline(input[4] + input[5]), + x1: 0, y1: 0.777 + x2: 0, y2: 0.937 + ) + ) +} +# 'star' 7 color hybrid +card_hybrid_7_typeline := { + card_hybrid_nt( + linear_blend( + image1: linear_blend( + image1: linear_blend( + image1: card_hybrid_typeline(input[0] + input[1]), + image2: card_hybrid_typeline(input[2] + input[3]), + x1: 0, y1: 0.34 + x2: 0, y2: 0.50 + ), + image2: card_hybrid_typeline(input[4] + input[5]), + x1: 0, y1: 0.877 + x2: 0, y2: 0.937 + ), + image2: typeline_template(input[6]), + x1: 0, y1: 1.140 + x2: 0, y2: 1.300 + ) + ) +} +# horizontal 3 color hybrid +card_hybrid_3h_typeline := { + card_hybrid_nt_typeline( + linear_blend( + image1: typeline_template(input[0]) + x1: 0.22, y1: 0 + x2: 0.4, y2: 0 + image2: linear_blend( + image1: typeline_template(input[1]) + x1: 0.6, y1: 0 + x2: 0.78, y2: 0 + image2: typeline_template(input[2]) + )) + ) +} +# horizontal 4 color hybrid +card_hybrid_4h_typeline := { + card_hybrid_nt_typeline( + linear_blend( + # blend = 0.16 + image1: typeline_template(input[0]) + x1: 0.15, y1: 0 + x2: 0.31, y2: 0 + image2: linear_blend( + image1: typeline_template(input[1]) + x1: 0.42, y1: 0 + x2: 0.58, y2: 0 + image2: linear_blend( + image1: typeline_template(input[2]) + x1: 0.69, y1: 0 + x2: 0.85, y2: 0 + image2: typeline_template(input[3]) + ))) + ) +} +# horizontal 5 color hybrid +card_hybrid_5h_typeline := { + card_hybrid_nt_typeline( + linear_blend( + image1: typeline_template(input[0]) + x1: 2.0 / 15, y1: 0 + x2: 4.0 / 15, y2: 0 + image2: linear_blend( + image1: typeline_template(input[1]) + x1: 5.0 / 15, y1: 0 + x2: 7.0 / 15, y2: 0 + image2: linear_blend( + image1: typeline_template(input[2]) + x1: 8.0 / 15, y1: 0 + x2: 10.0 / 15, y2: 0 + image2: linear_blend( + image1: typeline_template(input[3]) + x1: 11.0 / 15, y1: 0 + x2: 13.0 / 15, y2: 0 + image2: typeline_template(input[4]) + )))) + ) +} +# horizontal 6 color hybrid +card_hybrid_6h_typeline := { + card_hybrid_nt( + linear_blend( + image1: typeline_template(input[0]) + x1: 1.5 / 15, y1: 0 + x2: 3.1 / 15, y2: 0 + image2: linear_blend( + image1: typeline_template(input[1]) + x1: 4.1 / 15, y1: 0 + x2: 5.7 / 15, y2: 0 + image2: linear_blend( + image1: typeline_template(input[2]) + x1: 6.7 / 15, y1: 0 + x2: 8.3 / 15, y2: 0 + image2: linear_blend( + image1: typeline_template(input[3]) + x1: 9.3 / 15, y1: 0 + x2: 10.9 / 15, y2: 0 + image2: linear_blend( + image1: typeline_template(input[4]) + x1: 11.9 / 15, y1: 0 + x2: 13.5 / 15, y2: 0 + image2: typeline_template(input[5]) + ))))) + ) +} +# horizontal 7 color hybrid +card_hybrid_7h_typeline := { + card_hybrid_nt( + linear_blend( + image1: typeline_template(input[0]) + x1: 1.3 / 15, y1: 0 + x2: 2.7 / 15, y2: 0 + image2: linear_blend( + image1: typeline_template(input[1]) + x1: 3.5 / 15, y1: 0 + x2: 4.9 / 15, y2: 0 + image2: linear_blend( + image1: typeline_template(input[2]) + x1: 5.7 / 15, y1: 0 + x2: 7.1 / 15, y2: 0 + image2: linear_blend( + image1: typeline_template(input[3]) + x1: 7.9 / 15, y1: 0 + x2: 9.3 / 15, y2: 0 + image2: linear_blend( + image1: typeline_template(input[4]) + x1: 10.1 / 15, y1: 0 + x2: 11.5 / 15, y2: 0 + image2: linear_blend( + image1: typeline_template(input[5]) + x1: 12.3 / 15, y1: 0 + x2: 13.7 / 15, y2: 0 + image2: typeline_template(input[6]) + )))))) + ) +} + +######################################################################## +# Textboxes +######################################################################## + +# Make parts of the input grey (land color) +card_hybrid_nt_textbox := { + if mask_hybrid_with_land() then + masked_blend( + mask: "hybrid_blend_nt_textbox.png", + dark: textboxland_template(""), + light: input, + ) + else input +} + +# Card hybrid without land blending +card_hybrid_textbox := { + linear_blend( + image1: textbox_template(input[0]) + image2: textbox_template(input[1]) + x1: 0.4, y1: 0 + x2: 0.6, y2: 0 + ) +} + + +card_hybrid_2_textbox := card_hybrid_textbox + card_hybrid_nt_textbox + +# vertical 2 color hybrid +card_hybrid_2v_textbox := { + card_hybrid_nt_textbox( + linear_blend( + image1: textbox_template(input[0]) + image2: textbox_template(input[1]) + x1: 0, y1: 0.4 + x2: 0, y2: 0.62 + ) + ) +} +# 'star' 3 color hybrid +card_hybrid_3_textbox := { + card_hybrid_nt_textbox( + linear_blend( + image1: card_hybrid_textbox(input[0] + input[1]), + image2: textbox_template(input[2]), + x1: 0, y1: 0.55 + x2: 0, y2: 0.77 + ) + ) +} +# 'star' 4 color hybrid +card_hybrid_4_textbox := { + card_hybrid_nt_textbox( + linear_blend( + image1: card_hybrid_textbox(input[0] + input[1]) + image2: card_hybrid_textbox(input[2] + input[3]) + x1: 0, y1: 0.4 + x2: 0, y2: 0.62 + ) + ) +} +# 'star' 5 color hybrid +card_hybrid_5_textbox := { + card_hybrid_nt_textbox( + linear_blend( + image1: linear_blend( + image1: card_hybrid_textbox(input[0] + input[1]), + image2: card_hybrid_textbox(input[2] + input[3]), + x1: 0, y1: 0.19 + x2: 0, y2: 0.35 + ), + image2: textbox_template(input[4]), + x1: 0, y1: 0.777 + x2: 0, y2: 0.937 + ) + ) +} +# 'star' 6 color hybrid +card_hybrid_6_textbox := { + card_hybrid_nt_textbox( + linear_blend( + image1: linear_blend( + image1: card_hybrid_textbox(input[0] + input[1]), + image2: card_hybrid_textbox(input[2] + input[3]), + x1: 0, y1: 0.19 + x2: 0, y2: 0.35 + ), + image2: card_hybrid_textbox(input[4] + input[5]), + x1: 0, y1: 0.777 + x2: 0, y2: 0.937 + ) + ) +} +# 'star' 7 color hybrid +card_hybrid_7_textbox := { + card_hybrid_nt( + linear_blend( + image1: linear_blend( + image1: linear_blend( + image1: card_hybrid_textbox(input[0] + input[1]), + image2: card_hybrid_textbox(input[2] + input[3]), + x1: 0, y1: 0.34 + x2: 0, y2: 0.50 + ), + image2: card_hybrid_textbox(input[4] + input[5]), + x1: 0, y1: 0.877 + x2: 0, y2: 0.937 + ), + image2: textbox_template(input[6]), + x1: 0, y1: 1.140 + x2: 0, y2: 1.300 + ) + ) +} +# horizontal 3 color hybrid +card_hybrid_3h_textbox := { + card_hybrid_nt_textbox( + linear_blend( + image1: textbox_template(input[0]) + x1: 0.22, y1: 0 + x2: 0.4, y2: 0 + image2: linear_blend( + image1: textbox_template(input[1]) + x1: 0.6, y1: 0 + x2: 0.78, y2: 0 + image2: textbox_template(input[2]) + )) + ) +} +# horizontal 4 color hybrid +card_hybrid_4h_textbox := { + card_hybrid_nt_textbox( + linear_blend( + # blend = 0.16 + image1: textbox_template(input[0]) + x1: 0.15, y1: 0 + x2: 0.31, y2: 0 + image2: linear_blend( + image1: textbox_template(input[1]) + x1: 0.42, y1: 0 + x2: 0.58, y2: 0 + image2: linear_blend( + image1: textbox_template(input[2]) + x1: 0.69, y1: 0 + x2: 0.85, y2: 0 + image2: textbox_template(input[3]) + ))) + ) +} +# horizontal 5 color hybrid +card_hybrid_5h_textbox := { + card_hybrid_nt_textbox( + linear_blend( + image1: textbox_template(input[0]) + x1: 2.0 / 15, y1: 0 + x2: 4.0 / 15, y2: 0 + image2: linear_blend( + image1: textbox_template(input[1]) + x1: 5.0 / 15, y1: 0 + x2: 7.0 / 15, y2: 0 + image2: linear_blend( + image1: textbox_template(input[2]) + x1: 8.0 / 15, y1: 0 + x2: 10.0 / 15, y2: 0 + image2: linear_blend( + image1: textbox_template(input[3]) + x1: 11.0 / 15, y1: 0 + x2: 13.0 / 15, y2: 0 + image2: textbox_template(input[4]) + )))) + ) +} +# horizontal 6 color hybrid +card_hybrid_6h_textbox := { + card_hybrid_nt( + linear_blend( + image1: textbox_template(input[0]) + x1: 1.5 / 15, y1: 0 + x2: 3.1 / 15, y2: 0 + image2: linear_blend( + image1: textbox_template(input[1]) + x1: 4.1 / 15, y1: 0 + x2: 5.7 / 15, y2: 0 + image2: linear_blend( + image1: textbox_template(input[2]) + x1: 6.7 / 15, y1: 0 + x2: 8.3 / 15, y2: 0 + image2: linear_blend( + image1: textbox_template(input[3]) + x1: 9.3 / 15, y1: 0 + x2: 10.9 / 15, y2: 0 + image2: linear_blend( + image1: textbox_template(input[4]) + x1: 11.9 / 15, y1: 0 + x2: 13.5 / 15, y2: 0 + image2: textbox_template(input[5]) + ))))) + ) +} +# horizontal 7 color hybrid +card_hybrid_7h_textbox := { + card_hybrid_nt( + linear_blend( + image1: textbox_template(input[0]) + x1: 1.3 / 15, y1: 0 + x2: 2.7 / 15, y2: 0 + image2: linear_blend( + image1: textbox_template(input[1]) + x1: 3.5 / 15, y1: 0 + x2: 4.9 / 15, y2: 0 + image2: linear_blend( + image1: textbox_template(input[2]) + x1: 5.7 / 15, y1: 0 + x2: 7.1 / 15, y2: 0 + image2: linear_blend( + image1: textbox_template(input[3]) + x1: 7.9 / 15, y1: 0 + x2: 9.3 / 15, y2: 0 + image2: linear_blend( + image1: textbox_template(input[4]) + x1: 10.1 / 15, y1: 0 + x2: 11.5 / 15, y2: 0 + image2: linear_blend( + image1: textbox_template(input[5]) + x1: 12.3 / 15, y1: 0 + x2: 13.7 / 15, y2: 0 + image2: textbox_template(input[6]) + )))))) + ) +} + +######################################################################## +# Power/toughness boxes ######################################################################## # Make parts of the input grey (hpt.jpg color) diff --git a/data/magic-blends.mse-include/card-backgrounds b/data/magic-blends.mse-include/card-backgrounds index aafbcb3c..21912838 100644 --- a/data/magic-blends.mse-include/card-backgrounds +++ b/data/magic-blends.mse-include/card-backgrounds @@ -32,13 +32,13 @@ choice images: multicolor 3 color black / green / white : script: multi_hybrid(card_hybrid_3("bgw")) multicolor 3 color red / white / blue : script: multi_hybrid(card_hybrid_3("rwu")) multicolor 3 color green / blue / black : script: multi_hybrid(card_hybrid_3("gub")) - multicolor 4 color w/u/b/r : script: multi_hybrid(card_hybrid_4("wubr")) - multicolor 4 color u/b/r/g : script: multi_hybrid(card_hybrid_4("ubrg")) - multicolor 4 color b/r/g/w : script: multi_hybrid(card_hybrid_4("brgw")) - multicolor 4 color r/g/w/u : script: multi_hybrid(card_hybrid_4("rgwu")) - multicolor 4 color g/w/u/b : script: multi_hybrid(card_hybrid_4("gwub")) - multicolor 5 color w/u/b/r/g : script: multi_hybrid(card_hybrid_5()) - multicolor 5 color w/u/b/r/g (horizontal) : script: multi_hybrid(card_hybrid_5h()) + multicolor 4 color white / blue / black / red : script: multi_hybrid(card_hybrid_4("wubr")) + multicolor 4 color blue / black / red / green : script: multi_hybrid(card_hybrid_4("ubrg")) + multicolor 4 color black / red / green / white : script: multi_hybrid(card_hybrid_4("brgw")) + multicolor 4 color red / green / white / blue : script: multi_hybrid(card_hybrid_4("rgwu")) + multicolor 4 color green / white / blue / black : script: multi_hybrid(card_hybrid_4("gwub")) + multicolor 5 color white / blue / black / red / green : script: multi_hybrid(card_hybrid_5("wubrg")) + multicolor 5 color horizontal white / blue / black / red / green : script: multi_hybrid(card_hybrid_5h("wubrg")) land : script: land_template("") land 1 color white : script: land_template("w") land 1 color blue : script: land_template("u") @@ -91,18 +91,18 @@ choice images: hybrid 3 color horizontal black / green / white : script: card_hybrid_3h("bgw") hybrid 3 color horizontal red / white / blue : script: card_hybrid_3h("rwu") hybrid 3 color horizontal green / blue / black : script: card_hybrid_3h("gub") - hybrid 4 color w/u/b/r : script: card_hybrid_4("wubr") - hybrid 4 color u/b/r/g : script: card_hybrid_4("ubrg") - hybrid 4 color b/r/g/w : script: card_hybrid_4("brgw") - hybrid 4 color r/g/w/u : script: card_hybrid_4("rgwu") - hybrid 4 color g/w/u/b : script: card_hybrid_4("gwub") - hybrid 4 color horizontal w/u/b/r : script: card_hybrid_4h("wubr") - hybrid 4 color horizontal u/b/r/g : script: card_hybrid_4h("ubrg") - hybrid 4 color horizontal b/r/g/w : script: card_hybrid_4h("brgw") - hybrid 4 color horizontal r/g/w/u : script: card_hybrid_4h("rgwu") - hybrid 4 color horizontal g/w/u/b : script: card_hybrid_4h("gwub") - hybrid 5 color w/u/b/r/g : script: card_hybrid_5() - hybrid 5 color w/u/b/r/g (horizontal) : script: card_hybrid_5h() + hybrid 4 color white / blue / black / red : script: card_hybrid_4("wubr") + hybrid 4 color blue / black / red / green : script: card_hybrid_4("ubrg") + hybrid 4 color black / red / green / white : script: card_hybrid_4("brgw") + hybrid 4 color red / green / white / blue : script: card_hybrid_4("rgwu") + hybrid 4 color green / white / blue / black : script: card_hybrid_4("gwub") + hybrid 4 color horizontal white / blue / black / red : script: card_hybrid_4h("wubr") + hybrid 4 color horizontal blue / black / red / green : script: card_hybrid_4h("ubrg") + hybrid 4 color horizontal black / red / green / white : script: card_hybrid_4h("brgw") + hybrid 4 color horizontal red / green / white / blue : script: card_hybrid_4h("rgwu") + hybrid 4 color horizontal green / white / blue / black : script: card_hybrid_4h("gwub") + hybrid 5 color white / blue / black / red / green : script: card_hybrid_5("wubrg") + hybrid 5 color horizontal white / blue / black / red / green : script: card_hybrid_5h("wubrg") hybrid vertical white / blue : script: card_hybrid_2v("wu") hybrid vertical white / black : script: card_hybrid_2v("wb") hybrid vertical white / red : script: card_hybrid_2v("wr") diff --git a/data/magic-blends.mse-include/card-colors b/data/magic-blends.mse-include/card-colors index 776245bb..fafdff65 100644 --- a/data/magic-blends.mse-include/card-colors +++ b/data/magic-blends.mse-include/card-colors @@ -37,15 +37,15 @@ choice: choice: green / blue / black choice: name: 4 color - choice: w/u/b/r - choice: u/b/r/g - choice: b/r/g/w - choice: r/g/w/u - choice: g/w/u/b + choice: white / blue / black / red + choice: blue / black / red / green + choice: black / red / green / white + choice: red / green / white / blue + choice: green / white / blue / black choice: name: 5 color - choice: w/u/b/r/g - choice: w/u/b/r/g (horizontal) + choice: white / blue / black / red / green + choice: horizontal white / blue / black / red / green choice: name: land group choice: colorless @@ -114,22 +114,22 @@ choice: choice: green / blue / black choice: name: 4 color - choice: w/u/b/r - choice: u/b/r/g - choice: b/r/g/w - choice: r/g/w/u - choice: g/w/u/b + choice: white / blue / black / red + choice: blue / black / red / green + choice: black / red / green / white + choice: red / green / white / blue + choice: green / white / blue / black choice: name: horizontal - choice: w/u/b/r - choice: u/b/r/g - choice: b/r/g/w - choice: r/g/w/u - choice: g/w/u/b + choice: white / blue / black / red + choice: blue / black / red / green + choice: black / red / green / white + choice: red / green / white / blue + choice: green / white / blue / black choice: name: 5 color - choice: w/u/b/r/g - choice: w/u/b/r/g (horizontal) + choice: white / blue / black / red / green + choice: horizontal white / blue / black / red / green choice: # Vertical hybrids, for flip cards # By: Wolfwood diff --git a/data/magic-blends.mse-include/card-ptboxes b/data/magic-blends.mse-include/card-ptboxes index 5867c3ad..9ba4969b 100644 --- a/data/magic-blends.mse-include/card-ptboxes +++ b/data/magic-blends.mse-include/card-ptboxes @@ -32,13 +32,13 @@ choice images: multicolor 3 color black / green / white : script: multi_hybrid_pt("w") multicolor 3 color red / white / blue : script: multi_hybrid_pt("u") multicolor 3 color green / blue / black : script: multi_hybrid_pt("b") - multicolor 4 color w/u/b/r : script: multi_hybrid_pt("r") - multicolor 4 color u/b/r/g : script: multi_hybrid_pt("g") - multicolor 4 color b/r/g/w : script: multi_hybrid_pt("w") - multicolor 4 color r/g/w/u : script: multi_hybrid_pt("u") - multicolor 4 color g/w/u/b : script: multi_hybrid_pt("b") - multicolor 5 color w/u/b/r/g : script: multi_hybrid_pt("r") - multicolor 5 color w/u/b/r/g (horizontal) : script: multi_hybrid_pt("g") + multicolor 4 color white / blue / black / red : script: multi_hybrid_pt("r") + multicolor 4 color blue / black / red / green : script: multi_hybrid_pt("g") + multicolor 4 color black / red / green / white : script: multi_hybrid_pt("w") + multicolor 4 color red / green / white / blue : script: multi_hybrid_pt("u") + multicolor 4 color green / white / blue / black : script: multi_hybrid_pt("b") + multicolor 5 color white / blue / black / red / green : script: multi_hybrid_pt("r") + multicolor 5 color horizontal white / blue / black / red / green : script: multi_hybrid_pt("g") land : script: pt_template("l") land 1 color white : script: pt_template("wl") land 1 color blue : script: pt_template("ul") @@ -91,18 +91,18 @@ choice images: hybrid 3 color horizontal black / green / white : script: card_hybrid_3h_pt("gw") hybrid 3 color horizontal red / white / blue : script: card_hybrid_3h_pt("wu") hybrid 3 color horizontal green / blue / black : script: card_hybrid_3h_pt("ub") - hybrid 4 color w/u/b/r : script: card_hybrid_pt("r") - hybrid 4 color u/b/r/g : script: card_hybrid_pt("g") - hybrid 4 color b/r/g/w : script: card_hybrid_pt("w") - hybrid 4 color r/g/w/u : script: card_hybrid_pt("u") - hybrid 4 color g/w/u/b : script: card_hybrid_pt("b") - hybrid 4 color horizontal w/u/b/r : script: card_hybrid_4h_pt("br") - hybrid 4 color horizontal u/b/r/g : script: card_hybrid_4h_pt("rg") - hybrid 4 color horizontal b/r/g/w : script: card_hybrid_4h_pt("gw") - hybrid 4 color horizontal r/g/w/u : script: card_hybrid_4h_pt("wu") - hybrid 4 color horizontal g/w/u/b : script: card_hybrid_4h_pt("ub") - hybrid 5 color w/u/b/r/g : script: card_hybrid_pt("r") - hybrid 5 color w/u/b/r/g (horizontal) : script: card_hybrid_pt("5b") + hybrid 4 color white / blue / black / red : script: card_hybrid_pt("r") + hybrid 4 color blue / black / red / green : script: card_hybrid_pt("g") + hybrid 4 color black / red / green / white : script: card_hybrid_pt("w") + hybrid 4 color red / green / white / blue : script: card_hybrid_pt("u") + hybrid 4 color green / white / blue / black : script: card_hybrid_pt("b") + hybrid 4 color horizontal white / blue / black / red : script: card_hybrid_4h_pt("br") + hybrid 4 color horizontal blue / black / red / green : script: card_hybrid_4h_pt("rg") + hybrid 4 color horizontal black / red / green / white : script: card_hybrid_4h_pt("gw") + hybrid 4 color horizontal red / green / white / blue : script: card_hybrid_4h_pt("wu") + hybrid 4 color horizontal green / white / blue / black : script: card_hybrid_4h_pt("ub") + hybrid 5 color white / blue / black / red / green : script: card_hybrid_pt("r") + hybrid 5 color horizontal white / blue / black / red / green : script: card_hybrid_pt("5b") hybrid vertical white / blue : script: card_hybrid_pt("u") hybrid vertical white / black : script: card_hybrid_pt("b") hybrid vertical white / red : script: card_hybrid_pt("r") diff --git a/data/magic-blends.mse-include/flip-ptboxes b/data/magic-blends.mse-include/flip-ptboxes index a876e760..47b27eb0 100644 --- a/data/magic-blends.mse-include/flip-ptboxes +++ b/data/magic-blends.mse-include/flip-ptboxes @@ -32,13 +32,13 @@ choice images: multicolor 3 color black / green / white : script: multi_hybrid_pt("w") multicolor 3 color red / white / blue : script: multi_hybrid_pt("u") multicolor 3 color green / blue / black : script: multi_hybrid_pt("b") - multicolor 4 color w/u/b/r : script: multi_hybrid_pt("u") - multicolor 4 color u/b/r/g : script: multi_hybrid_pt("b") - multicolor 4 color b/r/g/w : script: multi_hybrid_pt("r") - multicolor 4 color r/g/w/u : script: multi_hybrid_pt("g") - multicolor 4 color g/w/u/b : script: multi_hybrid_pt("w") - multicolor 5 color w/u/b/r/g : script: multi_hybrid_pt("u") - multicolor 5 color w/u/b/r/g (horizontal) : script: multi_hybrid_pt("g") + multicolor 4 color white / blue / black / red : script: multi_hybrid_pt("u") + multicolor 4 color blue / black / red / green : script: multi_hybrid_pt("b") + multicolor 4 color black / red / green / white : script: multi_hybrid_pt("r") + multicolor 4 color red / green / white / blue : script: multi_hybrid_pt("g") + multicolor 4 color green / white / blue / black : script: multi_hybrid_pt("w") + multicolor 5 color white / blue / black / red / green : script: multi_hybrid_pt("u") + multicolor 5 color horizontal white / blue / black / red / green : script: multi_hybrid_pt("g") # No p/t boxes for lands yet land : script: pt_template("l") land 1 color white : script: pt_template("wl") @@ -82,13 +82,13 @@ choice images: hybrid 3 color black / green / white : script: card_hybrid_pt("g") hybrid 3 color red / white / blue : script: card_hybrid_pt("w") hybrid 3 color green / blue / black : script: card_hybrid_pt("u") - hybrid 4 color w/u/b/r : script: card_hybrid_pt("u") - hybrid 4 color u/b/r/g : script: card_hybrid_pt("b") - hybrid 4 color b/r/g/w : script: card_hybrid_pt("r") - hybrid 4 color r/g/w/u : script: card_hybrid_pt("g") - hybrid 4 color g/w/u/b : script: card_hybrid_pt("w") - hybrid 5 color w/u/b/r/g : script: card_hybrid_pt("u") - hybrid 5 color w/u/b/r/g (horizontal) : script: card_hybrid_pt("g") + hybrid 4 color white / blue / black / red : script: card_hybrid_pt("u") + hybrid 4 color blue / black / red / green : script: card_hybrid_pt("b") + hybrid 4 color black / red / green / white : script: card_hybrid_pt("r") + hybrid 4 color red / green / white / blue : script: card_hybrid_pt("g") + hybrid 4 color green / white / blue / black : script: card_hybrid_pt("w") + hybrid 5 color white / blue / black / red / green : script: card_hybrid_pt("u") + hybrid 5 color horizontal white / blue / black / red / green : script: card_hybrid_pt("g") hybrid vertical white / blue : script: card_hybrid_pt("w") hybrid vertical white / black : script: card_hybrid_pt("w") hybrid vertical white / red : script: card_hybrid_pt("w") diff --git a/data/magic-blends.mse-include/flip-ptboxes2 b/data/magic-blends.mse-include/flip-ptboxes2 index 0590ca5a..c59fa641 100644 --- a/data/magic-blends.mse-include/flip-ptboxes2 +++ b/data/magic-blends.mse-include/flip-ptboxes2 @@ -32,14 +32,13 @@ choice images: multicolor 3 color black / green / white : script: multi_hybrid_pt2("w") multicolor 3 color red / white / blue : script: multi_hybrid_pt2("u") multicolor 3 color green / blue / black : script: multi_hybrid_pt2("b") - multicolor 4 color w/u/b/r : script: multi_hybrid_pt2("b") - multicolor 4 color u/b/r/g : script: multi_hybrid_pt2("r") - multicolor 4 color b/r/g/w : script: multi_hybrid_pt2("g") - multicolor 4 color r/g/w/u : script: multi_hybrid_pt2("w") - multicolor 4 color g/w/u/b : script: multi_hybrid_pt2("u") - multicolor 5 color w/u/b/r/g : script: multi_hybrid_pt2("b") - multicolor 5 color w/u/b/r/g (horizontal) : script: multi_hybrid_pt2("w") -# No p/t boxes for lands yet + multicolor 4 color white / blue / black / red : script: multi_hybrid_pt2("b") + multicolor 4 color blue / black / red / green : script: multi_hybrid_pt2("r") + multicolor 4 color black / red / green / white : script: multi_hybrid_pt2("g") + multicolor 4 color red / green / white / blue : script: multi_hybrid_pt2("w") + multicolor 4 color green / white / blue / black : script: multi_hybrid_pt2("u") + multicolor 5 color white / blue / black / red / green : script: multi_hybrid_pt2("b") + multicolor 5 color horizontal white / blue / black / red / green : script: multi_hybrid_pt2("w") land : script: pt2_template("l") land 1 color white : script: pt2_template("wl") land 1 color blue : script: pt2_template("ul") @@ -82,13 +81,13 @@ choice images: hybrid 3 color black / green / white : script: card_hybrid_pt2("w") hybrid 3 color red / white / blue : script: card_hybrid_pt2("u") hybrid 3 color green / blue / black : script: card_hybrid_pt2("b") - hybrid 4 color w/u/b/r : script: card_hybrid_pt2("b") - hybrid 4 color u/b/r/g : script: card_hybrid_pt2("r") - hybrid 4 color b/r/g/w : script: card_hybrid_pt2("g") - hybrid 4 color r/g/w/u : script: card_hybrid_pt2("w") - hybrid 4 color g/w/u/b : script: card_hybrid_pt2("u") - hybrid 5 color w/u/b/r/g : script: card_hybrid_pt2("g") - hybrid 5 color w/u/b/r/g (horizontal) : script: card_hybrid_pt2("w") + hybrid 4 color white / blue / black / red : script: card_hybrid_pt2("b") + hybrid 4 color blue / black / red / green : script: card_hybrid_pt2("r") + hybrid 4 color black / red / green / white : script: card_hybrid_pt2("g") + hybrid 4 color red / green / white / blue : script: card_hybrid_pt2("w") + hybrid 4 color green / white / blue / black : script: card_hybrid_pt2("u") + hybrid 5 color white / blue / black / red / green : script: card_hybrid_pt2("g") + hybrid 5 color horizontal white / blue / black / red / green : script: card_hybrid_pt2("w") hybrid vertical white / blue : script: card_hybrid_pt2("u") hybrid vertical white / black : script: card_hybrid_pt2("b") hybrid vertical white / red : script: card_hybrid_pt2("r") diff --git a/data/magic-watermarks.mse-include/watermark_bgmana.png b/data/magic-watermarks.mse-include/watermark_bgmana.png new file mode 100644 index 00000000..243649aa Binary files /dev/null and b/data/magic-watermarks.mse-include/watermark_bgmana.png differ diff --git a/data/magic-watermarks.mse-include/watermark_brmana.png b/data/magic-watermarks.mse-include/watermark_brmana.png new file mode 100644 index 00000000..7d8b7db2 Binary files /dev/null and b/data/magic-watermarks.mse-include/watermark_brmana.png differ diff --git a/data/magic-watermarks.mse-include/watermark_dcipromo.png b/data/magic-watermarks.mse-include/watermark_dcipromo.png new file mode 100644 index 00000000..601d423f Binary files /dev/null and b/data/magic-watermarks.mse-include/watermark_dcipromo.png differ diff --git a/data/magic-watermarks.mse-include/watermark_fnmpromo.png b/data/magic-watermarks.mse-include/watermark_fnmpromo.png new file mode 100644 index 00000000..737f8874 Binary files /dev/null and b/data/magic-watermarks.mse-include/watermark_fnmpromo.png differ diff --git a/data/magic-watermarks.mse-include/watermark_gumana.png b/data/magic-watermarks.mse-include/watermark_gumana.png new file mode 100644 index 00000000..c710e527 Binary files /dev/null and b/data/magic-watermarks.mse-include/watermark_gumana.png differ diff --git a/data/magic-watermarks.mse-include/watermark_gwmana.png b/data/magic-watermarks.mse-include/watermark_gwmana.png new file mode 100644 index 00000000..8307bf64 Binary files /dev/null and b/data/magic-watermarks.mse-include/watermark_gwmana.png differ diff --git a/data/magic-watermarks.mse-include/watermark_rgmana.png b/data/magic-watermarks.mse-include/watermark_rgmana.png new file mode 100644 index 00000000..df64de28 Binary files /dev/null and b/data/magic-watermarks.mse-include/watermark_rgmana.png differ diff --git a/data/magic-watermarks.mse-include/watermark_rwmana.png b/data/magic-watermarks.mse-include/watermark_rwmana.png new file mode 100644 index 00000000..a23b599a Binary files /dev/null and b/data/magic-watermarks.mse-include/watermark_rwmana.png differ diff --git a/data/magic-watermarks.mse-include/watermark_ubmana.png b/data/magic-watermarks.mse-include/watermark_ubmana.png new file mode 100644 index 00000000..a5170e89 Binary files /dev/null and b/data/magic-watermarks.mse-include/watermark_ubmana.png differ diff --git a/data/magic-watermarks.mse-include/watermark_urmana.png b/data/magic-watermarks.mse-include/watermark_urmana.png new file mode 100644 index 00000000..064983ef Binary files /dev/null and b/data/magic-watermarks.mse-include/watermark_urmana.png differ diff --git a/data/magic-watermarks.mse-include/watermark_wbmana.png b/data/magic-watermarks.mse-include/watermark_wbmana.png new file mode 100644 index 00000000..a1718be4 Binary files /dev/null and b/data/magic-watermarks.mse-include/watermark_wbmana.png differ diff --git a/data/magic-watermarks.mse-include/watermark_wumana.png b/data/magic-watermarks.mse-include/watermark_wumana.png new file mode 100644 index 00000000..7fc90878 Binary files /dev/null and b/data/magic-watermarks.mse-include/watermark_wumana.png differ diff --git a/data/magic-watermarks.mse-include/watermarks b/data/magic-watermarks.mse-include/watermarks index 7fd387fd..021d0580 100644 --- a/data/magic-watermarks.mse-include/watermarks +++ b/data/magic-watermarks.mse-include/watermarks @@ -16,3 +16,15 @@ choice images: guild symbol The Golgari (B/G): script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_golgari.png") guild symbol Boros Legion (R/W): script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_boros.png") guild symbol The Simic (G/U): script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_simic.png") + xander hybrid mana B/R: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_brmana.png") + xander hybrid mana U/B: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_ubmana.png") + xander hybrid mana B/G: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_bgmana.png") + xander hybrid mana R/G: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_rgmana.png") + xander hybrid mana G/U: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_gumana.png") + xander hybrid mana U/R: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_urmana.png") + xander hybrid mana W/B: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_wbmana.png") + xander hybrid mana G/W: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_gwmana.png") + xander hybrid mana R/W: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_rwmana.png") + xander hybrid mana W/U: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_wumana.png") + promo symbol DCI: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_dcipromo.png") + promo symbol FNM: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_fnmpromo.png") diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game index 80fd43f8..181a24a3 100644 --- a/data/magic.mse-game/game +++ b/data/magic.mse-game/game @@ -84,8 +84,8 @@ init script: else if count == 2 then "multicolor 2 color " + color_name(colors[0]) + " / " + color_name(colors[1]) else if set.set_info.use_gradient_multicolor != "yes" then "multicolor" # stop here else if count == 3 then "multicolor 3 color " + color_name(colors[0]) + " / " + color_name(colors[1]) + " / " + color_name(colors[2]) - else if count == 3 then "multicolor 4 color " + to_lower(colors[0]) + "/" + to_lower(colors[1]) + "/" + to_lower(colors[2]) + "/" + to_lower(colors[3]) - else if count == 5 then "multicolor 5 color w/u/b/r/g" + else if count == 4 then "multicolor 4 color " + color_name(colors[0]) + " / " + color_name(colors[1]) + " / " + color_name(colors[2]) + " / " + color_name(colors[3]) + else if count == 5 then "multicolor 5 color " + color_name(colors[0]) + " / " + color_name(colors[1]) + " / " + color_name(colors[2]) + " / " + color_name(colors[3]) + " / " + color_name(colors[4]) else "multicolor" else # hybrid @@ -542,6 +542,22 @@ card field: choice: The Golgari (B/G) choice: Boros Legion (R/W) choice: The Simic (G/U) + choice: + name: xander hybrid mana + choice: B/R + choice: U/B + choice: B/G + choice: R/G + choice: G/U + choice: U/R + choice: W/B + choice: G/W + choice: R/W + choice: W/U + choice: + name: promo symbol + choice: DCI + choice: FNM description: A watermark for below the textbox, this can be a big mana symbol used on basic lands, or a guild symbol ############################# PT