gaztin/magic-set-editor-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix type_name for localization

Browse Source 
type_name() returns a localized string, so type_name comparisions should compare against type_name() of a known quantity instead
This commit is contained in:
cajun
2024-09-23 10:12:58 -05:00
parent 1a5432a0ec
commit 8fd810b1d3
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/magic-blends.mse-include/new-blends
View File

@@ -969,9 +969,9 @@ module_stamp := { color_background(type:"stamp", base_hybrid:stamp_hybrid, fol
module_ubstamp := { color_background(type:"ubstamp", base_hybrid:stamp_hybrid, folder:template_prefix["ubstamp"], blend_type:"stamp") } module_ubstamp := { color_background(type:"ubstamp", base_hybrid:stamp_hybrid, folder:template_prefix["ubstamp"], blend_type:"stamp") }
module_nyx := { module_nyx := {
type := "nyx" type := "nyx"
if has_png(set.alternate_nyx) and type_name(harder_script["alt_nyx" or else nil] or else nil) != "nothing" if has_png(set.alternate_nyx) and type_name(harder_script["alt_nyx" or else nil] or else nil) != type_name(nil)
then type := "alt_nyx" then type := "alt_nyx"
else if set.alternate_nyx == "star" and type_name(harder_script["star" or else nil] or else template_prefix["star" or else nil] or else nil) != "nothing" else if set.alternate_nyx == "star" and type_name(harder_script["star" or else nil] or else template_prefix["star" or else nil] or else nil) != type_name(nil)
then type := "star" then type := "star"
color_background( color_background(
type: type, type: type,
@@ -1092,7 +1092,7 @@ set_watermark_blend := {
} }
spotlight_watermark_blend := { spotlight_watermark_blend := {
face := [1:card.card_color, 2:card.card_color_2, 3:card.card_color_3][face] face := [1:card.card_color, 2:card.card_color_2, 3:card.card_color_3][face]
if type_name(input) == "string" and contains(input, match:".png,") then ( if type_name(input) == type_name("string") and contains(input, match:".png,") then (
array := split_text(input+",,", match:",") array := split_text(input+",,", match:",")
input := array.0 input := array.0
l := min(to_number(array.1),500) l := min(to_number(array.1),500)

4
data/magic-m15-altered.mse-style/style
View File

@@ -6,7 +6,7 @@ icon: card-sample.png
installer group: magic/m15 style/normal cards installer group: magic/m15 style/normal cards
position hint: 001 position hint: 001
version: 2024-09-04 version: 2024-09-23
depends on: depends on:
package: magic.mse-game package: magic.mse-game
version: 2020-04-25 version: 2020-04-25
@@ -274,7 +274,7 @@ init script:
} }
is_beyond := { is_beyond := {
chosen(styling.frames, choice:"universes beyond") chosen(styling.frames, choice:"universes beyond")
or (chosen(styling.other_options, choice:"auto ub") and card.card_stamp == "universes beyond") or (chosen(styling.other_options, choice:"auto ub") and (card.card_stamp == "universes beyond" or card.card_stamp == "flatstamped universes beyond"))
} }
is_miracle := { is_miracle := {
chosen(styling.frames, choice:"miracle") chosen(styling.frames, choice:"miracle")

4
data/magic-m15-mainframe-dfc.mse-style/style
View File

@@ -190,12 +190,12 @@ init script:
flag2: "flag.png", flag2: "flag.png",
] ]
template := { template := {
if type_name(harder_script[type] or else nil) != "nothing" if type_name(harder_script[type] or else nil) != type_name(nil)
then harder_script[type](input, land:false) then harder_script[type](input, land:false)
else template_prefix[type] + input + template_suffix[type] else template_prefix[type] + input + template_suffix[type]
} }
land_template := { land_template := {
if type_name(harder_script[type] or else nil) != "nothing" if type_name(harder_script[type] or else nil) != type_name(nil)
then harder_script[type](input, land:true) then harder_script[type](input, land:true)
else template_prefix[type] + input + (if landless(type) or input == "a" then "" else "l") + template_suffix[type] else template_prefix[type] + input + (if landless(type) or input == "a" then "" else "l") + template_suffix[type]
} }

8
data/magic-m15-saga.mse-style/style
View File

@@ -6,7 +6,7 @@ installer group: magic/m15 style/sagas
icon: card-sample.png icon: card-sample.png
position hint: 010 position hint: 010
version: 2024-09-01 version: 2024-09-23
depends on: depends on:
package: magic.mse-game package: magic.mse-game
version: 2014-06-25 version: 2014-06-25
@@ -55,12 +55,12 @@ init script:
identity: "identity.png" identity: "identity.png"
] ]
template := { template := {
if type_name(harder_script[type] or else nil) != "nothing" if type_name(harder_script[type] or else nil) != type_name(nil)
then harder_script[type](input, land:false) then harder_script[type](input, land:false)
else template_prefix[type] + input + template_suffix[type] else template_prefix[type] + input + template_suffix[type]
} }
land_template := { land_template := {
if type_name(harder_script[type] or else nil) != "nothing" if type_name(harder_script[type] or else nil) != type_name(nil)
then harder_script[type](input, land:true) then harder_script[type](input, land:true)
else template_prefix[type] + (if input == "a" then "c" else input) + (if landless(type) then "" else "l") + template_suffix[type] else template_prefix[type] + (if input == "a" then "c" else input) + (if landless(type) then "" else "l") + template_suffix[type]
} }
@@ -235,7 +235,7 @@ init script:
auto_snow := { contains(styling.auto_frames, match:"snow") and lang_setting("is_snow")(card.super_type) } auto_snow := { contains(styling.auto_frames, match:"snow") and lang_setting("is_snow")(card.super_type) }
is_beyond := { is_beyond := {
chosen(styling.other_options, choice:"universes beyond") chosen(styling.other_options, choice:"universes beyond")
or (chosen(styling.auto_frames, choice:"universes beyond") and card.card_stamp == "universes beyond") or (chosen(styling.auto_frames, choice:"universes beyond") and (card.card_stamp == "universes beyond" or card.card_stamp == "flatstamped universes beyond"))
} }
nyx_background := { color_background(type:"nyx", base_hybrid:card_hybrid) } nyx_background := { color_background(type:"nyx", base_hybrid:card_hybrid) }
snow_background := { color_background(type:"snowtexture", base_hybrid:card_hybrid) } snow_background := { color_background(type:"snowtexture", base_hybrid:card_hybrid) }

4
data/magic-modules.mse-include/crowns/readme.txt
View File

@@ -16,12 +16,12 @@ include file: /magic-modules.mse-include/corners/card_fields_tfc
#### Finally, the template script must be adjusted like so: #### Finally, the template script must be adjusted like so:
template := { template := {
if type_name(harder_script[type] or else nil) != "nothing" if type_name(harder_script[type] or else nil) != type_name(nil)
then harder_script[type](input, land:false) then harder_script[type](input, land:false)
else template_prefix[type] + input + template_suffix[type] else template_prefix[type] + input + template_suffix[type]
} }
land_template := { land_template := {
if type_name(harder_script[type] or else nil) != "nothing" if type_name(harder_script[type] or else nil) != type_name(nil)
then harder_script[type](input, land:true) then harder_script[type](input, land:true)
else template_prefix[type] + input + (if input == "a" then "" else "l") + template_suffix[type] else template_prefix[type] + input + (if input == "a" then "" else "l") + template_suffix[type]
} }