Skip to content

M
magicseteditor
Commit a3565fa1 authored by pichoro's avatar pichoro
Browse files
Options

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.
parent c7c8335e
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 10 deletions
data/magic-blends.mse-include/include
View file @ a3565fa1
mse version: 0.3.6 mse version: 0.3.6
full name: Magic The Gathering, card blend utilities 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 # This file doesn't do anything, other files in this directory can be included
# in game/style files: # in game/style files:
......
data/magic-blends.mse-include/new-blends
View file @ a3565fa1
...@@ -241,8 +241,23 @@ horizontal_pt_hybrid := [ ...@@ -241,8 +241,23 @@ horizontal_pt_hybrid := [
x1: 0.08, y1: 0 x1: 0.08, y1: 0
x2: 0.65, y2: 0 x2: 0.65, y2: 0
)} )}
6: { template(colors[5]) } #TODO 6: { linear_blend(
7: { template(colors[6]) } #TODO 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 := [ pt_hybrid := [
...@@ -273,7 +288,7 @@ pt_hybrid := [ ...@@ -273,7 +288,7 @@ pt_hybrid := [
3: { template(colors[2]) } 3: { template(colors[2]) }
4: { template(colors[3]) } 4: { template(colors[3]) }
5: { template(colors[4]) } 5: { template(colors[4]) }
6: { template(colors[5]) } # Probably not right 6: { template(colors[5]) }
7: { template(colors[6]) } 7: { template(colors[6]) }
] ]
overlay: overlay_hybrid overlay: overlay_hybrid
......
data/magic-future-textless.mse-style/style
View file @ a3565fa1
...@@ -5,7 +5,7 @@ full name: Futureshift Textless ...@@ -5,7 +5,7 @@ full name: Futureshift Textless
icon: card-sample.png icon: card-sample.png
position hint: 051 position hint: 051
version: 2008-01-12 version: 2008-01-20
depends on: depends on:
package: magic.mse-game package: magic.mse-game
version: 2007-09-23 version: 2007-09-23
...@@ -45,6 +45,12 @@ init script: ...@@ -45,6 +45,12 @@ init script:
dark: land_template("c"), dark: land_template("c"),
light: base, 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 else if multi then
masked_blend( masked_blend(
mask: "multicolor_blend_{type}.png", mask: "multicolor_blend_{type}.png",
...@@ -92,6 +98,7 @@ init script: ...@@ -92,6 +98,7 @@ init script:
else "white" else "white"
} }
typesymbol_color:= { if contains(card.card_color, match:"artifact") then "black" 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 ( else if contains(card.card_color, match:"multicolor") then (
if card.card_color=="multicolor" then "black" if card.card_color=="multicolor" then "black"
else if not contains(card.card_color, match:"white") then "white" else if not contains(card.card_color, match:"white") then "white"
...@@ -195,6 +202,10 @@ card style: ...@@ -195,6 +202,10 @@ card style:
contains(card.card_color, match:"radial") or contains(card.card_color, match:"radial") or
contains(card.card_color, match:"vertical") and contains(card.card_color, match:"vertical") and
not contains(card.card_color, match:"multicolor") then rgb(0,0,0) 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 else if contains(card.card_color, match:"land") and
contains(card.card_color, match:"multicolor") then rgb(0,0,0) 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) else if styling.grey_hybrid_name and contains(card.card_color, match:"hybrid") then rgb(0,0,0)
...@@ -273,6 +284,10 @@ card style: ...@@ -273,6 +284,10 @@ card style:
contains(card.card_color, match:"radial") or contains(card.card_color, match:"radial") or
contains(card.card_color, match:"vertical") and contains(card.card_color, match:"vertical") and
not contains(card.card_color, match:"multicolor") then rgb(0,0,0) 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 else if contains(card.card_color, match:"land") and
contains(card.card_color, match:"multicolor") then rgb(0,0,0) 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) else if styling.grey_hybrid_name and contains(card.card_color, match:"hybrid") then rgb(0,0,0)
......
data/magic-future.mse-style/style
View file @ a3565fa1
...@@ -5,7 +5,7 @@ full name: Futureshift ...@@ -5,7 +5,7 @@ full name: Futureshift
icon: card-sample.png icon: card-sample.png
position hint: 050 position hint: 050
version: 2008-01-12 version: 2008-01-20
depends on: depends on:
package: magic.mse-game package: magic.mse-game
version: 2007-12-29 version: 2007-12-29
...@@ -53,6 +53,12 @@ init script: ...@@ -53,6 +53,12 @@ init script:
dark: land_template("c"), dark: land_template("c"),
light: base, 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 else if multi then
masked_blend( masked_blend(
mask: "multicolor_blend_{type}.png", mask: "multicolor_blend_{type}.png",
...@@ -132,6 +138,7 @@ init script: ...@@ -132,6 +138,7 @@ init script:
else "white" else "white"
} }
typesymbol_color:= { if contains(card.card_color, match:"artifact") then "black" 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 ( else if contains(card.card_color, match:"multicolor") then (
if card.card_color=="multicolor" then "black" if card.card_color=="multicolor" then "black"
else if not contains(card.card_color, match:"white") then "white" else if not contains(card.card_color, match:"white") then "white"
...@@ -262,6 +269,10 @@ card style: ...@@ -262,6 +269,10 @@ card style:
contains(card.card_color, match:"radial") or contains(card.card_color, match:"radial") or
contains(card.card_color, match:"vertical") and contains(card.card_color, match:"vertical") and
not contains(card.card_color, match:"multicolor") then rgb(0,0,0) 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 else if contains(card.card_color, match:"land") and
contains(card.card_color, match:"multicolor") then rgb(0,0,0) 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) else if styling.grey_hybrid_name and contains(card.card_color, match:"hybrid") then rgb(0,0,0)
...@@ -341,6 +352,10 @@ card style: ...@@ -341,6 +352,10 @@ card style:
contains(card.card_color, match:"radial") or contains(card.card_color, match:"radial") or
contains(card.card_color, match:"vertical") and contains(card.card_color, match:"vertical") and
not contains(card.card_color, match:"multicolor") then rgb(0,0,0) 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 else if contains(card.card_color, match:"land") and
contains(card.card_color, match:"multicolor") then rgb(0,0,0) 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) else if styling.grey_hybrid_name and contains(card.card_color, match:"hybrid") then rgb(0,0,0)
...@@ -383,15 +398,16 @@ card style: ...@@ -383,15 +398,16 @@ card style:
font: font:
name: MPlantin name: MPlantin
italic name: MPlantin-Italic italic name: MPlantin-Italic
size: 15 size: 13
scale down to: 6 scale down to: 6
color: color:
script: script:
if not contains(card.card_color, match:"land") then rgb(0,0,0) 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) else font_color(card.card_color)
symbol font: symbol font:
name: { styling.text_box_mana_symbols } name: { styling.text_box_mana_symbols }
size: 15 size: 13
alignment: alignment:
script: script:
if (styling.center_text == "short text only" and if (styling.center_text == "short text only" and
......
data/magic.mse-game/game
View file @ a3565fa1
...@@ -1349,7 +1349,6 @@ word list: ...@@ -1349,7 +1349,6 @@ word list:
name: All Races name: All Races
word: word:
name: A name: A
word: Anemone
word: Angel word: Angel
word: Anteater word: Anteater
word: Antelope word: Antelope
...@@ -1424,7 +1423,6 @@ word list: ...@@ -1424,7 +1423,6 @@ word list:
word: Golem word: Golem
word: Gorgon word: Gorgon
word: Graveborn word: Graveborn
word: Gremlin
word: Griffin word: Griffin
word: word:
name: H name: H
...@@ -1439,6 +1437,7 @@ word list: ...@@ -1439,6 +1437,7 @@ word list:
word: Hound word: Hound
word: Human word: Human
word: Hydra word: Hydra
word: Hyena
word: word:
name: I name: I
word: Illusion word: Illusion
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment