diff --git a/data/magic-blends.mse-include/include b/data/magic-blends.mse-include/include index b2c46b0a..1e9dd494 100644 --- a/data/magic-blends.mse-include/include +++ b/data/magic-blends.mse-include/include @@ -1,6 +1,6 @@ -mse version: 0.3.5 +mse version: 0.3.6 full name: Magic The Gathering, card blend utilities -version: 2007-09-23 +version: 2008-01-12 # 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 79a9b7eb..83984947 100644 --- a/data/magic-blends.mse-include/new-blends +++ b/data/magic-blends.mse-include/new-blends @@ -7,6 +7,7 @@ ######################################################################## mask_hybrid_with_land := { false } +mask_multi_land_with_color := { false } template := { input + "{type}.jpg" } land_template := { (if input == "a" then "c" else input) + "l{type}.jpg" } # For what value should thumbnails of hybrids be made? @@ -483,6 +484,12 @@ color_combination := { 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", diff --git a/data/magic-extended-art.mse-style/style b/data/magic-extended-art.mse-style/style index dbc1ebaa..854d5c93 100644 --- a/data/magic-extended-art.mse-style/style +++ b/data/magic-extended-art.mse-style/style @@ -5,7 +5,7 @@ short name: Extended Art icon: card-sample.png position hint: 006 -version: 2007-12-29 +version: 2008-01-12 depends on: package: magic.mse-game version: 2007-12-29 @@ -34,6 +34,9 @@ init script: # Should hybrids have a grey name? mask_hybrid_with_land := { styling.grey_hybrid_name } + #Should multicolor lands with basic land types have a colored name? + mask_multi_land_with_color := { styling.colored_multicolor_land_name } + # Which artifact template should be used? artifact_template := { if input == "a" and not styling.darker_artifacts @@ -72,6 +75,10 @@ styling field: type: boolean name: grey hybrid name description: Use a grey background for the name and type line on hybrid cards. This is done on real cards. +styling field: + type: boolean + name: colored multicolor land name + description: Use a colored background for the name and type on multicolor land cards with a basic land type. This is done on real cards. styling field: type: boolean name: use guild mana symbols diff --git a/data/magic-future-textless.mse-style/style b/data/magic-future-textless.mse-style/style index fbd5118e..19b20ff3 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: 2007-12-29 +version: 2008-01-12 depends on: package: magic.mse-game version: 2007-09-23 @@ -29,6 +29,9 @@ init script: # Should hybrids have a grey name? mask_hybrid_with_land := { styling.grey_hybrid_name } + #Should multicolor lands with basic land types have a colored name? + mask_multi_land_with_color := { styling.colored_multicolor_land_name } + template := { input + "{type}.jpg" } land_template := { (if input == "a" then "c" else input) + "l{type}.jpg" } color_combination := { @@ -127,6 +130,10 @@ styling field: type: boolean name: grey hybrid name description: Use a grey background for the name and type line on hybrid cards. This is done on real cards. +styling field: + type: boolean + name: colored multicolor land name + description: Use a colored background for the name and type on multicolor land cards with a basic land type. This is done on real cards. styling field: type: boolean name: use guild mana symbols diff --git a/data/magic-future.mse-style/style b/data/magic-future.mse-style/style index e13b5ded..e6f8cd6a 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-30 +version: 2008-01-12 depends on: package: magic.mse-game version: 2007-12-29 @@ -37,6 +37,8 @@ card dpi: 150 init script: mask_hybrid_with_land := { styling.grey_hybrid_name } + mask_multi_land_with_color := { styling.colored_multicolor_land_name } + template_suffix := [card: "card.jpg", pt: "pt.png", textbox: "textbox.png", typeline: "typeline.png"] template := { input + template_suffix[type] } land_template := { (if input == "a" then "c" else input) + "l" + template_suffix[type] } @@ -168,6 +170,10 @@ styling field: type: boolean name: grey hybrid name description: Use a grey background for the name and type line on hybrid cards. This is done on real cards. +styling field: + type: boolean + name: colored multicolor land name + description: Use a colored background for the name and type on multicolor land cards with a basic land type. This is done on real cards. styling field: type: boolean name: use guild mana symbols diff --git a/data/magic-new-planeswalker.mse-style/image_mask.png b/data/magic-new-planeswalker.mse-style/image_mask.png index 21a9121e..c15b8cdc 100644 Binary files a/data/magic-new-planeswalker.mse-style/image_mask.png and b/data/magic-new-planeswalker.mse-style/image_mask.png differ diff --git a/data/magic-new-promo.mse-style/style b/data/magic-new-promo.mse-style/style index d56e3eb4..c207e565 100644 --- a/data/magic-new-promo.mse-style/style +++ b/data/magic-new-promo.mse-style/style @@ -5,7 +5,7 @@ full name: Large image icon: card-sample.png position hint: 004 -version: 2008-01-10 +version: 2008-01-12 depends on: package: magic.mse-game version: 2007-12-29 @@ -36,6 +36,9 @@ init script: # Should hybrids have a grey name? mask_hybrid_with_land := { styling.grey_hybrid_name } + #Should multicolor lands with basic land types have a colored name? + mask_multi_land_with_color := { styling.colored_multicolor_land_name } + # Which artifact template should be used? artifact_template := { if input == "a" and not styling.darker_artifacts @@ -64,6 +67,10 @@ styling field: type: boolean name: grey hybrid name description: Use a grey background for the name and type line on hybrid cards. This is done on real cards. +styling field: + type: boolean + name: colored multicolor land name + description: Use a colored background for the name and type on multicolor land cards with a basic land type. This is done on real cards. styling field: type: boolean name: use guild mana symbols diff --git a/data/magic-new-split.mse-style/style b/data/magic-new-split.mse-style/style index 5b8b1120..580be0a7 100644 --- a/data/magic-new-split.mse-style/style +++ b/data/magic-new-split.mse-style/style @@ -5,7 +5,7 @@ full name: Modern split cards icon: card-sample.png position hint: 003 -version: 2008-01-10 +version: 2008-01-12 depends on: package: magic.mse-game version: 2007-12-29 @@ -39,6 +39,9 @@ init script: # Should hybrids have a grey name? mask_hybrid_with_land := { styling.grey_hybrid_name } + #Should multicolor lands with basic land types have a colored name? + mask_multi_land_with_color := { styling.colored_multicolor_land_name } + # Which artifact template should be used? artifact_template := { if input == "a" and not styling.darker_artifacts @@ -78,6 +81,10 @@ styling field: type: boolean name: grey hybrid name description: Use a grey background for the name and type line on hybrid cards. This is done on real cards. +styling field: + type: boolean + name: colored multicolor land name + description: Use a colored background for the name and type on multicolor land cards with colors chosen. This is done on real cards. styling field: type: boolean name: use guild mana symbols diff --git a/data/magic-new.mse-style/style b/data/magic-new.mse-style/style index 791a78c2..c79c8cd4 100644 --- a/data/magic-new.mse-style/style +++ b/data/magic-new.mse-style/style @@ -5,7 +5,7 @@ full name: After 8th edition icon: card-sample.png position hint: 001 -version: 2008-01-10 +version: 2008-01-12 depends on: package: magic.mse-game version: 2007-12-29 @@ -36,6 +36,9 @@ init script: # Should hybrids have a grey name? mask_hybrid_with_land := { styling.grey_hybrid_name } + #Should multicolor lands with basic land types have a colored name? + mask_multi_land_with_color := { styling.colored_multicolor_land_name } + # Which artifact template should be used? artifact_template := { if input == "a" then ( @@ -84,6 +87,10 @@ styling field: type: boolean name: grey hybrid name description: Use a grey background for the name and type line on hybrid cards. This is done on real cards. +styling field: + type: boolean + name: colored multicolor land name + description: Use a colored background for the name and type on multicolor land cards with a basic land type. This is done on real cards. styling field: type: boolean name: use guild mana symbols diff --git a/data/magic-planeshifted.mse-style/style b/data/magic-planeshifted.mse-style/style index 9e20c81b..37c2000f 100644 --- a/data/magic-planeshifted.mse-style/style +++ b/data/magic-planeshifted.mse-style/style @@ -5,7 +5,7 @@ full name: Planar Chaos Timeshifts icon: card-sample.png position hint: 011 -version: 2008-01-10 +version: 2008-01-12 depends on: package: magic.mse-game version: 2007-12-29 @@ -30,6 +30,9 @@ init script: # Should hybrids have a grey name? mask_hybrid_with_land := { styling.grey_hybrid_name } + #Should multicolor lands with basic land types have a colored name? + mask_multi_land_with_color := { styling.colored_multicolor_land_name } + template_suffix := [card: "card.jpg", pt: "pt.png"] template := { input + template_suffix[type] } land_template := { (if input == "a" then "c" else input) + "l" + template_suffix[type] } @@ -67,6 +70,10 @@ styling field: type: boolean name: grey hybrid name description: Use a grey background for the name and type line on hybrid cards. This is done on real cards. +styling field: + type: boolean + name: colored multicolor land name + description: Use a colored background for the name and type on multicolor land cards with a basic land type. This is done on real cards. styling field: type: boolean name: use guild mana symbols diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game index 08eee237..db5a7ba0 100644 --- a/data/magic.mse-game/game +++ b/data/magic.mse-game/game @@ -1,12 +1,11 @@ - -mse version: 0.3.6 +mse version: 0.3.6 short name: Magic full name: Magic the Gathering installer group: magic/game files icon: card-back.png position hint: 01 -version: 2008-01-09 +version: 2008-01-12 depends on: package: magic-blends.mse-include version: 2007-09-23 @@ -1347,7 +1346,7 @@ word list: word: Treefolk word: Zombie word: - name: All Types + name: All Races word: name: A word: Anemone @@ -1603,7 +1602,7 @@ word list: word: Wizard word: Zombie word: - name: All Types + name: All Classes word: name: A-C word: Advisor