From acfaeed425c0264f811fc01d6834e4613e79b16f Mon Sep 17 00:00:00 2001
From: pichoro <pichoro@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Sat, 15 Sep 2007 01:30:27 +0000
Subject: [PATCH] Modified action param to not include colons or semi-colons.
 Modified name param to not include colons or semi-colons and to include
 regular dashes (because they're legal in Magic card names). Modified prefix
 param to accept curly apostrophe (Urza'swalk *shudder*). Modified landwalk to
 to_lower() all inputs with "land".

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@697 0fc631ac-6414-0410-93d0-97cfa31319b6
---
 data/magic.mse-game/game    | 8 ++++----
 data/vanguard.mse-game/game | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game
index d23248c2..74693516 100644
--- a/data/magic.mse-game/game
+++ b/data/magic.mse-game/game
@@ -1564,12 +1564,12 @@ keyword parameter type:
 		script: \{english_number_ordinal({input})\}
 keyword parameter type:
 	name: action
-	match: [^(\n]+
+	match: [^(:;\n]+
 	separator after is: [.]
 	reminder script: alternative_cost()
 keyword parameter type:
 	name: name
-	match: [^(.,\n—-]+
+	match: [^(.:;\n—]+
 	refer script:
 		name: normal
 		description: No changes made.
@@ -1587,7 +1587,7 @@ keyword parameter type:
 	description: Prefix for things like "<something>walk"
 	optional: false
 #	match: [A-Z][a-z, ]*([A-Z][a-z, ]*\xEB00) # commented out because it stopped prefix param from working, version below allows all "walks", including "Dame Judi Denchwalk", doesn't trigger #in middle of sentences, and doesn't trigger in chains of keywords.
-	match: [A-Z][A-Z,a-z ]*
+	match: [A-Z][A-Z,a-z’ ]*
 	example: Forest
 keyword parameter type:
 	name: a
@@ -1620,7 +1620,7 @@ keyword:
 	keyword: Landwalk
 	match: <atom-param>prefix</atom-param>walk
 	mode: core
-	reminder: This creature is unblockable as long as defending player controls a {param1}.
+	reminder: This creature is unblockable as long as defending player controls a {if match(param1.value, match: " land$") then "{to_lower(param1)}" else "{param1}"}.
 keyword:
 	keyword: Protection from
 	match: Protection from <atom-param>name</atom-param>
diff --git a/data/vanguard.mse-game/game b/data/vanguard.mse-game/game
index 9b1eac55..86bce726 100644
--- a/data/vanguard.mse-game/game
+++ b/data/vanguard.mse-game/game
@@ -470,12 +470,12 @@ keyword parameter type:
 		script: \{english_number_multiple({input})\}
 keyword parameter type:
 	name: action
-	match: [^(\n]+
+	match: [^(;:\n]+
 	separator after is: [.]
 	reminder script: alternative_cost()
 keyword parameter type:
 	name: name
-	match: [^(.,\n—-]+
+	match: [^(.:;\n—]+
 	refer script:
 		name: normal
 		description: No changes made.
@@ -488,7 +488,7 @@ keyword parameter type:
 	name: prefix
 	description: Prefix for things like "<something>walk"
 	optional: false
-	match: [A-Z][A-Z,a-z ]*
+	match: [A-Z][A-Z,a-z’ ]*
 	example: Forest
 keyword parameter type:
 	name: a