Skip to content

M
magicseteditor
Commit 1922307e authored by pichoro's avatar pichoro
Browse files
Options

Fixed minor error in game file that caused 4 part hybrids not to autoswitch 

In preparation to merge FPM and normal Magic:
Added Xander and Promotional Watermarks
Modified Blend Scripts to handle larger numbers of pieces.
parent 282b4505
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1316 additions and 101 deletions
data/magic-blends.mse-include/blend-scripts
View file @ 1922307e
This diff is collapsed.
data/magic-blends.mse-include/card-backgrounds
View file @ 1922307e
......@@ -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")
......
data/magic-blends.mse-include/card-colors
View file @ 1922307e
......@@ -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
......
data/magic-blends.mse-include/card-ptboxes
View file @ 1922307e
......@@ -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")
......
data/magic-blends.mse-include/flip-ptboxes
View file @ 1922307e
......@@ -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")
......
data/magic-blends.mse-include/flip-ptboxes2
View file @ 1922307e
......@@ -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")
......
data/magic-watermarks.mse-include/watermarks
View file @ 1922307e
......@@ -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")
data/magic.mse-game/game
View file @ 1922307e
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment