From 107227b24a3dff32ebcc55e1e5b8dbe6cfee5530 Mon Sep 17 00:00:00 2001 From: pichoro Date: Mon, 21 Jan 2008 04:23:44 +0000 Subject: [PATCH] Improved blends for pt-boxes. Updated creature type lists in accordance w/ Oracle update. Shrank textbox font size for magic-future. Fixed new "colored multicolor land name" option in futureshifts. git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@825 0fc631ac-6414-0410-93d0-97cfa31319b6 --- data/magic-blends.mse-include/include | 2 +- data/magic-blends.mse-include/new-blends | 21 ++++++++++++++++++--- data/magic-future-textless.mse-style/style | 17 ++++++++++++++++- data/magic-future.mse-style/style | 22 +++++++++++++++++++--- data/magic.mse-game/game | 3 +-- 5 files changed, 55 insertions(+), 10 deletions(-) diff --git a/data/magic-blends.mse-include/include b/data/magic-blends.mse-include/include index 1e9dd494..88dcd71c 100644 --- a/data/magic-blends.mse-include/include +++ b/data/magic-blends.mse-include/include @@ -1,6 +1,6 @@ mse version: 0.3.6 full name: Magic The Gathering, card blend utilities -version: 2008-01-12 +version: 2008-01-20 # This file doesn't do anything, other files in this directory can be included # in game/style files: diff --git a/data/magic-blends.mse-include/new-blends b/data/magic-blends.mse-include/new-blends index 83984947..9f6e4fec 100644 --- a/data/magic-blends.mse-include/new-blends +++ b/data/magic-blends.mse-include/new-blends @@ -241,8 +241,23 @@ horizontal_pt_hybrid := [ x1: 0.08, y1: 0 x2: 0.65, y2: 0 )} - 6: { template(colors[5]) } #TODO - 7: { template(colors[6]) } #TODO + 6: { linear_blend( + image1: template(colors[4]) + image2: template(colors[5]) + x1: 0.07, y1: 0 + x2: 0.7, y2: 0 + )} + 7: {linear_blend( + image1: linear_blend( + image1: template(colors[4]), + image2: template(colors[5]), + x1: -0.2, y1: 0 + x2: 0.2, y2: 0 + ), + image2: template(colors[6]), + x1: 0.5, y1: 0 + x2: 0.7, y2: 0 + )} ] pt_hybrid := [ @@ -273,7 +288,7 @@ pt_hybrid := [ 3: { template(colors[2]) } 4: { template(colors[3]) } 5: { template(colors[4]) } - 6: { template(colors[5]) } # Probably not right + 6: { template(colors[5]) } 7: { template(colors[6]) } ] overlay: overlay_hybrid diff --git a/data/magic-future-textless.mse-style/style b/data/magic-future-textless.mse-style/style index 19b20ff3..e74517cc 100644 --- a/data/magic-future-textless.mse-style/style +++ b/data/magic-future-textless.mse-style/style @@ -5,7 +5,7 @@ full name: Futureshift Textless icon: card-sample.png position hint: 051 -version: 2008-01-12 +version: 2008-01-20 depends on: package: magic.mse-game version: 2007-09-23 @@ -45,6 +45,12 @@ init script: dark: land_template("c"), light: base, ) + else if land and multi and mask_multi_land_with_color() then + masked_blend( + mask: "hybrid_blend_{type}.png", + dark: base, + light: land_template("m"), + ) else if multi then masked_blend( mask: "multicolor_blend_{type}.png", @@ -92,6 +98,7 @@ init script: else "white" } typesymbol_color:= { if contains(card.card_color, match:"artifact") then "black" + else if contains(card.card_color, match:"land") and contains(card.card_color, match:"multicolor") and styling.colored_multicolor_land_name then "black" else if contains(card.card_color, match:"multicolor") then ( if card.card_color=="multicolor" then "black" else if not contains(card.card_color, match:"white") then "white" @@ -195,6 +202,10 @@ card style: contains(card.card_color, match:"radial") or contains(card.card_color, match:"vertical") and not contains(card.card_color, match:"multicolor") then rgb(0,0,0) + else if contains(card.card_color, match:"land") and + contains(card.card_color, match:"multicolor") and + contains(card.card_color, match:"black") and + styling.colored_multicolor_land_name then rgb(255,255,255) else if contains(card.card_color, match:"land") and contains(card.card_color, match:"multicolor") then rgb(0,0,0) else if styling.grey_hybrid_name and contains(card.card_color, match:"hybrid") then rgb(0,0,0) @@ -273,6 +284,10 @@ card style: contains(card.card_color, match:"radial") or contains(card.card_color, match:"vertical") and not contains(card.card_color, match:"multicolor") then rgb(0,0,0) + else if contains(card.card_color, match:"land") and + contains(card.card_color, match:"multicolor") and + contains(card.card_color, match:"black") and + styling.colored_multicolor_land_name then rgb(255,255,255) else if contains(card.card_color, match:"land") and contains(card.card_color, match:"multicolor") then rgb(0,0,0) else if styling.grey_hybrid_name and contains(card.card_color, match:"hybrid") then rgb(0,0,0) diff --git a/data/magic-future.mse-style/style b/data/magic-future.mse-style/style index e6f8cd6a..98fca668 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: 2008-01-12 +version: 2008-01-20 depends on: package: magic.mse-game version: 2007-12-29 @@ -53,6 +53,12 @@ init script: dark: land_template("c"), light: base, ) + else if land and multi and mask_multi_land_with_color() then + masked_blend( + mask: "hybrid_blend_{type}.png", + dark: base, + light: land_template("m"), + ) else if multi then masked_blend( mask: "multicolor_blend_{type}.png", @@ -132,6 +138,7 @@ init script: else "white" } typesymbol_color:= { if contains(card.card_color, match:"artifact") then "black" + else if contains(card.card_color, match:"land") and contains(card.card_color, match:"multicolor") and styling.colored_multicolor_land_name then "black" else if contains(card.card_color, match:"multicolor") then ( if card.card_color=="multicolor" then "black" else if not contains(card.card_color, match:"white") then "white" @@ -262,6 +269,10 @@ card style: contains(card.card_color, match:"radial") or contains(card.card_color, match:"vertical") and not contains(card.card_color, match:"multicolor") then rgb(0,0,0) + else if contains(card.card_color, match:"land") and + contains(card.card_color, match:"multicolor") and + contains(card.card_color, match:"black") and + styling.colored_multicolor_land_name then rgb(255,255,255) else if contains(card.card_color, match:"land") and contains(card.card_color, match:"multicolor") then rgb(0,0,0) else if styling.grey_hybrid_name and contains(card.card_color, match:"hybrid") then rgb(0,0,0) @@ -341,6 +352,10 @@ card style: contains(card.card_color, match:"radial") or contains(card.card_color, match:"vertical") and not contains(card.card_color, match:"multicolor") then rgb(0,0,0) + else if contains(card.card_color, match:"land") and + contains(card.card_color, match:"multicolor") and + contains(card.card_color, match:"black") and + styling.colored_multicolor_land_name then rgb(255,255,255) else if contains(card.card_color, match:"land") and contains(card.card_color, match:"multicolor") then rgb(0,0,0) else if styling.grey_hybrid_name and contains(card.card_color, match:"hybrid") then rgb(0,0,0) @@ -383,15 +398,16 @@ card style: font: name: MPlantin italic name: MPlantin-Italic - size: 15 + size: 13 scale down to: 6 color: script: if not contains(card.card_color, match:"land") then rgb(0,0,0) + else if contains(card.card_color, match:"multicolor") then rgb(0,0,0) else font_color(card.card_color) symbol font: name: { styling.text_box_mana_symbols } - size: 15 + size: 13 alignment: script: if (styling.center_text == "short text only" and diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game index db5a7ba0..7f0cac72 100644 --- a/data/magic.mse-game/game +++ b/data/magic.mse-game/game @@ -1349,7 +1349,6 @@ word list: name: All Races word: name: A - word: Anemone word: Angel word: Anteater word: Antelope @@ -1424,7 +1423,6 @@ word list: word: Golem word: Gorgon word: Graveborn - word: Gremlin word: Griffin word: name: H @@ -1439,6 +1437,7 @@ word list: word: Hound word: Human word: Hydra + word: Hyena word: name: I word: Illusion