Updated vanguard export size to be more realistic.

Magic-old heavily updated.
Magic keyword system updated to allow for Prowl (morningtide).
Amplify keyword updated to maintain functionality.
Prowl, Kinship, and Reinforce keywords added to Magic and Vanguard.
Protection keyword updated.
Altered creature type lists (they still don't really work right).
Fixed an error in champion keyword; still no championing multiple cards.
New colorless frame for magic-future.
Made watermarks in magic-future more narrow; keeps larger ones out of typeline.
Old style watermarks now available in magic-old styles.

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

data/magic-future.mse-style/style

@@ -411,9 +411,9 @@ card style:
 		line height soft: 0.9
 		line height line: 1.5
 	watermark:
-		left: 117
+		left: 127
 		top : 321
-		width: 152
+		width: 132
 		height: 152
 		z index: 2
 		render style: image

data/magic-new-planeswalker.mse-style/style

@@ -196,10 +196,10 @@ card style:
 
 	############################# Image
 	image:
-		left:	29
+		left:	28
-		top:	55
+		top:	54
-		width:	316
+		width:	317
-		height:	425
+		height:	426
 		z index: 1
 		mask: image_mask.png
 

data/magic-old-split.mse-style/style

@@ -5,13 +5,13 @@ short name: Old Splits
 icon: card-sample.png
 position hint: 103
 
-version: 2007-09-23
+version: 2007-12-29
 depends on:
 	package: magic.mse-game
 	version: 2007-09-23
 depends on:
 	package: magic-watermarks.mse-include
-	version: 2007-09-23
+	version: 2007-12-29
 depends on:
 	package: magic-mana-large.mse-symbol-font
 	version: 2007-09-23
@@ -439,7 +439,7 @@ card style:
 		z index: 1
 		render style: image
 		alignment: middle center
-		include file: /magic-watermarks.mse-include/watermarks
+		include file: /magic-watermarks.mse-include/watermarks-old
 	watermark 2:
 		left: 338
 		top : 228
@@ -448,7 +448,7 @@ card style:
 		z index: 1
 		render style: image
 		alignment: middle center
-		include file: /magic-watermarks.mse-include/watermarks
+		include file: /magic-watermarks.mse-include/watermarks-old
 
 	############################# PT
 	pt:

data/magic-old-token.mse-style/style

@@ -11,13 +11,10 @@ full name: Old style
 icon: card-sample.png
 position hint: 107
 
-version: 2007-09-23
+version: 2007-12-29
 depends on:
 	package: magic.mse-game
 	version: 2007-09-23
-depends on:
-	package: magic-watermarks.mse-include
-	version: 2007-09-23
 depends on:
 	package: magic-mana-large.mse-symbol-font
 	version: 2007-09-23

data/magic-old.mse-style/style

@@ -11,13 +11,13 @@ full name: Before 8th edition
 icon: card-sample.png
 position hint: 101
 
-version: 2007-09-23
+version: 2007-12-29
 depends on:
 	package: magic.mse-game
 	version: 2007-09-23
 depends on:
 	package: magic-watermarks.mse-include
-	version: 2007-09-23
+	version: 2007-12-29
 depends on:
 	package: magic-mana-large.mse-symbol-font
 	version: 2007-09-23
@@ -25,9 +25,9 @@ depends on:
 	package: magic-mana-small.mse-symbol-font
 	version: 2007-09-23
 
-card width: 337
+card width: 375
-card height: 469
+card height: 523
-card dpi: 134.98
+card dpi: 150
 
 ############################################################## Extra scripts
 ## COPY/PASTE from magic-new.mse-style/style
@@ -58,7 +58,7 @@ init script:
 				dark:  land_template(colors[0]),
 				light: land_template(colors[1]),
 			)
-		else if land then
+		else if land and color_count!=1 then
 			masked_blend(
 				mask:  "land_blend_{type}.png",
 				dark:  land_template("c"),
@@ -174,19 +174,19 @@ card style:
 	border color:
 		left: 0
 		top : 0
-		width:	337
+		width:	375
-		height:	468
+		height:	523
 		radius: 18
-		left width:   18
+		left width:   19
 		right width:  19
-		top width:    18
+		top width:    19
 		bottom width: 19
 		z index: -1
 	card color:
-		left:	12
+		left:	0
-		top:	12
+		top:	0
-		width:	312
+		width:	375
-		height:	444
+		height:	523
 		z index: -2
 		render style: image
 		popup style: in place
@@ -194,36 +194,36 @@ card style:
 
 	############################# Name line
 	name:
-		left: 39
+		left:   42
-		top : 21
+		top :   24
-		right: { 300 - card_style.casting_cost.content_width }
+		right: { 341 - card_style.casting_cost.content_width }
-		height: 22
+		height: 23
 		alignment: bottom shrink-overflow
 		padding bottom: 0
 		z index: 1
 		font:
 			name: MagicMedieval
-			size: 14
+			size: 15.5
 			color: rgb(255,255,255)
 			shadow color: rgb(0,0,0)
 			shadow displacement x: 1
 			shadow displacement y: 1
 	casting cost:
-		right: 304
+		right: 341
-		top : 21
+		top : 22
 		width: { max(30, card_style.casting_cost.content_width) + 5 }
-		height: 22
+		height: 24
 		alignment: middle right
 		symbol font:
 			name: magic-mana-small
-			size: 14
+			size: 16
 			alignment: middle right
 		always symbol: true
 		z index: 2
 		padding top: 0
 	card symbol:
-		left: 22
+		left: 24
-		top : 21
+		top : 24
 		height: 20
 		width: 14
 		render style: image
@@ -232,33 +232,34 @@ card style:
 
 	############################# Image
 	image:
-		left:	41
+		left:	45
-		top:	47
+		top:	51
-		width:	255
+		width:	286
-		height:	207
+		height:	233
 		z index: 1
 
 	############################# Card type
 
 	type:
-		left: 37
+		left: 39
-		top : 260
+		top : 292
-		width: { 262 - max(22,card_style.rarity.content_width) }
+		width: { 298 - max(22,card_style.rarity.content_width) }
-		height: 18
+		height: 20
-		alignment: top left shrink-overflow
+		alignment: middle shrink-overflow
 		z index: 1
+		padding top: 2
 		font:
 			name: MPlantin
-			size: 11
+			size: 12
 			color: rgb(255,255,255)
 			shadow color: rgb(0,0,0)
 			shadow displacement x: 1
 			shadow displacement y: 1
-			separator color: rgb(192,192,192)
+			separator color: rgb(128,128,128)
 
 	rarity:
-		right: 299
+		left: 293
-		top : 257
+		top : 290
 		width: 44
 		height: 22
 		z index: 1
@@ -287,13 +288,13 @@ card style:
 	############################# Text box
 	text:
 		left: 43
-		top : 283
+		top : 318
-		width: 253
+		width: 289
-		height: 128
+		height: 143
 		font:
 			name: MPlantin
 			italic name: MPlantin-Italic
-			size: 13
+			size: 14
 			scale down to: 6
 			color: rgb(0,0,0)
 		symbol font:
@@ -302,7 +303,7 @@ card style:
 					if styling.popup_mana_symbols
 					then "magic-mana-large"
 					else "magic-mana-small"
-			size: 13
+			size: 14
 		alignment:
 			script:
 				if (styling.center_text == "short text only" and
@@ -313,67 +314,67 @@ card style:
 				then "middle center"
 				else "middle left"
 		z index: 2
-		padding left:   2
+		padding left:   6
 		padding top:    2
-		padding right:  2
+		padding right:  4
-		padding bottom: 2
+		padding bottom: 0
 		line height hard: 1.2
 		line height line: 1.5
 		line height soft: 0.9
 	watermark:
-		left: 111
+		left: 120
-		top : 277
+		top : 313
-		width: 124
+		width: 138
-		height: 140
+		height: 150
 		z index: 1
 		render style: image
 		alignment: middle center
-		include file: /magic-watermarks.mse-include/watermarks
+		include file: /magic-watermarks.mse-include/watermarks-old
 
 	############################# PT
 	pt:
 		z index: 4
-		left:	266
+		left:	295
-		top:	420
+		top:	470
-		width:	42
+		width:	47
-		height:	28
+		height:	27
-		alignment: right top
+		alignment: right middle
 		font:
 			name: Mplantin
-			size: 16
+			size: 17
 			weight: bold
 			color: rgb(255,255,255)
 			shadow color: rgb(0,0,0)
-			shadow displacement x: 2
+			shadow displacement x: 1
-			shadow displacement y: 2
+			shadow displacement y: 1
-			separator color: rgb(255,50,50)
+			separator color: rgb(200,0,0)
 
 	############################# Card sorting / numbering
 	############################# Copyright stuff
 
 	illustrator:
-		left: 68
+		left: 80
-		top : 419
+		top : 470
-		width: 200
+		width: 217
-		height: 14
+		height: 16
 		z index: 1
-		alignment: center
+		alignment: middle center
 		font:
-			name: Mplantin
+			name: MPlantin
-			size: 9
+			size: 10
 			color: rgb(255,255,255)
 			shadow color: rgb(0,0,0)
 			shadow displacement x: 1
 			shadow displacement y: 1
 
 	copyright line:
-		left: 68
+		left: 65
-		top : 434
+		top : 486
-		width: 200
+		width: 247
-		height: 9
+		height: 12
 		z index: 1
-		alignment: center
+		alignment: middle center
 		font:
 			name: MPlantin
-			size: 6
+			size: 6.5
 			color: { font_color(card.card_color) }

data/magic-watermarks.mse-include/include

@@ -1,6 +1,6 @@
 mse version: 0.3.5
 full name: Magic The Gathering, textbox watermarks
-version: 2007-09-29
+version: 2007-12-29
 
 # This file doesn't do anything, other files in this directory can be included
 # in game/style files:

data/magic-watermarks.mse-include/watermarks-old

@@ -0,0 +1,70 @@
+# Old Style Watermark images
+
+choice images:
+	mana symbol white:			/magic-watermarks.mse-include/watermark_w_old.png
+	mana symbol blue:			/magic-watermarks.mse-include/watermark_u_old.png
+	mana symbol black:			/magic-watermarks.mse-include/watermark_b_old.png
+	mana symbol red:			/magic-watermarks.mse-include/watermark_r_old.png
+	mana symbol green:			/magic-watermarks.mse-include/watermark_g_old.png
+	mana symbol snow:			script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_s.png")
+
+	transparent mana symbol white:		script: set_alpha(alpha: 0.4, input:"/magic-watermarks.mse-include/watermark_w_old.png")
+	transparent mana symbol blue:		script: set_alpha(alpha: 0.4, input:"/magic-watermarks.mse-include/watermark_u_old.png")
+	transparent mana symbol black:		script: set_alpha(alpha: 0.4, input:"/magic-watermarks.mse-include/watermark_b_old.png")
+	transparent mana symbol red:		script: set_alpha(alpha: 0.4, input:"/magic-watermarks.mse-include/watermark_r_old.png")
+	transparent mana symbol green:		script: set_alpha(alpha: 0.4, input:"/magic-watermarks.mse-include/watermark_g_old.png")
+	
+	guild symbol The Azorius Senate (W/U):    	script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_azorius.png")
+	guild symbol House Dimir (U/B):       	script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_dimir.png")
+	guild symbol The Cult of Rakdos (B/R):    	script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_rakados.png")
+	guild symbol The Gruul Clans (R/G):       	script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_gruul.png")
+	guild symbol The Selesnya Conclave (G/W): 	script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_selesnya.png")
+	guild symbol The Orzhov Syndicate (W/B):  	script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_orzhov.png")
+	guild symbol The Izzet (U/R):         	script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_izzet.png")
+	guild symbol The Golgari (B/G):       	script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_golgari.png")
+	guild symbol The Boros Legion (R/W):      	script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_boros.png")
+	guild symbol The Simic Combine (G/U):         	script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_simic.png")
+	
+	colored xander hybrid mana B/R:			/magic-watermarks.mse-include/watermark_brmana_colored.png
+	colored xander hybrid mana U/B:			/magic-watermarks.mse-include/watermark_ubmana_colored.png
+	colored xander hybrid mana B/G:			/magic-watermarks.mse-include/watermark_bgmana_colored.png
+	colored xander hybrid mana R/G:			/magic-watermarks.mse-include/watermark_rgmana_colored.png
+	colored xander hybrid mana G/U:			/magic-watermarks.mse-include/watermark_gumana_colored.png
+	colored xander hybrid mana U/R:			/magic-watermarks.mse-include/watermark_urmana_colored.png
+	colored xander hybrid mana W/B:			/magic-watermarks.mse-include/watermark_wbmana_colored.png
+	colored xander hybrid mana G/W:			/magic-watermarks.mse-include/watermark_gwmana_colored.png
+	colored xander hybrid mana R/W:			/magic-watermarks.mse-include/watermark_rwmana_colored.png
+	colored xander hybrid mana W/U:			/magic-watermarks.mse-include/watermark_wumana_colored.png
+
+	xander hybrid mana B/R:		    	script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_brmana.png")
+	xander hybrid mana U/B:		    	script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_ubmana.png")
+	xander hybrid mana B/G:		    	script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_bgmana.png")
+	xander hybrid mana R/G:		    	script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_rgmana.png")
+	xander hybrid mana G/U:		    	script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_gumana.png")
+	xander hybrid mana U/R:		    	script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_urmana.png")
+	xander hybrid mana W/B:		    	script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_wbmana.png")
+	xander hybrid mana G/W:		    	script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_gwmana.png")
+	xander hybrid mana R/W:		    	script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_rwmana.png")
+	xander hybrid mana W/U:		    	script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_wumana.png")
+	
+	future sight type symbols artifact:			script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_artifact.png")
+	future sight type symbols creature:			script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_creature.png")
+	future sight type symbols enchantment:		script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_enchantment.png")
+	future sight type symbols instant:			script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_instant.png")
+	future sight type symbols land:				script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_land.png")
+	future sight type symbols multiple:			script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_multiple.png")
+	future sight type symbols sorcery:			script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/futsymbol_sorcery.png")
+
+	set symbol:
+		{ set_combine(combine:"shadow",
+		   set_alpha(
+		    alpha: 0.5,
+		    #symbol_variation(symbol: set.symbol, variation: "common")
+		    drop_shadow(offset_x: -0.01, offset_y: 0.03, blur_radius: 0.02, alpha: 1, color: rgb(0,0,0),
+		     enlarge(border_size: 0.03,
+		      symbol_variation(symbol: set.symbol, border_radius: 0, fill_color:rgb(255,255,255), border_color:rgb(0,0,0))
+		     )
+		    )
+		   )
+		  )
+		}

data/magic.mse-game/game

@@ -4,7 +4,7 @@ full name: Magic the Gathering
 icon: card-back.png
 position hint: 01
 
-version: 2007-10-13
+version: 2007-12-29
 depends on:
 	package: magic-blends.mse-include
 	version: 2007-09-23
@@ -252,7 +252,7 @@ init script:
 	
 	# replaces — correctly
 	add := "" # default is nothing
-	separate_words := remove_tags + trim + replace_rule(match:" ", replace: " and/or ")
+	separate_words := remove_tags + trim + replace_rule(match:" ", replace: {spacer})
 	for_mana_costs := format_cost := {
 		if input.separator_before == "—" and contains(input.param, match: " ") then (
 			if contains(input.param, match:",") then (
@@ -1313,37 +1313,52 @@ word list:
 	word: Land
 	word: Planeswalker
 
+## I (Pichoro) have altered the race and class lists so that things like "class: Elf" don't happen.
+## If this is really disliked, I have the original lists saved.
+## TODO: Make the alphabetical sublists actually work.
 word list:
 	name: race
 	word:
 		script: all_races()
 		line below: true
+	word: Angel
+	word: Beast
+	word: Bird
+	word: Construct
+	word: Demon
+	word: Dragon
+	word: Drake
+	word: Elemental
+	word: Elf
+	word: Faerie
+	word: Giant
+	word: Goblin
+	word: Golem
+	word: Human
+	word: Illusion
+	word: Merfolk
+	word: Treefolk
+	word: Zombie
 	word:
 		name: All Types
 		word: A
-			word: Advisor
 			word: Anemone
 			word: Angel
 			word: Anteater
 			word: Antelope
 			word: Ape
-			word: Archer
 			word: Archon
-			word: Artificer
-			word: Assassin
 			word: Assembly-Worker
 			word: Atog
 			word: Aurochs
 			word: Avatar
 		word: B
 			word: Badger
-			word: Barbarian
 			word: Basilisk
 			word: Bat
 			word: Bear
 			word: Beast
 			word: Beeble
-			word: Berserker
 			word: Bird
 			word: Blinkmoth
 			word: Boar
@@ -1353,36 +1368,28 @@ word list:
 			word: Camarid
 			word: Camel
 			word: Caribou
-			word: Carrier
 			word: Cat
 			word: Centaur
 			word: Cephalid
 			word: Chimera
-			word: Citizen
-			word: Cleric
 			word: Cockatrice
 			word: Construct
-			word: Coward
 			word: Crab
 			word: Crocodile
 			word: Cyclops
 		word: D
 			word: Dauthi
 			word: Demon
-			word: Deserter
 			word: Devil
 			word: Djinn
 			word: Dragon
 			word: Drake
 			word: Dreadnought
-			word: Drone
-			word: Druid
 			word: Dryad
 			word: Dwarf
 		word: E
 			word: Efreet
 			word: Egg
-			word: Elder
 			word: Elemental
 			word: Elephant
 			word: Elf
@@ -1392,7 +1399,6 @@ word list:
 			word: Faerie
 			word: Ferret
 			word: Fish
-			word: Flagbearer
 			word: Fox
 			word: Frog
 			word: Fungus
@@ -1431,7 +1437,6 @@ word list:
 			word: Kavu
 			word: Kirin
 			word: Kithkin
-			word: Knight
 			word: Kobold
 			word: Kor
 			word: Kraken
@@ -1445,25 +1450,18 @@ word list:
 		word: M
 			word: Manticore
 			word: Masticore
-			word: Mercenary
 			word: Merfolk
 			word: Metathran
-			word: Minion
 			word: Minotaur
-			word: Monger
 			word: Mongoose
-			word: Monk
 			word: Moonfolk
 			word: Mutant
 			word: Myr
-			word: Mystic
 		word: N
 			word: Nautilus
 			word: Nephilim
 			word: Nightmare
 			word: Nightstalker
-			word: Ninja
-			word: Nomad
 		word: O
 			word: Octopus
 			word: Ogre
@@ -1481,31 +1479,23 @@ word list:
 			word: Phelddagrif
 			word: Phoenix
 			word: Pincher
-			word: Pirate
 			word: Plant
 			word: Prism
 		word: R
 			word: Rabbit
 			word: Rat
-			word: Rebel
 			word: Reflection
 			word: Rhino
-			word: Rigger
-			word: Rogue
 		word: S
 			word: Sa-Sl
 				word: Salamander
-				word: Samurai
 				word: Sand
 				word: Saproling
 				word: Satyr
 				word: Scarecrow
 				word: Scorpion
-				word: Scout
-				word: Serf
 				word: Serpent
 				word: Shade
-				word: Shaman
 				word: Shapeshifter
 				word: Sheep
 				word: Skeleton
@@ -1514,11 +1504,9 @@ word list:
 				word: Slug
 			word: Sn-Sz
 				word: Snake
-				word: Soldier
 				word: Soltari
 				word: Spawn
 				word: Specter
-				word: Spellshaper
 				word: Sphinx
 				word: Spider
 				word: Spike
@@ -1528,7 +1516,6 @@ word list:
 				word: Squid
 				word: Squirrel
 				word: Starfish
-				word: Survivor
 		word: T
 			word: Tetravite
 			word: Thalakos
@@ -1547,10 +1534,8 @@ word list:
 			word: Volver
 		word: W
 			word: Wall
-			word: Warrior
 			word: Weird
 			word: Whale
-			word: Wizard
 			word: Wolf
 			word: Wolverine
 			word: Wombat
@@ -1568,250 +1553,81 @@ word list:
 	word:
 		script: all_classes()
 		line below: true
+	word: Advisor
+	word: Archer
+	word: Artificer
+	word: Assassin
+	word: Beast
+	word: Cleric
+	word: Druid
+	word: Knight
+	word: Mutant
+	word: Rogue
+	word: Scout
+	word: Shaman
+	word: Soldier
+	word: Warrior
+	word: Wizard
+	word: Zombie
 	word:
 		name: All Types
-		word: A
+		word: A-C
 			word: Advisor
-			word: Anemone
-			word: Angel
-			word: Anteater
-			word: Antelope
-			word: Ape
 			word: Archer
 			word: Archon
 			word: Artificer
 			word: Assassin
-			word: Assembly-Worker
-			word: Atog
-			word: Aurochs
-			word: Avatar
-		word: B
-			word: Badger
 			word: Barbarian
-			word: Basilisk
-			word: Bat
-			word: Bear
 			word: Beast
-			word: Beeble
 			word: Berserker
-			word: Bird
-			word: Blinkmoth
-			word: Boar
 			word: Bringer
 			word: Brushwagg
-		word: C
-			word: Camarid
-			word: Camel
-			word: Caribou
 			word: Carrier
-			word: Cat
-			word: Centaur
-			word: Cephalid
-			word: Chimera
 			word: Citizen
 			word: Cleric
-			word: Cockatrice
-			word: Construct
 			word: Coward
-			word: Crab
+		word: D-I
-			word: Crocodile
-			word: Cyclops
-		word: D
-			word: Dauthi
-			word: Demon
 			word: Deserter
-			word: Devil
-			word: Djinn
-			word: Dragon
-			word: Drake
 			word: Dreadnought
 			word: Drone
 			word: Druid
-			word: Dryad
-			word: Dwarf
-		word: E
-			word: Efreet
-			word: Egg
 			word: Elder
-			word: Elemental
-			word: Elephant
-			word: Elf
-			word: Elk
-			word: Eye
-		word: F
-			word: Faerie
-			word: Ferret
-			word: Fish
 			word: Flagbearer
-			word: Fox
-			word: Frog
-			word: Fungus
-		word: G
-			word: Gargoyle
-			word: Giant
-			word: Gnome
-			word: Goat
-			word: Goblin
-			word: Golem
-			word: Gorgon
-			word: Graveborn
-			word: Gremlin
-			word: Griffin
-		word: H
 			word: Hag
-			word: Harpy
 			word: Hellion
-			word: Hippo
-			word: Homarid
-			word: Homunculus
 			word: Horror
-			word: Horse
-			word: Hound
-			word: Human
-			word: Hydra
-		word: I
-			word: Illusion
-			word: Imp
 			word: Incarnation
-			word: Insect
+		word: J-P
-		word: J
-			word: Jellyfish
 			word: Juggernaut
-		word: K
-			word: Kavu
-			word: Kirin
-			word: Kithkin
 			word: Knight
-			word: Kobold
-			word: Kor
-			word: Kraken
-		word: L
-			word: Lammasu
-			word: Leech
 			word: Leviathan
-			word: Lhurgoyf
-			word: Licid
-			word: Lizard
-		word: M
-			word: Manticore
-			word: Masticore
 			word: Mercenary
-			word: Merfolk
-			word: Metathran
 			word: Minion
-			word: Minotaur
 			word: Monger
-			word: Mongoose
 			word: Monk
-			word: Moonfolk
 			word: Mutant
-			word: Myr
 			word: Mystic
-		word: N
-			word: Nautilus
-			word: Nephilim
-			word: Nightmare
-			word: Nightstalker
 			word: Ninja
 			word: Nomad
-		word: O
-			word: Octopus
-			word: Ogre
-			word: Ooze
-			word: Orb
-			word: Orc
-			word: Orgg
-			word: Ouphe
-			word: Ox
-			word: Oyster
-		word: P
-			word: Pegasus
-			word: Pentavite
-			word: Pest
-			word: Phelddagrif
-			word: Phoenix
-			word: Pincher
 			word: Pirate
-			word: Plant
+		word: R-S
-			word: Prism
-		word: R
-			word: Rabbit
-			word: Rat
 			word: Rebel
 			word: Reflection
-			word: Rhino
 			word: Rigger
 			word: Rogue
-		word: S
+			word: Samurai
-			word: Sa-Sl
+			word: Scout
-				word: Salamander
+			word: Serf
-				word: Samurai
+			word: Shaman
-				word: Sand
+			word: Soldier
-				word: Saproling
+			word: Spellshaper
-				word: Satyr
+			word: Survivor
-				word: Scarecrow
+		word: T-Z
-				word: Scorpion
-				word: Scout
-				word: Serf
-				word: Serpent
-				word: Shade
-				word: Shaman
-				word: Shapeshifter
-				word: Sheep
-				word: Skeleton
-				word: Slith
-				word: Sliver
-				word: Slug
-			word: Sn-Sz
-				word: Snake
-				word: Soldier
-				word: Soltari
-				word: Spawn
-				word: Specter
-				word: Spellshaper
-				word: Sphinx
-				word: Spider
-				word: Spike
-				word: Spirit
-				word: Splinter
-				word: Sponge
-				word: Squid
-				word: Squirrel
-				word: Starfish
-				word: Survivor
-		word: T
-			word: Tetravite
-			word: Thalakos
 			word: Thopter
-			word: Thrull
-			word: Treefolk
-			word: Triskelavite
-			word: Troll
-			word: Turtle
-		word: U
-			word: Unicorn
-		word: V
 			word: Vampire
-			word: Vedalken
-			word: Viashino
-			word: Volver
-		word: W
-			word: Wall
 			word: Warrior
-			word: Weird
-			word: Whale
 			word: Wizard
-			word: Wolf
-			word: Wolverine
-			word: Wombat
-			word: Worm
-			word: Wraith
-			word: Wurm
-		word: Y
-			word: Yeti
-		word: Z
 			word: Zombie
-			word: Zubera
 
 word list:
 	name: artifact
@@ -2049,9 +1865,13 @@ keyword parameter type:
 		description: Removes plurality from words.
 		script: \{english_singular({input})\}
 	refer script:
-		name: separate words
+		name: separate words with "and/or"
 		description: Changes spaces to " and/or ". "Elf Warrior" becomes "Elf and/or Warrior".
-		script: \{separate_words({input})\}
+		script: \{separate_words(spacer: " and/or ", {input})\}
+	refer script:
+		name: separate words with "or"
+		description: Changes spaces to " or ". "Elf Warrior" becomes "Elf or Warrior".
+		script: \{separate_words(spacer: " or ", {input})\}
 keyword parameter type:
 	name: prefix
 	description: Prefix for things like "<something>walk"
@@ -2061,7 +1881,7 @@ keyword parameter type:
 	example: Forest
 keyword parameter type:
 	name: a
-	match: [ ]*|[ an?]*
+	match: [ ]*|[ ][an?]*
 
 ############################# All Magic keywords
 # By JrEye and Neko_Asakami, Updated by Pichoro and Buttock1234
@@ -2095,7 +1915,7 @@ keyword:
 	keyword: Protection from
 	match: Protection from <atom-param>name</atom-param>
 	mode: core
-	reminder: This creature can’t be blocked, targeted, dealt damage, enchanted, or equipped by anything {english_singular(param1)}.
+	reminder: {if has_pt() then "This creature" else "This permanent"} can’t be blocked, targeted, dealt damage, or enchanted by anything {english_singular(param1)}.
 keyword:
 	keyword: Regeneration
 	match: Regenerate
@@ -2205,7 +2025,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 {separate_words(card.sub_type)} card 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(spacer: " and/or ", card.sub_type)} card you reveal in your hand.
 keyword:
 	keyword: Double strike
 	match: Double strike
@@ -2418,7 +2238,7 @@ keyword:
 keyword:
 	keyword: Deathtouch
 	match: Deathtouch
-	mode: expert
+	mode: core
 	reminder: Whenever this creature deals damage to a creature, destroy that creature.
 keyword:
 	keyword: Reach
@@ -2498,7 +2318,7 @@ 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.
+	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.
 keyword:
 	keyword: Clash
 	match: Clash
@@ -2514,3 +2334,18 @@ keyword:
 	match: Hideaway
 	mode: expert
 	reminder: This land comes into play tapped. When it does, look at the top four cards of your library, remove one from the game face down, then put the rest on the bottom of your library.
+keyword:
+	keyword: Kinship
+	match: Kinship
+	mode: pseudo
+	rules: Kinship — At the beginning of your upkeep, you may look at the top card of your library. If that card shares a creature type with ~, you may reveal it. If you do, [effect].
+keyword:
+	keyword: Prowl
+	match: Prowl <atom-param>cost</atom-param>
+	mode: expert
+	reminder: You may play this for its prowl cost if you dealt combat damage to a player this turn with a {separate_words(spacer: " or ", card.sub_type)}.
+keyword:
+	keyword: Reinforce
+	match: Reinforce <atom-param>number</atom-param>—<atom-param>cost</atom-param>
+	mode: expert
+	reminder: {param2}, Discard this card: Put {english_number_a(param1)} +1/+1 counter(s) on target creature.

data/vanguard-standard.mse-style/style

@@ -17,7 +17,8 @@ depends on:
 
 card width: 375
 card height: 523
-card dpi: 150
+#card dpi: 150
+card dpi: { 782 / 7 }
 
 # Author: Wolfwood
 # Based on: magic-new

data/vanguard.mse-game/game

@@ -3,7 +3,7 @@ short name: Vanguard
 full name: Magic Vanguard
 icon: card-sample.png
 position hint: 02
-version: 2007-10-13
+version: 2007-12-29
 
 # Author : Wolfwood
 # Most stuff is copy/pasted from magic.mse-game
@@ -940,3 +940,17 @@ keyword:
 	match: hideaway
 	mode: expert
 	reminder: The land comes into play tapped. When it does, look at the top four cards of your library, remove one from the game face down, then put the rest on the bottom of your library.
+keyword:
+	keyword: Kinship
+	match: Kinship
+	mode: pseudo
+keyword:
+	keyword: Prowl
+	match: prowl <atom-param>cost</atom-param>
+	mode: expert
+	reminder: You may play it for its prowl cost if you dealt combat damage to a player this turn with a creature that shares a type with it.
+keyword:
+	keyword: Reinforce
+	match: reinforce <atom-param>number</atom-param>—<atom-param>cost</atom-param>
+	mode: expert
+	reminder: {param2}, Discard it: Put {english_number_a(param1)} +1/+1 counter(s) on target creature.