Added 'position hint' to packages, used to specify the order of the packages in a package list;

Added 'pack type', intended for playtesting (random boosters/starters);
Added 'default(_image)' property to ImageStyle, and added the frame fillers for magic;
Added blurring and bold printing (rather hacky) to the text rendering functions (used for "double click to add image" text);
Added 'symmetric overlay' combine mode, which will look really nice for hybrids;
Moved the watermark choices from the game to an include file in magic-watermarks;
Working on a replacement for the image scripting system that plays nicer with the rest of the code. In particular, it will be possible to compare generated images quickly, so they can be updated continuously. This is a work in progress, currently there are two versions of everything.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@327 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2007-05-09 21:41:15 +00:00
parent 6f7db851a7
commit 3c4729aaa2
63 changed files with 964 additions and 134 deletions
+1
View File
@@ -529,6 +529,7 @@ type:
string: string
boolean: boolean
color: color
image: image
nil: nothing
# Symbol editor shapes
Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

@@ -0,0 +1,3 @@
mse version: 0.3.2
full name: Magic The Gathering, placeholder images
version: 2007.05.09
Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

@@ -0,0 +1,18 @@
# default image if there is none
default_image := {
"/magic-default-image.mse-include/" +
if input == "white" then "white.jpg"
else if input == "blue" then "blue.jpg"
else if input == "red" then "red.jpg"
else if input == "black" then "black.jpg"
else if input == "green" then "green.jpg"
else if input == "land 1 color white" then "white.jpg"
else if input == "land 1 color blue" then "blue.jpg"
else if input == "land 1 color red" then "red.jpg"
else if input == "land 1 color black" then "black.jpg"
else if input == "land 1 color green" then "green.jpg"
else if is_artifact() then "artifact.jpg"
else if is_colorless() then "colorless.jpg"
else "multicolor.jpg"
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 7.9 KiB

+3
View File
@@ -3,6 +3,7 @@ game: magic
full name: Extended Art
short name: Extended Art
icon: card-sample.png
position hint: 007
card width: 375
card height: 523
@@ -14,6 +15,7 @@ card dpi: 150
init script:
# Load blend scripts for hybrids/multicolors
include file: magic-blends.mse-include/blend-scripts
include file: magic-default-image.mse-include/scripts
# Should hybrids have a grey name?
mask_hybrid_with_land := { styling.grey_hybrid_name }
@@ -154,6 +156,7 @@ card style:
width: 311
height: 376
z index: 1
default: {default_image(card.card_color)}
############################# Card type
@@ -3,6 +3,7 @@ game: magic
full name: FPM's Flip Magic
short name: FPM Flip
icon: card-sample.png
position hint: 402
card width: 375
card height: 523
@@ -3,6 +3,7 @@ game: magic
full name: FPM's Normal Magic
short name: FPM Normal
icon: card-sample.png
position hint: 401
card width: 375
card height: 523
@@ -3,6 +3,7 @@ game: magic
full name: FPM's Promo Magic
short name: FPM Promo
icon: card-sample.png
position hint: 404
card width: 375
card height: 523
@@ -3,6 +3,7 @@ game: magic
full name: FPM's Split Magic
short name: FPM Split
icon: card-sample.png
position hint: 403
card width: 523
card height: 375
@@ -3,6 +3,7 @@ game: magic
full name: FPM's Token Magic
short name: FPM Token
icon: card-sample.png
position hint: 421
card width: 375
card height: 523
+3
View File
@@ -3,6 +3,7 @@ game: magic
short name: Flip Cards
full name: Modern flip cards
icon: card-sample.png
position hint: 002
card width: 375
card height: 523
@@ -17,6 +18,7 @@ card dpi: 150
init script:
# Load blend scripts for hybrids/multicolors
include file: magic-blends.mse-include/blend-scripts
include file: magic-default-image.mse-include/scripts
# Should hybrids have a grey name?
# Not supported (yet)
@@ -185,6 +187,7 @@ card style:
width: 311
height: 182
z index: 10
default: {default_image(card.card_color)}
############################# Card type
+3
View File
@@ -3,6 +3,7 @@ game: magic
short name: Promotional
full name: Large image
icon: card-sample.png
position hint: 004
card width: 375
card height: 523
@@ -13,6 +14,7 @@ card dpi: 150
init script:
# Load blend scripts for hybrids/multicolors
include file: magic-blends.mse-include/blend-scripts
include file: magic-default-image.mse-include/scripts
# Should hybrids have a grey name?
mask_hybrid_with_land := { styling.grey_hybrid_name }
@@ -162,6 +164,7 @@ card style:
width: 311
height: 408
z index: 1
default: {default_image(card.card_color)}
############################# Card type
+4
View File
@@ -3,6 +3,7 @@ game: magic
short name: Split Cards
full name: Modern split cards
icon: card-sample.png
position hint: 003
card width: 523
card height: 375
@@ -16,6 +17,7 @@ card dpi: 150
init script:
# Load blend scripts for hybrids/multicolors
include file: magic-blends.mse-include/blend-scripts
include file: magic-default-image.mse-include/scripts
# Should hybrids have a grey name?
mask_hybrid_with_land := { styling.grey_hybrid_name }
@@ -185,6 +187,7 @@ card style:
width: 216
height: 159
z index: 1
default: {default_image(card.card_color)}
image 2:
left: 279
@@ -192,6 +195,7 @@ card style:
width: 216
height: 159
z index: 1
default: {default_image(card.card_color_2)}
############################# Card type
+5
View File
@@ -3,6 +3,7 @@ game: magic
short name: Modern style
full name: After 8th edition
icon: card-sample.png
position hint: 001
version: 2007-05-05
depends on:
@@ -21,6 +22,7 @@ card dpi: 150
init script:
# Load blend scripts for hybrids/multicolors
include file: magic-blends.mse-include/blend-scripts
include file: magic-default-image.mse-include/scripts
# Should hybrids have a grey name?
mask_hybrid_with_land := { styling.grey_hybrid_name }
@@ -53,6 +55,7 @@ init script:
else rgb(0,0,0)
}
############################################################## Extra style options
styling field:
@@ -125,6 +128,7 @@ card style:
right width: 17
top width: 17
bottom width: 18
#mask: border-mask.png
z index: -1
card color:
left: 0
@@ -179,6 +183,7 @@ card style:
width: 311
height: 228
z index: 1
default: {default_image(card.card_color)}
############################# Card type
+1
View File
@@ -9,6 +9,7 @@ game: magic
short name: Tokens
full name: Old style
icon: card-sample.png
position hint: 121
card width: 312
card height: 444
+1
View File
@@ -9,6 +9,7 @@ game: magic
short name: Old style
full name: Before 8th edition
icon: card-sample.png
position hint: 101
card width: 312
card height: 444
+1
View File
@@ -3,6 +3,7 @@ game: magic
short name: Planeshifted
full name: Planar Chaos Timeshifts
icon: card-sample.png
position hint: 011
card width: 375
card height: 523
+1
View File
@@ -3,6 +3,7 @@ game: magic
short name: Textless
full name: Modern style
icon: card-sample.png
position hint: 006
card width: 375
card height: 523
@@ -0,0 +1,36 @@
# The watermark choices
# Included by a game file
choice: none
choice:
name: mana symbol
choice: white
choice: blue
choice: black
choice: red
choice: green
choice: snow
choice:
name: guild symbol
choice: Azorius Senate (W/U)
choice: House Dimir (U/B)
choice: Cult of Rakdos (B/R)
choice: Gruul Clans (R/G)
choice: Selesnya Conclave (G/W)
choice: Orzhov Syndicate (W/B)
choice: The Izzet (U/R)
choice: The Golgari (B/G)
choice: Boros Legion (R/W)
choice: The Simic (G/U)
choice:
name: xander hybrid mana
choice: B/R
choice: U/B
choice: B/G
choice: R/G
choice: G/U
choice: U/R
choice: W/B
choice: G/W
choice: R/W
choice: W/U
+33 -83
View File
@@ -3,6 +3,7 @@ short name: Magic
full name: Magic the Gathering
icon: card-back.png
version: 2007-05-05
position hint: 1
############################################################## Functions & filters
@@ -618,39 +619,7 @@ card field:
type: choice
name: watermark
icon: stats/watermark.png
choice: none
choice:
name: mana symbol
choice: white
choice: blue
choice: black
choice: red
choice: green
choice: snow
choice:
name: guild symbol
choice: Azorius Senate (W/U)
choice: House Dimir (U/B)
choice: Cult of Rakdos (B/R)
choice: Gruul Clans (R/G)
choice: Selesnya Conclave (G/W)
choice: Orzhov Syndicate (W/B)
choice: The Izzet (U/R)
choice: The Golgari (B/G)
choice: Boros Legion (R/W)
choice: The Simic (G/U)
choice:
name: xander hybrid mana
choice: B/R
choice: U/B
choice: B/G
choice: R/G
choice: G/U
choice: U/R
choice: W/B
choice: G/W
choice: R/W
choice: W/U
include file: magic-watermarks.mse-include/watermark-names
description: A watermark for below the textbox, this can be a big mana symbol used on basic lands, or a guild symbol
############################# PT
@@ -669,6 +638,7 @@ card field:
name: ptsymbols
choice: shieldsword
editable: false
save value: false
show statistics: false
card field:
type: text
@@ -848,39 +818,7 @@ card field:
card field:
type: choice
name: watermark 2
choice: none
choice:
name: mana symbol
choice: white
choice: blue
choice: black
choice: red
choice: green
choice: snow
choice:
name: xander hybrid mana
choice: B/R
choice: U/B
choice: B/G
choice: R/G
choice: G/U
choice: U/R
choice: W/B
choice: G/W
choice: R/W
choice: W/U
choice:
name: guild symbol
choice: Azorius Senate (W/U)
choice: House Dimir (U/B)
choice: Cult of Rakdos (B/R)
choice: Gruul Clans (R/G)
choice: Selesnya Conclave (G/W)
choice: Orzhov Syndicate (W/B)
choice: The Izzet (U/R)
choice: The Golgari (B/G)
choice: Boros Legion (R/W)
choice: The Simic (G/U)
include file: magic-watermarks.mse-include/watermark-names
description: A watermark for below the textbox, this can be a big mana symbol used on basic lands, a special symbol, or a guild symbol
card field:
type: text
@@ -899,6 +837,7 @@ card field:
name: ptsymbols 2
choice: shieldsword
editable: false
save value: false
show statistics: false
card field:
type: text
@@ -1053,25 +992,36 @@ statistics dimension:
############################################################## Add multiple cards
#set template:
# name: Base set (??? cards)
#set template:
# name: Expansion set (134 cards)
#set template:
# name: 5 color cycle
# field: rarity
#set template:
# name: 3 rarities cycle
############################################################## Card packs
#pack:
# name: Base set
# pack type:
#pack:
# name:
#pack:
# name: Booster
# pack type: random
# card type:
# amount: 1
# filter: rarity = "rare"
# card type:
# amount: 3
# filter: rarity = "uncommon"
# card type:
# amount: 11
# filter: rarity = "common"
pack type:
name: Starter pack
pack type:
name: Booster pack
card type:
name: Rare
amount: 1
filter: card.rarity = "rare"
card type:
name: Uncommon
amount: 3
filter: card.rarity = "uncommon"
card type:
name: Common
amount: 11
filter: card.rarity = "common"
+1
View File
@@ -2,6 +2,7 @@
short name: Vanguard
full name: Magic Vanguard
icon: card-sample.png
position hint: 2
# Author : Wolfwood
# Most stuff is copy/pasted from magic.mse-game
+1
View File
@@ -3,6 +3,7 @@ game: vs
short name: Promotional
full name: Extended Art Promo
icon: card-sample.png
position hint: 2
card width: 375
card height: 523
+1
View File
@@ -3,6 +3,7 @@ game: vs
short name: Standard
full name: Normal VS cards
icon: card-sample.png
position hint: 1
card width: 375
card height: 523
+1
View File
@@ -1,6 +1,7 @@
mse version: 0.3.1
short name: VS System
icon: card-back.png
position hint: 3
############################################################## Functions & filters
## Copied and Pasted from magic-new.mse-style/style, with a few modifications
+1
View File
@@ -1,6 +1,7 @@
mse version: 0.3.1
short name: Yu-Gi-Oh!
icon: card-back.png
position hint: 4
############################################################## Functions & filters
## Copied and Pasted from vs.mse-game, with a few modifications