From 13daa528b7ebe636891670a96e090499a52c593d Mon Sep 17 00:00:00 2001
From: pichoro <pichoro@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Sun, 11 Jan 2009 04:45:38 +0000
Subject: [PATCH] Adjusting keywords a little. Fixed magic-future-flip, and
 improved border mask. Bumped magic-future-textless so that magic-future-promo
 can depend on a new version of it.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1347 0fc631ac-6414-0410-93d0-97cfa31319b6
---
 .../bordermask.png                            | Bin 6798 -> 6688 bytes
 data/magic-future-split.mse-style/style       |  14 +++++++-------
 data/magic-future-textless.mse-style/style    |   4 ++--
 data/magic.mse-game/game                      |   2 +-
 data/magic.mse-game/keywords                  |   7 +------
 data/vanguard.mse-game/game                   |   9 ++-------
 6 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/data/magic-future-split.mse-style/bordermask.png b/data/magic-future-split.mse-style/bordermask.png
index ea39460db750b1e8ad8a3ecdafbf988c8015b8ab..df60bee4fba2325b9c0f85e1847d95d20e13173b 100644
GIT binary patch
literal 6688
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
J-GBtae*mDZS&0Au

literal 6798
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

diff --git a/data/magic-future-split.mse-style/style b/data/magic-future-split.mse-style/style
index ac4f3300..65cf9e9d 100644
--- a/data/magic-future-split.mse-style/style
+++ b/data/magic-future-split.mse-style/style
@@ -6,7 +6,7 @@ installer group: magic/Future/Split cards
 icon: card-sample.png
 position hint: 053
 
-version: 2009-01-09
+version: 2009-01-10
 depends on:
 	package: magic.mse-game
 	version: 2008-06-02
@@ -296,9 +296,9 @@ card style:
 						else rgb(0,0,0)
 					) else font_color(card.card_color_2)
 	casting cost:
-		left: 18
-		top: 18
-		height: 200
+		left: 9
+		top: 33
+		height: 174
 		width: 52
 		alignment: top left
 		direction: vertical
@@ -312,9 +312,9 @@ card style:
 		padding top: 0
 		mask: costmask.png
 	casting cost 2:
-		left: 269
-		top: 18
-		height: 200
+		left: 260
+		top: 33
+		height: 174
 		width: 52
 		alignment: top left
 		direction: vertical
diff --git a/data/magic-future-textless.mse-style/style b/data/magic-future-textless.mse-style/style
index 6c731545..1c92c929 100644
--- a/data/magic-future-textless.mse-style/style
+++ b/data/magic-future-textless.mse-style/style
@@ -1,4 +1,4 @@
-mse version: 0.3.7
+mse version: 0.3.8
 game: magic
 short name: Future Textless
 full name: Futureshift Textless
@@ -6,7 +6,7 @@ installer group: magic/Future/Textless cards
 icon: card-sample.png
 position hint: 055
 
-version: 2008-08-07
+version: 2009-01-10
 depends on:
 	package: magic.mse-game
 	version: 2008-06-02
diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game
index 188b688d..c240358f 100644
--- a/data/magic.mse-game/game
+++ b/data/magic.mse-game/game
@@ -5,7 +5,7 @@ installer group: magic/game files
 icon: card-back.png
 position hint: 01
 
-version: 2009-01-03
+version: 2009-01-10
 depends on: magic-blends.mse-include 2007-09-23
 depends on: magic-watermarks.mse-include 2007-09-23
 
diff --git a/data/magic.mse-game/keywords b/data/magic.mse-game/keywords
index 94cbf7be..57f4e666 100644
--- a/data/magic.mse-game/keywords
+++ b/data/magic.mse-game/keywords
@@ -190,7 +190,7 @@ keyword:
 keyword:
 	keyword: Flanking
 	match: Flanking
-	mode: old
+	mode: expert
 	reminder: Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.
 keyword:
 	keyword: Shadow
@@ -232,11 +232,6 @@ keyword:
 	match: Fading <atom-param>number</atom-param>
 	mode: expert
 	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>mana</atom-param> and/or <atom-param>mana</atom-param>
-	mode: expert
-	reminder: You may pay an additional {param1} and/or {param2} as you play this spell.
 keyword:
 	keyword: Kicker
 	match: Kicker <atom-param>cost</atom-param>
diff --git a/data/vanguard.mse-game/game b/data/vanguard.mse-game/game
index bf0b5cbe..eabb6547 100644
--- a/data/vanguard.mse-game/game
+++ b/data/vanguard.mse-game/game
@@ -5,7 +5,7 @@ installer group: Magic Vanguard/game files
 icon: card-sample.png
 position hint: 02
 
-version: 2009-01-09
+version: 2009-01-10
 
 # Author : Wolfwood
 # Most stuff is copy/pasted from magic.mse-game
@@ -612,7 +612,7 @@ keyword:
 keyword:
 	keyword: Flanking
 	match: flanking
-	mode: old
+	mode: expert
 	reminder: Whenever a creature without flanking blocks the creature, the blocking creature gets -1/-1 until end of turn.
 keyword:
 	keyword: Shadow
@@ -654,11 +654,6 @@ keyword:
 	match: fading <atom-param>number</atom-param>
 	mode: expert
 	reminder: It 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>mana</atom-param> and/or <atom-param>mana</atom-param>
-	mode: expert
-	reminder: You may pay an additional {param1} and/or {param2} as you play the card.
 keyword:
 	keyword: Kicker
 	match: kicker <atom-param>cost</atom-param>