From 427188118d020b8f03f1dad236fa500d57343cdb Mon Sep 17 00:00:00 2001 From: CajunAvenger Date: Sun, 24 Oct 2021 14:48:18 -0500 Subject: [PATCH] bugfixes --- .../artifact_blend_inverted.png | Bin 0 -> 3135 bytes .../artifact_blend_invertedpt.png | Bin 0 -> 3007 bytes data/magic-m15-altered.mse-style/style | 6 +++--- data/magic-m15-sketch.mse-style/style | 4 ++-- data/magic.mse-game/script | 9 +++++++++ 5 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 data/magic-m15-altered.mse-style/artifact_blend_inverted.png create mode 100644 data/magic-m15-altered.mse-style/artifact_blend_invertedpt.png diff --git a/data/magic-m15-altered.mse-style/artifact_blend_inverted.png b/data/magic-m15-altered.mse-style/artifact_blend_inverted.png new file mode 100644 index 0000000000000000000000000000000000000000..0a7f20ca2b875fc1b229fb0d7dfe71fb6d98a8db GIT binary patch literal 3135 zcmeH}ZBSEJ8plsSNhKQGvWi0uVP{*}Z50G8FNT-W=ps`@xAIyj!G<(~N&@E%+Vq~e%77d1o1Vc!6rCcjZQcVK|E(C}g(}5dUAOsS^UT3$Rwx2pXo!Kv* znLGdcJm)zx=l<`R-+5{drzCFj_V)$=Y)U$??`;5Z5C9&87rd~H?>%G~6I|)riEjd# zZo3r=)-e+fCIBE86I@5vWAO&|fvi#hh`rAq++SZKzJw*c-g_%?AEww?rm6&(;5kVL z_v0rC#I4&m;O+)o!BV7x)JzVQb@C*mi1VxxP)is`IgI>3sDN`UFfr-i;rw6*9st7G zqY;WeSV{SSwFeQ@qWi73K*>*-GvzfPdY=;DsNOG!`i#T1zR^~L?W?%)^g?J9w(}LoPk5%WvLej7bdI8DNJ2M)_4{?*fB&ATrf|gXiA1G zXZXDHvm-6dAw7=wmbVBiM*BlFF{^H;&5%Lkzy7Y0eUt}vr%hFj&Fkai`K~#*-&;6L z2+omEUW>5J3tXU%F?Kl%^NjWSB9C=U04adqM~9i zgdz)%FVli;F56iYv9zkev?-Yn0lh%#4B2L-h$v_>_9XG%kq98#A=NLAv(r?c6= zv5-+~i!?VKApcyvssBS!ZM6+)Q=GvoyBqAf+T z_jNvIR(~O>wU7T~91_N>7aqQ4NF?)bT_04OLRhZyU0OA|U^VpLk{QiJtt9A&4*l4# z=h06N(Er7dR+vwx)9ZoqNV?dGqG%Y7-4a!Yd*MY$7+8#dF295YSB>T>6MqR~6LkOE zVhzXo@MpSwHEpU#E|+7R*wos~hajlF+4^OW6vN&)e`$>I&d`5ZPKrInS($^$m$v|Y zoO62I%kj~nIE?j{TXc7=ph$sN72|!h(kE~ut*4TgCF&emZ(L>t0r&Wbm`ZyE&Cbp? zSPd=Ma)D)Wh(>FkOOLLrhi0aT?Bmr$(#Nu#uJ%Yh)7Dh0sD}CONm;J?&UK)yPYmGY zugr9s>Woo$#f&SwC-oS4(sdF_XEJ@0sY^xm$`jn~>}(remlM!x|h`n-AQSrub{$et!o}fbwZMTvxEM7#{^t&6=CxPepJ<;lO}A zdMhOK)Q*J#zFvxzo+U*_kA5dLU4h*Fkgdv zl}L_@aq+?;-`RzR!{I>C!TpBWT6BY?2QH%s4n3Y#W{IP4r@!I2UCWI1Y}V+=h`)Q< zu2HNsDoZiCo@B8?40rzG_gy#eZur2Q%TWN+r3{x^Qs9(4c! literal 0 HcmV?d00001 diff --git a/data/magic-m15-altered.mse-style/artifact_blend_invertedpt.png b/data/magic-m15-altered.mse-style/artifact_blend_invertedpt.png new file mode 100644 index 0000000000000000000000000000000000000000..fd16e5a876d86bae782c10a590a6ac0634dfecc6 GIT binary patch literal 3007 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 literal 0 HcmV?d00001 diff --git a/data/magic-m15-altered.mse-style/style b/data/magic-m15-altered.mse-style/style index b67db98bd..7fdf977cc 100644 --- a/data/magic-m15-altered.mse-style/style +++ b/data/magic-m15-altered.mse-style/style @@ -53,10 +53,10 @@ init script: #Should multicolor lands with basic land types have a colored name? mask_multi_land_with_color := { styling.colored_multicolor_land_name } - base_template_prefix := [card: "" alias: "alias/" snow:"snow/" snowtexture:"snow/" devoid:"devoid/" nyx: "nyx/" miracle: "miracles/" node:"nodes/" promo: "promo/" crown: "legend/" cons:"conspiracy/" curtain: "curtains/" fnm: "fnm/", fnmpt: "paradox/", inverted: "inverted/", invertedpt: "inverted/", map: "maps/" energy: "energies/", mappt: "maps/" pt: "", slide: "masks/", slide2: "masks/", arrow: "arrows/", arrow2: "arrows/", arrow3: "arrows/", season: "season/" stamp: "" identity: "/magic-identity-new.mse-include/", puma: "puma/"] - shifted_template_prefix := [card: "shifted/" alias: "shifted/" snow:"snow/" snowtexture:"snow/" devoid:"devoid/" nyx: "nyx/" miracle: "shifted/" node:"shifted/" promo: "promo/" crown: "shifted/" cons:"conspiracy/" curtain: "curtains/" fnm:"fnm/", fnmpt: "paradox/", inverted: "inverted/", invertedpt: "inverted/", map: "maps/" energy: "energies/", mappt: "maps/" pt: "shifted/", slide: "shifted/", slide2: "shifted/", arrow: "arrows/", arrow2: "arrows/", arrow3: "arrows/", season: "season/" stamp: "shifted/" identity: "/magic-identity-new.mse-include/", puma: "puma/shifted/"] + base_template_prefix := [card: "" alias: "alias/" snow:"snow/" snowtexture:"snow/" devoid:"devoid/" nyx: "nyx/" miracle: "miracles/" node:"nodes/" promo: "promo/" crown: "legend/" cons:"conspiracy/" curtain: "curtains/" fnm: "fnm/", fnmpt: "paradox/", inverted: "inverted/", invertedpt: "inverted/", map: "maps/" energy: "energies/", mappt: "maps/" pt: "", slide: "masks/", slide2: "masks/", slide3: "masks/", arrow: "arrows/", arrow2: "arrows/", arrow3: "arrows/", season: "season/" stamp: "" identity: "/magic-identity-new.mse-include/", puma: "puma/"] + shifted_template_prefix := [card: "shifted/" alias: "shifted/" snow:"snow/" snowtexture:"snow/" devoid:"devoid/" nyx: "nyx/" miracle: "shifted/" node:"shifted/" promo: "promo/" crown: "shifted/" cons:"conspiracy/" curtain: "curtains/" fnm:"fnm/", fnmpt: "paradox/", inverted: "inverted/", invertedpt: "inverted/", map: "maps/" energy: "energies/", mappt: "maps/" pt: "shifted/", slide: "shifted/", slide2: "shifted/", slide3: "shifted/", arrow: "arrows/", arrow2: "arrows/", arrow3: "arrows/", season: "season/" stamp: "shifted/" identity: "/magic-identity-new.mse-include/", puma: "puma/shifted/"] template_prefix := { if type == "miracle" and pure_snow() then [miracle:"snow/"] else if is_shifted() then shifted_template_prefix else base_template_prefix } - template_suffix := [card: "card.jpg" node:"node.png" alias:"alias.png" devoid:"card.png" snow:"card.jpg" snowtexture:"snow.png" nyx: "nyx.png" miracle: "miracle.png" promo: "card.jpg" crown: "crown.png" cons:"cons.png" curtain: "card.png" fnm:"card.png", fnmpt: "pt.png", inverted: "card.png", invertedpt: "pt.png", map: "card.png", energy: "card.png", mappt: "pt.png" pt: "pt.png", slide: "slide.png", slide2: "slide2.png", stamp: "stamp.jpg", arrow: "arrow.png", arrow2: "arrow2.png", arrow3: "arrow3.png", season: "flag.png" identity: "identity.png", puma: "puma.png"] + template_suffix := [card: "card.jpg" node:"node.png" alias:"alias.png" devoid:"card.png" snow:"card.jpg" snowtexture:"snow.png" nyx: "nyx.png" miracle: "miracle.png" promo: "card.jpg" crown: "crown.png" cons:"cons.png" curtain: "card.png" fnm:"card.png", fnmpt: "pt.png", inverted: "card.png", invertedpt: "pt.png", map: "card.png", energy: "card.png", mappt: "pt.png" pt: "pt.png", slide: "slide.png", slide2: "slide2.png", slide3: "slide3.png", stamp: "stamp.jpg", arrow: "arrow.png", arrow2: "arrow2.png", arrow3: "arrow3.png", season: "flag.png" identity: "identity.png", puma: "puma.png"] template := { crown_lead(type) + template_prefix()[type] + input + crown_follow(type) + template_suffix[type] } land_template := { crown_lead(type) + template_prefix()[type] + (if input == "a" then "c" else input) + (if landless(type) then "" else "l") + crown_follow(type) + template_suffix[type] } # Use land templates for previews because they show more contrast diff --git a/data/magic-m15-sketch.mse-style/style b/data/magic-m15-sketch.mse-style/style index c49cc97b3..f3e923632 100644 --- a/data/magic-m15-sketch.mse-style/style +++ b/data/magic-m15-sketch.mse-style/style @@ -335,9 +335,9 @@ card style: ############################# Text box text: left: 29 - top: 327 + top: {327-(-chop_top())} width: 314 - height: 154 + bottom: {481-chop_bot()} font: name: MPlantin italic name: MPlantin-Italic diff --git a/data/magic.mse-game/script b/data/magic.mse-game/script index a5fc588ed..88e386286 100644 --- a/data/magic.mse-game/script +++ b/data/magic.mse-game/script @@ -33,6 +33,15 @@ card_is_wedge := { color_string := card_color_to_letters(input) if color_string == "WUR" or color_string == "WBR" or color_string == "WBG" or color_string == "UBG" or color_string == "URG" then true else false } +list_colors := { + list := trim_colors(input) + cc := length(comma_count(list)) + if cc == 1 then + list := replace(list, match:", ", replace:" and ") + if cc > 1 then + list := replace(list, match:", ", replace:", and ", in_context:"[^ ]+$") + list +} # A mana cost can contain both normal and guild mana mana_filter := to_upper + { if chosen(set.mana_cost_sorting, choice: "unsorted") then mana_unsort()