diff --git a/img/frames/m15/borderless/m15GenericShowcaseFrameC.png b/img/frames/m15/borderless/m15GenericShowcaseFrameC.png new file mode 100644 index 00000000..58149f1d Binary files /dev/null and b/img/frames/m15/borderless/m15GenericShowcaseFrameC.png differ diff --git a/img/frames/m15/borderless/m15GenericShowcaseFrameCThumb.png b/img/frames/m15/borderless/m15GenericShowcaseFrameCThumb.png new file mode 100644 index 00000000..f3aa35eb Binary files /dev/null and b/img/frames/m15/borderless/m15GenericShowcaseFrameCThumb.png differ diff --git a/img/frames/m15/crowns/m15CrownCFloating.png b/img/frames/m15/crowns/m15CrownCFloating.png new file mode 100644 index 00000000..bc3f0540 Binary files /dev/null and b/img/frames/m15/crowns/m15CrownCFloating.png differ diff --git a/img/frames/m15/crowns/m15CrownCFloatingThumb.png b/img/frames/m15/crowns/m15CrownCFloatingThumb.png new file mode 100644 index 00000000..7b7967ef Binary files /dev/null and b/img/frames/m15/crowns/m15CrownCFloatingThumb.png differ diff --git a/img/frames/m15/holoStamps/m15HoloStampC.png b/img/frames/m15/holoStamps/m15HoloStampC.png new file mode 100644 index 00000000..96ef09bc Binary files /dev/null and b/img/frames/m15/holoStamps/m15HoloStampC.png differ diff --git a/img/frames/m15/holoStamps/m15HoloStampCThumb.png b/img/frames/m15/holoStamps/m15HoloStampCThumb.png new file mode 100644 index 00000000..041f04a9 Binary files /dev/null and b/img/frames/m15/holoStamps/m15HoloStampCThumb.png differ diff --git a/js/creator-23.js b/js/creator-23.js index 7c91e033..1c25957c 100644 --- a/js/creator-23.js +++ b/js/creator-23.js @@ -588,6 +588,8 @@ function cardFrameProperties(colors, manaCost, typeLine, power, style) { } } else if (colors.length != 0) { rules = colors[0]; + } else if (style == 'Borderless' && !typeLine.includes('Artifact')) { + rules = 'C'; } else { rules = 'A'; } @@ -637,6 +639,8 @@ function cardFrameProperties(colors, manaCost, typeLine, power, style) { } } else if (colors.length == 1) { typeTitle = colors[0]; + } else if (style == 'Borderless' && !typeLine.includes('Artifact')) { + typeTitle = 'C'; } else { typeTitle = 'A'; } @@ -980,7 +984,7 @@ async function autoBorderlessFrame(colors, mana_cost, type_line, power) { card.frames = []; document.querySelector('#frame-list').innerHTML = null; - var properties = cardFrameProperties(colors, mana_cost, type_line, power); + var properties = cardFrameProperties(colors, mana_cost, type_line, power, 'Borderless'); var style = 'regular'; if (type_line.toLowerCase().includes('enchantment creature') || type_line.toLowerCase().includes('enchantment artifact')) { style = 'Nyx'; @@ -1353,8 +1357,8 @@ function makeM15FrameByLetter(letter, mask = false, maskToRightHalf = false, sty function makeBorderlessFrameByLetter(letter, mask = false, maskToRightHalf = false, style) { letter = letter.toUpperCase(); - if (letter == 'C' || letter == 'V') { - letter = 'L'; + if (letter == 'V') { + letter = 'A'; } if (letter == 'ML') { @@ -1371,7 +1375,8 @@ function makeBorderlessFrameByLetter(letter, mask = false, maskToRightHalf = fal 'G': 'Green', 'M': 'Multicolored', 'A': 'Artifact', - 'L': 'Land' + 'L': 'Land', + 'C': 'Colorless' } if ((mask.includes('Crown') || mask == 'PT' || mask.includes('Stamp')) && letter.includes('L') && letter.length > 1) { diff --git a/js/frames/packBorderless.js b/js/frames/packBorderless.js index 41ce494d..441ae839 100644 --- a/js/frames/packBorderless.js +++ b/js/frames/packBorderless.js @@ -11,6 +11,7 @@ availableFrames = [ {name:'Multicolored Frame', src:'/img/frames/m15/borderless/m15GenericShowcaseFrameM.png', masks:masks}, {name:'Artifact Frame', src:'/img/frames/m15/borderless/m15GenericShowcaseFrameA.png', masks:masks}, {name:'Land Frame', src:'/img/frames/m15/borderless/m15GenericShowcaseFrameL.png', masks:masks}, + {name:'Colorless Frame', src:'/img/frames/m15/borderless/m15GenericShowcaseFrameC.png', masks:masks}, {name:'White Power/Toughness', src:'/img/frames/m15/borderless/pt/w.png', bounds:bounds}, {name:'Blue Power/Toughness', src:'/img/frames/m15/borderless/pt/u.png', bounds:bounds}, {name:'Black Power/Toughness', src:'/img/frames/m15/borderless/pt/b.png', bounds:bounds}, diff --git a/js/frames/packM15HoloStamps.js b/js/frames/packM15HoloStamps.js index ff387ff8..58a03a19 100644 --- a/js/frames/packM15HoloStamps.js +++ b/js/frames/packM15HoloStamps.js @@ -10,6 +10,7 @@ availableFrames = [ {name:'Multicolored Holo Stamp', src:'/img/frames/m15/holoStamps/m15HoloStampM.png', bounds:bounds}, {name:'Artifact Holo Stamp', src:'/img/frames/m15/holoStamps/m15HoloStampA.png', bounds:bounds}, {name:'Land Holo Stamp', src:'/img/frames/m15/holoStamps/m15HoloStampL.png', bounds:bounds}, + {name:'Colorless Holo Stamp', src:'/img/frames/m15/holoStamps/m15HoloStampC.png', bounds:bounds}, {name:'Artifact (2) Holo Stamp', src:'/img/frames/m15/holoStamps/m15HoloStampA2.png', bounds:bounds}, {name:'Artifact (3) Holo Stamp', src:'/img/frames/m15/holoStamps/m15HoloStampA3.png', bounds:bounds}, {name:'Plain Holo Stamp', src:'/img/frames/m15/holoStamps/stamp.png', bounds:{x:0.4554, y:0.9172, width:0.0894, height:0.0320}}, diff --git a/js/frames/packM15LegendCrownsFloating.js b/js/frames/packM15LegendCrownsFloating.js index 4292837a..36d9b42f 100644 --- a/js/frames/packM15LegendCrownsFloating.js +++ b/js/frames/packM15LegendCrownsFloating.js @@ -2,14 +2,15 @@ var bounds = {x:0.0307, y:0.0191, width:0.9387, height:0.1024}; //defines available frames availableFrames = [ - {name:'White Legend Crown', src:'/img/frames/m15/crowns/m15CrownWFloating.png', bounds:bounds, complementary:8}, - {name:'Blue Legend Crown', src:'/img/frames/m15/crowns/m15CrownUFloating.png', bounds:bounds, complementary:8}, - {name:'Black Legend Crown', src:'/img/frames/m15/crowns/m15CrownBFloating.png', bounds:bounds, complementary:8}, - {name:'Red Legend Crown', src:'/img/frames/m15/crowns/m15CrownRFloating.png', bounds:bounds, complementary:8}, - {name:'Green Legend Crown', src:'/img/frames/m15/crowns/m15CrownGFloating.png', bounds:bounds, complementary:8}, - {name:'Multicolored Legend Crown', src:'/img/frames/m15/crowns/m15CrownMFloating.png', bounds:bounds, complementary:8}, - {name:'Artifact Legend Crown', src:'/img/frames/m15/crowns/m15CrownAFloating.png', bounds:bounds, complementary:8}, - {name:'Land Legend Crown', src:'/img/frames/m15/crowns/m15CrownLFloating.png', bounds:bounds, complementary:8}, + {name:'White Legend Crown', src:'/img/frames/m15/crowns/m15CrownWFloating.png', bounds:bounds, complementary:9}, + {name:'Blue Legend Crown', src:'/img/frames/m15/crowns/m15CrownUFloating.png', bounds:bounds, complementary:9}, + {name:'Black Legend Crown', src:'/img/frames/m15/crowns/m15CrownBFloating.png', bounds:bounds, complementary:9}, + {name:'Red Legend Crown', src:'/img/frames/m15/crowns/m15CrownRFloating.png', bounds:bounds, complementary:9}, + {name:'Green Legend Crown', src:'/img/frames/m15/crowns/m15CrownGFloating.png', bounds:bounds, complementary:9}, + {name:'Multicolored Legend Crown', src:'/img/frames/m15/crowns/m15CrownMFloating.png', bounds:bounds, complementary:9}, + {name:'Artifact Legend Crown', src:'/img/frames/m15/crowns/m15CrownAFloating.png', bounds:bounds, complementary:9}, + {name:'Land Legend Crown', src:'/img/frames/m15/crowns/m15CrownLFloating.png', bounds:bounds, complementary:9}, + {name:'Colorless Legend Crown', src:'/img/frames/m15/crowns/m15CrownCFloating.png', bounds:bounds, complementary:9}, {name:'Legend Crown Border Cover', src:'/img/black.png', bounds:{x:0.0394, y:0.0277, width:0.9214, height:0.0177}}, {name:'Legend Crown Lower Cutout', src:'/img/black.png', bounds:{x:0.0734, y:0.1096, width:0.8532, height:0.0143}, erase:true}, {name:'Legend Crown Outline', src:'/img/frames/m15/crowns/m15CrownFloatingOutline.png', bounds:{x:0.028, y:0.0172, width:0.944, height:0.1062}}