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

data/vs-common.mse-include/include

@@ -1,11 +1,11 @@
-mse version: 0.3.8
+mse version: 0.3.9
 full name: VS System, textbox watermarks
-version: 2010-03-25
+version: 2011-01-08
 
 depends on:
 	package: vs-standard-official.mse-symbol-font
-	version: 2010-03-25
+	version: 2008-10-23
 
 # This file doesn't do anything, other files in this directory can be included
 # in game/style files:
-#    watermarks		Includes references to the watermark images, to be used in a style file
+#    watermarks		Includes references to the watermark images, to be used in a style file

data/vs.mse-game/game

@@ -1,14 +1,14 @@
-mse version: 0.3.8
+mse version: 0.3.9
 full name: VS System
 short name: VS
 installer group: VS System/game files
 icon: card-back.png
 position hint: 3
 
-version: 2010-08-13
+version: 2011-01-08
 depends on:
 	package: vs-common.mse-include
-	version: 2009-02-04
+	version: 2011-01-08
 ############ some scripts copied and altered from magic.mse-game
 ############################################################## The script
 
@@ -24,4 +24,4 @@ include file: keywords
 include file: word_lists
 include file: auto_replace
 
-############################################################## Other stuff
+############################################################## Other stuff

data/vs.mse-game/script

@@ -37,8 +37,7 @@
 		tag_remove_rule(tag: "<sym-auto>") +
 		tag_remove_rule(tag: "<i-auto>")   +
 		tag_remove_rule(tag: "<b-auto>")   +
-		remove_tag@(tag: "<nospellcheck") +
-		# step 2 : Reminder text for keywords
+		# step 2 : reminder text for keywords
 		expand_keywords@(
 			condition: {
 				correct_case
@@ -46,15 +45,15 @@
 			default_expand: {
 				chosen(choice:if correct_case then mode else "lower case", set.automatic_reminder_text)
 			},
-			combine: {
-				# un-bold parameters
-				keyword := tag_contents(keyword, tag:"<param",
-				              contents: {"</b-auto>{input}<b-auto>"})
-				reminder := process_english_hints(reminder)
-				# the combined result
-				"<b-auto>{keyword}</b-auto>"
-				 + if expand then "<atom-reminder-{mode}> ({reminder})</atom-reminder-{mode}>"
-			}) +
+			combine:        {
+				if mode == "real" then "<b-auto>{keyword}</b-auto>" + (if expand then "<atom-reminder-{mode}> ({process_english_hints(reminder)})</atom-reminder-{mode}>" else "")
+				else "<b-auto>{keyword}</b-auto>" }
+			) +
+		# step 2b : remove duplicate reminder text
+		replace@(
+			match: "(<atom-reminder-[^>]*>[^)]+[)]</atom-reminder-[^>]*>)([^\n]+)\\1"
+			replace: "\\2\\1"
+			) +
 		# step 3 : Expand shortcut words ~ and CARDNAME
 		replace_rule(
 			match: "~|~THIS~|CARDNAME",
@@ -70,19 +69,11 @@
 		replace_rule(
 			match: "->|>>>|@|<>|•",
 			replace: "<sym-auto>&</sym-auto>") +
-		# step 7: keyword parameters should not be bolded
-		# step 7a: put </b> before each <param>
-		#replace@(
-		#	match: "<param[^>]*>",
-		#	replace: "</b-auto>&") +
-		# step 7b: put <b> after each </param>
-		#replace@(
-		#	match: "</param[^>]*>",
-		#	replace: "&<b-auto>") +
+		#X#if contains(card.shape, match:"old") then symbol_filter else new_symbols
 		# step 8 : Italic reminder text
 		replace_rule(
-			match: "[(][^)\n]*[)]?",
-			in_context: "(^|[[:space:]])<match>|<atom-keyword><match>",
+		 	match: "[(]([^)\n]|[(][^)\n]*[)])*[)]?",
+			in_context: "(^|[[:space:]])<match>|<atom-keyword><match></",
 		 	replace: "<i-auto>&</i-auto>")
 	
 	############### Word List Scripts for Affiliations and Card Types
@@ -94,7 +85,7 @@
 		tag_remove_rule(tag: "</WORD-LIST-AFFILIATION1>") +
 		type_over_list +
 		{ "<word-list-affiliation1>{if contains(card.shape, match: "old") then (input) else to_upper(input)}</word-list-affiliation1>" }
-	
+
 	space_to_wltags := replace_rule(match:"( +|<soft> </soft>)",
 	                                replace:{"</word-list-{list_type}>{_1}<word-list-{list_type}>"})
 	
@@ -177,7 +168,7 @@
 		contains(card.rule_text, match: "Concealed—Optional")
 	}
 	is_concealed := { contains(card.card_type, match: "hidden") or
-		contains(card.rule_text, match: "Concealed")
+		card.card_type == "equipment concealed equipment"
 	}
 	is_equipment := { contains(card.card_type, match: "equipment")
 	}
@@ -227,7 +218,9 @@
 		else if is_character() and card.identity!="" then " <sym>•</sym> "
 		else if is_equipment() and card.identity=="" then " "
 		else if is_equipment() and card.identity!="" then " <sym>•</sym> "
-		else " "
+		else if is_location() and card.identity=="" then " "
+		else if is_location() and card.identity!="" then " <sym>•</sym> "
+		else ""
 	}
 	
 	separator_type := {