diff --git a/data/magic-blends.mse-include/include b/data/magic-blends.mse-include/include index 88dcd71c..b2e8cb28 100644 --- a/data/magic-blends.mse-include/include +++ b/data/magic-blends.mse-include/include @@ -1,6 +1,6 @@ mse version: 0.3.6 full name: Magic The Gathering, card blend utilities -version: 2008-01-20 +version: 2008-04-13 # This file doesn't do anything, other files in this directory can be included # in game/style files: diff --git a/data/magic-blends.mse-include/new-blends b/data/magic-blends.mse-include/new-blends index 9f6e4fec..05467740 100644 --- a/data/magic-blends.mse-include/new-blends +++ b/data/magic-blends.mse-include/new-blends @@ -513,7 +513,7 @@ color_combination := { ) else if artifact then masked_blend( - mask: "multicolor_blend_{type}.png", + mask: "artifact_blend_{type}.png", dark: template("a"), light: base, ) diff --git a/data/magic-extended-art.mse-style/artifact_blend_card.png b/data/magic-extended-art.mse-style/artifact_blend_card.png new file mode 100644 index 00000000..f032a0ac Binary files /dev/null and b/data/magic-extended-art.mse-style/artifact_blend_card.png differ diff --git a/data/magic-extended-art.mse-style/artifact_blend_pt.png b/data/magic-extended-art.mse-style/artifact_blend_pt.png new file mode 100644 index 00000000..03fdc049 Binary files /dev/null and b/data/magic-extended-art.mse-style/artifact_blend_pt.png differ diff --git a/data/magic-extended-art.mse-style/style b/data/magic-extended-art.mse-style/style index b8887f83..ab3a438c 100644 --- a/data/magic-extended-art.mse-style/style +++ b/data/magic-extended-art.mse-style/style @@ -5,7 +5,7 @@ short name: Extended Art icon: card-sample.png position hint: 006 -version: 2008-04-01 +version: 2008-04-13 depends on: package: magic.mse-game version: 2007-12-29 diff --git a/data/magic-firepenguinmaster-flip.mse-style/artifact_blend_card.png b/data/magic-firepenguinmaster-flip.mse-style/artifact_blend_card.png new file mode 100644 index 00000000..f6e136e6 Binary files /dev/null and b/data/magic-firepenguinmaster-flip.mse-style/artifact_blend_card.png differ diff --git a/data/magic-firepenguinmaster-flip.mse-style/style b/data/magic-firepenguinmaster-flip.mse-style/style index f890d277..1801c4f1 100644 --- a/data/magic-firepenguinmaster-flip.mse-style/style +++ b/data/magic-firepenguinmaster-flip.mse-style/style @@ -5,7 +5,7 @@ short name: FPM Flip icon: card-sample.png position hint: 402 -version: 2008-04-01 +version: 2008-04-13 depends on: package: magic.mse-game version: 2007-12-29 diff --git a/data/magic-firepenguinmaster.mse-style/artifact_blend_card.png b/data/magic-firepenguinmaster.mse-style/artifact_blend_card.png new file mode 100644 index 00000000..e226de9d Binary files /dev/null and b/data/magic-firepenguinmaster.mse-style/artifact_blend_card.png differ diff --git a/data/magic-firepenguinmaster.mse-style/style b/data/magic-firepenguinmaster.mse-style/style index d25bc67f..2a9e0002 100644 --- a/data/magic-firepenguinmaster.mse-style/style +++ b/data/magic-firepenguinmaster.mse-style/style @@ -5,7 +5,7 @@ short name: FPM Normal icon: card-sample.png position hint: 401 -version: 2008-04-01 +version: 2008-04-13 depends on: package: magic.mse-game version: 2007-12-29 diff --git a/data/magic-firepenguinmasterpromo.mse-style/artifact_blend_card.png b/data/magic-firepenguinmasterpromo.mse-style/artifact_blend_card.png new file mode 100644 index 00000000..e226de9d Binary files /dev/null and b/data/magic-firepenguinmasterpromo.mse-style/artifact_blend_card.png differ diff --git a/data/magic-firepenguinmasterpromo.mse-style/style b/data/magic-firepenguinmasterpromo.mse-style/style index 4e67dd88..66234eba 100644 --- a/data/magic-firepenguinmasterpromo.mse-style/style +++ b/data/magic-firepenguinmasterpromo.mse-style/style @@ -5,7 +5,7 @@ short name: FPM Promo icon: card-sample.png position hint: 404 -version: 2008-04-01 +version: 2008-04-13 depends on: package: magic.mse-game version: 2007-12-29 diff --git a/data/magic-firepenguinmastersplit.mse-style/artifact_blend_card.png b/data/magic-firepenguinmastersplit.mse-style/artifact_blend_card.png new file mode 100644 index 00000000..0b48a198 Binary files /dev/null and b/data/magic-firepenguinmastersplit.mse-style/artifact_blend_card.png differ diff --git a/data/magic-firepenguinmastersplit.mse-style/style b/data/magic-firepenguinmastersplit.mse-style/style index e352d98b..d835c9d4 100644 --- a/data/magic-firepenguinmastersplit.mse-style/style +++ b/data/magic-firepenguinmastersplit.mse-style/style @@ -5,7 +5,7 @@ short name: FPM Split icon: card-sample.png position hint: 403 -version: 2008-04-01 +version: 2008-04-13 depends on: package: magic.mse-game version: 2007-12-29 diff --git a/data/magic-firepenguinmastertokens.mse-style/artifact_blend_card.png b/data/magic-firepenguinmastertokens.mse-style/artifact_blend_card.png new file mode 100644 index 00000000..e226de9d Binary files /dev/null and b/data/magic-firepenguinmastertokens.mse-style/artifact_blend_card.png differ diff --git a/data/magic-firepenguinmastertokens.mse-style/artifact_blend_textbox.png b/data/magic-firepenguinmastertokens.mse-style/artifact_blend_textbox.png new file mode 100644 index 00000000..05b63fbf Binary files /dev/null and b/data/magic-firepenguinmastertokens.mse-style/artifact_blend_textbox.png differ diff --git a/data/magic-firepenguinmastertokens.mse-style/artifact_blend_typeline.png b/data/magic-firepenguinmastertokens.mse-style/artifact_blend_typeline.png new file mode 100644 index 00000000..063a5bfe Binary files /dev/null and b/data/magic-firepenguinmastertokens.mse-style/artifact_blend_typeline.png differ diff --git a/data/magic-firepenguinmastertokens.mse-style/style b/data/magic-firepenguinmastertokens.mse-style/style index 58be30bc..39b79c39 100644 --- a/data/magic-firepenguinmastertokens.mse-style/style +++ b/data/magic-firepenguinmastertokens.mse-style/style @@ -5,7 +5,7 @@ short name: FPM Token icon: card-sample.png position hint: 407 -version: 2008-04-01 +version: 2008-04-13 depends on: package: magic.mse-game version: 2007-12-29 diff --git a/data/magic-future-textless.mse-style/style b/data/magic-future-textless.mse-style/style index 192758c6..dcc915aa 100644 --- a/data/magic-future-textless.mse-style/style +++ b/data/magic-future-textless.mse-style/style @@ -5,7 +5,7 @@ full name: Futureshift Textless icon: card-sample.png position hint: 055 -version: 2008-03-12 +version: 2008-04-13 depends on: package: magic.mse-game version: 2007-09-23 @@ -34,43 +34,6 @@ init script: template := { input + "{type}.jpg" } land_template := { (if input == "a" then "c" else input) + "l{type}.jpg" } - color_combination := { - # The base hybrid, without the outer frame blended over it - base := base_hybrid[shape][color_count]() - - # Put a frame around it? - if land and not colored_lands then - masked_blend( - mask: "multicolor_blend_{type}.png", - dark: land_template("c"), - light: base, - ) - else if land and multi and mask_multi_land_with_color() then - masked_blend( - mask: "hybrid_blend_{type}.png", - dark: base, - light: land_template("m"), - ) - else if multi then - masked_blend( - mask: "multicolor_blend_{type}.png", - dark: template("m"), - light: base, - ) - else if artifact then - masked_blend( - mask: "artifact_blend_{type}.png", - dark: template("a"), - light: base, - ) - else if color_count > 1 and mask_hybrid_with_land() then - masked_blend( - mask: "hybrid_blend_{type}.png", - dark: land_template("c"), - light: base, - ) - else base - } # Use the normal tap symbol mana_t := { diff --git a/data/magic-future.mse-style/style b/data/magic-future.mse-style/style index 38269a5d..7bf3dd7a 100644 --- a/data/magic-future.mse-style/style +++ b/data/magic-future.mse-style/style @@ -5,7 +5,7 @@ full name: Futureshift icon: card-sample.png position hint: 050 -version: 2008-04-01 +version: 2008-04-13 depends on: package: magic.mse-game version: 2007-12-29 @@ -42,43 +42,6 @@ init script: template_suffix := [card: "card.jpg", pt: "pt.png", textbox: "textbox.png", typeline: "typeline.png"] template := { input + template_suffix[type] } land_template := { (if input == "a" then "c" else input) + "l" + template_suffix[type] } - color_combination := { - # The base hybrid, without the outer frame blended over it - base := base_hybrid[shape][color_count]() - - # Put a frame around it? - if land and not colored_lands then - masked_blend( - mask: "multicolor_blend_{type}.png", - dark: land_template("c"), - light: base, - ) - else if land and multi and mask_multi_land_with_color() then - masked_blend( - mask: "hybrid_blend_{type}.png", - dark: base, - light: land_template("m"), - ) - else if multi then - masked_blend( - mask: "multicolor_blend_{type}.png", - dark: template("m"), - light: base, - ) - else if artifact then - masked_blend( - mask: "artifact_blend_{type}.png", - dark: template("a"), - light: base, - ) - else if color_count > 1 and mask_hybrid_with_land() then - masked_blend( - mask: "hybrid_blend_{type}.png", - dark: land_template("c"), - light: base, - ) - else base - } # Use the normal tap symbol mana_t := { diff --git a/data/magic-new-flip.mse-style/artifact_blend_card.png b/data/magic-new-flip.mse-style/artifact_blend_card.png new file mode 100644 index 00000000..e75f2caf Binary files /dev/null and b/data/magic-new-flip.mse-style/artifact_blend_card.png differ diff --git a/data/magic-new-flip.mse-style/artifact_blend_pt.png b/data/magic-new-flip.mse-style/artifact_blend_pt.png new file mode 100644 index 00000000..f623e918 Binary files /dev/null and b/data/magic-new-flip.mse-style/artifact_blend_pt.png differ diff --git a/data/magic-new-flip.mse-style/artifact_blend_pt2.png b/data/magic-new-flip.mse-style/artifact_blend_pt2.png new file mode 100644 index 00000000..d26476e7 Binary files /dev/null and b/data/magic-new-flip.mse-style/artifact_blend_pt2.png differ diff --git a/data/magic-new-flip.mse-style/style b/data/magic-new-flip.mse-style/style index 1f1f4605..3ae567b5 100644 --- a/data/magic-new-flip.mse-style/style +++ b/data/magic-new-flip.mse-style/style @@ -5,7 +5,7 @@ full name: Modern flip cards icon: card-sample.png position hint: 002 -version: 2008-04-01 +version: 2008-04-13 depends on: package: magic.mse-game version: 2007-12-29 @@ -229,9 +229,9 @@ card style: separator color: rgb(128,128,128) type 2: - right: { if card.pt != "" then 86 else 34 } + right: { if card.pt_2 != "" then 86 else 34 } bottom: 353 - width: { if card.pt != "" then 256 else 308 } + width: { if card.pt_2 != "" then 256 else 308 } height: 18 alignment: top shrink-overflow angle: 180 @@ -419,7 +419,7 @@ extra card field: extra card style: pt box: - left: 286 + left: 285 top: 123 width: 70 height: 38 @@ -430,7 +430,7 @@ extra card style: image: { flip_ptbox() } pt box 2: - left: 17 + left: 18 top: 342 width: 70 height: 38 diff --git a/data/magic-new-planeswalker.mse-style/artifact_blend_card.png b/data/magic-new-planeswalker.mse-style/artifact_blend_card.png new file mode 100644 index 00000000..f27156b3 Binary files /dev/null and b/data/magic-new-planeswalker.mse-style/artifact_blend_card.png differ diff --git a/data/magic-new-planeswalker.mse-style/style b/data/magic-new-planeswalker.mse-style/style index 67e689af..b860ab3c 100644 --- a/data/magic-new-planeswalker.mse-style/style +++ b/data/magic-new-planeswalker.mse-style/style @@ -5,7 +5,7 @@ full name: Modern Planeswalkers icon: card-sample.png position hint: 008 -version: 2008-04-01 +version: 2008-04-13 depends on: package: magic.mse-game version: 2007-12-29 diff --git a/data/magic-new-promo.mse-style/artifact_blend_card.png b/data/magic-new-promo.mse-style/artifact_blend_card.png new file mode 100644 index 00000000..0602b3b6 Binary files /dev/null and b/data/magic-new-promo.mse-style/artifact_blend_card.png differ diff --git a/data/magic-new-promo.mse-style/artifact_blend_pt.png b/data/magic-new-promo.mse-style/artifact_blend_pt.png new file mode 100644 index 00000000..03fdc049 Binary files /dev/null and b/data/magic-new-promo.mse-style/artifact_blend_pt.png differ diff --git a/data/magic-new-promo.mse-style/style b/data/magic-new-promo.mse-style/style index 15542258..95fd5945 100644 --- a/data/magic-new-promo.mse-style/style +++ b/data/magic-new-promo.mse-style/style @@ -5,7 +5,7 @@ full name: Large image icon: card-sample.png position hint: 004 -version: 2008-04-01 +version: 2008-04-13 depends on: package: magic.mse-game version: 2007-12-29 diff --git a/data/magic-new-split.mse-style/artifact_blend_card.png b/data/magic-new-split.mse-style/artifact_blend_card.png new file mode 100644 index 00000000..9ea747ae Binary files /dev/null and b/data/magic-new-split.mse-style/artifact_blend_card.png differ diff --git a/data/magic-new-split.mse-style/artifact_blend_pt.png b/data/magic-new-split.mse-style/artifact_blend_pt.png new file mode 100644 index 00000000..916ea755 Binary files /dev/null and b/data/magic-new-split.mse-style/artifact_blend_pt.png differ diff --git a/data/magic-new-split.mse-style/style b/data/magic-new-split.mse-style/style index 343e5017..fa4a71cf 100644 --- a/data/magic-new-split.mse-style/style +++ b/data/magic-new-split.mse-style/style @@ -5,7 +5,7 @@ full name: Modern split cards icon: card-sample.png position hint: 003 -version: 2008-04-01 +version: 2008-04-13 depends on: package: magic.mse-game version: 2007-12-29 diff --git a/data/magic-new-token.mse-style/artifact_blend_card0.png b/data/magic-new-token.mse-style/artifact_blend_card0.png new file mode 100644 index 00000000..3d360205 Binary files /dev/null and b/data/magic-new-token.mse-style/artifact_blend_card0.png differ diff --git a/data/magic-new-token.mse-style/artifact_blend_card1.png b/data/magic-new-token.mse-style/artifact_blend_card1.png new file mode 100644 index 00000000..52de1c8c Binary files /dev/null and b/data/magic-new-token.mse-style/artifact_blend_card1.png differ diff --git a/data/magic-new-token.mse-style/artifact_blend_card2.png b/data/magic-new-token.mse-style/artifact_blend_card2.png new file mode 100644 index 00000000..5284c2c4 Binary files /dev/null and b/data/magic-new-token.mse-style/artifact_blend_card2.png differ diff --git a/data/magic-new-token.mse-style/artifact_blend_pt0.png b/data/magic-new-token.mse-style/artifact_blend_pt0.png new file mode 100644 index 00000000..08bbb035 Binary files /dev/null and b/data/magic-new-token.mse-style/artifact_blend_pt0.png differ diff --git a/data/magic-new-token.mse-style/artifact_blend_pt1.png b/data/magic-new-token.mse-style/artifact_blend_pt1.png new file mode 100644 index 00000000..045ef573 Binary files /dev/null and b/data/magic-new-token.mse-style/artifact_blend_pt1.png differ diff --git a/data/magic-new-token.mse-style/artifact_blend_pt2.png b/data/magic-new-token.mse-style/artifact_blend_pt2.png new file mode 100644 index 00000000..0c9478f0 Binary files /dev/null and b/data/magic-new-token.mse-style/artifact_blend_pt2.png differ diff --git a/data/magic-new-token.mse-style/multicolor_blend_card2.png b/data/magic-new-token.mse-style/multicolor_blend_card2.png index b282b340..73e7d963 100644 Binary files a/data/magic-new-token.mse-style/multicolor_blend_card2.png and b/data/magic-new-token.mse-style/multicolor_blend_card2.png differ diff --git a/data/magic-new-token.mse-style/style b/data/magic-new-token.mse-style/style index cb9eb113..5b91250b 100644 --- a/data/magic-new-token.mse-style/style +++ b/data/magic-new-token.mse-style/style @@ -5,7 +5,7 @@ full name: Modern style icon: card-sample.png position hint: 007 -version: 2008-04-01 +version: 2008-04-13 depends on: package: magic.mse-game version: 2007-12-29 diff --git a/data/magic-new.mse-style/artifact_blend_card.png b/data/magic-new.mse-style/artifact_blend_card.png new file mode 100644 index 00000000..34cfe297 Binary files /dev/null and b/data/magic-new.mse-style/artifact_blend_card.png differ diff --git a/data/magic-new.mse-style/artifact_blend_pt.png b/data/magic-new.mse-style/artifact_blend_pt.png new file mode 100644 index 00000000..03fdc049 Binary files /dev/null and b/data/magic-new.mse-style/artifact_blend_pt.png differ diff --git a/data/magic-new.mse-style/style b/data/magic-new.mse-style/style index 119d9d96..ddfe37f8 100644 --- a/data/magic-new.mse-style/style +++ b/data/magic-new.mse-style/style @@ -5,7 +5,7 @@ full name: After 8th edition icon: card-sample.png position hint: 001 -version: 2008-04-01 +version: 2008-04-13 depends on: package: magic.mse-game version: 2007-12-29 diff --git a/data/magic-old-split.mse-style/style b/data/magic-old-split.mse-style/style index dfc15e7c..609126e0 100644 --- a/data/magic-old-split.mse-style/style +++ b/data/magic-old-split.mse-style/style @@ -5,7 +5,7 @@ short name: Old Splits icon: card-sample.png position hint: 103 -version: 2008-04-05 +version: 2008-04-13 depends on: package: magic.mse-game version: 2007-12-29 @@ -67,7 +67,9 @@ init script: ) else if artifact then masked_blend( - mask: "multicolor_blend_{type}.png", + mask: ( if styling.type_of_gradient_artifact == "full card" then "multicolor_blend_{type}.png" + else if styling.type_of_gradient_artifact == "trim only" then "multicolor_blend_{type}2.png" + else "multicolor_blend_{type}.png" ), dark: template("a"), light: base, ) @@ -119,6 +121,13 @@ styling field: choice: full card choice: trim only initial: full card +styling field: + type: choice + name: type of gradient artifact + description: What parts of the card should be blended for gradient artifact? + choice: full card + choice: trim only + initial: full card styling field: type: choice name: tap symbol diff --git a/data/magic-old-token.mse-style/style b/data/magic-old-token.mse-style/style index a9fff177..48abbe85 100644 --- a/data/magic-old-token.mse-style/style +++ b/data/magic-old-token.mse-style/style @@ -11,7 +11,7 @@ full name: Old style icon: card-sample.png position hint: 107 -version: 2008-04-01 +version: 2008-04-13 depends on: package: magic.mse-game version: 2007-12-29 @@ -67,7 +67,9 @@ init script: ) else if artifact then masked_blend( - mask: "multicolor_blend_{type}.png", + mask: ( if styling.type_of_gradient_artifact == "full card" then "multicolor_blend_{type}.png" + else if styling.type_of_gradient_artifact == "trim only" then "multicolor_blend_{type}2.png" + else "multicolor_blend_{type}.png" ), dark: template("a"), light: base, ) @@ -121,6 +123,13 @@ styling field: choice: full card choice: trim only initial: full card +styling field: + type: choice + name: type of gradient artifact + description: What parts of the card should be blended for gradient artifact? + choice: full card + choice: trim only + initial: full card styling field: type: choice name: tap symbol diff --git a/data/magic-old.mse-style/style b/data/magic-old.mse-style/style index 56eb2ca2..32772949 100644 --- a/data/magic-old.mse-style/style +++ b/data/magic-old.mse-style/style @@ -11,7 +11,7 @@ full name: Before 8th edition icon: card-sample.png position hint: 101 -version: 2008-04-01 +version: 2008-04-13 depends on: package: magic.mse-game version: 2007-12-29 @@ -75,7 +75,9 @@ init script: ) else if artifact then masked_blend( - mask: "multicolor_blend_{type}.png", + mask: ( if styling.type_of_gradient_artifact == "full card" then "multicolor_blend_{type}.png" + else if styling.type_of_gradient_artifact == "trim only" then "multicolor_blend_{type}2.png" + else "multicolor_blend_{type}.png" ), dark: template("a"), light: base, ) @@ -132,6 +134,13 @@ styling field: choice: full card choice: trim only initial: full card +styling field: + type: choice + name: type of gradient artifact + description: What parts of the card should be blended for gradient artifact? + choice: full card + choice: trim only + initial: full card styling field: type: choice name: tap symbol diff --git a/data/magic-planeshifted.mse-style/artifact_blend_card.png b/data/magic-planeshifted.mse-style/artifact_blend_card.png new file mode 100644 index 00000000..34cfe297 Binary files /dev/null and b/data/magic-planeshifted.mse-style/artifact_blend_card.png differ diff --git a/data/magic-planeshifted.mse-style/artifact_blend_pt.png b/data/magic-planeshifted.mse-style/artifact_blend_pt.png new file mode 100644 index 00000000..03fdc049 Binary files /dev/null and b/data/magic-planeshifted.mse-style/artifact_blend_pt.png differ diff --git a/data/magic-planeshifted.mse-style/style b/data/magic-planeshifted.mse-style/style index 2231b47b..8352f5c8 100644 --- a/data/magic-planeshifted.mse-style/style +++ b/data/magic-planeshifted.mse-style/style @@ -5,7 +5,7 @@ full name: Planar Chaos Timeshifts icon: card-sample.png position hint: 011 -version: 2008-04-01 +version: 2008-04-13 depends on: package: magic.mse-game version: 2007-12-29 diff --git a/data/magic-textless.mse-style/artifact_blend_card.png b/data/magic-textless.mse-style/artifact_blend_card.png new file mode 100644 index 00000000..9dbd3f86 Binary files /dev/null and b/data/magic-textless.mse-style/artifact_blend_card.png differ diff --git a/data/magic-textless.mse-style/artifact_blend_pt.png b/data/magic-textless.mse-style/artifact_blend_pt.png new file mode 100644 index 00000000..03fdc049 Binary files /dev/null and b/data/magic-textless.mse-style/artifact_blend_pt.png differ diff --git a/data/magic-textless.mse-style/style b/data/magic-textless.mse-style/style index 84ee8995..09972255 100644 --- a/data/magic-textless.mse-style/style +++ b/data/magic-textless.mse-style/style @@ -5,7 +5,7 @@ full name: Modern style icon: card-sample.png position hint: 005 -version: 2008-04-01 +version: 2008-04-13 depends on: package: magic.mse-game version: 2007-12-29 diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game index fd1be68a..0fd46122 100644 --- a/data/magic.mse-game/game +++ b/data/magic.mse-game/game @@ -5,7 +5,7 @@ installer group: magic/game files icon: card-back.png position hint: 01 -version: 2008-04-01 +version: 2008-04-14 depends on: package: magic-blends.mse-include version: 2007-09-23 @@ -202,6 +202,20 @@ init script: else if contains(card.name, match:"Forest") then "LF" # Forests else "LA" # other basic lands } + hybrid_cost_sort := { + colors := sort_text(casting_cost, order: "") + if colors = "WU" then "GA" + else if colors = "WB" then "GB" + else if colors = "UB" then "GC" + else if colors = "UR" then "GD" + else if colors = "BR" then "GE" + else if colors = "BG" then "GF" + else if colors = "RG" then "GG" + else if colors = "WR" then "GH" + else if colors = "WG" then "GI" + else if colors = "UG" then "GJ" + else "GK" + } color_of_card := { card_color := card.card_color casting_cost := card.casting_cost @@ -211,7 +225,7 @@ init script: if card.rarity != "basic land" then "K" # Nonbasic Land else basic_land_sort() ) else if is_null_cost(casting_cost) then ( - if chosen(choice: "hybrid", card_color) then "G" # Hybrids + if chosen(choice: "hybrid", card_color) then "GK" # Hybrids else if is_multicolor(card_color) then "F" # Multicolor else if chosen(choice:"white", card_color) then "A" # White else if chosen(choice:"blue", card_color) then "B" # Blue @@ -228,7 +242,7 @@ init script: else if colors == "B" then "C" # Black else if colors == "R" then "D" # Red else if colors == "G" then "E" # Green - else if contains(casting_cost, match:"/") then "G" #Hybrid + else if contains(casting_cost, match:"/") then hybrid_cost_sort() #Hybrid else "F" # Multicolor ) } @@ -308,6 +322,9 @@ init script: | [ ]* # keyword argument that is declared as cost | , # keyword argument that is declared as cost "; + # truncates the name of legends + legend_filter := replace_rule(match:", [A-Z,a-z,0-9,' ]*", replace: "" )+ + replace_rule(match:"the [A-Z,a-z,0-9,' ]*", replace: "" ) # the rule text filter # - adds mana symbols # - makes text in parentheses italic @@ -338,11 +355,21 @@ init script: in_context: "(^|[[:space:]]|\\()", # TODO: Allow any punctuation before replace: "" ) + - # step 3b : fill in atom fields + # step 3b : expand shortcut words ` and shortened LEGENDNAME + replace_rule( + match: "LEGENDNAME", + in_context: "(^|[[:space:]]|\\()", # TODO: Allow any punctuation before + replace: "" + ) + + # step 3c : fill in atom fields tag_contents_rule( tag: "", contents: { if card_name=="" then "CARDNAME" else card_name } ) + + tag_contents_rule( + tag: "", + contents: { if card_name=="" then "LEGENDNAME" else legend_filter(card_name) } + ) + # step 4 : explict non mana symbols replace_rule( match: "\\][STQXYZIWUBRG0-9/|]+\\[", @@ -1759,6 +1786,9 @@ auto replace: auto replace: match: AAA replace: as an additional cost to play +auto replace: + match: @ + replace: LEGENDNAME ############################################################## Add multiple cards @@ -2424,3 +2454,8 @@ keyword: match: Wither mode: expert reminder: This deals damage to creatures in the form of -1/-1 counters. +keyword: + keyword: Conspire + match: Conspire + mode: expert + reminder: As you play this spell, you may tap two untapped creatures you control that share a color with it. When you do, copy it{ if is_targeted() then " and you may choose a new target for the copy" }. diff --git a/data/vanguard.mse-game/game b/data/vanguard.mse-game/game index 2c20789e..8f43d07c 100644 --- a/data/vanguard.mse-game/game +++ b/data/vanguard.mse-game/game @@ -4,7 +4,7 @@ full name: Magic Vanguard icon: card-sample.png position hint: 02 -version: 2008-04-01 +version: 2008-04-09 # Author : Wolfwood # Most stuff is copy/pasted from magic.mse-game @@ -966,3 +966,8 @@ keyword: match: wither mode: expert reminder: It deals damage to creatures in the form of -1/-1 counters. +keyword: + keyword: Conspire + match: conspire + mode: expert + reminder: As you play it, you may tap two untapped creatures you control that share a color with it. When you do, copy it and you may choose a new target for the copy. \ No newline at end of file