Add more orange

This commit is contained in:
Sebastian Lundegård Kylander
2026-03-29 18:48:18 +02:00
parent 58b760ba72
commit 9c35a6ce75
12 changed files with 144 additions and 72 deletions

View File

@@ -219,7 +219,7 @@ color_category_statistic :=
}
face_color_category_statistic :=
{
artifact := chosen(choice:"artifact") and not (chosen(choice:"white") or chosen(choice:"blue") or chosen(choice:"black") or chosen(choice:"red") or chosen(choice:"green"))
artifact := chosen(choice:"artifact") and not (chosen(choice:"white") or chosen(choice:"blue") or chosen(choice:"black") or chosen(choice:"red") or chosen(choice:"green") or chosen(choice:"orange"))
land := chosen(choice:"land")
multi := chosen(choice:"multicolor")
hybrid := chosen(choice:"hybrid")
@@ -228,7 +228,8 @@ face_color_category_statistic :=
black := chosen(choice:"black")
red := chosen(choice:"red")
green := chosen(choice:"green")
multi_color := count_chosen(choices:"white, blue, black, red, green")
orange := chosen(choice:"orange")
multi_color := count_chosen(choices:"white, blue, black, red, green, orange")
if land then all_en_space_statistic(lang_setting("land"))
else if multi then all_en_space_statistic(lang_setting("multicolor"))
else if multi_color == 2
@@ -240,6 +241,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 if orange then all_en_space_statistic(lang_setting("orange"))
else all_en_space_statistic(lang_setting("colorless"))
}
@@ -254,7 +256,7 @@ face_omniverse_color_statistic :=
{
if chosen(choice: "land") then all_en_space_statistic(lang_setting("land"))
else if chosen(choice: "multicolor") then all_en_space_statistic(lang_setting("multicolor"))
else if count_chosen(choices: "white, blue, black, red, green, pink, purple, yellow, orange, brown") == 2
else if count_chosen(choices: "white, blue, black, red, green, orange, pink, purple, yellow, brown") == 2
and chosen(choice: "artifact") then all_en_space_statistic(lang_setting("hybrid")) ##hybrid artifacts would show as their first color
else if chosen(choice: "hybrid") then all_en_space_statistic(lang_setting("hybrid"))
else if (chosen(choice: "artifact")
@@ -263,20 +265,20 @@ face_omniverse_color_statistic :=
or chosen(choice: "black")
or chosen(choice: "red")
or chosen(choice: "green")
or chosen(choice: "orange")
or chosen(choice: "pink")
or chosen(choice: "purple")
or chosen(choice: "yellow")
or chosen(choice: "orange")
or chosen(choice: "brown"))) then all_en_space_statistic(lang_setting("artifact"))
else if chosen(choice: "white") then all_en_space_statistic(lang_setting("white"))
else if chosen(choice: "blue") then all_en_space_statistic(lang_setting("blue"))
else if chosen(choice: "black") then all_en_space_statistic(lang_setting("black"))
else if chosen(choice: "red") then all_en_space_statistic(lang_setting("red"))
else if chosen(choice: "green") then all_en_space_statistic(lang_setting("green"))
else if chosen(choice: "orange") then all_en_space_statistic(lang_setting("orange"))
else if chosen(choice: "pink") then all_en_space_statistic(lang_setting("pink"))
else if chosen(choice: "purple") then all_en_space_statistic(lang_setting("purple"))
else if chosen(choice: "yellow") then all_en_space_statistic(lang_setting("yellow"))
else if chosen(choice: "orange") then all_en_space_statistic(lang_setting("orange"))
else if chosen(choice: "brown") then all_en_space_statistic(lang_setting("brown"))
else input
}
@@ -292,12 +294,14 @@ cc_colored_pips_statistic :=
symbol_aggregate_statistic(cc, symbol: "B") +
symbol_aggregate_statistic(cc, symbol: "R") +
symbol_aggregate_statistic(cc, symbol: "G") +
symbol_aggregate_statistic(cc, symbol: "O") +
symbol_aggregate_statistic(cc, symbol: "C") +
symbol_aggregate_statistic(cc2, symbol: "W") +
symbol_aggregate_statistic(cc2, symbol: "U") +
symbol_aggregate_statistic(cc2, symbol: "B") +
symbol_aggregate_statistic(cc2, symbol: "R") +
symbol_aggregate_statistic(cc2, symbol: "G") +
symbol_aggregate_statistic(cc2, symbol: "O") +
symbol_aggregate_statistic(cc2, symbol: "C")
substring(result, begin: 1)
}
@@ -307,7 +311,7 @@ cc_colored_pips_totals_statistic :=
{
cc := card.casting_cost + (if check_2_statistic() then " " + card.casting_cost_2 else "")
join(wubrgc_break_statistic(cc), sep:",")
join(wubrgoc_break_statistic(cc), sep:",")
}
# Count how many cards have one white pip in their ability costs. Repeat for two white pips. Repeat for three, then four+, then again for other colors.
@@ -323,6 +327,7 @@ ability_colored_pips_statistic :=
symbol_aggregate_statistic(costs[x], symbol: "B") +
symbol_aggregate_statistic(costs[x], symbol: "R") +
symbol_aggregate_statistic(costs[x], symbol: "G") +
symbol_aggregate_statistic(costs[x], symbol: "O") +
symbol_aggregate_statistic(costs[x], symbol: "C")
)
substring(result, begin: 1))
@@ -336,7 +341,7 @@ ability_colored_pips_totals_statistic :=
count := length(costs) - 1
result := for x from 0 to count do
(
"," + join(wubrgc_break_statistic(costs[x]), sep:",")
"," + join(wubrgoc_break_statistic(costs[x]), sep:",")
)
substring(result, begin: 1))
}
@@ -383,10 +388,11 @@ devotion_filters_statistic := [
B: filter_text@(match:"B")
R: filter_text@(match:"R")
G: filter_text@(match:"G")
G: filter_text@(match:"O")
C: filter_text@(match:"C")
]
color_pip_break_statistic := break_text@(match:"([A-Z0-9]/|[|])*[WUBRG]")
wubrgc_break_statistic := break_text@(match:"[WUBRGC]")
color_pip_break_statistic := break_text@(match:"([A-Z0-9]/|[|])*[WUBRGO]")
wubrgoc_break_statistic := break_text@(match:"[WUBRGOC]")
symbol_aggregate_statistic :=
{
devotion := devotion_filters_statistic[symbol](input)
@@ -461,13 +467,14 @@ face_mana_production_list_statistic :=
can_Chosen := lang_setting("chosen_mana_production")(combined_text) != ""
# the mana symbols we can produce
produced_symbols := wubrgc_break_statistic(lang_setting("mana_symbol_production")(combined_text))
produced_symbols := wubrgoc_break_statistic(lang_setting("mana_symbol_production")(combined_text))
(if lang_setting("is_plains")(sub) or contains_element(produced_symbols, element:"W") then ",W" else "") +
(if lang_setting("is_island")(sub) or contains_element(produced_symbols, element:"U") then ",U" else "") +
(if lang_setting("is_swamp")(sub) or contains_element(produced_symbols, element:"B") then ",B" else "") +
(if lang_setting("is_mountain")(sub) or contains_element(produced_symbols, element:"R") then ",R" else "") +
(if lang_setting("is_forest")(sub) or contains_element(produced_symbols, element:"G") then ",G" else "") +
(if lang_setting("is_desert")(sub) or contains_element(produced_symbols, element:"O") then ",O" else "") +
(if lang_setting("is_wastes")(name) or contains_element(produced_symbols, element:"C") then ",C" else "") +
(if can_Any then ","+all_en_space_statistic(lang_setting("mana_any")) else "") +
(if can_Chosen then ","+all_en_space_statistic(lang_setting("mana_chosen")) else "")