Commit c09610ff authored by pichoro's avatar pichoro

Keyword Polish. Evoke added. Keywords that should change based on factors...

Keyword Polish. Evoke added.  Keywords that should change based on factors like targeting or not (like Storm), or that should display subtype (Amplify) do now.
Added grey colorless land styling for FPM templates.
Expanded size of rarity symbols in all applicable styles.
parent 4f492f06
......@@ -160,7 +160,7 @@ card style:
type:
left: 33
top : 445
width: 286
width: { 308 - max(22,card_style.rarity.content_width) }
height: 18
alignment: top shrink-overflow
z index: 3
......@@ -171,11 +171,12 @@ card style:
separator color: rgb(128,128,128)
rarity:
left: 322
right: 344
top : 445
width: 22
width: 44
height: 22
z index: 3
alignment: middle right
render style: image
choice images:
# Images based on the set symbol
......
......@@ -227,11 +227,12 @@ card style:
color: rgb(0,0,0)
separator color: rgb(128,128,128)
rarity:
left: 75
left: 64
top : 348
width: 22
width: 44
height: 22
z index: 1
alignment: middle center
render style: image
choice images:
# Images based on the set symbol
......
......@@ -22,7 +22,11 @@ init script:
) else input
}
template := { green_template() + "{type}.jpg" }
land_template := { (if input == "a" then "c" else green_template()) + "l{type}.jpg" }
land_template := {
(if input == "a" then (
if styling.land_style == "grey" then "e"
else "c"
) else green_template()) + "l{type}.jpg" }
# Use the normal tap symbol
mana_t := {
......@@ -61,6 +65,13 @@ styling field:
initial: dark
choice: light
choice: dark
styling field:
type: choice
name: land style
description: Should colorless lands be normal or grey?
initial: normal
choice: normal
choice: grey
styling field:
type: boolean
name: use guild mana symbols
......@@ -194,11 +205,12 @@ card style:
separator color: rgb(128,128,128)
rarity:
left: 75
left: 64
top : 302
width: 22
width: 44
height: 22
z index: 1
alignment: middle center
render style: image
choice images:
# Images based on the set symbol
......
......@@ -19,7 +19,11 @@ init script:
) else input
}
template := { green_template() + "{type}.jpg" }
land_template := { (if input == "a" then "c" else green_template()) + "l{type}.jpg" }
land_template := {
(if input == "a" then (
if styling.land_style == "grey" then "e"
else "c"
) else green_template()) + "l{type}.jpg" }
# Use the normal tap symbol
mana_t := {
......@@ -58,6 +62,13 @@ styling field:
initial: dark
choice: light
choice: dark
styling field:
type: choice
name: land style
description: Should colorless lands be normal or grey?
initial: normal
choice: normal
choice: grey
styling field:
type: boolean
name: use guild mana symbols
......@@ -289,9 +300,6 @@ card style:
{ if styling.font_color = "white" then rgb(255,255,255)
else if styling.font_color = "black" then rgb(0,0,0)
else rgb(0,0,0) }
symbol font:
name: magic-paintbrush
size: 14
copyright line:
left: 65
......
......@@ -25,7 +25,11 @@ init script:
) else input
}
template := { green_template() + "{type}.jpg" }
land_template := { (if input == "a" then "c" else green_template()) + "l{type}.jpg" }
land_template := {
(if input == "a" then (
if styling.land_style == "grey" then "e"
else "c"
) else green_template()) + "l{type}.jpg" }
# Use the normal tap symbol
mana_t := {
......@@ -63,6 +67,13 @@ styling field:
initial: dark
choice: light
choice: dark
styling field:
type: choice
name: land style
description: Should colorless lands be normal or grey?
initial: normal
choice: normal
choice: grey
styling field:
type: boolean
name: use guild mana symbols
......@@ -259,11 +270,12 @@ card style:
color: rgb(0,0,0)
separator color: rgb(128,128,128)
rarity:
left: 56.95
left: 48.45
top : 214
width: 17
width: 34
height: 17
z index: 1
alignment: middle center
render style: image
choice images:
# Images based on the set symbol
......@@ -273,11 +285,12 @@ card style:
rare: script: symbol_variation(symbol: set.symbol, variation: "rare")
special: script: symbol_variation(symbol: set.symbol, variation: "special")
rarity 2:
left: 310.44
left: 301.54
top : 214
width: 17
width: 34
height: 17
z index: 1
alignment: middle center
render style: image
choice images:
# Images based on the set symbol
......
......@@ -3,7 +3,7 @@ game: magic
full name: FPM's Token Magic
short name: FPM Token
icon: card-sample.png
position hint: 421
position hint: 407
card width: 375
card height: 523
......@@ -20,7 +20,11 @@ init script:
}
suffix := [card: "card.jpg", textbox: "textbox.png", typeline: "typeline.png"]
template := { green_template() + suffix[type] }
land_template := { (if input == "a" then "c" else green_template()) + "l" + suffix[type] }
land_template := {
(if input == "a" then (
if styling.land_style == "grey" then "e"
else "c"
) else green_template()) + "l" + suffix[type] }
# Use the normal tap symbol
mana_t := {
......@@ -63,6 +67,13 @@ styling field:
initial: dark
choice: light
choice: dark
styling field:
type: choice
name: land style
description: Should colorless lands be normal or grey?
initial: normal
choice: normal
choice: grey
styling field:
type: choice
name: tap symbol
......@@ -192,12 +203,13 @@ card style:
rarity:
left:
{ if card.type != "" or card.illustrator != "" or card.copyright != "" then 75
{ if card.type != "" or card.illustrator != "" or card.copyright != "" then 64
else 23 }
top : 468
width: 22
width: 44
height: 22
z index: 3
alignment: middle center
render style: image
choice images:
# Images based on the set symbol
......
......@@ -65,6 +65,9 @@ init script:
else "new"
}
# Use guild mana symbols?
guild_mana := { styling.use_guild_mana_symbols }
colorless_color := {
if contains(card.card_color, match: "white")
and not contains(card.card_color, match: "hybrid")
......@@ -215,7 +218,7 @@ card style:
type:
left: 49
top : 434
width: 270
width: { 288 - max(18,card_style.rarity.content_width) }
height: 28
alignment: top shrink-overflow
z index: 1
......@@ -226,11 +229,12 @@ card style:
color: { font_color(card.card_color) }
separator color: rgb(128,128,128)
rarity:
left: 334
right: 352
top : 439
width: 18
width: 36
height: 19
z index: 2
alignment: middle right
render style: image
choice images:
# Images based on the set symbol
......
......@@ -250,7 +250,7 @@ card style:
type:
left: 49
top : 300
width: 270
width: { 291 - max(21,card_style.rarity.content_width) }
height: 20
alignment: middle shrink-overflow
z index: 3
......@@ -261,11 +261,12 @@ card style:
color: { font_color(card.card_color) }
separator color: rgb(128,128,128)
rarity:
left: 332
right: 353
top : 301
width: 21
width: 42
height: 21
z index: 3
alignment: middle right
render style: image
choice images:
# Images based on the set symbol
......
......@@ -214,11 +214,12 @@ card style:
separator color: rgb(128,128,128)
rarity:
left: 320
left: 309
top : 482
width: 22
width: 44
height: 22
z index: 1
alignment: middle center
render style: image
choice images:
# Images based on the set symbol
......
......@@ -201,7 +201,7 @@ card style:
type:
left: 30
top : 211
width: 197
width: { 210 - max(13,card_style.rarity.content_width) }
height: 17
alignment: top shrink-overflow
z index: 1
......@@ -214,7 +214,7 @@ card style:
type 2:
left: 282
top : 211
width: 197
width: { 210 - max(13,card_style.rarity.content_width) }
height: 17
alignment: top shrink-overflow
z index: 1
......@@ -225,11 +225,12 @@ card style:
separator color: rgb(128,128,128)
rarity:
left: 228
right: 241
top : 213
width: 13
width: 26
height: 13
z index: 1
alignment: middle right
render style: image
choice images:
# Images based on the set symbol
......@@ -240,11 +241,12 @@ card style:
special: script: symbol_variation(symbol: set.symbol, variation: "special")
rarity 2:
left: 480
right: 493
top : 213
width: 13
width: 26
height: 13
z index: 1
alignment: middle right
render style: image
choice images:
# Images based on the set symbol
......
......@@ -3,7 +3,7 @@ game: magic
short name: Tokens
full name: Modern style
icon: card-sample.png
position hint: 010
position hint: 007
version: 2007-06-27
depends on:
package: magic.mse-game
......@@ -167,7 +167,7 @@ card style:
{ if text_shape() == "0" then 432
else if text_shape() == "1" then 414
else 353 }
width: 286
width: { 308 - max(22,card_style.rarity.content_width) }
height: 20
alignment: top shrink-overflow
z index: 1
......@@ -181,14 +181,15 @@ card style:
separator color: rgb(128,128,128)
rarity:
left: 320
right: 342
top:
{ if text_shape() == "0" then 432
else if text_shape() == "1" then 414
else 353 }
width: 22
width: 44
height: 22
z index: 1
alignment: middle right
render style: image
choice images:
# Images based on the set symbol
......
......@@ -258,7 +258,7 @@ card style:
type:
left: 32
top : 206
width: 197
width: { 210 - max(13,card_style.rarity.content_width) }
height: 16
alignment: middle shrink-overflow
z index: 1
......@@ -274,7 +274,7 @@ card style:
type 2:
left: 284
top : 206
width: 197
width: { 210 - max(13,card_style.rarity.content_width) }
height: 16
alignment: middle shrink-overflow
z index: 1
......@@ -288,11 +288,12 @@ card style:
separator color: rgb(128,128,128)
rarity:
left: 228
right: 241
top : 207
width: 13
width: 26
height: 13
z index: 1
alignment: middle right
render style: image
choice images:
# Images based on the set symbol
......@@ -315,11 +316,12 @@ card style:
else symbol_variation(symbol: set.symbol, variation: "common")
rarity 2:
left: 480
right: 493
top : 207
width: 13
width: 26
height: 13
z index: 1
alignment: middle right
render style: image
choice images:
# Images based on the set symbol
......
......@@ -9,7 +9,7 @@ game: magic
short name: Tokens
full name: Old style
icon: card-sample.png
position hint: 121
position hint: 107
card width: 312
card height: 444
......@@ -199,7 +199,7 @@ card style:
type:
left: 47
top : 296
width: 199
width: { 221 - max(22,card_style.rarity.content_width) }
height: 18
alignment: top left shrink-overflow
z index: 1
......@@ -213,11 +213,12 @@ card style:
separator color: rgb(192,192,192)
rarity:
left: 247
right: 269
top : 294
width: 22
width: 44
height: 22
z index: 1
alignment: middle right
render style: image
choice images:
# Images based on the set symbol
......
......@@ -229,7 +229,7 @@ card style:
type:
left: 37
top : 260
width: 240
width: { 262 - max(22,card_style.rarity.content_width) }
height: 18
alignment: top left shrink-overflow
z index: 1
......@@ -243,11 +243,12 @@ card style:
separator color: rgb(192,192,192)
rarity:
left: 277
right: 299
top : 257
width: 22
width: 44
height: 22
z index: 1
alignment: middle right
render style: image
choice images:
# Images based on the set symbol
......
......@@ -158,7 +158,7 @@ card style:
type:
left: 35
top : 298
width: 286
width: { 308 - max(22,card_style.rarity.content_width) }
height: 20
alignment: middle shrink-overflow
z index: 1
......@@ -174,11 +174,12 @@ card style:
separator color: rgb(192,192,192)
rarity:
left: 320
right: 342
top : 297
width: 22
width: 44
height: 22
z index: 1
alignment: middle right
render style: image
choice images:
# Images based on the set symbol
......
......@@ -3,7 +3,7 @@ game: magic
short name: Textless
full name: Modern style
icon: card-sample.png
position hint: 007
position hint: 005
card width: 375
card height: 523
......@@ -150,11 +150,12 @@ card style:
############################# Card type
rarity:
left: 320
left: 309
top : 480
width: 22
width: 44
height: 22
z index: 1
alignment: middle center
render style: image
choice images:
# Images based on the set symbol
......
......@@ -3,7 +3,7 @@ short name: Magic
full name: Magic the Gathering
icon: card-back.png
version: 2007-07-01
position hint: 1
position hint: 01
############################################################## Functions & filters
......@@ -237,6 +237,8 @@ init script:
# replaces — correctly
add := "" # default is nothing
separate_words := replace_rule(match:" ", replace: " and/or ")+
tag_remove_rule(tag: "<word-list")
for_mana_costs := format_cost := {
if input.separator_before == "—" and contains(input.param, match: " ") then (
if contains(input.param, match:",") then (
......@@ -1472,6 +1474,10 @@ keyword parameter type:
name: singular
description: Removes plurality from words.
script: \{english_singular({input})\}
refer script:
name: separate words
description: Changes spaces to " and/or ". "Elf Warrior" becomes "Elf and/or Warrior".
script: \{separate_words({input})\}
keyword parameter type:
name: prefix
description: Prefix for things like "<something>walk"
......@@ -1625,7 +1631,7 @@ keyword:
keyword: Amplify
match: Amplify <atom-param>number</atom-param>
mode: expert
reminder: As this card comes into play, put {english_number_a(param1)} +1/+1 counter(s) on it for each creature that shares a type with this that 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(card.sub_type)} card you reveal in your hand.
keyword:
keyword: Double strike
match: Double strike
......@@ -1645,7 +1651,7 @@ keyword:
keyword: Storm
match: Storm
mode: expert
reminder: When you play this spell, copy it for each spell played before it this turn. You may choose new targets for the copies.
reminder: When you play this spell, copy it for each spell played before it this turn.{ if contains(card.rule_text, match:"target") or contains(card.rule_text, match:"Target") then " You may choose new targets for the copies." else "" }
keyword:
keyword: Affinity for
match: Affinity for <atom-param>name</atom-param>
......@@ -1734,7 +1740,7 @@ keyword:
keyword: Epic
match: Epic
mode: expert
reminder: For the rest of the game, you can’t play spells. At the beginning of each of your upkeeps, copy this spell except for its epic ability. If the spell has any targets, you may choose new targets for the copy.
reminder: For the rest of the game, you can’t play spells. At the beginning of each of your upkeeps, copy this spell except for its epic ability.{ if contains(card.rule_text, match:"target") or contains(card.rule_text, match:"Target") then " You may choose a new target for the copy." else "" }
keyword:
keyword: Channel
match: Channel
......@@ -1779,7 +1785,7 @@ keyword:
keyword: Replicate
match: Replicate <atom-param>cost</atom-param>
mode: expert
reminder: When you play this spell, copy it for each time you paid its replicate cost. You may choose new targets for the copies.
reminder: When you play this spell, copy it for each time you paid its replicate cost.{ if contains(card.rule_text, match:"target") or contains(card.rule_text, match:"Target") then " You may choose new targets for the copies." else "" }
keyword:
keyword: Graft
match: Graft <atom-param>number</atom-param>
......@@ -1839,7 +1845,7 @@ keyword:
keyword: Gravestorm
match: Gravestorm
mode: expert
reminder: When you play this spell, copy it for each permanent put into a graveyard this turn. You may choose new targets for the copies.
reminder: When you play this spell, copy it for each permanent put into a graveyard this turn.{ if contains(card.rule_text, match:"target") or contains(card.rule_text, match:"Target") then " You may choose new targets for the copies." else "" }
keyword:
keyword: Lifelink
match: Lifelink
......@@ -1899,8 +1905,13 @@ keyword:
match: Grandeur
mode: pseudo
rules: Grandeur — Discard another card named ~: [effect].
keyword:
keyword: Evoke
match: Evoke <atom-param>cost</atom-param>
mode: expert
reminder: You may play this spell for its evoke cost. If you do, it's sacrificed when it comes into play.
keyword:
keyword: Champion
match: Champion <atom-param>a</atom-param> <atom-param>name</atom-param>
mode: core
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.
......@@ -2,7 +2,7 @@
short name: Vanguard
full name: Magic Vanguard
icon: card-sample.png
position hint: 2
position hint: 02
# Author : Wolfwood
# Most stuff is copy/pasted from magic.mse-game
......@@ -517,6 +517,9 @@ keyword parameter type:
optional: false
match: [A-Z][A-Z,a-z ]*
example: Forest
keyword parameter type:
name: a
match: an?
############################# All Magic keywords
# By JrEye and Neko_Asakami, Updated by Pichoro and Buttock1234
......@@ -927,3 +930,13 @@ keyword:
keyword: Grandeur
match: Grandeur
mode: pseudo
keyword:
keyword: Evoke
match: Evoke <atom-param>cost</atom-param>
mode: expert
reminder: You may play this spell for its evoke cost. If you do, it's sacrificed when it comes into play.
keyword:
keyword: Champion
match: Champion <atom-param>a</atom-param> <atom-param>name</atom-param>
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.
......@@ -3,7 +3,7 @@ full name: VS System
short name: VS
icon: card-back.png
version: 2007-06-25
position hint: 3
position hint: 03
############################################################## Functions & filters
# General functions
......
mse version: 0.3.2
short name: Yu-Gi-Oh!
icon: card-back.png
position hint: 4
position hint: 04
############################################################## Functions & filters
## Copied and Pasted from vs.mse-game, with a few modifications
......
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