amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-12 05:36:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
In preparation to merge FPM and normal Magic:
Added Xander and Promotional Watermarks
Modified Blend Scripts to handle larger numbers of pieces.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@298 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
pichoro
2007-04-23 04:25:12 +00:00
parent c9ef77b9a4
commit 5b89617148
20 changed files with 1316 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/magic-blends.mse-include/blend-scripts
+1201 -13
View File
File diff suppressed because it is too large Load Diff
data/magic-blends.mse-include/card-backgrounds
+19 -19
View File
@@ -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
+19 -19
View File
@@ -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
+19 -19
View File
@@ -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
+14 -14
View File
@@ -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
+14 -15
View File
@@ -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")