From 8133196f15c0bb7462692c777b977c24f424c49a Mon Sep 17 00:00:00 2001
From: pichoro <pichoro@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Sat, 9 Jun 2007 05:07:58 +0000
Subject: [PATCH] Finished adding overlay hybrids. Updated flying's reminder
 text to 10th edition version.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@414 0fc631ac-6414-0410-93d0-97cfa31319b6
---
 data/magic-blends.mse-include/blend-scripts | 20 +++++++++++++++++++-
 data/magic.mse-game/game                    |  2 +-
 data/vanguard.mse-game/game                 |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/data/magic-blends.mse-include/blend-scripts b/data/magic-blends.mse-include/blend-scripts
index ed5b8d71..3b44a5b4 100644
--- a/data/magic-blends.mse-include/blend-scripts
+++ b/data/magic-blends.mse-include/blend-scripts
@@ -1411,8 +1411,14 @@ card_hybrid_pt := {
 	then land_hybrid_pt()
 	else pt_template()
 }
-# 'overlay' 2 color pt hybrid
+# For overlay p/t box
 card_hybrid_pt_overlay := {
+	if mask_hybrid_with_land()
+	then land_hybrid_pt_overlay()
+	else card_hybrid_pt_overlayer()
+}
+# 'overlay' 2 color pt hybrid
+card_hybrid_pt_overlayer := {
 	combine_blend(
 		image1: pt_template(input[0]),
 		image2: pt_template(input[1]),
@@ -1427,6 +1433,18 @@ land_hybrid_pt := {
 		light: pt_template(),
 	)
 }
+# Mask part of the input p/t box with "hpt.jpg" file, do the rest as an overlay hybrid
+land_hybrid_pt_overlay := {
+	masked_blend(
+		mask: "hybrid_blend_pt.png",
+		dark: "hpt.jpg",
+		light: combine_blend(
+			image1: pt_template(input[0]),
+			image2: pt_template(input[1]),
+			combine: "symmetric overlay"
+		)
+	)
+}
 # Multicolor blend for pt box
 multi_hybrid_pt := {
 	masked_blend(
diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game
index 18fc6dd5..a31602de 100644
--- a/data/magic.mse-game/game
+++ b/data/magic.mse-game/game
@@ -1251,7 +1251,7 @@ keyword:
 	keyword: Flying
 	match: Flying
 	mode: core
-	reminder: This creature can’t be blocked except by creatures with flying and/or reach.
+	reminder: This creature can’t be blocked except by creatures with flying or reach.
 keyword:
 	keyword: First strike
 	match: First strike
diff --git a/data/vanguard.mse-game/game b/data/vanguard.mse-game/game
index 0bfd7fe9..23a2b6be 100644
--- a/data/vanguard.mse-game/game
+++ b/data/vanguard.mse-game/game
@@ -465,7 +465,7 @@ keyword:
 	keyword: Flying
 	match: Flying
 	mode: core
-	reminder: This creature can’t be blocked except by creatures with flying and/or reach.
+	reminder: This creature can’t be blocked except by creatures with flying or reach.
 keyword:
 	keyword: First strike
 	match: First strike