diff --git a/data/magic-new-split.mse-style/style b/data/magic-new-split.mse-style/style
index 4a3b9783..4f5cfba1 100644
--- a/data/magic-new-split.mse-style/style
+++ b/data/magic-new-split.mse-style/style
@@ -23,9 +23,12 @@ init script:
# Which artifact template should be used?
artifact_template := {
- if styling.darker_artifacts then "a" else "oa"
+ if input == "a" and not styling.darker_artifacts
+ then "oa"
+ else input
}
-
+ template := { artifact_template() + "{type}.jpg" }
+
# Use the normal tap symbol
mana_t := {
if styling.tap_symbol == "old" then "old"
diff --git a/data/magic-new-token.mse-style/acard0.jpg b/data/magic-new-token.mse-style/acard0.jpg
index 98b4d396..29dd0395 100644
Binary files a/data/magic-new-token.mse-style/acard0.jpg and b/data/magic-new-token.mse-style/acard0.jpg differ
diff --git a/data/magic-new-token.mse-style/acard1.jpg b/data/magic-new-token.mse-style/acard1.jpg
index 007321d8..fb515cda 100644
Binary files a/data/magic-new-token.mse-style/acard1.jpg and b/data/magic-new-token.mse-style/acard1.jpg differ
diff --git a/data/magic-new-token.mse-style/acard2.jpg b/data/magic-new-token.mse-style/acard2.jpg
index 4124cf48..b11c29d3 100644
Binary files a/data/magic-new-token.mse-style/acard2.jpg and b/data/magic-new-token.mse-style/acard2.jpg differ
diff --git a/data/magic-new-token.mse-style/apt0.jpg b/data/magic-new-token.mse-style/apt0.jpg
index 694890e9..eced0642 100644
Binary files a/data/magic-new-token.mse-style/apt0.jpg and b/data/magic-new-token.mse-style/apt0.jpg differ
diff --git a/data/magic-new-token.mse-style/apt1.jpg b/data/magic-new-token.mse-style/apt1.jpg
index 7b06ee7e..54d33cf4 100644
Binary files a/data/magic-new-token.mse-style/apt1.jpg and b/data/magic-new-token.mse-style/apt1.jpg differ
diff --git a/data/magic-new-token.mse-style/apt2.jpg b/data/magic-new-token.mse-style/apt2.jpg
index 7aba1859..0ca3fe72 100644
Binary files a/data/magic-new-token.mse-style/apt2.jpg and b/data/magic-new-token.mse-style/apt2.jpg differ
diff --git a/data/magic-new-token.mse-style/hybrid_blend_card0.png b/data/magic-new-token.mse-style/hybrid_blend_card0.png
new file mode 100644
index 00000000..a2590634
Binary files /dev/null and b/data/magic-new-token.mse-style/hybrid_blend_card0.png differ
diff --git a/data/magic-new-token.mse-style/hybrid_blend_card1.png b/data/magic-new-token.mse-style/hybrid_blend_card1.png
new file mode 100644
index 00000000..81c88a8e
Binary files /dev/null and b/data/magic-new-token.mse-style/hybrid_blend_card1.png differ
diff --git a/data/magic-new-token.mse-style/hybrid_blend_card2.png b/data/magic-new-token.mse-style/hybrid_blend_card2.png
new file mode 100644
index 00000000..35690cd3
Binary files /dev/null and b/data/magic-new-token.mse-style/hybrid_blend_card2.png differ
diff --git a/data/magic-new-token.mse-style/oacard0.jpg b/data/magic-new-token.mse-style/oacard0.jpg
index 29dd0395..98b4d396 100644
Binary files a/data/magic-new-token.mse-style/oacard0.jpg and b/data/magic-new-token.mse-style/oacard0.jpg differ
diff --git a/data/magic-new-token.mse-style/oacard1.jpg b/data/magic-new-token.mse-style/oacard1.jpg
index fb515cda..007321d8 100644
Binary files a/data/magic-new-token.mse-style/oacard1.jpg and b/data/magic-new-token.mse-style/oacard1.jpg differ
diff --git a/data/magic-new-token.mse-style/oacard2.jpg b/data/magic-new-token.mse-style/oacard2.jpg
index b11c29d3..4124cf48 100644
Binary files a/data/magic-new-token.mse-style/oacard2.jpg and b/data/magic-new-token.mse-style/oacard2.jpg differ
diff --git a/data/magic-new-token.mse-style/oapt0.jpg b/data/magic-new-token.mse-style/oapt0.jpg
index eced0642..694890e9 100644
Binary files a/data/magic-new-token.mse-style/oapt0.jpg and b/data/magic-new-token.mse-style/oapt0.jpg differ
diff --git a/data/magic-new-token.mse-style/oapt1.jpg b/data/magic-new-token.mse-style/oapt1.jpg
index 54d33cf4..7b06ee7e 100644
Binary files a/data/magic-new-token.mse-style/oapt1.jpg and b/data/magic-new-token.mse-style/oapt1.jpg differ
diff --git a/data/magic-new-token.mse-style/oapt2.jpg b/data/magic-new-token.mse-style/oapt2.jpg
index 0ca3fe72..7aba1859 100644
Binary files a/data/magic-new-token.mse-style/oapt2.jpg and b/data/magic-new-token.mse-style/oapt2.jpg differ
diff --git a/data/magic-textless.mse-style/style b/data/magic-textless.mse-style/style
index 72d577d6..659c72d7 100644
--- a/data/magic-textless.mse-style/style
+++ b/data/magic-textless.mse-style/style
@@ -34,10 +34,6 @@ init script:
############################################################## Extra style options
-styling field:
- type: boolean
- name: darker artifacts
- description: Use darker artifacts, as used by Wizards since Fifth Dawn.
styling field:
type: boolean
name: grey hybrid name
diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game
index 0d2d61cd..bb2876a0 100644
--- a/data/magic.mse-game/game
+++ b/data/magic.mse-game/game
@@ -132,17 +132,18 @@ init script:
is_multicolor := { chosen(choice: "multicolor") and input != "artifact, multicolor" }
is_hybrid := { chosen(choice: "hybrid") }
is_land := { chosen(choice: "land") }
+
sort_index := {
if card.casting_cost_2 !="" and card.card_color != card.card_color_2 then "H"
- else if card.card_color=="white" then "A"
- else if card.card_color=="blue" then "B"
- else if card.card_color=="black" then "C"
- else if card.card_color=="red" then "D"
- else if card.card_color=="green" then "E"
else if is_land (card.card_color) then (if card.rarity != "basic land" then "J" else "K")
- else if is_multicolor(card.card_color) then "F"
+ else if is_multicolor(card.card_color) then "F"
else if is_hybrid (card.card_color) then "G"
- else "I" # colorless
+ else if chosen(choice:"white", card.card_color) then "A"
+ else if chosen(choice:"blue", card.card_color) then "B"
+ else if chosen(choice:"black", card.card_color) then "C"
+ else if chosen(choice:"red", card.card_color) then "D"
+ else if chosen(choice:"green", card.card_color) then "E"
+ else "I" # colorless, artifacts
};
# The color of a card
@@ -1393,7 +1394,7 @@ keyword:
keyword: Banding
match: Banding
mode: old
- reminder: When declaring attackers or blockers this creature may group with other creatures with banding and one creature without banding. When damage is dealt, you decide where damage is dealt.
+ reminder: When declaring attackers or blockers, this creature may group with other creatures with banding and one creature without banding. When damage is dealt, you decide where damage is dealt.
keyword:
keyword: Landwalk
match: prefixwalk
@@ -1413,7 +1414,7 @@ keyword:
keyword: Bands with other
match: Bands with other name
mode: old
- reminder: When declaring attackers or blockers this creature may group with other creatures with banding or bands with {param1}. When damage is dealt, you decide where damage is dealt.
+ reminder: When declaring attackers or blockers, this creature may group with other creatures with banding or bands with other {param1}. When damage is dealt, you decide where damage is dealt.
keyword:
keyword: Rampage
match: Rampage number
@@ -1652,7 +1653,7 @@ keyword:
keyword: Haunt
match: Haunt
mode: expert
- reminder: When this card is put into a graveyard from play, remove it from the game haunting target creature.
+ reminder: When this { if contains(card.type,match:"Instant") or contains(card.type,match:"Sorcery") then "spell card is put into a graveyard after resolving," else "card is put into a graveyard from play," } remove it from the game haunting target creature.
keyword:
keyword: Bloodthirst
match: Bloodthirst number
diff --git a/data/vanguard.mse-game/game b/data/vanguard.mse-game/game
index 29d84287..29b3283b 100644
--- a/data/vanguard.mse-game/game
+++ b/data/vanguard.mse-game/game
@@ -505,7 +505,7 @@ keyword:
keyword: Banding
match: banding
mode: old
- reminder: When declaring attackers or blockers it may group with other creatures with banding and one creature without banding. When damage is dealt, you decide where damage is dealt.
+ reminder: When declaring attackers or blockers, it may group with other creatures with banding and one creature without banding. When damage is dealt, you decide where damage is dealt.
keyword:
keyword: Landwalk
match: prefixwalk
@@ -525,7 +525,7 @@ keyword:
keyword: Bands with other
match: bands with other name
mode: old
- reminder: When declaring attackers or blockers it may group with other creatures with banding or bands with {param1}. When damage is dealt, you decide where damage is dealt.
+ reminder: When declaring attackers or blockers, it may group with other creatures with banding or bands with {param1}. When damage is dealt, you decide where damage is dealt.
keyword:
keyword: Rampage
match: rampage number
@@ -774,7 +774,7 @@ keyword:
keyword: Haunt
match: haunt
mode: expert
- reminder: When it is put into a graveyard from play, remove it from the game haunting target creature.
+ reminder: When it is put into a graveyard from play, or when it resolves if it is not a permanent, remove it from the game haunting target creature.
keyword:
keyword: Bloodthirst
match: bloodthirst number
diff --git a/data/yugioh-standard.mse-style/style b/data/yugioh-standard.mse-style/style
index 21091884..1638e3db 100644
--- a/data/yugioh-standard.mse-style/style
+++ b/data/yugioh-standard.mse-style/style
@@ -3,9 +3,10 @@ game: yugioh
short name: Standard
icon: card-sample.png
-card width: 375
+card width: 361
card height: 523
-card dpi: 300
+card dpi: 152.6265
+
############################################################## Extra scripts
@@ -18,7 +19,7 @@ card style:
card type:
left: 0
top: 0
- width: 375
+ width: 361
height: 523
z index: -2
render style: image
@@ -37,9 +38,9 @@ card style:
############################# Name line
name:
- left: 35
+ left: 34
top : 31
- width: 265
+ width: 250
height: 35
alignment: bottom shrink-overflow
padding bottom: 0
@@ -51,7 +52,7 @@ card style:
script: if is_nmonster() then rgb(255,255,255)
else rgb(0,0,0)
attribute:
- left: 302
+ left: 290
top : 32
width: 35
height: 35
@@ -69,10 +70,10 @@ card style:
spell: spell.png
trap: trap.png
level:
- left: 45
+ left: 43
top : 78
height: 25
- width: 285
+ width: 275
z index: 2
alignment: middle right
font:
@@ -88,18 +89,18 @@ card style:
############################# Image
image:
- left: 53
+ left: 51
top: 114
- width: 267
+ width: 257
height: 261
z index: 1
############################# Card type
monster type:
- left: 38
+ left: 37
top : 403
- width: 200
+ width: 193
height: 14
alignment: top left
z index: 2
@@ -113,9 +114,9 @@ card style:
############################# Edition and Card ID
number:
- left: 210
+ left: 202
top : 383
- width: 120
+ width: 116
height: 28
z index: 2
alignment: top right
@@ -124,9 +125,9 @@ card style:
size: 8
color: rgb(0,0,0)
edition:
- left: 45
+ left: 43
top: 383
- width: 120
+ width: 116
height: 18
z index: 2
font:
@@ -136,10 +137,10 @@ card style:
############################# Text box
rule text:
- left: 35
+ left: 34
top :
script: if is_nmonster() then 400 else 413
- width: 301
+ width: 290
height:
script: if is_nmonster() then 90 else 63
font:
@@ -158,9 +159,9 @@ card style:
############################# Attack/Defense
attack:
- left: 205
+ left: 197
top: 477
- width: 50
+ width: 48
height: 18
z index: 2
alignment: left middle
@@ -171,10 +172,9 @@ card style:
visible: script: if is_nmonster() then false else true
defense:
- z index: 4
- left: 276
+ left: 266
top: 477
- width: 50
+ width: 48
height: 18
z index: 2
alignment: left middle
@@ -188,9 +188,9 @@ card style:
############################# Copyright stuff
gamecode:
- left: 15
+ left: 14
top : 499
- width: 100
+ width: 96
height: 18
alignment: top left
z index: 2
@@ -200,9 +200,9 @@ card style:
color: rgb(0,0,0)
copyright:
- left: 195
+ left: 188
top : 499
- width: 150
+ width: 145
height: 18
z index: 2
alignment: top right