From a8efc132f33fa31bffbeda7a5edd03795993b423 Mon Sep 17 00:00:00 2001 From: twanvl Date: Thu, 5 Jul 2007 00:54:11 +0000 Subject: [PATCH] Updated default image script to new color system git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@485 0fc631ac-6414-0410-93d0-97cfa31319b6 --- data/magic-default-image.mse-include/scripts | 72 ++++++++------------ 1 file changed, 27 insertions(+), 45 deletions(-) diff --git a/data/magic-default-image.mse-include/scripts b/data/magic-default-image.mse-include/scripts index 69668ce0..42115813 100644 --- a/data/magic-default-image.mse-include/scripts +++ b/data/magic-default-image.mse-include/scripts @@ -1,50 +1,32 @@ # default image if there is none -default_image_1 := {"/magic-default-image.mse-include/" + input} -default_image_2 := { - combine_blend( - image1: default_image_1(image1), - image2: default_image_1(image2), - combine: "symmetric overlay" - ) -} +default_images := [ + c: "/magic-default-image.mse-include/colorless.jpg" + a: "/magic-default-image.mse-include/artifact.jpg" + m: "/magic-default-image.mse-include/multicolor.jpg" + w: "/magic-default-image.mse-include/white.jpg" + u: "/magic-default-image.mse-include/blue.jpg" + b: "/magic-default-image.mse-include/black.jpg" + r: "/magic-default-image.mse-include/red.jpg" + g: "/magic-default-image.mse-include/green.jpg" +] default_image := { - if input == "white" then default_image_1("white.jpg") - else if input == "blue" then default_image_1("blue.jpg") - else if input == "red" then default_image_1("red.jpg") - else if input == "black" then default_image_1("black.jpg") - else if input == "green" then default_image_1("green.jpg") - else if input == "land" then default_image_2(image1:"colorless.jpg", image2:"artifact.jpg") - else if input == "land 1 color white" then default_image_2(image1:"colorless.jpg", image2:"white.jpg") - else if input == "land 1 color blue" then default_image_2(image1:"colorless.jpg", image2:"blue.jpg") - else if input == "land 1 color red" then default_image_2(image1:"colorless.jpg", image2:"red.jpg") - else if input == "land 1 color black" then default_image_2(image1:"colorless.jpg", image2:"black.jpg") - else if input == "land 1 color green" then default_image_2(image1:"colorless.jpg", image2:"green.jpg") - else if input == "land 1 color multicolor" then default_image_2(image1:"colorless.jpg", image2:"multicolor.jpg") - else if is_land() then default_image_2(image1:"colorless.jpg", image2:"multicolor.jpg") - else if input == "hybrid 2 color white / blue" then default_image_2(image1:"white.jpg", image2:"blue.jpg" ) - else if input == "hybrid 2 color blue / black" then default_image_2(image1:"blue.jpg", image2:"black.jpg") - else if input == "hybrid 2 color black / red" then default_image_2(image1:"black.jpg", image2:"red.jpg" ) - else if input == "hybrid 2 color red / green" then default_image_2(image1:"red.jpg", image2:"green.jpg") - else if input == "hybrid 2 color green / white" then default_image_2(image1:"green.jpg", image2:"white.jpg") - else if input == "hybrid 2 color white / black" then default_image_2(image1:"white.jpg", image2:"black.jpg") - else if input == "hybrid 2 color blue / red" then default_image_2(image1:"blue.jpg", image2:"red.jpg" ) - else if input == "hybrid 2 color black / green" then default_image_2(image1:"black.jpg", image2:"green.jpg") - else if input == "hybrid 2 color red / white" then default_image_2(image1:"red.jpg", image2:"white.jpg") - else if input == "hybrid 2 color overlay green / blue" then default_image_2(image1:"green.jpg", image2:"blue.jpg" ) - else if input == "hybrid 2 color overlay white / blue" then default_image_2(image1:"white.jpg", image2:"blue.jpg" ) - else if input == "hybrid 2 color overlay blue / black" then default_image_2(image1:"blue.jpg", image2:"black.jpg") - else if input == "hybrid 2 color overlay black / red" then default_image_2(image1:"black.jpg", image2:"red.jpg" ) - else if input == "hybrid 2 color overlay red / green" then default_image_2(image1:"red.jpg", image2:"green.jpg") - else if input == "hybrid 2 color overlay green / white" then default_image_2(image1:"green.jpg", image2:"white.jpg") - else if input == "hybrid 2 color overlay white / black" then default_image_2(image1:"white.jpg", image2:"black.jpg") - else if input == "hybrid 2 color overlay blue / red" then default_image_2(image1:"blue.jpg", image2:"red.jpg" ) - else if input == "hybrid 2 color overlay black / green" then default_image_2(image1:"black.jpg", image2:"green.jpg") - else if input == "hybrid 2 color overlay red / white" then default_image_2(image1:"red.jpg", image2:"white.jpg") - else if input == "hybrid 2 color overlay green / blue" then default_image_2(image1:"green.jpg", image2:"blue.jpg" ) - else if is_artifact() then default_image_1("artifact.jpg") - else if is_colorless() then default_image_1("colorless.jpg") - else default_image_1("multicolor.jpg") -} \ No newline at end of file + color_background(color_combination: { + combine := "symmetric overlay" + base := + if color_count == 0 then if land then default_images.a else default_images.c + else if color_count == 1 then default_images[colors] + else if color_count == 2 then combine_blend( + image1: default_images[colors.0], + image2: default_images[colors.1], + ) + else default_images.m + + if land then combine_blend(image1: default_images.c, image2: base) + else if multi then combine_blend(image1: default_images.m, image2: base) + else if artifact then combine_blend(image1: default_images.a, image2: base) + else base + }) +}