diff --git a/data/magic-blends.mse-include/new-blends b/data/magic-blends.mse-include/new-blends index c164034e0..0445afc63 100644 --- a/data/magic-blends.mse-include/new-blends +++ b/data/magic-blends.mse-include/new-blends @@ -823,7 +823,8 @@ blend_colors := { + (if chosen(choice:"blue" ) then "u") + (if chosen(choice:"black" ) then "b") + (if chosen(choice:"red" ) then "r") - + (if chosen(choice:"green" ) then "g")) + + (if chosen(choice:"green" ) then "g") + ) if multi and (hybrid or colors == "") then ( colors := colors + "m" ) @@ -1108,8 +1109,8 @@ font_white := { + (if chosen(choice:"blue" ) then "u") + (if chosen(choice:"black" ) then "b") + (if chosen(choice:"red" ) then "r") - + (if chosen(choice:"green" ) then "g")) - + (if artifact then "a") + + (if chosen(choice:"green" ) then "g") + ) + (if artifact then "a") font_colors_white( if chosen(choice:"land") then "l" else if input == "artifact, multicolor" then "a" diff --git a/data/magic.mse-game/script b/data/magic.mse-game/script index 6589c07e9..54de7aedb 100644 --- a/data/magic.mse-game/script +++ b/data/magic.mse-game/script @@ -1054,12 +1054,11 @@ remove_type := replace@(match: "(Artifact|Creature|Enchantment|Instant|Land|Plan replace@(match: "[ ]+", in_context: "^", replace: "")+ replace@(match: "[ ]+", in_context: "$", replace: "") -write_wubrg := { - (if match(input, match:"white") then "W" else "")+ - (if match(input, match:"blue") then "U" else "")+ - (if match(input, match:"black") then "B" else "")+ - (if match(input, match:"red") then "R" else "")+ - (if match(input, match:"green") then "G" else "") +write_wubrg := {(if match(input, match:"white") then "W" else "") + + (if match(input, match:"blue") then "U" else "") + + (if match(input, match:"black") then "B" else "") + + (if match(input, match:"red") then "R" else "") + + (if match(input, match:"green") then "G" else "") } colored_mana := {to_number( for each sym in cmc_split(to_text()) do ( @@ -1079,7 +1078,13 @@ generic_mana := {to_number( } primary_card_color := { - 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") + ) land := chosen(choice:"land") multi := chosen(choice:"multicolor") hybrid := chosen(choice:"hybrid") @@ -1102,7 +1107,13 @@ primary_card_color := { else input } sparker_card_color := { - 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") + ) land := chosen(choice:"land") multi := chosen(choice:"multicolor") hybrid := chosen(choice:"hybrid") @@ -1137,11 +1148,11 @@ contains_target := match@(match:"(?i)([^a-z]|^)targets?([^a-z]|$)") is_targeted := { contains_target(card.rule_text) } #### convert color word to mana symbol -color_to_mana := replace@(match: "white", replace: "[W]")+ - replace@(match: "blue", replace: "[U]")+ - replace@(match: "black", replace: "[B]")+ - replace@(match: "red", replace: "[R]")+ - replace@(match: "green", replace: "[G]") +color_to_mana := replace@(match: "white", replace: "[W]") + + replace@(match: "blue", replace: "[U]") + + replace@(match: "black", replace: "[B]") + + replace@(match: "red", replace: "[R]") + + replace@(match: "green", replace: "[G]") #### convert number word to digit digital_number := { @@ -5758,7 +5769,20 @@ apply_index := { } color: {fill_len(color_of_card(), lead:"A")}, "color category": { - indexes := [[lang_setting("colorless")], [lang_setting("white")], [lang_setting("blue")], [lang_setting("black")], [lang_setting("red")], [lang_setting("green")], [lang_setting("purple")], [lang_setting("pink")], [lang_setting("yellow")], [lang_setting("orange")], [lang_setting("brown")], [lang_setting("multicolor")], [lang_setting("hybrid")]] + indexes := [[lang_setting("colorless")] + ,[lang_setting("white")] + ,[lang_setting("blue")] + ,[lang_setting("black")] + ,[lang_setting("red")] + ,[lang_setting("green")] + ,[lang_setting("purple")] + ,[lang_setting("pink")] + ,[lang_setting("yellow")] + ,[lang_setting("orange")] + ,[lang_setting("brown")] + ,[lang_setting("multicolor")] + ,[lang_setting("hybrid")] + ] fill_len(position(of:[card.color_category], in:indexes, lead:"0", fill_to:2)) }, "exact color": { @@ -5860,7 +5884,25 @@ skeleton_runner := { (cards := cards + [new_card([name:prefix+letter_list[x]+fill_len(y, lead:"0"), rarity:rarity, super_type:super_type, casting_cost:mana_list[x]])];) ) cards -}@(count:1, rarity:"common", type:"", prefix:"C", super_type:"", color_list:["white", "blue", "black", "red", "green"], letter_list:["W", "U", "B", "R", "G"], mana_list:"nope") +}@(count:1 + ,rarity:"common" + ,type:"" + ,prefix:"C" + ,super_type:"" + ,color_list:["white" + ,"blue" + ,"black" + ,"red" + ,"green" + ] + ,letter_list:["W" + ,"U" + ,"B" + ,"R" + ,"G" + ] + ,mana_list:"nope" +) #### outside to make singleton scripts easier blank_list_5 := ["","","","",""] blank_list_10 := ["","","","","","","","","",""] diff --git a/data/magic.mse-game/statistics_script b/data/magic.mse-game/statistics_script index dfdc9886a..ddbd2d6fa 100644 --- a/data/magic.mse-game/statistics_script +++ b/data/magic.mse-game/statistics_script @@ -219,7 +219,13 @@ 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") + ) land := chosen(choice:"land") multi := chosen(choice:"multicolor") hybrid := chosen(choice:"hybrid")