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

Stats page bug fixes (#29)

Browse Source 
* Added <atom-sep> to subtype_separators to better accomodate multi-wordsubtypes.
* Fixed the colorless value in Color Category not being localized and not linking relevant cards when clicking on it's histogram bar.
* Fixed the global_variable_average_opening_hand_statistic function being extremely slow and potentially crashing large sets.
* Added is_tokenish method that checks if something is a token, an emblem, a designation, a rulestip, a counter or a checklist.
* Fixed a bug on some setups, where strings could be too long and would cause the display tab of the preferences menu to collapse on itself.
* fix some untranslated strings

---------

Co-authored-by: cajun <12363371+CajunAvenger@users.noreply.github.com>
This commit is contained in:
GenevensiS
2024-01-15 14:10:57 +01:00
committed by GitHub
parent 0960b3d694
commit 666632a4e9
17 changed files with 243 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
data/magic.mse-game/language_map
View File

@@ -725,7 +725,7 @@ languages := [
pt_separator : "/"
supertype_separator : " "
type_separator : " — "
subtype_separator : " "
subtype_separator : "<atom-sep> </atom-sep>"
keyword_types : ["old","core","expert","pseudo","action","custom"]
is_artifact : match@(match: "(?i)Artifact")
@@ -1461,7 +1461,7 @@ languages := [
supertype_separator : " "
type_separator : " — "
super_spacer : true
subtype_separator : " "
subtype_separator : "<atom-sep> </atom-sep>"
keyword_types : ["viejo","núcleo","experto","seudo","acción","personalizado"]
is_artifact : match@(match: "(?i)Artefacto")
@@ -2874,7 +2874,7 @@ languages := [
supertype_separator : " "
type_separator : " — "
super_spacer : true
subtype_separator : " "
subtype_separator : "<atom-sep> </atom-sep>"
keyword_types : ["vecchio","nucleo","esperto","pseudo","azione","personalizzato"]
is_artifact : match@(match: "(?i)Artefatto")
@@ -3579,7 +3579,7 @@ languages := [
pt_separator : "/"
supertype_separator : ""
type_separator : " — "
subtype_separator : "・"
subtype_separator : "<atom-sep>・</atom-sep>"
keyword_types : ["古い","中核","習熟","疑似","アクション","パーソナライズされた"]
is_artifact : match@(match: "(?i)アーティファクト")
@@ -4356,7 +4356,7 @@ languages := [
supertype_separator : " "
type_separator : " — "
super_spacer : true
subtype_separator : " "
subtype_separator : "<atom-sep> </atom-sep>"
keyword_types : ["늙은","핵심","숙련된","가짜","행동","맞춤형"]
is_artifact : match@(match: "(?i)마법물체")
@@ -5026,7 +5026,7 @@ languages := [
supertype_separator : " "
type_separator : " — "
super_spacer : true
subtype_separator : " "
subtype_separator : "<atom-sep> </atom-sep>"
keyword_types : ["velho","núcleo","perito","pseudo","ação","personalizado"]
is_artifact : match@(match: "(?i)Artefato")
@@ -5735,7 +5735,7 @@ languages := [
supertype_separator : " "
type_separator : " — "
super_spacer : true
subtype_separator : " "
subtype_separator : "<atom-sep> </atom-sep>"
keyword_types : ["старый","ядро","экспертный","псевдо","действие","персонализированный"]
is_artifact : match@(match: "(?i)Артефакт")
@@ -7805,7 +7805,7 @@ languages := [
pt_separator : "/"
supertype_separator : " "
type_separator : " — "
subtype_separator : " "
subtype_separator : "<atom-sep> </atom-sep>"
keyword_types : ["old","core","expert","pseudo","action","custom"]
],
"English (Canadian)": [
@@ -7814,7 +7814,7 @@ languages := [
pt_separator : "/"
supertype_separator : " "
type_separator : " — "
subtype_separator : " "
subtype_separator : "<atom-sep> </atom-sep>"
keyword_types : ["old","core","expert","pseudo","action","custom"]
]
]

11
data/magic.mse-game/script
View File

@@ -1106,10 +1106,9 @@ super_type_filter := {
"<{tag}>{input}</{tag}>"
}
break_subtypes := split_text@(match: " +|<atom-sep>[^<]*</atom-sep>", include_empty:false)
break_subtypes := split_text@(match: "<atom-sep>[^<]*</atom-sep>|</?word-list-[^>]*>", include_empty:false) # splitting at word-list tags is for backwards compatibility, when atom-sep was not yet inserted everywhere.
break_supertypes := split_text@(match: "<atom-sep>[^<]*</atom-sep>", include_empty:false)
sub_type_filter := {
input := remove_tag(tag: "<word-list-")
input := remove_tag(tag: "<soft")
# What word list to use?
list_type_rest := if lang_setting("is_creature")(type) or lang_setting("is_kindred")(type) then "class-"+lang_setting("code")
@@ -1130,9 +1129,11 @@ sub_type_filter := {
);
# wrap wordlist tag around each part
parts := break_subtypes()
(for each i:part in parts do
if i == 0 then
"<word-list-{list_type_first}>{part}</word-list-{list_type_first}>"
checked_first := false
(for each part in parts do
if trim(part) == "" then ""
else if not checked_first then
(checked_first := true; "<word-list-{list_type_first}>{part}</word-list-{list_type_first}>")
else
languages[lang_name()].subtype_separator + "<word-list-{list_type_rest}>{part}</word-list-{list_type_rest}>"
) +

68
data/magic.mse-game/statistics_script
View File

@@ -238,7 +238,7 @@ face_color_category_statistic :=
else if black then all_en_space_statistic(lang_setting("black"))
else if red then all_en_space_statistic(lang_setting("red"))
else if green then all_en_space_statistic(lang_setting("green"))
else input
else all_en_space_statistic(lang_setting("colorless"))
}
# Omniverse colors
@@ -597,13 +597,9 @@ average_opening_hand_statistic :=
}
global_variable_average_opening_hand_statistic :=
{
set_count := length(set.cards)-1
if set_count < 0 then "" else (
cards := for x from 0 to set_count do (if trim_from_draw_statistic(card: set.cards[x]) then [] else [set.cards[x]])
card_count := length(cards)-1
card_count_real := to_number(card_count+1)
if card_count < 6 then lang_setting("message_drops_no_cards") else (
if length(set.cards) < 1 then "" else (
card_count := 0
lands := 0
manaartifacts := 0
nonmanaartifacts := 0
@@ -614,19 +610,36 @@ global_variable_average_opening_hand_statistic :=
sorceries := 0
instants := 0
for x from 0 to card_count do
is_land := lang_setting("is_land")
is_artifact := lang_setting("is_artifact")
is_enchantment := lang_setting("is_enchantment")
is_planeswalker := lang_setting("is_planeswalker")
is_battle := lang_setting("is_battle")
is_creature := lang_setting("is_creature")
is_sorcery := lang_setting("is_sorcery")
is_instant := lang_setting("is_instant")
for each c in set.cards do
(
c := cards[x]
if has_type_statistic(card:c, "land") then lands := lands + 1
if has_type_statistic(card:c, "artifact") then (if mana_production_list_statistic(card: c, check_type: "nonland") == "" then (nonmanaartifacts := nonmanaartifacts + 1) else (manaartifacts := manaartifacts + 1))
if has_type_statistic(card:c, "enchantment") then enchantments := enchantments + 1
if has_type_statistic(card:c, "planeswalker") then planeswalkers := planeswalkers + 1
if has_type_statistic(card:c, "battle") then battles := battles + 1
if has_type_statistic(card:c, "creature") then creatures := creatures + 1
if has_type_statistic(card:c, "sorcery") then sorceries := sorceries + 1
if has_type_statistic(card:c, "instant") then instants := instants + 1
if not trim_from_draw_statistic(card:c) then
(
type := c.type + (if check_2_statistic(card:c) then " " + c.type_2 else "")
card_count := card_count + 1
if is_land(type) then lands := lands + 1
if is_artifact(type) then (if mana_production_list_statistic(card: c, check_type: "nonland") == "" then (nonmanaartifacts := nonmanaartifacts + 1) else (manaartifacts := manaartifacts + 1))
if is_enchantment(type) then enchantments := enchantments + 1
if is_planeswalker(type) then planeswalkers := planeswalkers + 1
if is_battle(type) then battles := battles + 1
if is_creature(type) then creatures := creatures + 1
if is_sorcery(type) then sorceries := sorceries + 1
if is_instant(type) then instants := instants + 1
)
""
)
if card_count < 6 then lang_setting("message_drops_no_cards") else (
card_count_real := to_number(card_count)
lands_average := format_average_statistic(7.0 * to_number(lands) / card_count_real)
manaartifacts_average := format_average_statistic(7.0 * to_number(manaartifacts) / card_count_real)
nonmanaartifacts_average := format_average_statistic(7.0 * to_number(nonmanaartifacts) / card_count_real)
@@ -659,10 +672,20 @@ format_average_statistic :=
# Rarities.
rarity_statistic :=
{
if card.shape == "Token" or card.shape == "token" or lang_setting("is_token")(card.super_type) then all_en_space_statistic(lang_setting("token"))
if is_tokenish_statistics(card.shape) or lang_setting("is_token")(card.super_type) then all_en_space_statistic(lang_setting("token"))
else if lang_setting("is_land")(card.super_type) and lang_setting("is_basic")(card.super_type) then all_en_space_statistic(lang_setting("basic_land"))
else all_en_space_statistic(lang_setting(replace_space_statistic(card.rarity)))
}
is_tokenish_statistics :=
{
input := to_lower(input)
contains(input, match: "token")
or contains(input, match: "emblem")
or contains(input, match: "designation")
or contains(input, match: "rulestip")
or contains(input, match: "counter")
or contains(input, match: "checklist")
}
# Watermarks
watermark_statistic :=
@@ -1078,7 +1101,7 @@ en_space_statistic := replace@(match: " ", replace: " ", in_context:"[^>]<matc
all_en_space_statistic := replace@(match: " ", replace: " ")
clean_subtypes_statistic := replace_squote_statistic +
en_space_statistic
# semicolor separated lists of all localized canon subtypes
land_subtypes_statistic := {
basics := lang_setting("word_lists_basic")
@@ -1536,22 +1559,19 @@ trim_from_statistic :=
{
if set.trim_statistics then
(
card.shape == "token"
or card.shape == "emblem"
is_tokenish_statistics(card.shape)
or card.rarity == "special"
or card.rarity == "masterpiece"
or lang_setting("is_nonstandard")(card.type)
)
else false
}
trim_from_draw_statistic :=
{
contains(card.notes, match: "commander")
or contains(card.notes, match: "Commander")
or (set.trim_statistics and (card.rarity == "special" or card.rarity == "masterpiece"))
or card.shape == "token"
or card.shape == "emblem"
or is_tokenish_statistics(card.shape)
or lang_setting("is_nonstandard")(card.type)
or filter_from_statistic(card: card) == lang_setting("message_filter_filtered")
}

138
data/magic.mse-game/word_lists
View File

@@ -576,7 +576,7 @@ word list:
is prefix: true
line below: true
word:
name: Nonstandard
name: 非標準
word: 策略
word: ダンジョン
word: エリート・クリーチャー
@@ -770,7 +770,7 @@ word list:
script: all_races()
line below: true
word:
name: All Races
name: Alle Arten
word:
name: A
word:
@@ -885,7 +885,7 @@ word list:
script: all_classes()
line below: true
word:
name: All Classes
name: Alle Klassen
word:
name: A-B
word:
@@ -914,23 +914,23 @@ word list:
script: all_sub_types(setting:"is_plane")
line below: true
word:
name: Standard Planes
name: Standardwelt
word:
script: lang_setting("word_lists_plane").0
word:
name: Planechase Planes
name: Planechase Welt
word:
script: lang_setting("word_lists_plane").1
word:
name: Other Modern Planes
name: Andere moderne Welt
word:
script: lang_setting("word_lists_plane").2
word:
name: Very Old Planes
name: Sehr alte Welt
word:
script: lang_setting("word_lists_plane").3
word:
name: Dr Who Planes
name: Dr Who Welt
word:
script: lang_setting("word_lists_plane").4
@@ -1118,7 +1118,7 @@ word list:
script: all_races()
line below: true
word:
name: All Races
name: Todas las especies
word:
name: A
word:
@@ -1235,7 +1235,7 @@ word list:
script: all_classes()
line below: true
word:
name: All Classes
name: Todas las clases
word:
name: A-B
word:
@@ -1264,19 +1264,19 @@ word list:
script: all_sub_types(setting:"is_plane")
line below: true
word:
name: Standard Planes
name: Plano estándar
word:
script: lang_setting("word_lists_plane").0
word:
name: Planechase Planes
name: Plano Planechase
word:
script: lang_setting("word_lists_plane").1
word:
name: Other Modern Planes
name: Otro plano moderno
word:
script: lang_setting("word_lists_plane").2
word:
name: Very Old Planes
name: Plano muy antiguo
word:
script: lang_setting("word_lists_plane").3
word:
@@ -1294,7 +1294,7 @@ word list:
script: all_races()
line below: true
word:
name: All Races
name: Toutes les espèces
word:
name: A
word:
@@ -1403,7 +1403,7 @@ word list:
script: all_classes()
line below: true
word:
name: All Classes
name: Tous les cours
word:
name: A-B
word:
@@ -1432,19 +1432,19 @@ word list:
script: all_sub_types(setting:"is_plane")
line below: true
word:
name: Standard Planes
name: Plan standards
word:
script: lang_setting("word_lists_plane").0
word:
name: Planechase Planes
name: Plan Planechase
word:
script: lang_setting("word_lists_plane").1
word:
name: Other Modern Planes
name: Autres plans modernes
word:
script: lang_setting("word_lists_plane").2
word:
name: Very Old Planes
name: Très vieux plans
word:
script: lang_setting("word_lists_plane").3
word:
@@ -1462,7 +1462,7 @@ word list:
script: all_races()
line below: true
word:
name: All Races
name: Tutte le specie
word:
name: A
word:
@@ -1579,7 +1579,7 @@ word list:
script: all_classes()
line below: true
word:
name: All Classes
name: Tutte le classi
word:
name: A-C
word:
@@ -1608,23 +1608,23 @@ word list:
script: all_sub_types(setting:"is_plane")
line below: true
word:
name: Standard Planes
name: Piano standard
word:
script: lang_setting("word_lists_plane").0
word:
name: Planechase Planes
name: Piano Planechase
word:
script: lang_setting("word_lists_plane").1
word:
name: Other Modern Planes
name: Altri piano moderni
word:
script: lang_setting("word_lists_plane").2
word:
name: Very Old Planes
name: Piano molto vecchi
word:
script: lang_setting("word_lists_plane").3
word:
name: Dr Who Planes
name: Dr Who Piano
word:
script: lang_setting("word_lists_plane").4
@@ -1638,7 +1638,7 @@ word list:
script: all_races()
line below: true
word:
name: All Races
name: 全種
word:
name: あ
word:
@@ -1825,7 +1825,7 @@ word list:
script: all_classes()
line below: true
word:
name: All Classes
name: すべてのクラス
word:
name: あ
word:
@@ -1964,23 +1964,23 @@ word list:
script: all_sub_types(setting:"is_plane")
line below: true
word:
name: Standard Planes
name: 標準次元
word:
script: lang_setting("word_lists_plane").0
word:
name: Planechase Planes
name: Planechase 次元
word:
script: lang_setting("word_lists_plane").1
word:
name: Other Modern Planes
name: その他のモダン次元
word:
script: lang_setting("word_lists_plane").2
word:
name: Very Old Planes
name: とても古い次元
word:
script: lang_setting("word_lists_plane").3
word:
name: Dr Who Planes
name: Dr Who 次元
word:
script: lang_setting("word_lists_plane").4
@@ -1994,7 +1994,7 @@ word list:
script: all_races()
line below: true
word:
name: All Races
name: 모든 종
word:
name: ᄀ
word:
@@ -2087,7 +2087,7 @@ word list:
script: all_classes()
line below: true
word:
name: All Classes
name: 모든 수업
word:
name: ᄀ-ᄃ
word:
@@ -2112,23 +2112,23 @@ word list:
script: all_sub_types(setting:"is_plane")
line below: true
word:
name: Standard Planes
name: 표준치수
word:
script: lang_setting("word_lists_plane").0
word:
name: Planechase Planes
name: Planechase 치수
word:
script: lang_setting("word_lists_plane").1
word:
name: Other Modern Planes
name: 기타 현대식 치수
word:
script: lang_setting("word_lists_plane").2
word:
name: Very Old Planes
name: 아주 오래된 치수
word:
script: lang_setting("word_lists_plane").3
word:
name: Dr Who Planes
name: Dr Who 치수
word:
script: lang_setting("word_lists_plane").4
@@ -2142,7 +2142,7 @@ word list:
script: all_races()
line below: true
word:
name: All Races
name: Todas as espécies
word:
name: A
word:
@@ -2257,7 +2257,7 @@ word list:
script: all_classes()
line below: true
word:
name: All Classes
name: Todas as aulas
word:
name: A-B
word:
@@ -2286,23 +2286,23 @@ word list:
script: all_sub_types(setting:"is_plane")
line below: true
word:
name: Standard Planes
name: Plano padrão
word:
script: lang_setting("word_lists_plane").0
word:
name: Planechase Planes
name: Planechase plano
word:
script: lang_setting("word_lists_plane").1
word:
name: Other Modern Planes
name: Outros plano modernos
word:
script: lang_setting("word_lists_plane").2
word:
name: Very Old Planes
name: Plano muito antigos
word:
script: lang_setting("word_lists_plane").3
word:
name: Dr Who Planes
name: Dr Who plano
word:
script: lang_setting("word_lists_plane").4
@@ -2316,7 +2316,7 @@ word list:
script: all_races()
line below: true
word:
name: All Races
name: Все виды
word:
name: А
word:
@@ -2435,7 +2435,7 @@ word list:
script: all_classes()
line below: true
word:
name: All Classes
name: Все классы
word:
name: А-Д
word:
@@ -2460,23 +2460,23 @@ word list:
script: all_sub_types(setting:"is_plane")
line below: true
word:
name: Standard Planes
name: Стандарт мир
word:
script: lang_setting("word_lists_plane").0
word:
name: Planechase Planes
name: Planechase мир
word:
script: lang_setting("word_lists_plane").1
word:
name: Other Modern Planes
name: Другое современное мир
word:
script: lang_setting("word_lists_plane").2
word:
name: Very Old Planes
name: Очень старый мир
word:
script: lang_setting("word_lists_plane").3
word:
name: Dr Who Planes
name: Dr Who мир
word:
script: lang_setting("word_lists_plane").4
@@ -2490,7 +2490,7 @@ word list:
script: all_races()
line below: true
word:
name: All Races
name: 所有物种
word:
name: 三-凡
word:
@@ -2551,7 +2551,7 @@ word list:
script: all_classes()
line below: true
word:
name: All Classes
name: 所有职业
word:
name: 伙-孽
word:
@@ -2576,23 +2576,23 @@ word list:
script: all_sub_types(setting:"is_plane")
line below: true
word:
name: Standard Planes
name: 标准次元
word:
script: lang_setting("word_lists_plane").0
word:
name: Planechase Planes
name: Planechase 次元
word:
script: lang_setting("word_lists_plane").1
word:
name: Other Modern Planes
name: 其他现代次元
word:
script: lang_setting("word_lists_plane").2
word:
name: Very Old Planes
name: 很旧次元
word:
script: lang_setting("word_lists_plane").3
word:
name: Dr Who Planes
name: Dr Who 次元
word:
script: lang_setting("word_lists_plane").4
@@ -2606,7 +2606,7 @@ word list:
script: all_races()
line below: true
word:
name: All Races
name: 所有物種
word:
name: 三-分
word:
@@ -2667,7 +2667,7 @@ word list:
script: all_classes()
line below: true
word:
name: All Classes
name: 所有職業
word:
name: 伙-平
word:
@@ -2692,23 +2692,23 @@ word list:
script: all_sub_types(setting:"is_plane")
line below: true
word:
name: Standard Planes
name: 標準次元
word:
script: lang_setting("word_lists_plane").0
word:
name: Planechase Planes
name: Planechase 次元
word:
script: lang_setting("word_lists_plane").1
word:
name: Other Modern Planes
name: 其他現代化次元
word:
script: lang_setting("word_lists_plane").2
word:
name: Very Old Planes
name: 很舊次元
word:
script: lang_setting("word_lists_plane").3
word:
name: Dr Who Planes
name: Dr Who 次元
word:
script: lang_setting("word_lists_plane").4