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

Add more orange

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@ watermark_colors := {
else if trim_colors(check_colors) == "black" then "bb"
else if trim_colors(check_colors) == "red" then "rr"
else if trim_colors(check_colors) == "green" then "gg"
else if trim_colors(check_colors) == "orange" then "oo"
else if contains(check_colors, match:"multi") or
contains(check_colors, match:"hybrid") or
contains(check_colors, match:", land") then hybrid_color(face:face)
@@ -45,22 +46,32 @@ hybrid_color := {
else if trimmed == "white, black" then "wb"
else if trimmed == "white, red" then "rw"
else if trimmed == "white, green" then "gw"
else if trimmed == "white, orange" then "wo"
else if trimmed == "blue, black" then "ub"
else if trimmed == "blue, red" then "ur"
else if trimmed == "blue, green" then "gu"
else if trimmed == "blue, orange" then "uo"
else if trimmed == "black, red" then "br"
else if trimmed == "black, green" then "bg"
else if trimmed == "black, orange" then "bo"
else if trimmed == "red, green" then "rg"
else if trimmed == "red, orange" then "ro"
else if trimmed == "green, orange" then "go"
else if trimmed == "white, blue, reversed" then "uw"
else if trimmed == "white, black, reversed" then "bw"
else if trimmed == "white, red, reversed" then "wr"
else if trimmed == "white, green, reversed" then "wg"
else if trimmed == "white, orange, reversed" then "ow"
else if trimmed == "blue, black, reversed" then "bu"
else if trimmed == "blue, red, reversed" then "ru"
else if trimmed == "blue, green, reversed" then "ug"
else if trimmed == "blue, orange, reversed" then "ou"
else if trimmed == "black, red, reversed" then "rb"
else if trimmed == "black, green, reversed" then "bg"
else if trimmed == "black, green, reversed" then "gb"
else if trimmed == "black, orange, reversed" then "ob"
else if trimmed == "red, green, reversed" then "gr"
else if trimmed == "red, orange, reversed" then "or"
else if trimmed == "green, orange, reversed" then "og"
else "mm"
}@(face:"")
########################################################################
@@ -818,12 +829,13 @@ stamp_hybrid := [
# Putting it all together.
########################################################################
blend_colors := {
colors := sort_text( order: if card_is_wedge(input) then "(wbgur)" else "(wubrg)"
colors := sort_text( order: if card_is_wedge(input) then "(wbguro)" else "(wubrgo)"
, (if chosen(choice:"white" ) then "w")
+ (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 chosen(choice:"orange" ) then "o"))
if multi and (hybrid or colors == "") then (
colors := colors + "m"
)
@@ -1103,12 +1115,13 @@ font_color_positions := [
font_white := {
hybrid := chosen(choice:"hybrid" )
artifact := chosen(choice:"artifact" )
colors := sort_text( order: "(wubrg)"
colors := sort_text( order: "(wubrgo)"
, (if chosen(choice:"white" ) then "w")
+ (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 chosen(choice:"orange" ) then "o"))
+ (if artifact then "a")
font_colors_white(
if chosen(choice:"land") then "l"

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

@@ -4642,7 +4642,7 @@ extra card style:
render style: image
image: bookmarks/stripe.png
z index: 835
visible: {length(write_wubrg(card.card_color))==2 and front_saga()}
visible: {length(write_wubrgo(card.card_color))==2 and front_saga()}
stripe 2:
left: 392
top: 60
@@ -4651,7 +4651,7 @@ extra card style:
render style: image
image: bookmarks/stripe.png
z index: 835
visible: {length(write_wubrg(card.card_color_2))==2 and back_saga()}
visible: {length(write_wubrgo(card.card_color_2))==2 and back_saga()}
alias bar:
left: 34
top: {if front_normal() then 55 else if mythic_edition() then 47 else 49}

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

@@ -1406,7 +1406,7 @@ extra card style:
render style: image
image: bookmark/stripe.png
z index: 820
visible: {length(write_wubrg(card.card_color))==2 and not un_marked()}
visible: {length(write_wubrgo(card.card_color))==2 and not un_marked()}
paper:
left: {if is_saga() then 28 else 186}
top: 58

3
data/magic-modules.mse-include/symbols/choices
View File

@@ -12,6 +12,7 @@ choice:
choice: black
choice: red
choice: green
choice: orange
choice: multicolor
choice: colorless
choice: artifact
@@ -47,6 +48,7 @@ choice:
choice: black
choice: red
choice: green
choice: orange
choice: multicolor
choice: colorless
choice: artifact
@@ -59,6 +61,7 @@ choice:
choice: black
choice: red
choice: green
choice: orange
choice: multicolor
choice: colorless
choice: artifact

6
data/magic-modules.mse-include/watermarks/choices
View File

@@ -11,6 +11,7 @@ choice:
choice: black
choice: red
choice: green
choice: orange
choice: colorless
choice:
name: snow
@@ -22,6 +23,7 @@ choice:
choice: black
choice: red
choice: green
choice: orange
choice: colorless
choice:
name: hi res
@@ -30,6 +32,7 @@ choice:
choice: black
choice: red
choice: green
choice: orange
choice: colorless
choice:
name: double
@@ -50,6 +53,7 @@ choice:
choice: black
choice: red
choice: green
choice: orange
choice:
name: colorless
line below: true
@@ -60,6 +64,7 @@ choice:
choice: black
choice: red
choice: green
choice: orange
choice: colorless
choice:
name: hi res
@@ -68,6 +73,7 @@ choice:
choice: black
choice: red
choice: green
choice: orange
choice: colorless
choice:
name: double

6
data/magic.mse-game/add_cards_scripts
View File

@@ -10,6 +10,7 @@ add cards script:
, new_card([name: "Swamp", super_type: "Basic Land", sub_type: "Swamp", rarity: "basic land", watermark: "mana symbol black"])
, new_card([name: "Mountain", super_type: "Basic Land", sub_type: "Mountain", rarity: "basic land", watermark: "mana symbol red"])
, new_card([name: "Forest", super_type: "Basic Land", sub_type: "Forest", rarity: "basic land", watermark: "mana symbol green"])
, new_card([name: "Desert", super_type: "Basic Land", sub_type: "Desert", rarity: "basic land", watermark: "mana symbol orange"])
]
add cards script:
@@ -23,6 +24,7 @@ add cards script:
, new_card([name: "Snow-Covered Swamp", super_type: "Basic Snow Land", sub_type: "Swamp", rarity: "common", watermark: "mana symbol black"])
, new_card([name: "Snow-Covered Mountain", super_type: "Basic Snow Land", sub_type: "Mountain", rarity: "common", watermark: "mana symbol red"])
, new_card([name: "Snow-Covered Forest", super_type: "Basic Snow Land", sub_type: "Forest", rarity: "common", watermark: "mana symbol green"])
, new_card([name: "Snow-Covered Desert", super_type: "Basic Snow Land", sub_type: "Desert", rarity: "common", watermark: "mana symbol orange"])
]
#add cards script:
@@ -44,6 +46,7 @@ add cards script:
, new_card([casting_cost: "B"])
, new_card([casting_cost: "R"])
, new_card([casting_cost: "G"])
, new_card([casting_cost: "O"])
]
add cards script:
name: &Uncommon Cycle
@@ -54,12 +57,13 @@ add cards script:
, new_card([casting_cost: "B", rarity: "uncommon"])
, new_card([casting_cost: "R", rarity: "uncommon"])
, new_card([casting_cost: "G", rarity: "uncommon"])
, new_card([casting_cost: "O", rarity: "uncommon"])
]
add cards script:
name: &Rare Cycle
description: Adds a rare card of each color to the set
script:
[ new_card([casting_cost: "W", rarity: "rare"]) , new_card([casting_cost: "U", rarity: "rare"]) , new_card([casting_cost: "B", rarity: "rare"]) , new_card([casting_cost: "R", rarity: "rare"]) , new_card([casting_cost: "G", rarity: "rare"]) ]
[ new_card([casting_cost: "W", rarity: "rare"]) , new_card([casting_cost: "U", rarity: "rare"]) , new_card([casting_cost: "B", rarity: "rare"]) , new_card([casting_cost: "R", rarity: "rare"]) , new_card([casting_cost: "G", rarity: "rare"]) , new_card([casting_cost: "O", rarity: "rare"]) ]
add cards script:
name: &Design Skeleton Full
description: Basic skeleton of 19C,11U,7R,2M/color, 1U,1R/color pair, 6C,15U,8R,5M/colorless. Type "skeleton_info()" in console tab/help

2
data/magic.mse-game/game_script
View File

@@ -7,11 +7,11 @@ card list color script:
else if input == "black" then rgb(0,0,0)
else if input == "red" then rgb(168,0,0)
else if input == "green" then rgb(0,168,0)
else if input == "orange" then rgb(253,196,41)
else if input == "pink" then rgb(210,60,140)
else if input == "purple" then rgb(150,100,160)
else if input == "yellow" then rgb(190,200,50)
else if input == "brown" then rgb(51, 10, 0)
else if input == "orange" then rgb(255, 51, 0)
else (
artifact := chosen(choice:"artifact")
land := chosen(choice:"land")

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

@@ -819,6 +819,7 @@ languages := [
is_swamp : match@(match: "(?i)Swamp")
is_mountain : match@(match: "(?i)Mountain")
is_forest : match@(match: "(?i)Forest")
is_derast : match@(match: "(?i)Desert")
is_wastes : match@(match: "(?i)Wastes")
is_class : match@(match: "(?i)Class")
@@ -846,21 +847,22 @@ languages := [
is_black : match@(match: "(?i)black")
is_red : match@(match: "(?i)red")
is_green : match@(match: "(?i)green")
is_orange : match@(match: "(?i)orange")
is_colorless : match@(match: "(?i)colorless")
is_cda_colorless : match@(match: "(?i)is colorless")
is_cda_all_colors : match@(match: "(?i)is all colors")
cda_colors : filter_text@(match: "is (white|blue|black|red|green)((,|, and| and) (white|blue|black|red|green))*")
cda_colors : filter_text@(match: "is (white|blue|black|red|green|orange)((,|, and| and) (white|blue|black|red|green|orange))*")
white : "White"
blue : "Blue"
black : "Black"
red : "Red"
green : "Green"
orange : "Orange"
purple : "Purple"
pink : "Pink"
yellow : "Yellow"
orange : "Orange"
brown : "Brown"
multicolor : "Multicolor"
hybrid : "Hybrid"

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

@@ -438,6 +438,7 @@ colors_from_mana_symbols := {
if contains(input, match:"B") then str := str + ["black"]
if contains(input, match:"R") then str := str + ["red"]
if contains(input, match:"G") then str := str + ["green"]
if contains(input, match:"O") then str := str + ["orange"]
join(str, sep:", ")
}
@@ -590,6 +591,7 @@ colorless_color := {
else if cc == "black" then "b"
else if cc == "red" then "r"
else if cc == "green" then "g"
else if cc == "orange" then "o"
else "c"
}
@@ -620,6 +622,7 @@ color_name := {
else if input == "B" then "black"
else if input == "R" then "red"
else if input == "G" then "green"
else if input == "O" then "orange"
else ""
}
mana_name := {
@@ -628,6 +631,7 @@ mana_name := {
else if input == "black" then "B"
else if input == "red" then "R"
else if input == "green" then "G"
else if input == "orange" then "O"
else "C"
}
color_names_1 := { color_name(colors.0) }
@@ -701,6 +705,7 @@ land_to_color := {
else if watermark == "mana symbol black" then "black, land"
else if watermark == "mana symbol red" then "red, land"
else if watermark == "mana symbol green" then "green, land"
else if watermark == "mana symbol orange" then "orange, land"
else land_multicolor(colors:color_text_filter(input: rules))
}@(rules:card.rule_text)
@@ -708,7 +713,7 @@ land_to_color := {
text_to_color := {
#### Note: running filter_text is quite slow, do a quick 'contains' check first
if contains(match: card_name + " is") then (
text := filter_text(match: "is (colorless|all colors|((blue|white|green|red|black)((,|,? and) (blue|white|green|red|black))*))", in_context: regex_escape(card_name)+"(</[-a-z]+>)* <match>\\.")
text := filter_text(match: "is (colorless|all colors|((blue|white|green|red|black|orange)((,|,? and) (blue|white|green|red|black|orange))*))", in_context: regex_escape(card_name)+"(</[-a-z]+>)* <match>\\.")
if text != "" then (
if contains(text, match: "all colors") then (
colors := "WUBRGO"
@@ -721,6 +726,7 @@ text_to_color := {
if contains(text, match: "black") then colors := colors + "B"
if contains(text, match: "red") then colors := colors + "R"
if contains(text, match: "green") then colors := colors + "G"
if contains(text, match: "orange") then colors := colors + "O"
if land == true then land_multicolor()
else mana_to_color(hybrid: "")
)
@@ -743,7 +749,7 @@ card_color := {
else text_color
};
#### Number of colors in a card_color
card_color_color_count := count_chosen@(choices: "white,blue,black,red,green,artifact")
card_color_color_count := count_chosen@(choices: "white,blue,black,red,green,orange,artifact")
#### Clean up color field
card_color_filter := {
colors := card_color_color_count()
@@ -777,6 +783,7 @@ card_color_to_letters := {
+(if contains(color_string, match:"black") then "B" else "")
+(if contains(color_string, match:"red") then "R" else "")
+(if contains(color_string, match:"green") then "G" else "")
+(if contains(color_string, match:"orange") then "O" else "")
}
card_color_field := { if input <= 1 then card.card_color else card["card_color_" + input] }
@@ -825,30 +832,32 @@ color_of_card := {
#type := card.super_type
artifact := chosen(card_color, choice:"artifact")
if contains(card.shape, match: "split") and
card_color != card.card_color_2 then "I" #### Diff Color Splits
card_color != card.card_color_2 then "K" #### Diff Color Splits
else if chosen(choice: "land", card_color) then ( #### Lands
if card.rarity != "basic land" then "L" #### Nonbasic Land
if card.rarity != "basic land" then "M" #### Nonbasic Land
else basic_land_sort() #### Basic Land
) else if is_null_cost(casting_cost) then ( #### Non-Land Cards with no or zero costs.
if chosen(choice: "colorless", card_color) then "A" #### Clear Colorless
else if chosen(choice: "hybrid", card_color) then "HK" #### Hybrids
else if is_multicolor(card_color) then "GK" #### Multicolor
else if chosen(choice: "hybrid", card_color) then "IL" #### Hybrids
else if is_multicolor(card_color) then "HL" #### Multicolor
else if chosen(choice:"white", card_color) then "B" #### White
else if chosen(choice:"blue", card_color) then "C" #### Blue
else if chosen(choice:"black", card_color) then "D" #### Black
else if chosen(choice:"red", card_color) then "E" #### Red
else if chosen(choice:"green", card_color) then "F" #### Green
else "J" #### Artifact
else if chosen(choice:"orange", card_color) then "G" #### Orange
else "K" #### Artifact
) else (
#### Cards with costs.
colors := sort_text(casting_cost, order: "<WUBRGO>")
if colors == "" and artifact then "J" #### Artifact
if colors == "" and artifact then "K" #### Artifact
else if colors == "" then "A" #### Clear Colorless
else if colors == "W" then "B" #### White
else if colors == "U" then "C" #### Blue
else if colors == "B" then "D" #### Black
else if colors == "R" then "E" #### Red
else if colors == "G" then "F" #### Green
else if colors == "O" then "G" #### Orange
else if is_hybrid_cost() then hybrid_color_pair_sort() #### Hybrid (by pairs)
else if contains(casting_cost, match:"/") and artifact then "I" #### Hybrid Artifacts
else multi_color_pair_sort() #### Multicolor (by pairs)
@@ -867,6 +876,7 @@ basic_land_sort := {
else if contains(name, match:"Swamp") then "MD" #### Swamps
else if contains(name, match:"Mountain") then "ME" #### Mountains
else if contains(name, match:"Forest") then "MF" #### Forests
else if contains(name, match:"Desert") then "MG" #### Desert
else "MA" #### other basic lands
}
hybrid_color_pair_sort := {
@@ -882,7 +892,12 @@ hybrid_color_pair_sort := {
else if colors == "BG" then "HH"
else if colors == "WR" then "HI"
else if colors == "UG" then "HJ"
else "HK"
else if colors == "WO" then "HK"
else if colors == "UO" then "HL"
else if colors == "BO" then "HM"
else if colors == "RO" then "HN"
else if colors == "GO" then "HO"
else "HP"
}
multi_color_pair_sort := {
colors := sort_text(casting_cost, order: "<WUBRGO>")
@@ -897,8 +912,13 @@ multi_color_pair_sort := {
else if colors == "BG" then "GH"
else if colors == "WR" then "GI"
else if colors == "UG" then "GJ"
else if contains(card.casting_cost, match:"/") then "GL"
else "GK"
else if colors == "WO" then "GK"
else if colors == "UO" then "GL"
else if colors == "BO" then "GM"
else if colors == "RO" then "GN"
else if colors == "GO" then "GO"
else if contains(card.casting_cost, match:"/") then "GQ"
else "GP"
}
#### Sort the card into its rarity tier
@@ -1054,12 +1074,13 @@ remove_type := replace@(match: "(Artifact|Creature|Enchantment|Instant|Land|Plan
replace@(match: "[ ]+", in_context: "^<match>", replace: "")+
replace@(match: "[ ]+", in_context: "<match>$", replace: "")
write_wubrg := {
write_wubrgo := {
(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 "")
(if match(input, match:"green") then "G" else "")+
(if match(input, match:"orange") then "O" else "")
}
colored_mana := {to_number(
for each sym in cmc_split(to_text()) do (
@@ -1079,7 +1100,7 @@ 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") or chosen(choice:"orange"))
land := chosen(choice:"land")
multi := chosen(choice:"multicolor")
hybrid := chosen(choice:"hybrid")
@@ -1088,7 +1109,8 @@ primary_card_color := {
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 "land"
else if multi then "multicolor"
else if multi_color == 2 and chosen(choice:"artifact") then "hybrid" #### hybrid artifacts would show as their first color
@@ -1099,10 +1121,11 @@ primary_card_color := {
else if black then "black"
else if red then "red"
else if green then "green"
else if orange then "orange"
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") or chosen(choice:"orange"))
land := chosen(choice:"land")
multi := chosen(choice:"multicolor")
hybrid := chosen(choice:"hybrid")
@@ -1111,7 +1134,8 @@ sparker_card_color := {
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 "colorless"
else if multi then "multicolor"
else if multi_color >= 2 then "multicolor"
@@ -1122,6 +1146,7 @@ sparker_card_color := {
else if black then "black"
else if red then "red"
else if green then "green"
else if orange then "orange"
else "colorless"
}
@@ -1141,7 +1166,8 @@ 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]")
replace@(match: "green", replace: "[G]")+
replace@(match: "orange", replace: "[O]")
#### convert number word to digit
digital_number := {
@@ -1298,7 +1324,7 @@ protection_code := {
else if match(input, match:"^(converted|mana|power|toughness)") then "anything with " + replace(input, match:"and from", replace:"or", in_context:" <match> ")
else if contains(input, match:"the chosen player") then "anything " + replace(input, match:"the chosen", replace:"controlled by that")
else if contains(input, match:"the chosen") then "anything with " + replace(input, match:"the chosen", replace:"that")
else if contains(input, match:"all colors") then "anything " + replace(input, match:"all colors", replace:"that's white, blue, black, red, or green")
else if contains(input, match:"all colors") then "anything " + replace(input, match:"all colors", replace:"that's white, blue, black, red, green, or orange")
else if match(input, match:"^you$") then "anything you control"
else if match(input, match:"^its owner$") then "anything its owner controls"
else if match(input, match:"^(each of )?your opponents$") then "anything " + replace(input, match:"(each of )?your opponents", replace:"controlled by those players")
@@ -2627,6 +2653,7 @@ card_new_color := {
else if card.card_color == "black" then "b"
else if card.card_color == "red" then "r"
else if card.card_color == "green" then "g"
else if card.card_color == "orange" then "o"
else if contains(card.card_color, match:"artifact") then "a"
else if contains(card.card_color, match:"multi") or contains(card.card_color, match:"hybrid") then "m"
else "c"
@@ -5557,6 +5584,7 @@ alias_colors := {
b: rgb(39, 38, 36),
r: rgb(168, 88, 81),
g: rgb(6, 120, 69),
o: rgb(253, 196, 41),
a: rgb(239, 238, 236),
m: rgb(243, 210, 105),
c: rgb(173, 151, 137)
@@ -5758,7 +5786,7 @@ 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("orange")], [lang_setting("purple")], [lang_setting("pink")], [lang_setting("yellow")], [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,14 +5888,14 @@ 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", "orange"], letter_list:["W", "U", "B", "R", "G", "O"], mana_list:"nope")
#### outside to make singleton scripts easier
blank_list_5 := ["","","","",""]
blank_list_10 := ["","","","","","","","","",""]
mana_list_ally := ["WU","UB","BR","RG","GW"]
mana_list_enemy := ["WB","UR","BG","RW","GU"]
mana_list_shard := ["WUB","UBR","BRG","RGW","GWU"]
mana_list_wedge := ["WBG","URW","BGU","RWB","GUR"]
mana_list_ally := ["WU","UB","BR","RG","GW","GO","OW"]
mana_list_enemy := ["WB","UR","BG","RW","GU","UO","BO","RO"]
mana_list_shard := ["WUB","UBR","BRG","RGW","GWU"] # TODO: Add shard triplets for orange
mana_list_wedge := ["WBG","URW","BGU","RWB","GUR"] # TODO: Add wedge triples for orange
skeleton_script := {
cards := [];
cards := cards + skeleton_runner(count:skeleton_commons);

27
data/magic.mse-game/statistics_script
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 "")

3
data/magic.mse-game/symbols/menu_choice_images
View File

@@ -22,6 +22,7 @@ choice images:
sparker (colored) black: /magic.mse-game/symbols/sparker/black.png
sparker (colored) red: /magic.mse-game/symbols/sparker/red.png
sparker (colored) green: /magic.mse-game/symbols/sparker/green.png
sparker (colored) orange: /magic.mse-game/symbols/sparker/orange.png
sparker (colored) multicolor: /magic.mse-game/symbols/sparker/multicolor.png
sparker (colored) colorless: /magic.mse-game/symbols/sparker/colorless.png
sparker (colored) artifact: /magic.mse-game/symbols/sparker/artifact.png
@@ -32,6 +33,7 @@ choice images:
modal front black: /magic.mse-game/symbols/modalfront/black.png
modal front red: /magic.mse-game/symbols/modalfront/red.png
modal front green: /magic.mse-game/symbols/modalfront/green.png
modal front orange: /magic.mse-game/symbols/modalfront/orange.png
modal front multicolor: /magic.mse-game/symbols/modalfront/multicolor.png
modal front colorless: /magic.mse-game/symbols/modalfront/colorless.png
modal front artifact: /magic.mse-game/symbols/modalfront/artifact.png
@@ -42,6 +44,7 @@ choice images:
modal back black: /magic.mse-game/symbols/modalback/black.png
modal back red: /magic.mse-game/symbols/modalback/red.png
modal back green: /magic.mse-game/symbols/modalback/green.png
modal back orange: /magic.mse-game/symbols/modalback/orange.png
modal back multicolor: /magic.mse-game/symbols/modalback/multicolor.png
modal back colorless: /magic.mse-game/symbols/modalback/colorless.png
modal back artifact: /magic.mse-game/symbols/modalback/artifact.png

6
data/magic.mse-game/watermarks/menu_choice_images
View File

@@ -6,6 +6,7 @@ choice images:
mana symbol black: /magic.mse-game/watermarks/watermark_b.png
mana symbol red: /magic.mse-game/watermarks/watermark_r.png
mana symbol green: /magic.mse-game/watermarks/watermark_g.png
mana symbol orange: /magic.mse-game/watermarks/watermark_o.png
mana symbol colorless: /magic.mse-game/watermarks/watermark_c.png
mana symbol snow: /magic.mse-game/watermarks/watermark_s.png
@@ -14,6 +15,7 @@ choice images:
mana symbol old black: /magic.mse-game/watermarks/watermark_b_old.png
mana symbol old red: /magic.mse-game/watermarks/watermark_r_old.png
mana symbol old green: /magic.mse-game/watermarks/watermark_g_old.png
mana symbol old orange: /magic.mse-game/watermarks/watermark_o_old.png
mana symbol old colorless: /magic.mse-game/watermarks/watermark_c_old.png
mana symbol hi res white: /magic.mse-game/watermarks/watermark_w_big.png
@@ -21,6 +23,7 @@ choice images:
mana symbol hi res black: /magic.mse-game/watermarks/watermark_b_big.png
mana symbol hi res red: /magic.mse-game/watermarks/watermark_r_big.png
mana symbol hi res green: /magic.mse-game/watermarks/watermark_g_big.png
mana symbol hi res orange: /magic.mse-game/watermarks/watermark_o_big.png
mana symbol hi res colorless: /magic.mse-game/watermarks/watermark_c_big.png
mana symbol double WU: /magic.mse-game/watermarks/mana_wu.png
@@ -39,12 +42,14 @@ choice images:
transparent mana symbol black: /magic.mse-game/watermarks/watermark_b.png
transparent mana symbol red: /magic.mse-game/watermarks/watermark_r.png
transparent mana symbol green: /magic.mse-game/watermarks/watermark_g.png
transparent mana symbol orange: /magic.mse-game/watermarks/watermark_o.png
transparent mana symbol old white: /magic.mse-game/watermarks/watermark_w_old.png
transparent mana symbol old blue: /magic.mse-game/watermarks/watermark_u_old.png
transparent mana symbol old black: /magic.mse-game/watermarks/watermark_b_old.png
transparent mana symbol old red: /magic.mse-game/watermarks/watermark_r_old.png
transparent mana symbol old green: /magic.mse-game/watermarks/watermark_g_old.png
transparent mana symbol old orange: /magic.mse-game/watermarks/watermark_o_old.png
transparent mana symbol old colorless: /magic.mse-game/watermarks/watermark_c_old.png
transparent mana symbol hi res white: /magic.mse-game/watermarks/watermark_w_big.png
@@ -52,6 +57,7 @@ choice images:
transparent mana symbol hi res black: /magic.mse-game/watermarks/watermark_b_big.png
transparent mana symbol hi res red: /magic.mse-game/watermarks/watermark_r_big.png
transparent mana symbol hi res green: /magic.mse-game/watermarks/watermark_g_big.png
transparent mana symbol hi res orange: /magic.mse-game/watermarks/watermark_o_big.png
transparent mana symbol hi res colorless: /magic.mse-game/watermarks/watermark_c_big.png
transparent mana symbol double WU: /magic.mse-game/watermarks/mana_wu_old.png