Fix various template warnings (#32)

- Missing :
- Deprecated =
- Not valid color name
- Must always return statement
This commit is contained in:
GenevensiS
2024-02-11 04:37:08 +01:00
committed by GitHub
parent 1ca8a98b3e
commit b7fb27fbb5
26 changed files with 141 additions and 143 deletions

View File

@@ -51,7 +51,7 @@ init script:
# Use guild mana symbols?
guild_mana := { styling.use_guild_mana_symbols }
pt := { if card.pt != "" then "-pt"}
pt := { if card.pt != "" then "-pt" else ""}
############################################################## Set info fields
set info style:

View File

@@ -140,8 +140,8 @@ card style:
name: MatrixBoldSmallCaps
size: 18
color:
{ if styling.font_color = "white" then rgb(255,255,255)
else if styling.font_color = "black" then rgb(0,0,0)
{ if styling.font_color == "white" then rgb(255,255,255)
else if styling.font_color == "black" then rgb(0,0,0)
else rgb(0,0,0) }
casting cost:
left: 325
@@ -187,8 +187,8 @@ card style:
name: Matrix
size: 16
color:
{ if styling.font_color = "white" then rgb(255,255,255)
else if styling.font_color = "black" then rgb(0,0,0)
{ if styling.font_color == "white" then rgb(255,255,255)
else if styling.font_color == "black" then rgb(0,0,0)
else rgb(0,0,0) }
scale down to: 6
separator color: rgb(128,128,128)
@@ -287,8 +287,8 @@ card style:
size: 8
weight: bold
color:
{ if styling.font_color = "white" then rgb(255,255,255)
else if styling.font_color = "black" then rgb(0,0,0)
{ if styling.font_color == "white" then rgb(255,255,255)
else if styling.font_color == "black" then rgb(0,0,0)
else rgb(0,0,0) }
copyright line:
left: 28

View File

@@ -532,7 +532,7 @@ extra card style:
visible: { card.pt != "" }
render style: image
image: { card_ptbox() }
paintbrush
paintbrush:
right: { ( if card.pt != "" then 275 else 338 ) - card_style.illustrator.content_width }
top : 476
width: 40

View File

@@ -345,7 +345,7 @@ extra card style:
choice images:
frame: frame.png
pt: pt_frame.png
paintbrush
paintbrush:
right: { ( if card.pt != "" then 275 else 338 ) - card_style.illustrator.content_width }
top : 474
width: 40

View File

@@ -691,7 +691,7 @@ extra card style:
visible: { card.pt_2 != "" }
render style: image
image: { flip_ptbox2() }
paintbrush
paintbrush:
right: { 353 - card_style.illustrator.content_width }
top : 478
width: 40

View File

@@ -588,7 +588,7 @@ extra card style:
visible: { card.pt != "" }
render style: image
image: { card_ptbox() }
paintbrush
paintbrush:
left: { if card.pt != "" then 92 else 30 }
top : 476
width: 40

View File

@@ -524,7 +524,7 @@ extra card field:
script: ":"
save value: false
extra card style:
paintbrush
paintbrush:
left: 505
top : { 215 + card_style.illustrator.content_width * 0.5 }
width: 40

View File

@@ -631,7 +631,7 @@ extra card style:
popup style: in place
image: { card_typeline() }
z index: 3
paintbrush
paintbrush:
left: 30
top : 476
width: 40

View File

@@ -777,7 +777,7 @@ extra card style:
visible: { card.pt_2 != "" }
render style: image
image: { flip_ptbox2() }
paintbrush
paintbrush:
right: { ( if card.pt != "" then 195 else 241 ) - card_style.illustrator.content_width }
top : 334
width: 25
@@ -797,7 +797,7 @@ extra card style:
angle: 90
render style: image
image: {if styling.overlay == "" then nil else styling.overlay + "/overlay.png"}
paintbrush 2
paintbrush 2:
right: { 492 - card_style.illustrator_2.content_width }
top : 334
width: 25

View File

@@ -829,7 +829,7 @@ extra card style:
visible: { card.pt_2 != "" }
render style: image
image: { card_ptbox() }
paintbrush
paintbrush:
right: { ( if card.pt != "" then 195 else 241 ) - card_style.illustrator.content_width }
top : 334
width: 25
@@ -849,7 +849,7 @@ extra card style:
angle: 90
render style: image
image: {if styling.overlay == "" then nil else styling.overlay + "/overlay.png"}
paintbrush 2
paintbrush 2:
right: { ( if card.pt_2 != "" then 446 else 492 ) - card_style.illustrator_2.content_width }
top : 334
width: 25

View File

@@ -265,7 +265,7 @@ extra card style:
choice images:
frame: frame.png
pt: pt_frame.png
paintbrush
paintbrush:
right: { ( if card.pt != "" then 275 else 338 ) - card_style.illustrator.content_width }
top : 479
width: 40

View File

@@ -530,7 +530,7 @@ extra card style:
visible: { card.pt != "" }
render style: image
image: { card_ptbox() }
paintbrush
paintbrush:
right: { ( if card.pt != "" then 275 else 338 ) - card_style.illustrator.content_width }
top : 476
width: 40

View File

@@ -141,7 +141,7 @@ styling field:
name: promo
description: Is this card a promo card, with the "P" rarity?
initial: no
styling field
styling field:
type: boolean
name: masterpiece
description: Is this card a Masterpiece?
@@ -304,9 +304,7 @@ card style:
name: MPlantin
italic name: MPlantin-Italic
size: 10
color: if (card.color == "black" )
then "white"
else "black"
color: { if card.card_color == "black" then "white" else "black" }
symbol font:
name: { styling.text_box_mana_symbols }
size: 11.5

View File

@@ -928,7 +928,7 @@ extra card field:
editable: true
save value: true
description: The image of the card
extra card field
extra card field:
type: choice
name: change focus
choice:

View File

@@ -29,13 +29,13 @@
# Names of colors
color_name := {
if input = "W" then "white"
else if input = "U" then "blue"
else if input = "B" then "black"
else if input = "R" then "red"
else if input = "G" then "green"
else if input = "P" then "purple"
else if input = "K" then "pink"
if input == "W" then "white"
else if input == "U" then "blue"
else if input == "B" then "black"
else if input == "R" then "red"
else if input == "G" then "green"
else if input == "P" then "purple"
else if input == "K" then "pink"
else ""
}
color_names_6 := { color_name(colors.0) + ", " + color_name(colors.1) + ", " + color_name(colors.2) + ", " + color_name(colors.3) + ", " + color_name(colors.4) + ", " + color_name(colors.5) }
@@ -45,7 +45,7 @@
color_filterS := sort_text@(order: "<S>")
mana_to_color := {
count := number_of_items(in: colors)
if hybrid == "" and snow = "" and contains(type, match:"Artifact") then
if hybrid == "" and snow == "" and contains(type, match:"Artifact") then
# not a hybrid, not snow costed, but artifact
if count == 0 then "colorless"
else if count == 1 then color_names_1() + ", artifact"
@@ -146,7 +146,7 @@
if text != "" then (
if contains(text, match: "all colors") then (
colors := "WUPBRG"
if land = "land" then land_multicolor()
if land == "land" then land_multicolor()
else mana_to_color(hybrid: "")
) else (
colors := ""
@@ -157,11 +157,13 @@
if contains(text, match: "red") then colors := colors + "R"
if contains(text, match: "green") then colors := colors + "G"
if contains(text, match: "pink") then colors := colors + "K"
if land = "land" then land_multicolor()
if land == "land" then land_multicolor()
else mana_to_color(hybrid: "")
)
)
else ""
)
else ""
}
card_color := {
@@ -202,52 +204,52 @@
# normal/token, color, shifted, split
hybrid_color_pair_sort := {
colors := sort_text(casting_cost, order: "<WUPBRGK>")
if colors = "WU" then "HA"
else if colors = "UP" then "HB"
else if colors = "PB" then "HC"
else if colors = "BR" then "HD"
else if colors = "RG" then "HE"
else if colors = "GW" then "HF"
else if colors = "WP" then "HG"
else if colors = "UB" then "HH"
else if colors = "PR" then "HI"
else if colors = "BG" then "HJ"
else if colors = "RW" then "HJAA"
else if colors = "GU" then "HJAB"
else if colors = "WB" then "HJAC"
else if colors = "UR" then "HJAD"
else if colors = "PG" then "HJAE"
else if colors = "WK" then "HJBA"
else if colors = "UK" then "HJBB"
else if colors = "BK" then "HJBC"
else if colors = "RK" then "HJBD"
else if colors = "GK" then "HJBE"
else if colors = "PK" then "HJBF"
if colors == "WU" then "HA"
else if colors == "UP" then "HB"
else if colors == "PB" then "HC"
else if colors == "BR" then "HD"
else if colors == "RG" then "HE"
else if colors == "GW" then "HF"
else if colors == "WP" then "HG"
else if colors == "UB" then "HH"
else if colors == "PR" then "HI"
else if colors == "BG" then "HJ"
else if colors == "RW" then "HJAA"
else if colors == "GU" then "HJAB"
else if colors == "WB" then "HJAC"
else if colors == "UR" then "HJAD"
else if colors == "PG" then "HJAE"
else if colors == "WK" then "HJBA"
else if colors == "UK" then "HJBB"
else if colors == "BK" then "HJBC"
else if colors == "RK" then "HJBD"
else if colors == "GK" then "HJBE"
else if colors == "PK" then "HJBF"
else "HK"
}
multi_color_pair_sort := {
colors := sort_text(casting_cost, order: "<WUPBRG>")
if colors = "WU" then "GA"
else if colors = "UP" then "GB"
else if colors = "PB" then "GC"
else if colors = "BR" then "GD"
else if colors = "RG" then "GE"
else if colors = "GW" then "GF"
else if colors = "WP" then "GG"
else if colors = "UB" then "GH"
else if colors = "PR" then "GI"
else if colors = "BG" then "GJ"
else if colors = "RW" then "GJAA"
else if colors = "GU" then "GJAB"
else if colors = "WB" then "GJAC"
else if colors = "UR" then "GJAD"
else if colors = "PG" then "GJAE"
else if colors = "WK" then "GJBA"
else if colors = "UK" then "GJBB"
else if colors = "BK" then "GJBC"
else if colors = "RK" then "GJBD"
else if colors = "GK" then "GJBE"
else if colors = "PK" then "GJBF"
if colors == "WU" then "GA"
else if colors == "UP" then "GB"
else if colors == "PB" then "GC"
else if colors == "BR" then "GD"
else if colors == "RG" then "GE"
else if colors == "GW" then "GF"
else if colors == "WP" then "GG"
else if colors == "UB" then "GH"
else if colors == "PR" then "GI"
else if colors == "BG" then "GJ"
else if colors == "RW" then "GJAA"
else if colors == "GU" then "GJAB"
else if colors == "WB" then "GJAC"
else if colors == "UR" then "GJAD"
else if colors == "PG" then "GJAE"
else if colors == "WK" then "GJBA"
else if colors == "UK" then "GJBB"
else if colors == "BK" then "GJBC"
else if colors == "RK" then "GJBD"
else if colors == "GK" then "GJBE"
else if colors == "PK" then "GJBF"
else if contains(card.casting_cost, match:"/") then "GL"
else "GK"
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

View File

@@ -1052,16 +1052,16 @@ init script:
# Names of colors
color_name := {
if input = "W" then "white"
else if input = "U" then "blue"
else if input = "B" then "black"
else if input = "R" then "red"
else if input = "G" then "green"
else if input = "L" then "yellow"
else if input = "P" then "purple"
else if input = "O" then "orange"
else if input = "E" then "brown"
else if input = "K" then "pink"
if input == "W" then "white"
else if input == "U" then "blue"
else if input == "B" then "black"
else if input == "R" then "red"
else if input == "G" then "green"
else if input == "L" then "yellow"
else if input == "P" then "purple"
else if input == "O" then "orange"
else if input == "E" then "brown"
else if input == "K" then "pink"
else ""
}
color_names_6 := { color_name(colors.0) + ", " + color_name(colors.1) + ", " + color_name(colors.2) + ", " + color_name(colors.3) + ", " + color_name(colors.4) + ", " + color_name(colors.5) }
@@ -1071,7 +1071,7 @@ init script:
color_filterS := sort_text@(order: "<S>")
mana_to_color := {
count := number_of_items(in: colors)
if hybrid == "" and snow = "" and contains(type, match:"Artifact") then
if hybrid == "" and snow == "" and contains(type, match:"Artifact") then
# not a hybrid, not snow costed, but artifact
if count == 0 then "colorless"
else if count == 1 then color_names_1() + ", artifact"
@@ -1172,7 +1172,7 @@ init script:
if text != "" then (
if contains(text, match: "all colors") then (
colors := "WUBRGLPOEK"
if land = "land" then land_multicolor()
if land == "land" then land_multicolor()
else mana_to_color(hybrid: "")
) else (
colors := ""
@@ -1186,11 +1186,13 @@ init script:
if contains(text, match: "orange") then colors := colors + "O"
if contains(text, match: "brown") then colors := colors + "E"
if contains(text, match: "pink") then colors := colors + "K"
if land = "land" then land_multicolor()
if land == "land" then land_multicolor()
else mana_to_color(hybrid: "")
)
)
else ""
)
else ""
}
card_color := {
@@ -1232,53 +1234,53 @@ init script:
hybrid_color_pair_sort := {
colors := sort_text(casting_cost, order: "<WUBRGLPOEK>")
if not set.sort_hybrid_in_pairs then "HK"
else if colors = "WU" then "HA"
else if colors = "UB" then "HB"
else if colors = "BR" then "HC"
else if colors = "RG" then "HD"
else if colors = "WG" then "HE"
else if colors = "WB" then "HF"
else if colors = "UR" then "HG"
else if colors = "BG" then "HH"
else if colors = "WR" then "HI"
else if colors = "UG" then "HJ"
else if colors = "WP" then "HJA"
else if colors = "UP" then "HJB"
else if colors = "BP" then "HJC"
else if colors = "RP" then "HJD"
else if colors = "GP" then "HJE"
else if colors = "WO" then "HJF"
else if colors = "UO" then "HJG"
else if colors = "BO" then "HJH"
else if colors = "RO" then "HJI"
else if colors = "GO" then "HJM"
else if colors = "PO" then "HJN"
else if colors == "WU" then "HA"
else if colors == "UB" then "HB"
else if colors == "BR" then "HC"
else if colors == "RG" then "HD"
else if colors == "WG" then "HE"
else if colors == "WB" then "HF"
else if colors == "UR" then "HG"
else if colors == "BG" then "HH"
else if colors == "WR" then "HI"
else if colors == "UG" then "HJ"
else if colors == "WP" then "HJA"
else if colors == "UP" then "HJB"
else if colors == "BP" then "HJC"
else if colors == "RP" then "HJD"
else if colors == "GP" then "HJE"
else if colors == "WO" then "HJF"
else if colors == "UO" then "HJG"
else if colors == "BO" then "HJH"
else if colors == "RO" then "HJI"
else if colors == "GO" then "HJM"
else if colors == "PO" then "HJN"
else "HK"
}
multi_color_pair_sort := {
colors := sort_text(casting_cost, order: "<WUBRGLPOEK>")
if not set.sort_multicolor_in_pairs then "GK"
else if colors = "WU" then "GA"
else if colors = "UB" then "GB"
else if colors = "BR" then "GC"
else if colors = "RG" then "GD"
else if colors = "WG" then "GE"
else if colors = "WB" then "GF"
else if colors = "UR" then "GG"
else if colors = "BG" then "GH"
else if colors = "WR" then "GI"
else if colors = "UG" then "GJ"
else if colors = "WP" then "GJA"
else if colors = "UP" then "GJB"
else if colors = "BP" then "GJC"
else if colors = "RP" then "GJD"
else if colors = "GP" then "GJE"
else if colors = "WO" then "GJF"
else if colors = "UO" then "GJG"
else if colors = "BO" then "GJH"
else if colors = "RO" then "GJI"
else if colors = "GO" then "GJM"
else if colors = "PO" then "GJN"
else if colors == "WU" then "GA"
else if colors == "UB" then "GB"
else if colors == "BR" then "GC"
else if colors == "RG" then "GD"
else if colors == "WG" then "GE"
else if colors == "WB" then "GF"
else if colors == "UR" then "GG"
else if colors == "BG" then "GH"
else if colors == "WR" then "GI"
else if colors == "UG" then "GJ"
else if colors == "WP" then "GJA"
else if colors == "UP" then "GJB"
else if colors == "BP" then "GJC"
else if colors == "RP" then "GJD"
else if colors == "GP" then "GJE"
else if colors == "WO" then "GJF"
else if colors == "UO" then "GJG"
else if colors == "BO" then "GJH"
else if colors == "RO" then "GJI"
else if colors == "GO" then "GJM"
else if colors == "PO" then "GJN"
else if contains(card.casting_cost, match:"/") then "GL"
else "GK"
}

View File

@@ -597,7 +597,7 @@ extra card style:
angle: 90
render style: image
image: {if styling.overlay == "" then nil else styling.overlay + "/overlay.png"}
paintbrush
paintbrush:
left: 25
top: 337
width: {if contains(styling.clear_side, match:"left") then 21 else 0}
@@ -607,7 +607,7 @@ extra card style:
choice images:
black: /magic-future-common.mse-include/paintbrush_black.png
white: /magic-future-common.mse-include/paintbrush_white.png
paintbrush 2
paintbrush 2:
left: 277
top: 337
width: {if contains(styling.clear_side, match:"right") then 21 else 0}

View File

@@ -422,7 +422,7 @@ extra card style:
visible: { card.pt != "" }
render style: image
image: { card_ptbox() }
paintbrush
paintbrush:
left: 28
top: 479
width: 32

View File

@@ -98,7 +98,7 @@ styling field:
name: use guild mana symbols
description: Use the Ravnica guild symbols instead of the official half/half circles for hybrid mana.
initial: no
styling field
styling field:
type: boolean
name: set logo
initial: yes

View File

@@ -25,9 +25,6 @@ depends on:
depends on:
package: magic-mana-small.mse-symbol-font
version: 2007-09-23
depends on:
package: magic-mana-small-stroked.mse-symbol-font
version: 2020-02-07
card width: 375
card height: 523

View File

@@ -363,7 +363,7 @@ extra card style:
visible: { card.pt != "" }
render style: image
image: { card_ptbox() }
paintbrush
paintbrush:
left: 325
top: 484
width: 25

View File

@@ -256,7 +256,6 @@ card style:
rare: script: symbol_variation(symbol: set.symbol, variation: "rare")
mythic rare: script: symbol_variation(symbol: set.symbol, variation: "mythic rare")
special: script: symbol_variation(symbol: set.symbol, variation: "special")
constructed: script: symbol_variation(symbol: set.symbol, variation: "constructed")
############################# Text box
text:
left: 29

View File

@@ -362,7 +362,7 @@ extra card style:
shadow displacement y: 0
shadow blur: 2
separator color: red
paintbrush
paintbrush:
right: { 330 - card_style.illustrator.content_width }
top: 260
width: 50