Skip to content

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

Fixed an error in the default setting for the card type symbol in futureshifts. 

Moved type symbol field back to game file, where it should remain.
parent 8d107601
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 98 deletions
data/magic-future-textless.mse-style/style
View file @ 9f678d73
...@@ -90,29 +90,6 @@ init script: ...@@ -90,29 +90,6 @@ init script:
else "white" else "white"
} }
typesymbol_type:= { if contains(card.type, match:"Tribal") then "multitype"
else if contains(card.type, match:"Sorcery") then "sorcery"
else if contains(card.type, match:"Instant") then "instant"
else if contains(card.type, match:"Planeswalker") then "multitype"
else if contains(card.type, match:"Creature") and
not contains(card.type, match:"Land") and
not contains(card.type, match:"Artifact") and
not contains(card.type, match:"Enchantment") then "creature"
else if contains(card.type, match:"Artifact") and
not contains(card.type, match:"Land") and
not contains(card.type, match:"Creature") and
not contains(card.type, match:"Enchantment") then "artifact"
else if contains(card.type, match:"Land") and
not contains(card.type, match:"Creature") and
not contains(card.type, match:"Artifact") and
not contains(card.type, match:"Enchantment") then "land"
else if contains(card.type, match:"Enchantment") and
not contains(card.type, match:"Land") and
not contains(card.type, match:"Artifact") and
not contains(card.type, match:"Creature") then "enchantment"
else "multitype"
}
card_shape := { "shifted" } card_shape := { "shifted" }
############################################################## Set info fields ############################################################## Set info fields
...@@ -240,6 +217,21 @@ card style: ...@@ -240,6 +217,21 @@ card style:
render style: image render style: image
choice images: choice images:
tombstone: tombstone.png tombstone: tombstone.png
type symbol:
left: 23
top: 25
width: 21
height: 20
z index: 2
render style: image
choice images:
artifact: { "/magic-future-common.mse-include/artifact_" + typesymbol_color(value) + ".png" }
creature: { "/magic-future-common.mse-include/creature_" + typesymbol_color(value) + ".png" }
enchantment: { "/magic-future-common.mse-include/enchantment_" + typesymbol_color(value) + ".png" }
instant: { "/magic-future-common.mse-include/instant_" + typesymbol_color(value) + ".png" }
land: { "/magic-future-common.mse-include/land_" + typesymbol_color(value) + ".png" }
multitype: { "/magic-future-common.mse-include/multitype_" + typesymbol_color(value) + ".png" }
sorcery: { "/magic-future-common.mse-include/sorcery_" + typesymbol_color(value) + ".png" }
############################# Image ############################# Image
image: image:
...@@ -377,17 +369,6 @@ extra card field: ...@@ -377,17 +369,6 @@ extra card field:
name: pt box name: pt box
script: card.card_color script: card.card_color
editable: false editable: false
extra card field:
type: choice
name: type symbol
default: typesymbol_type()
choice: artifact
choice: creature
choice: enchantment
choice: instant
choice: land
choice: multitype
choice: sorcery
extra card field: extra card field:
type: choice type: choice
name: paintbrush name: paintbrush
...@@ -406,21 +387,6 @@ extra card style: ...@@ -406,21 +387,6 @@ extra card style:
render style: image render style: image
image: { card_ptbox() } image: { card_ptbox() }
mask: mask_pt.png mask: mask_pt.png
type symbol:
left: 24
top: 25
width: 21
height: 20
z index: 2
render style: image
choice images:
artifact: { "/magic-future-common.mse-include/artifact_" + typesymbol_color(value) + ".png" }
creature: { "/magic-future-common.mse-include/creature_" + typesymbol_color(value) + ".png" }
enchantment: { "/magic-future-common.mse-include/enchantment_" + typesymbol_color(value) + ".png" }
instant: { "/magic-future-common.mse-include/instant_" + typesymbol_color(value) + ".png" }
land: { "/magic-future-common.mse-include/land_" + typesymbol_color(value) + ".png" }
multitype: { "/magic-future-common.mse-include/multitype_" + typesymbol_color(value) + ".png" }
sorcery: { "/magic-future-common.mse-include/sorcery_" + typesymbol_color(value) + ".png" }
paintbrush: paintbrush:
right: { ( if card.pt != "" then 281 else 341 ) - card_style.illustrator.content_width } right: { ( if card.pt != "" then 281 else 341 ) - card_style.illustrator.content_width }
top : 479 top : 479
......
data/magic-future.mse-style/style
View file @ 9f678d73
...@@ -121,29 +121,6 @@ init script: ...@@ -121,29 +121,6 @@ init script:
else "white" else "white"
} }
typesymbol_type:= { if contains(card.type, match:"Tribal") then "multitype"
else if contains(card.type, match:"Sorcery") then "sorcery"
else if contains(card.type, match:"Instant") then "instant"
else if contains(card.type, match:"Planeswalker") then "multitype"
else if contains(card.type, match:"Creature") and
not contains(card.type, match:"Land") and
not contains(card.type, match:"Artifact") and
not contains(card.type, match:"Enchantment") then "creature"
else if contains(card.type, match:"Artifact") and
not contains(card.type, match:"Land") and
not contains(card.type, match:"Creature") and
not contains(card.type, match:"Enchantment") then "artifact"
else if contains(card.type, match:"Land") and
not contains(card.type, match:"Creature") and
not contains(card.type, match:"Artifact") and
not contains(card.type, match:"Enchantment") then "land"
else if contains(card.type, match:"Enchantment") and
not contains(card.type, match:"Land") and
not contains(card.type, match:"Artifact") and
not contains(card.type, match:"Creature") then "enchantment"
else "multitype"
}
card_shape := { "shifted" } card_shape := { "shifted" }
############################################################## Set info fields ############################################################## Set info fields
...@@ -289,6 +266,21 @@ card style: ...@@ -289,6 +266,21 @@ card style:
render style: image render style: image
choice images: choice images:
tombstone: tombstone.png tombstone: tombstone.png
type symbol:
left: 24
top: 24
width: 21
height: 20
z index: 4
render style: image
choice images:
artifact: { "/magic-future-common.mse-include/artifact_" + typesymbol_color(value) + ".png" }
creature: { "/magic-future-common.mse-include/creature_" + typesymbol_color(value) + ".png" }
enchantment: { "/magic-future-common.mse-include/enchantment_" + typesymbol_color(value) + ".png" }
instant: { "/magic-future-common.mse-include/instant_" + typesymbol_color(value) + ".png" }
land: { "/magic-future-common.mse-include/land_" + typesymbol_color(value) + ".png" }
multitype: { "/magic-future-common.mse-include/multitype_" + typesymbol_color(value) + ".png" }
sorcery: { "/magic-future-common.mse-include/sorcery_" + typesymbol_color(value) + ".png" }
############################# Image ############################# Image
image: image:
...@@ -485,17 +477,6 @@ extra card field: ...@@ -485,17 +477,6 @@ extra card field:
script: card.card_color script: card.card_color
editable: false editable: false
save value: false save value: false
extra card field:
type: choice
name: type symbol
default: typesymbol_type(value)
choice: artifact
choice: creature
choice: enchantment
choice: instant
choice: land
choice: multitype
choice: sorcery
extra card field: extra card field:
type: choice type: choice
name: paintbrush name: paintbrush
...@@ -531,21 +512,6 @@ extra card style: ...@@ -531,21 +512,6 @@ extra card style:
visible: { card.pt != "" } visible: { card.pt != "" }
render style: image render style: image
image: { card_ptbox() } image: { card_ptbox() }
type symbol:
left: 24
top: 24
width: 21
height: 20
z index: 4
render style: image
choice images:
artifact: { "/magic-future-common.mse-include/artifact_" + typesymbol_color(value) + ".png" }
creature: { "/magic-future-common.mse-include/creature_" + typesymbol_color(value) + ".png" }
enchantment: { "/magic-future-common.mse-include/enchantment_" + typesymbol_color(value) + ".png" }
instant: { "/magic-future-common.mse-include/instant_" + typesymbol_color(value) + ".png" }
land: { "/magic-future-common.mse-include/land_" + typesymbol_color(value) + ".png" }
multitype: { "/magic-future-common.mse-include/multitype_" + typesymbol_color(value) + ".png" }
sorcery: { "/magic-future-common.mse-include/sorcery_" + typesymbol_color(value) + ".png" }
paintbrush paintbrush
right: { ( if card.pt != "" then 275 else 338 ) - card_style.illustrator.content_width } right: { ( if card.pt != "" then 275 else 338 ) - card_style.illustrator.content_width }
top : 476 top : 476
......
data/magic.mse-game/game
View file @ 9f678d73
...@@ -430,6 +430,31 @@ init script: ...@@ -430,6 +430,31 @@ init script:
# Shape of cards, can be changed in style files # Shape of cards, can be changed in style files
card_shape := { "normal" } card_shape := { "normal" }
typesymbol_type:= {
type := to_text(card.super_type)
if contains(type, match:"Tribal") then "multitype"
else if contains(type, match:"Sorcery") then "sorcery"
else if contains(type, match:"Instant") then "instant"
else if contains(type, match:"Planeswalker") then "multitype"
else if contains(type, match:"Creature") and
not contains(type, match:"Land") and
not contains(type, match:"Artifact") and
not contains(type, match:"Enchantment") then "creature"
else if contains(type, match:"Artifact") and
not contains(type, match:"Land") and
not contains(type, match:"Creature") and
not contains(type, match:"Enchantment") then "artifact"
else if contains(type, match:"Land") and
not contains(type, match:"Creature") and
not contains(type, match:"Artifact") and
not contains(type, match:"Enchantment") then "land"
else if contains(type, match:"Enchantment") and
not contains(type, match:"Land") and
not contains(type, match:"Artifact") and
not contains(type, match:"Creature") then "enchantment"
else "multitype"
}
############################################################## Statistics utilities ############################################################## Statistics utilities
# Converted mana cost # Converted mana cost
...@@ -717,6 +742,19 @@ card field: ...@@ -717,6 +742,19 @@ card field:
choice: none choice: none
choice: tombstone choice: tombstone
description: Symbol for this card (tombstone) description: Symbol for this card (tombstone)
card field:
type: choice
name: type symbol
default: typesymbol_type(value)
card list visible: false
show statistics: false
choice: artifact
choice: creature
choice: enchantment
choice: instant
choice: land
choice: multitype
choice: sorcery
############################# Image ############################# Image
card field: card field:
......
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