From f0be49c2e4c9a482430b6732cc14e47b3337fe0c Mon Sep 17 00:00:00 2001
From: pichoro <pichoro@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Mon, 31 Dec 2007 22:40:30 +0000
Subject: [PATCH] Fixed an error pertaining to rules text in futureshifts.
 "Shifted sorting" on futureshifts and planeshifts is now optional.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@807 0fc631ac-6414-0410-93d0-97cfa31319b6
---
 data/magic-future-textless.mse-style/style |  8 ++++++--
 data/magic-future.mse-style/style          | 11 +++++++----
 data/magic-planeshifted.mse-style/style    |  7 ++++++-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/data/magic-future-textless.mse-style/style b/data/magic-future-textless.mse-style/style
index 354c0edd..fbd5118e 100644
--- a/data/magic-future-textless.mse-style/style
+++ b/data/magic-future-textless.mse-style/style
@@ -105,7 +105,7 @@ init script:
 		else "white"
 	}
 	
-	card_shape := { "shifted" }
+	card_shape := { if styling.shifted_sorting then "shifted" else "normal" }
 
 ############################################################## Set info fields
 set info style:
@@ -118,7 +118,11 @@ set info style:
 			border color: rgb(0,0,0)
 
 ############################################################## Extra style options
-
+styling field:
+	type: boolean
+	name: shifted sorting
+	description: Should this style of card sort as a shifted card (after other cards of that color)?
+	initial: yes
 styling field:
 	type: boolean
 	name: grey hybrid name
diff --git a/data/magic-future.mse-style/style b/data/magic-future.mse-style/style
index 1059b179..e13b5ded 100644
--- a/data/magic-future.mse-style/style
+++ b/data/magic-future.mse-style/style
@@ -5,7 +5,7 @@ full name: Futureshift
 icon: card-sample.png
 position hint: 050
 
-version: 2007-12-29
+version: 2007-12-30
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -36,7 +36,6 @@ card dpi: 150
 
 init script:
 	mask_hybrid_with_land := { styling.grey_hybrid_name }
-	text_filter := { card.extra_data.paintbrush }
 	
 	template_suffix := [card: "card.jpg", pt: "pt.png", textbox: "textbox.png", typeline: "typeline.png"]
 	template := { input + template_suffix[type] }
@@ -147,7 +146,7 @@ init script:
 		else "white"
 	}
 	
-	card_shape := { "shifted" }
+	card_shape := { if styling.shifted_sorting then "shifted" else "normal" }
 
 ############################################################## Set info fields
 set info style:
@@ -160,7 +159,11 @@ set info style:
 			border color: rgb(0,0,0)
 
 ############################################################## Extra style options
-
+styling field:
+	type: boolean
+	name: shifted sorting
+	description: Should this style of card sort as a shifted card (after other cards of that color)?
+	initial: yes
 styling field:
 	type: boolean
 	name: grey hybrid name
diff --git a/data/magic-planeshifted.mse-style/style b/data/magic-planeshifted.mse-style/style
index 1aac9e41..61319f8a 100644
--- a/data/magic-planeshifted.mse-style/style
+++ b/data/magic-planeshifted.mse-style/style
@@ -44,7 +44,7 @@ init script:
 	# Use guild mana symbols?
 	guild_mana := { styling.use_guild_mana_symbols }
 	
-	card_shape := { "shifted" }
+	card_shape := { if styling.shifted_sorting then "shifted" else "normal" }
 
 ############################################################## Set info fields
 set info style:
@@ -58,6 +58,11 @@ set info style:
 
 ############################################################## Extra style options
 
+styling field:
+	type: boolean
+	name: shifted sorting
+	description: Should this style of card sort as a shifted card (after other cards of that color)?
+	initial: yes
 styling field:
 	type: boolean
 	name: colored mana symbols