Skip to content

M
magicseteditor
Commit 76d37ec7 authored by pichoro's avatar pichoro
Browse files
Options

Corrected Magic sorting script. 

Updated some gold, colorless, and light artifact frames.
Added machinery for tri-hybrid mana.
Added watermarks to magic-new-flip.
Updated watermarks.
Updated Vanguard keywords to version in Magic.
Fixed font_color scripts in magic-new-flip, magic-new-promo, and magic-new-textless.
parent 9f1a6b03
Hide whitespace changes
Inline Side-by-side
Showing with 180 additions and 43 deletions
data/magic-mana-beveled.mse-symbol-font/symbol-font
View file @ 76d37ec7
...@@ -45,6 +45,36 @@ symbol: ...@@ -45,6 +45,36 @@ symbol:
symbol: symbol:
code: G/U code: G/U
image: mana_gu.png image: mana_gu.png
symbol:
code: B/G/W
image: mana_bgw.png
symbol:
code: G/B/R
image: mana_brg.png
symbol:
code: G/U/B
image: mana_gub.png
symbol:
code: G/W/U
image: mana_gwu.png
symbol:
code: R/G/W
image: mana_rgw.png
symbol:
code: R/W/U
image: mana_rwu.png
symbol:
code: U/B/R
image: mana_ubr.png
symbol:
code: U/R/G
image: mana_urg.png
symbol:
code: W/B/R
image: mana_wbr.png
symbol:
code: W/U/B
image: mana_wub.png
symbol: symbol:
code: 1/2 code: 1/2
image: mana_1_half.png image: mana_1_half.png
......
data/magic-mana-large.mse-symbol-font/symbol-font
View file @ 76d37ec7
...@@ -56,6 +56,46 @@ symbol: ...@@ -56,6 +56,46 @@ symbol:
code: G/U code: G/U
image: mana_gu.png image: mana_gu.png
image font size: 145 image font size: 145
symbol:
code: B/G/W
image: mana_bgw.png
image font size: 145
symbol:
code: G/B/R
image: mana_brg.png
image font size: 145
symbol:
code: G/U/B
image: mana_gub.png
image font size: 145
symbol:
code: G/W/U
image: mana_gwu.png
image font size: 145
symbol:
code: R/G/W
image: mana_rgw.png
image font size: 145
symbol:
code: R/W/U
image: mana_rwu.png
image font size: 145
symbol:
code: U/B/R
image: mana_ubr.png
image font size: 145
symbol:
code: U/R/G
image: mana_urg.png
image font size: 145
symbol:
code: W/B/R
image: mana_wbr.png
image font size: 145
symbol:
code: W/U/B
image: mana_wub.png
image font size: 145
symbol: symbol:
code: 1/2 code: 1/2
image: mana_1_half.png image: mana_1_half.png
......
data/magic-mana-small.mse-symbol-font/symbol-font
View file @ 76d37ec7
...@@ -113,6 +113,46 @@ symbol: ...@@ -113,6 +113,46 @@ symbol:
code: G/U code: G/U
image: mana_gu.png image: mana_gu.png
image font size: 145 image font size: 145
symbol:
code: B/G/W
image: mana_bgw.png
image font size: 145
symbol:
code: G/B/R
image: mana_brg.png
image font size: 145
symbol:
code: G/U/B
image: mana_gub.png
image font size: 145
symbol:
code: G/W/U
image: mana_gwu.png
image font size: 145
symbol:
code: R/G/W
image: mana_rgw.png
image font size: 145
symbol:
code: R/W/U
image: mana_rwu.png
image font size: 145
symbol:
code: U/B/R
image: mana_ubr.png
image font size: 145
symbol:
code: U/R/G
image: mana_urg.png
image font size: 145
symbol:
code: W/B/R
image: mana_wbr.png
image font size: 145
symbol:
code: W/U/B
image: mana_wub.png
image font size: 145
symbol: symbol:
code: 1/2 code: 1/2
image: mana_1_half.png image: mana_1_half.png
......
data/magic-new-flip.mse-style/style
View file @ 76d37ec7
...@@ -35,12 +35,10 @@ init script: ...@@ -35,12 +35,10 @@ init script:
guild_mana := { styling.use_guild_mana_symbols } guild_mana := { styling.use_guild_mana_symbols }
# Does the card have a color that requires a white font for copyright/artist? # Does the card have a color that requires a white font for copyright/artist?
white_font_colors := filter_rule(match:"^(hybrid )?black|^land") white_font_colors := filter_rule(match:"^(hybrid 2 color )?(hybrid 3 color [^/]*/[^/]*/ )?(hybrid vertical [^/]*/ )?(black|land|hybrid 4 color white / blue / black / red)")
font_color := { font_color := {
if white_font_colors(input:card.card_color) != "" then if white_font_colors(input: card.card_color) != "" then rgb(255,255,255)
rgb(255,255,255) else rgb(0,0,0)
else
rgb(0,0,0)
} }
...@@ -287,6 +285,25 @@ card style: ...@@ -287,6 +285,25 @@ card style:
padding bottom: -1 padding bottom: -1
line height hard: 1.2 line height hard: 1.2
line height line: 1.5 line height line: 1.5
watermark:
left: 151
top : 58
width: 69
height: 69
z index: 1
render style: image
alignment: middle center
include file: magic-watermarks.mse-include/watermarks
watermark 2:
left: 151
top : 378
width: 69
height: 69
angle: 180
z index: 1
render style: image
alignment: middle center
include file: magic-watermarks.mse-include/watermarks
############################# PT ############################# PT
pt: pt:
......
data/magic-new-promo.mse-style/style
View file @ 76d37ec7
...@@ -36,12 +36,10 @@ init script: ...@@ -36,12 +36,10 @@ init script:
guild_mana := { styling.use_guild_mana_symbols } guild_mana := { styling.use_guild_mana_symbols }
# Does the card have a color that requires a white font for copyright/artist? # Does the card have a color that requires a white font for copyright/artist?
white_font_colors := filter_rule(match:"^(hybrid 2 color)?black|^land") white_font_colors := filter_rule(match:"^(hybrid 2 color )?(hybrid 3 color [^/]*/[^/]*/ )?(hybrid vertical [^/]*/ )?(black|land|hybrid 4 color white / blue / black / red)")
font_color := { font_color := {
if white_font_colors(input:card.card_color) != "" then if white_font_colors(input: card.card_color) != "" then rgb(255,255,255)
rgb(255,255,255) else rgb(0,0,0)
else
rgb(0,0,0)
} }
......
data/magic-new-split.mse-style/mpt.jpg
View replaced file @ 9f1a6b03 View file @ 76d37ec7
data/magic-new-split.mse-style/mpt.jpg

2.66 KB | W: | H:

data/magic-new-split.mse-style/mpt.jpg

1.25 KB | W: | H:

data/magic-new-split.mse-style/mpt.jpg
data/magic-new-split.mse-style/mpt.jpg
data/magic-new-split.mse-style/mpt.jpg
data/magic-new-split.mse-style/mpt.jpg
  • 2-up
  • Swipe
  • Onion skin
data/magic-new.mse-style/ccard.jpg
View replaced file @ 9f1a6b03 View file @ 76d37ec7
data/magic-new.mse-style/ccard.jpg

18.9 KB | W: | H:

data/magic-new.mse-style/ccard.jpg

66.6 KB | W: | H:

data/magic-new.mse-style/ccard.jpg
data/magic-new.mse-style/ccard.jpg
data/magic-new.mse-style/ccard.jpg
data/magic-new.mse-style/ccard.jpg
  • 2-up
  • Swipe
  • Onion skin
data/magic-new.mse-style/cpt.jpg
View replaced file @ 9f1a6b03 View file @ 76d37ec7
data/magic-new.mse-style/cpt.jpg

2.38 KB | W: | H:

data/magic-new.mse-style/cpt.jpg

13.2 KB | W: | H:

data/magic-new.mse-style/cpt.jpg
data/magic-new.mse-style/cpt.jpg
data/magic-new.mse-style/cpt.jpg
data/magic-new.mse-style/cpt.jpg
  • 2-up
  • Swipe
  • Onion skin
data/magic-textless.mse-style/style
View file @ 76d37ec7
...@@ -38,12 +38,10 @@ init script: ...@@ -38,12 +38,10 @@ init script:
guild_mana := { styling.use_guild_mana_symbols } guild_mana := { styling.use_guild_mana_symbols }
# Does the card have a color that requires a white font for copyright/artist? # Does the card have a color that requires a white font for copyright/artist?
white_font_colors := filter_rule(match:"^(hybrid 2 color)?black|^land") white_font_colors := filter_rule(match:"^(hybrid 2 color )?(hybrid 3 color [^/]*/[^/]*/ )?(hybrid vertical [^/]*/ )?(black|land|hybrid 4 color white / blue / black / red)")
font_color := { font_color := {
if white_font_colors(input:card.card_color) != "" then if white_font_colors(input: card.card_color) != "" then rgb(255,255,255)
rgb(255,255,255) else rgb(0,0,0)
else
rgb(0,0,0)
} }
############################################################## Extra style options ############################################################## Extra style options
......
data/magic-watermarks.mse-include/watermarks
View file @ 76d37ec7
...@@ -7,7 +7,6 @@ choice images: ...@@ -7,7 +7,6 @@ choice images:
mana symbol red: /magic-watermarks.mse-include/watermark_r.png mana symbol red: /magic-watermarks.mse-include/watermark_r.png
mana symbol green: /magic-watermarks.mse-include/watermark_g.png mana symbol green: /magic-watermarks.mse-include/watermark_g.png
mana symbol snow: /magic-watermarks.mse-include/watermark_s.png mana symbol snow: /magic-watermarks.mse-include/watermark_s.png
mana symbol tap: /magic-watermarks.mse-include/watermark_t.png
guild symbol Azorius Senate (W/U): script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_azorius.png") guild symbol Azorius Senate (W/U): script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_azorius.png")
guild symbol House Dimir (U/B): script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_dimir.png") guild symbol House Dimir (U/B): script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_dimir.png")
guild symbol Cult of Rakdos (B/R): script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_rakados.png") guild symbol Cult of Rakdos (B/R): script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_rakados.png")
...@@ -28,5 +27,3 @@ choice images: ...@@ -28,5 +27,3 @@ choice images:
xander hybrid mana G/W: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_gwmana.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 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") 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 @ 76d37ec7
...@@ -13,9 +13,29 @@ init script: ...@@ -13,9 +13,29 @@ init script:
mana_sort := sort_rule(order: "XYZ[0123456789]S(WUBRG)") mana_sort := sort_rule(order: "XYZ[0123456789]S(WUBRG)")
# correctly sort guild mana # correctly sort guild mana
mana_sort_guild := replace_rule( # swap these: mana_sort_guild := replace_rule( # swap these:
match: "U/W|B/U|R/B|G/B|W/G|B/W|R/U|G/B|W/R|U/G", match: "U/W|B/U|R/B|G/R|W/G|B/W|R/U|G/B|W/R|U/G",
in_context: "(^|[^/])<match>($|[^/])", in_context: "(^|[^/])<match>($|[^/])",
replace: {input[2] + "/" + input[0]}) + replace: {input[2] + "/" + input[0]}) +
replace_rule(
match: "W/B/U|W/R/B|U/R/B|U/G/R|B/G/R|B/W/G|R/W/G|R/U/W|G/U/W|G/B/U",
in_context: "(^|[^/])<match>($|[^/])",
replace: {input[0] + "/" + input[4] + "/" + input[2]}) +
replace_rule(
match: "B/U/W|R/B/W|R/B/U|G/R/U|G/R/B|W/G/B|W/G/R|U/W/R|U/W/G|B/U/G",
in_context: "(^|[^/])<match>($|[^/])",
replace: {input[4] + "/" + input[2] + "/" + input[0]}) +
replace_rule(
match: "U/W/B|B/W/R|B/U/R|R/U/G|R/B/G|G/B/W|G/R/W|W/R/U|W/G/U|U/G/B",
in_context: "(^|[^/])<match>($|[^/])",
replace: {input[2] + "/" + input[0] + "/" + input[4]}) +
replace_rule(
match: "U/B/W|B/R/U|R/G/B|G/W/R|W/U/G|B/R/W|R/G/U|G/W/B|W/U/R|U/B/G",
in_context: "(^|[^/])<match>($|[^/])",
replace: {input[4] + "/" + input[0] + "/" + input[2]}) +
replace_rule(
match: "B/W/U|R/U/B|G/B/R|W/R/G|U/G/W|R/W/B|G/U/R|W/B/G|U/R/W|B/G/U",
in_context: "(^|[^/])<match>($|[^/])",
replace: {input[2] + "/" + input[4] + "/" + input[0]}) +
replace_rule( replace_rule(
match: "T", replace: "" match: "T", replace: ""
) )
...@@ -62,6 +82,7 @@ init script: ...@@ -62,6 +82,7 @@ init script:
else else
# hybrid # hybrid
if count == 2 then "hybrid 2 color " + color_name(colors[0]) + " / " + color_name(colors[1]) if count == 2 then "hybrid 2 color " + color_name(colors[0]) + " / " + color_name(colors[1])
else if count == 3 then "hybrid 3 color " + color_name(colors[0]) + " / " + color_name(colors[1]) + " / " + color_name(colors[2])
else "multicolor" else "multicolor"
} }
...@@ -97,11 +118,12 @@ init script: ...@@ -97,11 +118,12 @@ init script:
) )
}; };
# Index for sorting, white cards are first, so white->1, blue->2, .. , # Index for sorting, white cards are first, so white->A, blue->B, .. ,
# multi->6, hybrid->7, arti->8, land->9, basic land->10 # multi->F, hybrid->G, arti->H, land->J, basic land->I
is_multicolor := filter_rule(match: "^multicolor") + {input != ""}; is_multicolor := filter_rule(match: "^multicolor") + {input != ""};
is_hybrid := filter_rule(match: "^hybrid") + {input != ""}; is_hybrid := filter_rule(match: "^hybrid") + {input != ""};
is_colorless := filter_rule(match: "^colorless") + {input != ""}; is_colorless := filter_rule(match: "^colorless") + {input != ""};
is_artifact := filter_rule(match: "^artifact") + {input != ""};
sort_index := { sort_index := {
if card.card_color=="white" then "A" if card.card_color=="white" then "A"
else if card.card_color=="blue" then "B" else if card.card_color=="blue" then "B"
...@@ -110,7 +132,7 @@ init script: ...@@ -110,7 +132,7 @@ init script:
else if card.card_color=="green" then "E" else if card.card_color=="green" then "E"
else if is_multicolor(card.card_color) then "F" else if is_multicolor(card.card_color) then "F"
else if is_hybrid (card.card_color) then "G" else if is_hybrid (card.card_color) then "G"
else if is_colorless (card.card_color) then "H" else if is_colorless (card.card_color) or is_artifact (card.card_color) then "H"
else if card.super_type!="Basic Land" then "I" else if card.super_type!="Basic Land" then "I"
else "J" else "J"
}; };
...@@ -226,7 +248,7 @@ init script: ...@@ -226,7 +248,7 @@ init script:
# step 8 : post ( capitalization # step 8 : post ( capitalization
replace_rule( replace_rule(
match: "[a-z]", match: "[a-z]",
in_context: "[(](<param-[a-z]*>)?<match>|[ ]*: <param-cost><match>|—<match>", in_context: "[(](<param-[a-z]*>)?<match>|[ ]*: <param-cost><match>|—<match>| — <match>",
replace: { to_upper() }) replace: { to_upper() })
#character filter for title line #character filter for title line
...@@ -602,7 +624,6 @@ card field: ...@@ -602,7 +624,6 @@ card field:
choice: red choice: red
choice: green choice: green
choice: snow choice: snow
choice: tap
choice: choice:
name: guild symbol name: guild symbol
choice: Azorius Senate (W/U) choice: Azorius Senate (W/U)
...@@ -627,10 +648,6 @@ card field: ...@@ -627,10 +648,6 @@ card field:
choice: G/W choice: G/W
choice: R/W choice: R/W
choice: W/U 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 description: A watermark for below the textbox, this can be a big mana symbol used on basic lands, or a guild symbol
############################# PT ############################# PT
...@@ -837,7 +854,6 @@ card field: ...@@ -837,7 +854,6 @@ card field:
choice: red choice: red
choice: green choice: green
choice: snow choice: snow
choice: tap
choice: choice:
name: xander hybrid mana name: xander hybrid mana
choice: B/R choice: B/R
...@@ -862,10 +878,6 @@ card field: ...@@ -862,10 +878,6 @@ card field:
choice: The Golgari (B/G) choice: The Golgari (B/G)
choice: Boros Legion (R/W) choice: Boros Legion (R/W)
choice: The Simic (G/U) choice: The Simic (G/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, a special symbol, or a guild symbol description: A watermark for below the textbox, this can be a big mana symbol used on basic lands, a special symbol, or a guild symbol
card field: card field:
type: text type: text
...@@ -1139,7 +1151,7 @@ keyword parameter type: ...@@ -1139,7 +1151,7 @@ keyword parameter type:
example: Forest example: Forest
############################# All Magic keywords ############################# All Magic keywords
# By JrEye and Neko_Asakami # By JrEye and Neko_Asakami, Updated by Pichoro and Buttock1234
keyword: keyword:
keyword: Flying keyword: Flying
......
data/vanguard.mse-game/game
View file @ 76d37ec7
...@@ -160,7 +160,7 @@ init script: ...@@ -160,7 +160,7 @@ init script:
# step 8 : post ( capitalization # step 8 : post ( capitalization
replace_rule( replace_rule(
match: "[a-z]", match: "[a-z]",
in_context: "[(](<param-[a-z]*>)?<match>|[ ]*: <param-cost><match>", in_context: "[(](<param-[a-z]*>)?<match>|[ ]*: <param-cost><match>|—<match>| — <match>",
replace: { to_upper() }) replace: { to_upper() })
...@@ -422,14 +422,14 @@ keyword parameter type: ...@@ -422,14 +422,14 @@ keyword parameter type:
name: name name: name
match: [^(.,\n]+ match: [^(.,\n]+
keyword parameter type: keyword parameter type:
name: land name: prefix
description: Prefix for things like "<something>walk" description: Prefix for things like "<something>walk"
optional: false optional: false
match: [A-Z][a-z]* match: [A-Z][a-z, ]*
example: Forest example: Forest
############################# All Magic keywords ############################# All Magic keywords
# By JrEye and Neko_Asakami, updated by Buttock1234 and Pichoro # By JrEye and Neko_Asakami, Updated by Pichoro and Buttock1234
keyword: keyword:
keyword: Flying keyword: Flying
...@@ -528,7 +528,7 @@ keyword: ...@@ -528,7 +528,7 @@ keyword:
reminder: At the beginning of your upkeep, if this came under your control since the beginning of your last upkeep, sacrifice it unless you pay its echo cost. reminder: At the beginning of your upkeep, if this came under your control since the beginning of your last upkeep, sacrifice it unless you pay its echo cost.
keyword: keyword:
keyword: Cardcycling keyword: Cardcycling
match: <atom-param>name</atom-param>cycling<atom-param>cost</atom-param> match: <atom-param>prefix</atom-param>cycling<atom-param>cost</atom-param>
mode: expert mode: expert
reminder: {format_cost(param2,add:"")}, Discard this card: Search your library for a {param1} card, reveal it, and put it into your hand. Then shuffle your library. reminder: {format_cost(param2,add:"")}, Discard this card: Search your library for a {param1} card, reveal it, and put it into your hand. Then shuffle your library.
keyword: keyword:
...@@ -612,13 +612,18 @@ keyword: ...@@ -612,13 +612,18 @@ keyword:
mode: expert mode: expert
reminder: This comes into play with a +1/+1 counter on it for each color of mana used to pay its cost. If it is not a creature, use charge counters instead. reminder: This comes into play with a +1/+1 counter on it for each color of mana used to pay its cost. If it is not a creature, use charge counters instead.
keyword: keyword:
keyword: Splice keyword: Splice (Mana Cost)
match: Splice onto <atom-param>name</atom-param> <atom-param>cost</atom-param> match: Splice onto <atom-param>name</atom-param> <atom-param>mana</atom-param>
mode: expert
reminder: As you play a {param1} spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card’s effects to that spell.
keyword:
keyword: Splice (Alternative Cost)
match: Splice onto <atom-param>name</atom-param>—<atom-param>action</atom-param>
mode: expert mode: expert
reminder: As you play a {param1} spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card’s effects to that spell. reminder: As you play a {param1} spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card’s effects to that spell.
keyword: keyword:
keyword: Offering keyword: Offering
match: <atom-param>name</atom-param> offering match: <atom-param>prefix</atom-param> offering
mode: expert mode: expert
reminder: You may play this card any time you could play an instant by sacrificing a {param1} and paying the difference in mana costs between this and the sacrificed {param1}. Mana cost includes color. reminder: You may play this card any time you could play an instant by sacrificing a {param1} and paying the difference in mana costs between this and the sacrificed {param1}. Mana cost includes color.
keyword: keyword:
...@@ -674,7 +679,7 @@ keyword: ...@@ -674,7 +679,7 @@ keyword:
reminder: If defending player is wearing any clothing made of denim, this creature is unblockable. reminder: If defending player is wearing any clothing made of denim, this creature is unblockable.
keyword: keyword:
keyword: Landwalk keyword: Landwalk
match: <atom-param>name</atom-param>walk match: <atom-param>prefix</atom-param>walk
mode: core mode: core
reminder: This creature is unblockable as long as defending player controls a {param1}. reminder: This creature is unblockable as long as defending player controls a {param1}.
keyword: keyword:
......
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