Action param altered to allow period.

All present keywords oraclized.
All keywords since Dissension added.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@284 0fc631ac-6414-0410-93d0-97cfa31319b6

data/magic.mse-game/game

@@ -939,7 +939,7 @@ keyword parameter type:
 # By jimrandomh
 keyword parameter type:
 	name: cost
-	match: [XYZ0-9WUBRGS/]+|[^(.,\n]|([XYZ0-9WUBRGS/]+,)?[^(.,\n]*
+	match: [^(\n]+
 keyword parameter type:
 	name: number
 	match: [XYZ0-9]+
@@ -961,7 +961,7 @@ keyword parameter type:
 		script: \{english_number_multiple({input})\}
 keyword parameter type:
 	name: action
-	match: [^(.,\n]+
+	match: [^(,\n]+
 keyword parameter type:
 	name: name
 	match: [^(.,\n]+
@@ -979,7 +979,7 @@ keyword:
 	keyword: Flying
 	match: Flying
 	mode: core
-	reminder: This creature can’t be blocked except by creatures with flying.
+	reminder: This creature can’t be blocked except by creatures with flying and/or reach.
 keyword:
 	keyword: Haste
 	match: Haste
@@ -1002,7 +1002,12 @@ keyword:
 	reminder: Target a {param1} as you play this. This card comes into play attached to that {param1}.
 keyword:
 	keyword: Cycling
-	match: Cycling <atom-param>cost</atom-param>
+	match: Cycling <atom-param>mana</atom-param>
+	mode: core
+	reminder: {param1}, Discard this card: Draw a card.
+keyword:
+	keyword: Cycling
+	match: Cycling—<atom-param>action</atom-param>
 	mode: core
 	reminder: {param1}, Discard this card: Draw a card.
 keyword:
@@ -1032,9 +1037,14 @@ keyword:
 	reminder: This creature can’t attack.
 keyword:
 	keyword: Cumulative upkeep
-	match: Cumulative upkeep <atom-param>cost</atom-param>
+	match: Cumulative upkeep <atom-param>mana</atom-param>
 	mode: old
 	reminder: At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay {param1} for each age counter on it.
+keyword:
+	keyword: Cumulative upkeep
+	match: Cumulative upkeep—<atom-param>action</atom-param>
+	mode: old
+	reminder: At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you {param1} for each age counter on it.
 keyword:
 	keyword: Horsemanship
 	match: Horsemanship
@@ -1047,64 +1057,93 @@ keyword:
 	reminder: At the beginning of your upkeep, put this and any cards attached to it in the phased-out zone.  If this is already in the phased-out zone, return it and any card attached to it to play.  If there were counters on this card when it phased out, put that many counters on it when it returns to play.  This ability does not cause comes-into-play or leaves play abilities to trigger.
 keyword:
 	keyword: Flanking
-	match: Flanking <atom-param>number</atom-param>
 	mode: old
-	reminder: Whenever a creature without flanking blocks this creature, the blocking creature gets -{param1}/-{param1} until end of turn.
+	reminder: Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.
 keyword:
 	keyword: Shadow
 	match: Shadow
 	mode: core
-	reminder: This creature can block or be blocked by only creatures with shadow.
+	reminder: This creature can block or be blocked only by creatures with shadow.
 keyword:
 	keyword: Buyback
-	match: Buyback <atom-param>cost</atom-param>
+	match: Buyback <atom-param>mana</atom-param>
 	mode: expert
-	reminder: You may pay {param1} in addition to any other costs as you play this spell. If you do, put ~ into your hand instead of your graveyard as part of its resolution.
+	reminder: You may pay {param1} 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: Buyback
+	match: Buyback—<ataom-param>action</atom-param>
+	mode: expert
+	reminder: You may {param1} 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: Echo
-	match: Echo
+	match: Echo <atom-param>mana</atom-param>
 	mode: expert
-	reminder: At the beginning of your next upkeep after this permanent comes under your control, sacrifice it unless you pay its mana cost.
+	reminder: At the beginning of your upkeep, if this came under your control since the beginning of your last upkeep, sacrifice it unless you pay its echo cost.
 keyword:
-	keyword: Landcycling
-	match: <atom-param>land</atom-param>cycling <atom-param>cost</atom-param>
+	keyword: Echo
+	match: Echo—<atom-param>action</atom-param>
+	mode: expert
+	reminder: At the beginning of your upkeep, if this came under your control since the beginning of your last upkeep, sacrifice it unless you pay its echo cost.
+keyword:
+	keyword: Cardcycling
+	match: <atom-param>name</atom-param>cycling <atom-param>mana</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: 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: Fading
 	match: Fading <atom-param>number</atom-param>
 	mode: expert
-	reminder: This comes into play with {param1} fade counter(s) on it. At the beginning of your upkeep, remove a fade counter from it. If you can’t, sacrifice it.
+	reminder: This comes into play with {english_number_a(param1)} fade counter(s) on it. At the beginning of your upkeep, remove a fade counter from it. If you can’t, sacrifice it.
 keyword:
 	keyword: Kicker
-	match: Kicker <atom-param>cost</atom-param>
+	match: Kicker <atom-param>mana</atom-param>
 	mode: expert
 	reminder: You may pay an additional {param1} as you play this spell.
+keyword:
+	keyword: Kicker
+	match: Kicker—<atom-param>action</atom-param>
+	mode: expert
+	reminder: You may {param1} as you play this spell.
 keyword:
 	keyword: Madness
-	match: Madness <atom-param>cost</atom-param>
+	match: Madness <atom-param>mana</atom-param>
 	mode: expert
 	reminder: You may play this card for its madness cost at the time you discard it.
 keyword:
-	keyword: Threshold
-	match: Threshold - <atom-param>action</atom-param>
+	keyword: Madness
+	match: Madness—<atom-param>action</atom-param>
 	mode: expert
-	reminder: You have threshold as long as seven or more cards are in your graveyard.
+	reminder: You may play this card for its madness cost at the time you discard it.
 keyword:
 	keyword: Flashback
-	match: Flashback <atom-param>cost</atom-param>
+	match: Flashback <atom-param>mana</atom-param>
+	mode: expert
+	reminder: You may play this card from your graveyard for its flashback cost. Then remove it from the game.
+keyword:
+	keyword: Flashback
+	match: Flashback—<atom-param>action</atom-param>
 	mode: expert
 	reminder: You may play this card from your graveyard for its flashback cost. Then remove it from the game.
 keyword:
 	keyword: Morph
-	match: Morph <atom-param>cost</atom-param>
+	match: Morph <atom-param>mana</atom-param>
 	mode: expert
-	reminder: You may play this face down as a 2/2 creature for [3]. Turn it face up any time for its morph cost.
+	reminder: You may play this face down as a 2/2 creature for <sym>3</sym>. Turn it face up any time for its morph cost.
+keyword:
+	keyword: Morph
+	match: Morph—<atom-param>action</atom-param>
+	mode: expert
+	reminder: You may play this face down as a 2/2 creature for <sym>3</sym>. Turn it face up any time for its morph cost.
 keyword:
 	keyword: Amplify
 	match: Amplify <atom-param>number</atom-param>
 	mode: expert
-	reminder: As this card comes into play, put {english_number(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 creature that shares a type with this that you reveal in your hand.
 keyword:
 	keyword: Double strike
 	match: Double strike
@@ -1127,17 +1166,27 @@ keyword:
 	reminder: This spell costs <sym>1</sym> less to play for each {param1} you control.
 keyword:
 	keyword: Entwine
-	match: Entwine <atom-param>cost</atom-param>
+	match: Entwine <atom-param>mana</atom-param>
+	mode: expert
+	reminder: Choose both if you pay the entwine cost.
+keyword:
+	keyword: Entwine
+	match: Entwine—<atom-param>action</atom-param>
 	mode: expert
 	reminder: Choose both if you pay the entwine cost.
 keyword:
 	keyword: Equip
-	match: Equip <atom-param>cost</atom-param>
+	match: Equip <atom-param>mana</atom-param>
 	mode: expert
-	reminder: {param1}: Attach to target creature you control. Equip only as a sorcery. This card comes into play unattached and stays in play if the creature leaves play.
+	reminder: {param1}: Attach to target creature you control. Equip only as a sorcery.
+keyword:
+	keyword: Equip
+	match: Equip—<atom-param>action</atom-param>
+	mode: expert
+	reminder: {param1}: Attach to target creature you control. Equip only as a sorcery.
 keyword:
 	keyword: Imprint
-	match: Imprint - <atom-param>action</atom-param>
+	match: Imprint—<atom-param>action</atom-param>
 	mode: expert
 	reminder: The removed card is imprinted on this artifact.
 keyword:
@@ -1157,12 +1206,17 @@ 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.
 keyword:
 	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>mana</atom-param>
 	mode: expert
 	reminder: As you play a {param1} spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card’s effects to that spell.
+keyword:
+	keyword: Splice
+	match: Splice onto <atom-param>name</atom-param>—<atom-param>action</atom-param>
+	mode: expert
+	reminder: As you play a {param1} spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.
 keyword:
 	keyword: Offering
-	match: Offering - <atom-param>name</atom-param>
+	match: <atom-param>name</atom-param> Offering
 	mode: expert
 	reminder: You may play this card any time you could play an instant by sacrificing a {param1} and paying the difference in mana costs between this and the sacrificed {param1}. Mana cost includes color.
 keyword:
@@ -1172,7 +1226,12 @@ keyword:
 	reminder: When this blocks or becomes blocked, it gets +{param1}/+{param1} until end of turn.
 keyword:
 	keyword: Ninjutsu
-	match: Ninjutsu <atom-param>cost</atom-param>
+	match: Ninjutsu <atom-param>mana</atom-param>
+	mode: expert
+	reminder: {param1}, Return an unblocked attacker you control to hand: Put this card into play from your hand tapped and attacking.
+keyword:
+	keyword: Ninjutsu
+	match: Ninjutsu—<atom-param>action</atom-param>
 	mode: expert
 	reminder: {param1}, Return an unblocked attacker you control to hand: Put this card into play from your hand tapped and attacking.
 keyword:
@@ -1192,7 +1251,12 @@ keyword:
 	reminder: Each creature you tap while playing this spell reduces its cost by <sym>1</sym> or by one mana of that creature’s color.
 keyword:
 	keyword: Transmute
-	match: Transmute <atom-param>cost</atom-param>
+	match: Transmute <atom-param>mana</atom-param>
+	mode: expert
+	reminder: {param1}, Discard this card: Search your library for a card with the same converted mana cost as this card, reveal it, and put it into your hand. Then shuffle your library. Play only as a sorcery.
+keyword:
+	keyword: Transmute
+	match: Transumute—<atom-param>action</atom-param>
 	mode: expert
 	reminder: {param1}, Discard this card: Search your library for a card with the same converted mana cost as this card, reveal it, and put it into your hand. Then shuffle your library. Play only as a sorcery.
 keyword:
@@ -1207,24 +1271,15 @@ keyword:
 	reminder: If an opponent was dealt damage this turn, this creature comes into play with {english_number_a(param1)} +1/+1 counter(s) on it.
 keyword:
 	keyword: Replicate
-	match: Replicate <atom-param>cost</atom-param>
+	match: Replicate <atom-param>mana</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.
 keyword:
-	keyword: Legendary Landwalk
-	match: Legendary Landwalk
-	mode: core
-	reminder: This creature is unblockable as long as defending player controls a Legendary land.
-keyword:
-	keyword: Non-basic Landwalk
-	match: Non-basic Landwalk
-	mode: core
-	reminder: This creature is unblockable as long as defending player controls a non-basic land.
-keyword:
-	keyword: Snow-covered Landwalk
-	match: Snow-covered Landwalk
-	mode: core
-	reminder: This creature is unblockable as long as defending player controls a Snow-covered land.
+	keyword: Replicate
+	match: Replicate—<atom-param>action</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.
+#Denimwalk was a casualty of my fixing landwalk to work right
 keyword:
 	keyword: Denimwalk
 	match: Denimwalk
@@ -1232,14 +1287,14 @@ keyword:
 	reminder: If defending player is wearing any clothing made of denim, this creature is unblockable.
 keyword:
 	keyword: Landwalk
-	match: <atom-param>land</atom-param>walk
+	match: <atom-param>name</atom-param>walk
 	mode: core
 	reminder: This creature is unblockable as long as defending player controls a {param1}.
 keyword:
 	keyword: Protection from
 	match: Protection from <atom-param>name</atom-param>
 	mode: core
-	reminder: This creature can’t be blocked, targeted, dealt damage, or enchanted by anything {param1}.
+	reminder: This creature can’t be blocked, targeted, dealt damage, or enchanted, or equipped by anything {param1}.
 keyword:
 	keyword: Dredge
 	match: Dredge <atom-param>number</atom-param>
@@ -1249,9 +1304,124 @@ keyword:
 	keyword: Graft
 	match: Graft <atom-param>number</atom-param>
 	mode: expert
-	reminder: This creature comes into play with {english_number(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: Forecast
-	match: Forecast <atom-param>cost</atom-param>
+	match: Forecast — <atom-param>cost</atom-param>, Reveal ~ from your hand: <atom-param>action</atom-param>.
 	mode: expert
 	reminder: Play this ability only during your upkeep and only once each turn.
+keyword:
+	keyword: Recover
+	match: Recover <atom-param>mana</atom-param>
+	mode: expert
+	reminder: When a creature is put into your graveyard from play, you may pay an additional {param1}. If you do, return this card from your graveyard to your hand. Otherwise, remove this card from the game.
+keyword:
+	keyword: Recover
+	match: Recover—<atom-param>action</atom-param>
+	mode: expert
+	reminder: When a creature is put into your graveyard from play, you may pay an additonal {param1}. If you do, return this card from your graveyard to your hand. Otherwise, remove this card from the game.
+keyword:
+	keyword: Ripple
+	match: Ripple <atom-param>number</atom-param>
+	mode: expert
+	reminder: When you play this spell, you may reveal the top {english_number_multiple(param1)} card(s) of your library. You may play any revealed cards with the same name as this spell without paying their mana costs. Put the rest on the bottom of your library.
+keyword:
+	keyword: Flash
+	match: Flash
+	mode: expert
+	reminder: You may play this spell anytime you could play an instant.
+keyword:
+	keyword: Split second
+	match: Split second
+	mode: expert
+	reminder: As long as this spell is on the stack, players can't play spells or activated abilities that aren't mana abilities.
+keyword:
+	keyword: Suspend
+	match: Suspend <atom-param>number</atom-param>—<atom-param>mana</atom-param>
+	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.
+keyword:
+	keyword: Vanishing
+	match: Vanishing <atom-param>number</atom-param>
+	mode: expert
+	reminder: This creature comes into play with {english_number_a(param1)} time counter(s) on it. At the beginning of your upkeep, remove a time counter from it. When you remove the last, sacrifice it.
+keyword:
+	keyword: Deathtouch
+	match: Deathtouch
+	mode: expert
+	reminder: Whenever this creature deals damage to a creature, destroy that creature.
+keyword:
+	keyword: Reach
+	match: Reach
+	mode: expert
+	reminder: This creature can block creatures with flying.
+keyword:
+	keyword: Gravestorm
+	match: Gravestorm
+	mode: expert
+	reminder: When you play this spell, copy it for each permanent put into a graveyard from this play this turn. You may choose new targets for the copies.
+keyword:
+	keyword: Lifelink
+	match: Lifelink
+	mode: expert
+	reminder: Whenever this creature deals damage, you gain that much life.
+keyword:
+	keyword: Absorb
+	match: Absorb <atom-param>number</atom-param>
+	mode: expert
+	reminder: If a source would deal damage to this creature, prevent {param1} of that damage.
+keyword:
+	keyword: Fateseal
+	match: Fateseal <atom-param>number</atom-param>
+	mode: expert
+	reminder: Look at the top {english_number_multiple(param1)} card(s) of an opponent's library, then put any number of them on the bottom of that player's library and the rest on top in any order.
+keyword:
+	keyword: Transfigure
+	match: Transfigure <atom-param>mana</atom-param>
+	mode: expert
+	reminder: {param1}, 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: Transfigure
+	match: Transfigure—<atom-param>action</atom-param>
+	mode: expert
+	reminder: {param1}, 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: Aura swap
+	match: Aura swamp <atom-param>mana</atom-param>
+	mode: expert
+	reminder: {param1}: Exchange this Aura with an Aura card in your hand.
+keyword:
+	keyword: Aura swap
+	match: Aura swap—<atom-param>action</atom-param>
+	mode: expert
+	reminder: {param1}: Exchange this Aura with an Aura card in your hand.
+keyword:
+	keyword: Frenzy
+	match: Frenzy <atom-param>number</atom-param>
+	mode: expert
+	reminder: Whenever this creature attacks and isn't blocked it gets +{param1}/+0 until end of turn.
+keyword:
+	keyword: Delve
+	match: Delve
+	mode: expert
+	reminder: You may remove any number of cards in your graveyard from the game as you play this spell. It costs <sym>1</sym> less to play for each card removed this way.
+keyword:
+	keyword: Poisonous
+	match: Poisonous <atom-param>number</atom-param>
+	mode: expert
+	reminder: Whenever this creature deals combat damage to a player, that player gets {english_number_a(param1)} poison counter(s). A player with ten or more poison counters loses the game.
+keyword:
+	keyword: Shroud
+	match: Shroud
+	mode: expert
+	reminder: This permanent can't be the target of spells or abilities.
+keyword:
+	keyword: Fortify
+	match: Fortify <atom-param>mana</atom-param>
+	mode: expert
+	reminder: <param>: Attach to target land you control. Fortify only as a sorcery. This card comes into play unattached and stays in play if the land leaves play.
+keyword:
+	keyword: Fortify
+	match: Fortify—<atom-param>action</atom-param>
+	mode: expert
+	reminder: <param>: Attach to target land you control. Fortify only as a sorcery. This card comes into play unattached and stays in play if the land leaves play.