Added snow and tap watermarks (these were already in watermarks-180);

Use watermark+angle:180 for the watermark2 in fpm flip templates. This means watermarks-180 can be removed.

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

data/magic-firepenguinmaster-flip.mse-style/style

@@ -298,7 +298,8 @@ card style:
 		z index: 1
 		render style: image
 		alignment: middle center
-		include file: magic-watermarks-180.mse-include/watermarks
+		angle: 180
+		include file: magic-watermarks.mse-include/watermarks
 
 	############################# PT
 	power:

data/magic-watermarks.mse-include/watermarks

@@ -6,6 +6,8 @@ choice images:
 	mana symbol black:			/magic-watermarks.mse-include/watermark_b.png
 	mana symbol red:			/magic-watermarks.mse-include/watermark_r.png
 	mana symbol green:			/magic-watermarks.mse-include/watermark_g.png
+	mana symbol snow:			/magic-watermarks.mse-include/watermark_s.png
+	mana symbol tap:			/magic-watermarks.mse-include/watermark_t.png
 	guild symbol 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 Cult of Rakdos (B/R):    	script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/watermark_rakados.png")

data/magic.mse-game/game

@@ -601,6 +601,8 @@ card field:
 		choice: black
 		choice: red
 		choice: green
+		choice: snow
+		choice: tap
 	choice:
 		name: guild symbol
 		choice: Azorius Senate (W/U)
@@ -949,8 +951,6 @@ card field:
 
 
 
-# The following (until keywords) doesn't do anything yet
-
 ############################################################## Statistics categories
 
 statistics dimension:
@@ -1007,6 +1007,8 @@ statistics dimension:
 #	data 1: card.card_color
 #	data 2: card.rarity
 
+# The following (until keywords) doesn't do anything yet
+
 ############################################################## Word lists
 
 #word list: