diff --git a/data/magic-future.mse-style/ccard.jpg b/data/magic-future.mse-style/ccard.jpg index 4e4e56ec..4c150cd8 100644 Binary files a/data/magic-future.mse-style/ccard.jpg and b/data/magic-future.mse-style/ccard.jpg differ diff --git a/data/magic-future.mse-style/style b/data/magic-future.mse-style/style index bf553936..c101ee03 100644 --- a/data/magic-future.mse-style/style +++ b/data/magic-future.mse-style/style @@ -411,9 +411,9 @@ card style: line height soft: 0.9 line height line: 1.5 watermark: - left: 117 + left: 127 top : 321 - width: 152 + width: 132 height: 152 z index: 2 render style: image diff --git a/data/magic-new-planeswalker.mse-style/acard.jpg b/data/magic-new-planeswalker.mse-style/acard.jpg index 7e0a309d..47fdc80e 100644 Binary files a/data/magic-new-planeswalker.mse-style/acard.jpg and b/data/magic-new-planeswalker.mse-style/acard.jpg differ diff --git a/data/magic-new-planeswalker.mse-style/bcard.jpg b/data/magic-new-planeswalker.mse-style/bcard.jpg index 2738778b..86463bb9 100644 Binary files a/data/magic-new-planeswalker.mse-style/bcard.jpg and b/data/magic-new-planeswalker.mse-style/bcard.jpg differ diff --git a/data/magic-new-planeswalker.mse-style/ccard.jpg b/data/magic-new-planeswalker.mse-style/ccard.jpg index c3013e12..7c5b8945 100644 Binary files a/data/magic-new-planeswalker.mse-style/ccard.jpg and b/data/magic-new-planeswalker.mse-style/ccard.jpg differ diff --git a/data/magic-new-planeswalker.mse-style/gcard.jpg b/data/magic-new-planeswalker.mse-style/gcard.jpg index 16a60676..e642cae1 100644 Binary files a/data/magic-new-planeswalker.mse-style/gcard.jpg and b/data/magic-new-planeswalker.mse-style/gcard.jpg differ diff --git a/data/magic-new-planeswalker.mse-style/mcard.jpg b/data/magic-new-planeswalker.mse-style/mcard.jpg index 9e10c797..551bc17a 100644 Binary files a/data/magic-new-planeswalker.mse-style/mcard.jpg and b/data/magic-new-planeswalker.mse-style/mcard.jpg differ diff --git a/data/magic-new-planeswalker.mse-style/rcard.jpg b/data/magic-new-planeswalker.mse-style/rcard.jpg index 4408b13b..330c4aae 100644 Binary files a/data/magic-new-planeswalker.mse-style/rcard.jpg and b/data/magic-new-planeswalker.mse-style/rcard.jpg differ diff --git a/data/magic-new-planeswalker.mse-style/style b/data/magic-new-planeswalker.mse-style/style index 3228bb61..dcdb78dd 100644 --- a/data/magic-new-planeswalker.mse-style/style +++ b/data/magic-new-planeswalker.mse-style/style @@ -196,10 +196,10 @@ card style: ############################# Image image: - left: 29 - top: 55 - width: 316 - height: 425 + left: 28 + top: 54 + width: 317 + height: 426 z index: 1 mask: image_mask.png diff --git a/data/magic-new-planeswalker.mse-style/ucard.jpg b/data/magic-new-planeswalker.mse-style/ucard.jpg index d97665c7..cde3f63d 100644 Binary files a/data/magic-new-planeswalker.mse-style/ucard.jpg and b/data/magic-new-planeswalker.mse-style/ucard.jpg differ diff --git a/data/magic-new-planeswalker.mse-style/wcard.jpg b/data/magic-new-planeswalker.mse-style/wcard.jpg index 1a333b41..df411736 100644 Binary files a/data/magic-new-planeswalker.mse-style/wcard.jpg and b/data/magic-new-planeswalker.mse-style/wcard.jpg differ diff --git a/data/magic-old-split.mse-style/style b/data/magic-old-split.mse-style/style index 9213f032..297d053f 100644 --- a/data/magic-old-split.mse-style/style +++ b/data/magic-old-split.mse-style/style @@ -5,13 +5,13 @@ short name: Old Splits icon: card-sample.png position hint: 103 -version: 2007-09-23 +version: 2007-12-29 depends on: package: magic.mse-game version: 2007-09-23 depends on: package: magic-watermarks.mse-include - version: 2007-09-23 + version: 2007-12-29 depends on: package: magic-mana-large.mse-symbol-font version: 2007-09-23 @@ -439,7 +439,7 @@ card style: z index: 1 render style: image alignment: middle center - include file: /magic-watermarks.mse-include/watermarks + include file: /magic-watermarks.mse-include/watermarks-old watermark 2: left: 338 top : 228 @@ -448,7 +448,7 @@ card style: z index: 1 render style: image alignment: middle center - include file: /magic-watermarks.mse-include/watermarks + include file: /magic-watermarks.mse-include/watermarks-old ############################# PT pt: diff --git a/data/magic-old-token.mse-style/style b/data/magic-old-token.mse-style/style index f646a6b5..a6925915 100644 --- a/data/magic-old-token.mse-style/style +++ b/data/magic-old-token.mse-style/style @@ -11,13 +11,10 @@ full name: Old style icon: card-sample.png position hint: 107 -version: 2007-09-23 +version: 2007-12-29 depends on: package: magic.mse-game version: 2007-09-23 -depends on: - package: magic-watermarks.mse-include - version: 2007-09-23 depends on: package: magic-mana-large.mse-symbol-font version: 2007-09-23 diff --git a/data/magic-old.mse-style/acard.jpg b/data/magic-old.mse-style/acard.jpg index a59ba3ce..7f73073a 100644 Binary files a/data/magic-old.mse-style/acard.jpg and b/data/magic-old.mse-style/acard.jpg differ diff --git a/data/magic-old.mse-style/alpha_blend.png b/data/magic-old.mse-style/alpha_blend.png index 025f5c6c..f47d2517 100644 Binary files a/data/magic-old.mse-style/alpha_blend.png and b/data/magic-old.mse-style/alpha_blend.png differ diff --git a/data/magic-old.mse-style/bcard.jpg b/data/magic-old.mse-style/bcard.jpg index 096f7b57..bdb806be 100644 Binary files a/data/magic-old.mse-style/bcard.jpg and b/data/magic-old.mse-style/bcard.jpg differ diff --git a/data/magic-old.mse-style/blcard.jpg b/data/magic-old.mse-style/blcard.jpg index 7d6d2ec7..1e23ba19 100644 Binary files a/data/magic-old.mse-style/blcard.jpg and b/data/magic-old.mse-style/blcard.jpg differ diff --git a/data/magic-old.mse-style/ccard.jpg b/data/magic-old.mse-style/ccard.jpg index 965cead5..fdd2c644 100644 Binary files a/data/magic-old.mse-style/ccard.jpg and b/data/magic-old.mse-style/ccard.jpg differ diff --git a/data/magic-old.mse-style/clcard.jpg b/data/magic-old.mse-style/clcard.jpg index 68aba502..21b4d6cd 100644 Binary files a/data/magic-old.mse-style/clcard.jpg and b/data/magic-old.mse-style/clcard.jpg differ diff --git a/data/magic-old.mse-style/gcard.jpg b/data/magic-old.mse-style/gcard.jpg index 926e8b85..af2d965e 100644 Binary files a/data/magic-old.mse-style/gcard.jpg and b/data/magic-old.mse-style/gcard.jpg differ diff --git a/data/magic-old.mse-style/glcard.jpg b/data/magic-old.mse-style/glcard.jpg index 2f3807a0..e24955fb 100644 Binary files a/data/magic-old.mse-style/glcard.jpg and b/data/magic-old.mse-style/glcard.jpg differ diff --git a/data/magic-old.mse-style/land_blend_card.png b/data/magic-old.mse-style/land_blend_card.png index 89f4784f..2bcf45d9 100644 Binary files a/data/magic-old.mse-style/land_blend_card.png and b/data/magic-old.mse-style/land_blend_card.png differ diff --git a/data/magic-old.mse-style/mcard.jpg b/data/magic-old.mse-style/mcard.jpg index ab4f2b30..8d22a92b 100644 Binary files a/data/magic-old.mse-style/mcard.jpg and b/data/magic-old.mse-style/mcard.jpg differ diff --git a/data/magic-old.mse-style/mlcard.jpg b/data/magic-old.mse-style/mlcard.jpg index 7b3b3cb2..b0923ecd 100644 Binary files a/data/magic-old.mse-style/mlcard.jpg and b/data/magic-old.mse-style/mlcard.jpg differ diff --git a/data/magic-old.mse-style/multicolor_blend_card.png b/data/magic-old.mse-style/multicolor_blend_card.png index d56707d5..1d213d88 100644 Binary files a/data/magic-old.mse-style/multicolor_blend_card.png and b/data/magic-old.mse-style/multicolor_blend_card.png differ diff --git a/data/magic-old.mse-style/multicolor_blend_card2.png b/data/magic-old.mse-style/multicolor_blend_card2.png index 03c463b2..b2c9cbc9 100644 Binary files a/data/magic-old.mse-style/multicolor_blend_card2.png and b/data/magic-old.mse-style/multicolor_blend_card2.png differ diff --git a/data/magic-old.mse-style/rcard.jpg b/data/magic-old.mse-style/rcard.jpg index 2cb96485..f2e34555 100644 Binary files a/data/magic-old.mse-style/rcard.jpg and b/data/magic-old.mse-style/rcard.jpg differ diff --git a/data/magic-old.mse-style/rlcard.jpg b/data/magic-old.mse-style/rlcard.jpg index c8ef4e39..2aab3b4c 100644 Binary files a/data/magic-old.mse-style/rlcard.jpg and b/data/magic-old.mse-style/rlcard.jpg differ diff --git a/data/magic-old.mse-style/style b/data/magic-old.mse-style/style index e51cb717..7783d486 100644 --- a/data/magic-old.mse-style/style +++ b/data/magic-old.mse-style/style @@ -11,13 +11,13 @@ full name: Before 8th edition icon: card-sample.png position hint: 101 -version: 2007-09-23 +version: 2007-12-29 depends on: package: magic.mse-game version: 2007-09-23 depends on: package: magic-watermarks.mse-include - version: 2007-09-23 + version: 2007-12-29 depends on: package: magic-mana-large.mse-symbol-font version: 2007-09-23 @@ -25,9 +25,9 @@ depends on: package: magic-mana-small.mse-symbol-font version: 2007-09-23 -card width: 337 -card height: 469 -card dpi: 134.98 +card width: 375 +card height: 523 +card dpi: 150 ############################################################## Extra scripts ## COPY/PASTE from magic-new.mse-style/style @@ -58,7 +58,7 @@ init script: dark: land_template(colors[0]), light: land_template(colors[1]), ) - else if land then + else if land and color_count!=1 then masked_blend( mask: "land_blend_{type}.png", dark: land_template("c"), @@ -174,19 +174,19 @@ card style: border color: left: 0 top : 0 - width: 337 - height: 468 + width: 375 + height: 523 radius: 18 - left width: 18 + left width: 19 right width: 19 - top width: 18 + top width: 19 bottom width: 19 z index: -1 card color: - left: 12 - top: 12 - width: 312 - height: 444 + left: 0 + top: 0 + width: 375 + height: 523 z index: -2 render style: image popup style: in place @@ -194,36 +194,36 @@ card style: ############################# Name line name: - left: 39 - top : 21 - right: { 300 - card_style.casting_cost.content_width } - height: 22 + left: 42 + top : 24 + right: { 341 - card_style.casting_cost.content_width } + height: 23 alignment: bottom shrink-overflow padding bottom: 0 z index: 1 font: name: MagicMedieval - size: 14 + size: 15.5 color: rgb(255,255,255) shadow color: rgb(0,0,0) shadow displacement x: 1 shadow displacement y: 1 casting cost: - right: 304 - top : 21 + right: 341 + top : 22 width: { max(30, card_style.casting_cost.content_width) + 5 } - height: 22 + height: 24 alignment: middle right symbol font: name: magic-mana-small - size: 14 + size: 16 alignment: middle right always symbol: true z index: 2 padding top: 0 card symbol: - left: 22 - top : 21 + left: 24 + top : 24 height: 20 width: 14 render style: image @@ -232,33 +232,34 @@ card style: ############################# Image image: - left: 41 - top: 47 - width: 255 - height: 207 + left: 45 + top: 51 + width: 286 + height: 233 z index: 1 ############################# Card type type: - left: 37 - top : 260 - width: { 262 - max(22,card_style.rarity.content_width) } - height: 18 - alignment: top left shrink-overflow + left: 39 + top : 292 + width: { 298 - max(22,card_style.rarity.content_width) } + height: 20 + alignment: middle shrink-overflow z index: 1 + padding top: 2 font: name: MPlantin - size: 11 + size: 12 color: rgb(255,255,255) shadow color: rgb(0,0,0) shadow displacement x: 1 shadow displacement y: 1 - separator color: rgb(192,192,192) + separator color: rgb(128,128,128) rarity: - right: 299 - top : 257 + left: 293 + top : 290 width: 44 height: 22 z index: 1 @@ -287,13 +288,13 @@ card style: ############################# Text box text: left: 43 - top : 283 - width: 253 - height: 128 + top : 318 + width: 289 + height: 143 font: name: MPlantin italic name: MPlantin-Italic - size: 13 + size: 14 scale down to: 6 color: rgb(0,0,0) symbol font: @@ -302,7 +303,7 @@ card style: if styling.popup_mana_symbols then "magic-mana-large" else "magic-mana-small" - size: 13 + size: 14 alignment: script: if (styling.center_text == "short text only" and @@ -313,67 +314,67 @@ card style: then "middle center" else "middle left" z index: 2 - padding left: 2 + padding left: 6 padding top: 2 - padding right: 2 - padding bottom: 2 + padding right: 4 + padding bottom: 0 line height hard: 1.2 line height line: 1.5 line height soft: 0.9 watermark: - left: 111 - top : 277 - width: 124 - height: 140 + left: 120 + top : 313 + width: 138 + height: 150 z index: 1 render style: image alignment: middle center - include file: /magic-watermarks.mse-include/watermarks + include file: /magic-watermarks.mse-include/watermarks-old ############################# PT pt: z index: 4 - left: 266 - top: 420 - width: 42 - height: 28 - alignment: right top + left: 295 + top: 470 + width: 47 + height: 27 + alignment: right middle font: name: Mplantin - size: 16 + size: 17 weight: bold color: rgb(255,255,255) shadow color: rgb(0,0,0) - shadow displacement x: 2 - shadow displacement y: 2 - separator color: rgb(255,50,50) + shadow displacement x: 1 + shadow displacement y: 1 + separator color: rgb(200,0,0) ############################# Card sorting / numbering ############################# Copyright stuff illustrator: - left: 68 - top : 419 - width: 200 - height: 14 + left: 80 + top : 470 + width: 217 + height: 16 z index: 1 - alignment: center + alignment: middle center font: - name: Mplantin - size: 9 + name: MPlantin + size: 10 color: rgb(255,255,255) shadow color: rgb(0,0,0) shadow displacement x: 1 shadow displacement y: 1 copyright line: - left: 68 - top : 434 - width: 200 - height: 9 + left: 65 + top : 486 + width: 247 + height: 12 z index: 1 - alignment: center + alignment: middle center font: name: MPlantin - size: 6 + size: 6.5 color: { font_color(card.card_color) } diff --git a/data/magic-old.mse-style/ucard.jpg b/data/magic-old.mse-style/ucard.jpg index d9cfb665..7ff32780 100644 Binary files a/data/magic-old.mse-style/ucard.jpg and b/data/magic-old.mse-style/ucard.jpg differ diff --git a/data/magic-old.mse-style/ulcard.jpg b/data/magic-old.mse-style/ulcard.jpg index 36e2db13..9c76a47d 100644 Binary files a/data/magic-old.mse-style/ulcard.jpg and b/data/magic-old.mse-style/ulcard.jpg differ diff --git a/data/magic-old.mse-style/wcard.jpg b/data/magic-old.mse-style/wcard.jpg index 3d3f321f..7906316f 100644 Binary files a/data/magic-old.mse-style/wcard.jpg and b/data/magic-old.mse-style/wcard.jpg differ diff --git a/data/magic-old.mse-style/wlcard.jpg b/data/magic-old.mse-style/wlcard.jpg index 472f88ea..7a7ad8c1 100644 Binary files a/data/magic-old.mse-style/wlcard.jpg and b/data/magic-old.mse-style/wlcard.jpg differ diff --git a/data/magic-watermarks.mse-include/include b/data/magic-watermarks.mse-include/include index fe797fb5..8acb6c2d 100644 --- a/data/magic-watermarks.mse-include/include +++ b/data/magic-watermarks.mse-include/include @@ -1,6 +1,6 @@ mse version: 0.3.5 full name: Magic The Gathering, textbox watermarks -version: 2007-09-29 +version: 2007-12-29 # This file doesn't do anything, other files in this directory can be included # in game/style files: diff --git a/data/magic-watermarks.mse-include/watermark_b_old.png b/data/magic-watermarks.mse-include/watermark_b_old.png new file mode 100644 index 00000000..b0f4e548 Binary files /dev/null and b/data/magic-watermarks.mse-include/watermark_b_old.png differ diff --git a/data/magic-watermarks.mse-include/watermark_g_old.png b/data/magic-watermarks.mse-include/watermark_g_old.png new file mode 100644 index 00000000..f8398a77 Binary files /dev/null and b/data/magic-watermarks.mse-include/watermark_g_old.png differ diff --git a/data/magic-watermarks.mse-include/watermark_r_old.png b/data/magic-watermarks.mse-include/watermark_r_old.png new file mode 100644 index 00000000..316ec4e6 Binary files /dev/null and b/data/magic-watermarks.mse-include/watermark_r_old.png differ diff --git a/data/magic-watermarks.mse-include/watermark_u_old.png b/data/magic-watermarks.mse-include/watermark_u_old.png new file mode 100644 index 00000000..d0ac9ffd Binary files /dev/null and b/data/magic-watermarks.mse-include/watermark_u_old.png differ diff --git a/data/magic-watermarks.mse-include/watermark_w_old.png b/data/magic-watermarks.mse-include/watermark_w_old.png new file mode 100644 index 00000000..875dc2ac Binary files /dev/null and b/data/magic-watermarks.mse-include/watermark_w_old.png differ diff --git a/data/magic-watermarks.mse-include/watermarks-old b/data/magic-watermarks.mse-include/watermarks-old new file mode 100644 index 00000000..61a71c7f --- /dev/null +++ b/data/magic-watermarks.mse-include/watermarks-old @@ -0,0 +1,70 @@ +# Old Style Watermark images + +choice images: + mana symbol white: /magic-watermarks.mse-include/watermark_w_old.png + mana symbol blue: /magic-watermarks.mse-include/watermark_u_old.png + mana symbol black: /magic-watermarks.mse-include/watermark_b_old.png + mana symbol red: /magic-watermarks.mse-include/watermark_r_old.png + mana symbol green: /magic-watermarks.mse-include/watermark_g_old.png + mana symbol snow: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_s.png") + + transparent mana symbol white: script: set_alpha(alpha: 0.4, input:"/magic-watermarks.mse-include/watermark_w_old.png") + transparent mana symbol blue: script: set_alpha(alpha: 0.4, input:"/magic-watermarks.mse-include/watermark_u_old.png") + transparent mana symbol black: script: set_alpha(alpha: 0.4, input:"/magic-watermarks.mse-include/watermark_b_old.png") + transparent mana symbol red: script: set_alpha(alpha: 0.4, input:"/magic-watermarks.mse-include/watermark_r_old.png") + transparent mana symbol green: script: set_alpha(alpha: 0.4, input:"/magic-watermarks.mse-include/watermark_g_old.png") + + guild symbol The 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 The Cult of Rakdos (B/R): script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_rakados.png") + guild symbol The Gruul Clans (R/G): script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_gruul.png") + guild symbol The Selesnya Conclave (G/W): script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_selesnya.png") + guild symbol The Orzhov Syndicate (W/B): script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_orzhov.png") + guild symbol The Izzet (U/R): script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_izzet.png") + guild symbol The Golgari (B/G): script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_golgari.png") + guild symbol The Boros Legion (R/W): script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_boros.png") + guild symbol The Simic Combine (G/U): script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_simic.png") + + colored xander hybrid mana B/R: /magic-watermarks.mse-include/watermark_brmana_colored.png + colored xander hybrid mana U/B: /magic-watermarks.mse-include/watermark_ubmana_colored.png + colored xander hybrid mana B/G: /magic-watermarks.mse-include/watermark_bgmana_colored.png + colored xander hybrid mana R/G: /magic-watermarks.mse-include/watermark_rgmana_colored.png + colored xander hybrid mana G/U: /magic-watermarks.mse-include/watermark_gumana_colored.png + colored xander hybrid mana U/R: /magic-watermarks.mse-include/watermark_urmana_colored.png + colored xander hybrid mana W/B: /magic-watermarks.mse-include/watermark_wbmana_colored.png + colored xander hybrid mana G/W: /magic-watermarks.mse-include/watermark_gwmana_colored.png + colored xander hybrid mana R/W: /magic-watermarks.mse-include/watermark_rwmana_colored.png + colored xander hybrid mana W/U: /magic-watermarks.mse-include/watermark_wumana_colored.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") + + future sight type symbols artifact: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_artifact.png") + future sight type symbols creature: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_creature.png") + future sight type symbols enchantment: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_enchantment.png") + future sight type symbols instant: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_instant.png") + future sight type symbols land: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_land.png") + future sight type symbols multiple: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_multiple.png") + future sight type symbols sorcery: script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_sorcery.png") + + set symbol: + { set_combine(combine:"shadow", + set_alpha( + alpha: 0.5, + #symbol_variation(symbol: set.symbol, variation: "common") + drop_shadow(offset_x: -0.01, offset_y: 0.03, blur_radius: 0.02, alpha: 1, color: rgb(0,0,0), + enlarge(border_size: 0.03, + symbol_variation(symbol: set.symbol, border_radius: 0, fill_color:rgb(255,255,255), border_color:rgb(0,0,0)) + ) + ) + ) + ) + } diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game index b0ebb8da..e2bec985 100644 --- a/data/magic.mse-game/game +++ b/data/magic.mse-game/game @@ -4,7 +4,7 @@ full name: Magic the Gathering icon: card-back.png position hint: 01 -version: 2007-10-13 +version: 2007-12-29 depends on: package: magic-blends.mse-include version: 2007-09-23 @@ -252,7 +252,7 @@ init script: # replaces — correctly add := "" # default is nothing - separate_words := remove_tags + trim + replace_rule(match:" ", replace: " and/or ") + separate_words := remove_tags + trim + replace_rule(match:" ", replace: {spacer}) for_mana_costs := format_cost := { if input.separator_before == "—" and contains(input.param, match: " ") then ( if contains(input.param, match:",") then ( @@ -1313,37 +1313,52 @@ word list: word: Land word: Planeswalker +## I (Pichoro) have altered the race and class lists so that things like "class: Elf" don't happen. +## If this is really disliked, I have the original lists saved. +## TODO: Make the alphabetical sublists actually work. word list: name: race word: script: all_races() line below: true + word: Angel + word: Beast + word: Bird + word: Construct + word: Demon + word: Dragon + word: Drake + word: Elemental + word: Elf + word: Faerie + word: Giant + word: Goblin + word: Golem + word: Human + word: Illusion + word: Merfolk + word: Treefolk + word: Zombie word: name: All Types word: A - word: Advisor word: Anemone word: Angel word: Anteater word: Antelope word: Ape - word: Archer word: Archon - word: Artificer - word: Assassin word: Assembly-Worker word: Atog word: Aurochs word: Avatar word: B word: Badger - word: Barbarian word: Basilisk word: Bat word: Bear word: Beast word: Beeble - word: Berserker word: Bird word: Blinkmoth word: Boar @@ -1353,36 +1368,28 @@ word list: word: Camarid word: Camel word: Caribou - word: Carrier word: Cat word: Centaur word: Cephalid word: Chimera - word: Citizen - word: Cleric word: Cockatrice word: Construct - word: Coward word: Crab word: Crocodile word: Cyclops word: D word: Dauthi word: Demon - word: Deserter word: Devil word: Djinn word: Dragon word: Drake word: Dreadnought - word: Drone - word: Druid word: Dryad word: Dwarf word: E word: Efreet word: Egg - word: Elder word: Elemental word: Elephant word: Elf @@ -1392,7 +1399,6 @@ word list: word: Faerie word: Ferret word: Fish - word: Flagbearer word: Fox word: Frog word: Fungus @@ -1431,7 +1437,6 @@ word list: word: Kavu word: Kirin word: Kithkin - word: Knight word: Kobold word: Kor word: Kraken @@ -1445,25 +1450,18 @@ word list: word: M word: Manticore word: Masticore - word: Mercenary word: Merfolk word: Metathran - word: Minion word: Minotaur - word: Monger word: Mongoose - word: Monk word: Moonfolk word: Mutant word: Myr - word: Mystic word: N word: Nautilus word: Nephilim word: Nightmare word: Nightstalker - word: Ninja - word: Nomad word: O word: Octopus word: Ogre @@ -1481,31 +1479,23 @@ word list: word: Phelddagrif word: Phoenix word: Pincher - word: Pirate word: Plant word: Prism word: R word: Rabbit word: Rat - word: Rebel word: Reflection word: Rhino - word: Rigger - word: Rogue word: S word: Sa-Sl word: Salamander - word: Samurai word: Sand word: Saproling word: Satyr word: Scarecrow word: Scorpion - word: Scout - word: Serf word: Serpent word: Shade - word: Shaman word: Shapeshifter word: Sheep word: Skeleton @@ -1514,11 +1504,9 @@ word list: word: Slug word: Sn-Sz word: Snake - word: Soldier word: Soltari word: Spawn word: Specter - word: Spellshaper word: Sphinx word: Spider word: Spike @@ -1528,7 +1516,6 @@ word list: word: Squid word: Squirrel word: Starfish - word: Survivor word: T word: Tetravite word: Thalakos @@ -1547,10 +1534,8 @@ word list: word: Volver word: W word: Wall - word: Warrior word: Weird word: Whale - word: Wizard word: Wolf word: Wolverine word: Wombat @@ -1568,250 +1553,81 @@ word list: word: script: all_classes() line below: true + word: Advisor + word: Archer + word: Artificer + word: Assassin + word: Beast + word: Cleric + word: Druid + word: Knight + word: Mutant + word: Rogue + word: Scout + word: Shaman + word: Soldier + word: Warrior + word: Wizard + word: Zombie word: name: All Types - word: A + word: A-C word: Advisor - word: Anemone - word: Angel - word: Anteater - word: Antelope - word: Ape word: Archer word: Archon word: Artificer word: Assassin - word: Assembly-Worker - word: Atog - word: Aurochs - word: Avatar - word: B - word: Badger word: Barbarian - word: Basilisk - word: Bat - word: Bear word: Beast - word: Beeble word: Berserker - word: Bird - word: Blinkmoth - word: Boar word: Bringer word: Brushwagg - word: C - word: Camarid - word: Camel - word: Caribou word: Carrier - word: Cat - word: Centaur - word: Cephalid - word: Chimera word: Citizen word: Cleric - word: Cockatrice - word: Construct word: Coward - word: Crab - word: Crocodile - word: Cyclops - word: D - word: Dauthi - word: Demon + word: D-I word: Deserter - word: Devil - word: Djinn - word: Dragon - word: Drake word: Dreadnought word: Drone word: Druid - word: Dryad - word: Dwarf - word: E - word: Efreet - word: Egg word: Elder - word: Elemental - word: Elephant - word: Elf - word: Elk - word: Eye - word: F - word: Faerie - word: Ferret - word: Fish word: Flagbearer - word: Fox - word: Frog - word: Fungus - word: G - word: Gargoyle - word: Giant - word: Gnome - word: Goat - word: Goblin - word: Golem - word: Gorgon - word: Graveborn - word: Gremlin - word: Griffin - word: H word: Hag - word: Harpy word: Hellion - word: Hippo - word: Homarid - word: Homunculus word: Horror - word: Horse - word: Hound - word: Human - word: Hydra - word: I - word: Illusion - word: Imp word: Incarnation - word: Insect - word: J - word: Jellyfish + word: J-P word: Juggernaut - word: K - word: Kavu - word: Kirin - word: Kithkin word: Knight - word: Kobold - word: Kor - word: Kraken - word: L - word: Lammasu - word: Leech word: Leviathan - word: Lhurgoyf - word: Licid - word: Lizard - word: M - word: Manticore - word: Masticore word: Mercenary - word: Merfolk - word: Metathran word: Minion - word: Minotaur word: Monger - word: Mongoose word: Monk - word: Moonfolk word: Mutant - word: Myr word: Mystic - word: N - word: Nautilus - word: Nephilim - word: Nightmare - word: Nightstalker word: Ninja word: Nomad - word: O - word: Octopus - word: Ogre - word: Ooze - word: Orb - word: Orc - word: Orgg - word: Ouphe - word: Ox - word: Oyster - word: P - word: Pegasus - word: Pentavite - word: Pest - word: Phelddagrif - word: Phoenix - word: Pincher word: Pirate - word: Plant - word: Prism - word: R - word: Rabbit - word: Rat + word: R-S word: Rebel word: Reflection - word: Rhino word: Rigger word: Rogue - word: S - word: Sa-Sl - word: Salamander - word: Samurai - word: Sand - word: Saproling - word: Satyr - word: Scarecrow - word: Scorpion - word: Scout - word: Serf - word: Serpent - word: Shade - word: Shaman - word: Shapeshifter - word: Sheep - word: Skeleton - word: Slith - word: Sliver - word: Slug - word: Sn-Sz - word: Snake - word: Soldier - word: Soltari - word: Spawn - word: Specter - word: Spellshaper - word: Sphinx - word: Spider - word: Spike - word: Spirit - word: Splinter - word: Sponge - word: Squid - word: Squirrel - word: Starfish - word: Survivor - word: T - word: Tetravite - word: Thalakos + word: Samurai + word: Scout + word: Serf + word: Shaman + word: Soldier + word: Spellshaper + word: Survivor + word: T-Z word: Thopter - word: Thrull - word: Treefolk - word: Triskelavite - word: Troll - word: Turtle - word: U - word: Unicorn - word: V word: Vampire - word: Vedalken - word: Viashino - word: Volver - word: W - word: Wall word: Warrior - word: Weird - word: Whale word: Wizard - word: Wolf - word: Wolverine - word: Wombat - word: Worm - word: Wraith - word: Wurm - word: Y - word: Yeti - word: Z word: Zombie - word: Zubera word list: name: artifact @@ -2049,9 +1865,13 @@ keyword parameter type: description: Removes plurality from words. script: \{english_singular({input})\} refer script: - name: separate words + name: separate words with "and/or" description: Changes spaces to " and/or ". "Elf Warrior" becomes "Elf and/or Warrior". - script: \{separate_words({input})\} + script: \{separate_words(spacer: " and/or ", {input})\} + refer script: + name: separate words with "or" + description: Changes spaces to " or ". "Elf Warrior" becomes "Elf or Warrior". + script: \{separate_words(spacer: " or ", {input})\} keyword parameter type: name: prefix description: Prefix for things like "walk" @@ -2061,7 +1881,7 @@ keyword parameter type: example: Forest keyword parameter type: name: a - match: [ ]*|[ an?]* + match: [ ]*|[ ][an?]* ############################# All Magic keywords # By JrEye and Neko_Asakami, Updated by Pichoro and Buttock1234 @@ -2095,7 +1915,7 @@ keyword: keyword: Protection from match: Protection from name mode: core - reminder: This creature can’t be blocked, targeted, dealt damage, enchanted, or equipped by anything {english_singular(param1)}. + reminder: {if has_pt() then "This creature" else "This permanent"} can’t be blocked, targeted, dealt damage, or enchanted by anything {english_singular(param1)}. keyword: keyword: Regeneration match: Regenerate @@ -2205,7 +2025,7 @@ keyword: keyword: Amplify match: Amplify number mode: expert - reminder: As this card comes into play, put {english_number_a(param1)} +1/+1 counter(s) on it for each {separate_words(card.sub_type)} card you reveal in your hand. + reminder: As this card comes into play, put {english_number_a(param1)} +1/+1 counter(s) on it for each {separate_words(spacer: " and/or ", card.sub_type)} card you reveal in your hand. keyword: keyword: Double strike match: Double strike @@ -2418,7 +2238,7 @@ keyword: keyword: keyword: Deathtouch match: Deathtouch - mode: expert + mode: core reminder: Whenever this creature deals damage to a creature, destroy that creature. keyword: keyword: Reach @@ -2498,7 +2318,7 @@ keyword: keyword: Champion match: Championaname mode: expert - reminder: When this comes into play, sacrifice it unless you remove another {param2} you control from the game. When this leaves play, that card returns to play. + reminder: When this comes into play, sacrifice it unless you remove another{param2} you control from the game. When this leaves play, that card returns to play. keyword: keyword: Clash match: Clash @@ -2514,3 +2334,18 @@ keyword: match: Hideaway mode: expert reminder: This land comes into play tapped. When it does, look at the top four cards of your library, remove one from the game face down, then put the rest on the bottom of your library. +keyword: + keyword: Kinship + match: Kinship + mode: pseudo + rules: Kinship — At the beginning of your upkeep, you may look at the top card of your library. If that card shares a creature type with ~, you may reveal it. If you do, [effect]. +keyword: + keyword: Prowl + match: Prowl cost + mode: expert + reminder: You may play this for its prowl cost if you dealt combat damage to a player this turn with a {separate_words(spacer: " or ", card.sub_type)}. +keyword: + keyword: Reinforce + match: Reinforce number—cost + mode: expert + reminder: {param2}, Discard this card: Put {english_number_a(param1)} +1/+1 counter(s) on target creature. diff --git a/data/vanguard-standard.mse-style/style b/data/vanguard-standard.mse-style/style index e3b60b6c..32b39311 100644 --- a/data/vanguard-standard.mse-style/style +++ b/data/vanguard-standard.mse-style/style @@ -17,7 +17,8 @@ depends on: card width: 375 card height: 523 -card dpi: 150 +#card dpi: 150 +card dpi: { 782 / 7 } # Author: Wolfwood # Based on: magic-new diff --git a/data/vanguard.mse-game/game b/data/vanguard.mse-game/game index 7b260c99..0c747e36 100644 --- a/data/vanguard.mse-game/game +++ b/data/vanguard.mse-game/game @@ -3,7 +3,7 @@ short name: Vanguard full name: Magic Vanguard icon: card-sample.png position hint: 02 -version: 2007-10-13 +version: 2007-12-29 # Author : Wolfwood # Most stuff is copy/pasted from magic.mse-game @@ -940,3 +940,17 @@ keyword: match: hideaway mode: expert reminder: The land comes into play tapped. When it does, look at the top four cards of your library, remove one from the game face down, then put the rest on the bottom of your library. +keyword: + keyword: Kinship + match: Kinship + mode: pseudo +keyword: + keyword: Prowl + match: prowl cost + mode: expert + reminder: You may play it for its prowl cost if you dealt combat damage to a player this turn with a creature that shares a type with it. +keyword: + keyword: Reinforce + match: reinforce number—cost + mode: expert + reminder: {param2}, Discard it: Put {english_number_a(param1)} +1/+1 counter(s) on target creature.