Commit ff1c6da4 authored by pichoro's avatar pichoro

Changed Extended Art text alignment to Bottom Left.

Fixed possible problem in Textless style.
Further updated Magic keyword system.
Added card fields necessary for FPM temp merger to magic game file.
Updated Vanguard with new keyword system.
Enabled reminder texts in Vanguard.
parent 45316572
...@@ -207,7 +207,7 @@ card style: ...@@ -207,7 +207,7 @@ card style:
then "magic-mana-large" then "magic-mana-large"
else "magic-mana-small" else "magic-mana-small"
size: 14 size: 14
alignment: middle left alignment: bottom left
z index: 2 z index: 2
padding left: 6 padding left: 6
padding top: 2 padding top: 2
......
...@@ -62,12 +62,27 @@ styling field: ...@@ -62,12 +62,27 @@ styling field:
name: use guild mana symbols name: use guild mana symbols
description: Use the Ravnica guild symbols instead of the official half/half circles for hybrid mana. description: Use the Ravnica guild symbols instead of the official half/half circles for hybrid mana.
initial: no initial: no
styling field:
type: choice
name: tap symbol
description: What tap symbol should be used on cards?
initial: modern
choice: modern
choice: old
choice: diagonal T
styling style: styling style:
use guild mana symbols: use guild mana symbols:
choice images: choice images:
yes: /magic-mana-small.mse-symbol-font/mana_guild_rg.png yes: /magic-mana-small.mse-symbol-font/mana_guild_rg.png
no: /magic-mana-small.mse-symbol-font/mana_rg.png no: /magic-mana-small.mse-symbol-font/mana_rg.png
tap symbol:
render style: both
choice images:
modern: /magic-mana-large.mse-symbol-font/mana_t.png
old: /magic-mana-large.mse-symbol-font/mana_t_old.png
diagonal T: /magic-mana-large.mse-symbol-font/mana_t_older.png
############################################################## Card fields ############################################################## Card fields
card style: card style:
......
...@@ -234,6 +234,18 @@ init script: ...@@ -234,6 +234,18 @@ init script:
replace_rule( replace_rule(
match: "s</param-name><s>" match: "s</param-name><s>"
replace: "" ) + replace: "" ) +
# step 6d : "." remover for keywords
replace_rule(
match: ".</param-name><.>"
replace: "" ) +
# step 6e : p/t detector, needed for suspend
tag_contents_rule(
tag: "<haspt>"
contents: { if card.pt == "" then "" else contents } ) +
# step 6f : casting cost detector, needed for suspend
tag_contents_rule(## <iscc> by somebloke
tag: "<hascc>"
contents: { if card.casting_cost == "" then "" else contents } ) +
# step 7 : italic reminder text # step 7 : italic reminder text
replace_rule( replace_rule(
match: "[(][^)\n]*[)]?", match: "[(][^)\n]*[)]?",
...@@ -242,7 +254,7 @@ init script: ...@@ -242,7 +254,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>", in_context: "[(](<param-[a-z]*>)?<match>|[ ]*: <param-cost><match>",
replace: { to_upper() }) replace: { to_upper() })
# the flavor text filter # the flavor text filter
...@@ -424,6 +436,13 @@ card field: ...@@ -424,6 +436,13 @@ card field:
# Specify the colors somewhere else, to keep things clean # Specify the colors somewhere else, to keep things clean
include file: magic-blends.mse-include/card-colors include file: magic-blends.mse-include/card-colors
default: card_color(casting_cost: card.casting_cost) default: card_color(casting_cost: card.casting_cost)
#needed for FPM temps
card field:
type: choice
name: font color
choice: black
choice: white
description: Font color for the typeline and textbox
############################# Name line ############################# Name line
card field: card field:
...@@ -491,7 +510,13 @@ card field: ...@@ -491,7 +510,13 @@ card field:
card list visible: true card list visible: true
card list column:4 card list column:4
description: The type of this card, type - to go the sub type description: The type of this card, type - to go the sub type
#needed for FPM temps
card field:
type: choice
name: type image
include file: magic-blends.mse-include/card-colors
script: card.card_color
editable: false
card field: card field:
type: choice type: choice
name: rarity name: rarity
...@@ -527,7 +552,15 @@ card field: ...@@ -527,7 +552,15 @@ card field:
show statistics: false show statistics: false
script: script:
combined_editor(field1: card.rule_text, separator: "<line>\n</line>", field2: card.flavor_text) combined_editor(field1: card.rule_text, separator: "<line>\n</line>", field2: card.flavor_text)
#needed for FPM temps
card field:
type: choice
name: textbox
include file: magic-blends.mse-include/card-colors
script: card.card_color
editable: false
save value: false
show statistics: false
card field: card field:
type: choice type: choice
name: watermark name: watermark
...@@ -582,6 +615,13 @@ card field: ...@@ -582,6 +615,13 @@ card field:
name: toughness name: toughness
icon: stats/toughness.png icon: stats/toughness.png
editable: false editable: false
#needed for FPM temps
card field:
type: choice
name: ptsymbols
choice: shieldsword
editable: false
show statistics: false
card field: card field:
type: text type: text
name: pt name: pt
...@@ -770,6 +810,13 @@ card field: ...@@ -770,6 +810,13 @@ card field:
icon: stats/toughness.png icon: stats/toughness.png
editable: false editable: false
show statistics: false show statistics: false
#needed for FPM temps
card field:
type: choice
name: ptsymbols 2
choice: shieldsword
editable: false
show statistics: false
card field: card field:
type: text type: text
name: pt 2 name: pt 2
...@@ -980,9 +1027,17 @@ keyword parameter type: ...@@ -980,9 +1027,17 @@ keyword parameter type:
description: standard cost description: standard cost
script: \{{input}\} script: \{{input}\}
refer script: refer script:
name: dual parameters name: add = nothing
description: parses dual costs without pay an additional description: parses dual costs without pay an additional
script: \{format_cost({input},add:"")\} script: \{format_cost({input},add:"")\}
refer script:
name: add = "pay an additional "
description: parses dual costs without pay an additional
script: \{format_cost({input},add:"pay an additional ")\}
refer script:
name: add = "pay "
description: parses dual costs without pay an additional
script: \{format_cost({input},add:"pay ")\}
keyword parameter type: keyword parameter type:
name: number name: number
match: [XYZ0-9]+ match: [XYZ0-9]+
...@@ -1082,7 +1137,7 @@ keyword: ...@@ -1082,7 +1137,7 @@ keyword:
keyword: Cumulative upkeep keyword: Cumulative upkeep
match: Cumulative upkeep<atom-param>cost</atom-param> match: Cumulative upkeep<atom-param>cost</atom-param>
mode: old mode: old
reminder: At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you {format_cost(param1,add:"pay an additional ")} for each age counter on it. reminder: At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you {format_cost(param1,add:"pay ")} for each age counter on it.
keyword: keyword:
keyword: Horsemanship keyword: Horsemanship
match: Horsemanship match: Horsemanship
...@@ -1107,7 +1162,7 @@ keyword: ...@@ -1107,7 +1162,7 @@ keyword:
keyword: Buyback keyword: Buyback
match: Buyback<atom-param>cost</atom-param> match: Buyback<atom-param>cost</atom-param>
mode: expert mode: expert
reminder: You may pay {format_cost(param1,add:"pay an additional ")} in addition to any other costs as you play this spell. If you do, put this card into your hand as it resolves. reminder: You may pay {format_cost(param1,add:"pay ")} in addition to any other costs as you play this spell. If you do, put this card into your hand as it resolves.
keyword: keyword:
keyword: Echo keyword: Echo
match: Echo<atom-param>cost</atom-param> match: Echo<atom-param>cost</atom-param>
...@@ -1117,12 +1172,7 @@ keyword: ...@@ -1117,12 +1172,7 @@ keyword:
keyword: Cardcycling keyword: Cardcycling
match: <atom-param>name</atom-param>cycling<atom-param>cost</atom-param> match: <atom-param>name</atom-param>cycling<atom-param>cost</atom-param>
mode: expert mode: expert
reminder: {format_cost(param1,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: Cardcycling
match: <atom-param>name</atom-param>cycling—<atom-param>action</atom-param>
mode: expert
reminder: {param2}, Discard this card: Search your library for a {param1} card, reveal it, and put it into your hand. Then shuffle your library.
keyword: keyword:
keyword: Fading keyword: Fading
match: Fading <atom-param>number</atom-param> match: Fading <atom-param>number</atom-param>
...@@ -1132,7 +1182,7 @@ keyword: ...@@ -1132,7 +1182,7 @@ keyword:
keyword: Kicker keyword: Kicker
match: Kicker<atom-param>cost</atom-param> match: Kicker<atom-param>cost</atom-param>
mode: expert mode: expert
reminder: You may pay an additional {format_cost(param1,add:"pay an additional ")} as you play this spell. reminder: You may {format_cost(param1,add:"pay an additional ")} as you play this spell.
keyword: keyword:
keyword: Madness keyword: Madness
match: Madness<atom-param>cost</atom-param> match: Madness<atom-param>cost</atom-param>
...@@ -1205,7 +1255,7 @@ keyword: ...@@ -1205,7 +1255,7 @@ keyword:
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
match: Splice onto <atom-param>name</atom-param><atom-param>cost</atom-param> match: Splice onto <atom-param>name</atom-param> <atom-param>cost</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:
...@@ -1286,14 +1336,14 @@ keyword: ...@@ -1286,14 +1336,14 @@ keyword:
reminder: This creature comes into play with {english_number_a(param1)} +1/+1 counter(s) on it. Whenever another creature comes into play, you may move a +1/+1 counter from this creature onto it. reminder: This creature comes into play with {english_number_a(param1)} +1/+1 counter(s) on it. Whenever another creature comes into play, you may move a +1/+1 counter from this creature onto it.
keyword: keyword:
keyword: Forecast keyword: Forecast
match: Forecast — <atom-param>cost</atom-param>, Reveal ~ from your hand: <atom-param>action</atom-param>. match: Forecast—<atom-param>cost</atom-param>, Reveal this card from your hand: <atom-param>action</atom-param>
mode: expert mode: expert
reminder: Play this ability only during your upkeep and only once each turn. reminder: Play this ability only during your upkeep and only once each turn.
keyword: keyword:
keyword: Recover keyword: Recover
match: Recover<atom-param>cost</atom-param> match: Recover<atom-param>cost</atom-param>
mode: expert mode: expert
reminder: When a creature is put into your graveyard from play, you may pay an additional {format_cost(param1,add:"pay an additional ")}. If you do, return this card from your graveyard to your hand. Otherwise, remove this card from the game. reminder: When a creature is put into your graveyard from play, you may {format_cost(param1,add:"pay ")}. If you do, return this card from your graveyard to your hand. Otherwise, remove this card from the game.
keyword: keyword:
keyword: Ripple keyword: Ripple
match: Ripple <atom-param>number</atom-param> match: Ripple <atom-param>number</atom-param>
...@@ -1313,7 +1363,7 @@ keyword: ...@@ -1313,7 +1363,7 @@ keyword:
keyword: Suspend keyword: Suspend
match: Suspend <atom-param>number</atom-param>—<atom-param>mana</atom-param> match: Suspend <atom-param>number</atom-param>—<atom-param>mana</atom-param>
mode: expert mode: expert
reminder: Rather than play this card from your hand, you may pay {param2} and remove it from the game with {english_number_a(param1)} time counter(s) on it. At the beginning of your upkeep, remove a time counter. When the last is removed, play it without paying its mana cost. It has haste. reminder: Rather than play this card from your hand,<hascc> you may</hascc> pay {param2} and remove it from the game with {english_number_a(param1)} time counter(s) on it. At the beginning of your upkeep, remove a time counter. When the last is removed, play it without paying its mana cost.<haspt> It has haste.</haspt>
keyword: keyword:
keyword: Vanishing keyword: Vanishing
match: Vanishing <atom-param>number</atom-param> match: Vanishing <atom-param>number</atom-param>
...@@ -1356,7 +1406,7 @@ keyword: ...@@ -1356,7 +1406,7 @@ keyword:
reminder: {format_cost(param1,add:"")}, Sacrifice this creature: Search your library for a creature card with the same converted mana cost as this creature and put that card into play. Then shuffle your library. Play only as a sorcery. reminder: {format_cost(param1,add:"")}, Sacrifice this creature: Search your library for a creature card with the same converted mana cost as this creature and put that card into play. Then shuffle your library. Play only as a sorcery.
keyword: keyword:
keyword: Aura swap keyword: Aura swap
match: Aura swamp<atom-param>cost</atom-param> match: Aura swap<atom-param>cost</atom-param>
mode: expert mode: expert
reminder: {format_cost(param1,add:"")}: Exchange this Aura with an Aura card in your hand. reminder: {format_cost(param1,add:"")}: Exchange this Aura with an Aura card in your hand.
keyword: keyword:
......
This diff is collapsed.
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