From 7ea81181cb3a5098677258b5ddb3a63238ebe5fe Mon Sep 17 00:00:00 2001 From: Kyle <41976328+ImKyle4815@users.noreply.github.com> Date: Sat, 27 Mar 2021 10:36:41 -0700 Subject: [PATCH] more colored border support --- img/manaSymbols/outline/outlineb.svg | 6 +++--- img/manaSymbols/outline/outlinec.svg | 6 +++--- img/manaSymbols/outline/outlineg.svg | 6 +++--- img/manaSymbols/outline/outliner.svg | 6 +++--- img/manaSymbols/outline/outlines.svg | 6 +++--- img/manaSymbols/outline/outlineu.svg | 6 +++--- img/manaSymbols/outline/outlinew.svg | 6 +++--- js/frames/packMargin-1.js | 5 +++++ js/frames/packMysticalArchive.js | 4 ++-- js/frames/packSeventh.js | 6 +++++- 10 files changed, 33 insertions(+), 24 deletions(-) diff --git a/img/manaSymbols/outline/outlineb.svg b/img/manaSymbols/outline/outlineb.svg index 3212e0bd..c08afe65 100644 --- a/img/manaSymbols/outline/outlineb.svg +++ b/img/manaSymbols/outline/outlineb.svg @@ -1,10 +1,10 @@ - + - + - + diff --git a/img/manaSymbols/outline/outlinec.svg b/img/manaSymbols/outline/outlinec.svg index 5af013f8..581acd1e 100644 --- a/img/manaSymbols/outline/outlinec.svg +++ b/img/manaSymbols/outline/outlinec.svg @@ -1,10 +1,10 @@ - + - + - + diff --git a/img/manaSymbols/outline/outlineg.svg b/img/manaSymbols/outline/outlineg.svg index b9038234..a6d32ecd 100644 --- a/img/manaSymbols/outline/outlineg.svg +++ b/img/manaSymbols/outline/outlineg.svg @@ -1,10 +1,10 @@ - + - + - + diff --git a/img/manaSymbols/outline/outliner.svg b/img/manaSymbols/outline/outliner.svg index 64ae6a49..31057e8a 100644 --- a/img/manaSymbols/outline/outliner.svg +++ b/img/manaSymbols/outline/outliner.svg @@ -1,10 +1,10 @@ - + - + - + diff --git a/img/manaSymbols/outline/outlines.svg b/img/manaSymbols/outline/outlines.svg index deac4406..f7bc66d4 100644 --- a/img/manaSymbols/outline/outlines.svg +++ b/img/manaSymbols/outline/outlines.svg @@ -1,8 +1,8 @@ - + - + - + diff --git a/img/manaSymbols/outline/outlineu.svg b/img/manaSymbols/outline/outlineu.svg index 545991ad..0ce0c6f4 100644 --- a/img/manaSymbols/outline/outlineu.svg +++ b/img/manaSymbols/outline/outlineu.svg @@ -1,10 +1,10 @@ - + - + - + diff --git a/img/manaSymbols/outline/outlinew.svg b/img/manaSymbols/outline/outlinew.svg index 12be2ab1..d5ffb6c8 100644 --- a/img/manaSymbols/outline/outlinew.svg +++ b/img/manaSymbols/outline/outlinew.svg @@ -1,10 +1,10 @@ - + - + - + diff --git a/js/frames/packMargin-1.js b/js/frames/packMargin-1.js index 37e6c31a..4b685019 100644 --- a/js/frames/packMargin-1.js +++ b/js/frames/packMargin-1.js @@ -1,11 +1,16 @@ //Create objects for common properties across available frames var bounds = {x:-0.044, y:-1/35, width:1.088, height:37/35}; +var ogBounds = {x:0, y:0, width:1, height:1}; +var masks = [{name:'Border Extension', src:'/img/frames/margins/blackBorderExtension.png'}, {name:'Borderless Border Extension', src:'/img/frames/margins/borderlessBorderExtension.png'}, {name:'Box Topper Border Extension', src:'/img/frames/margins/boxTopperBorderExtension.png'}, {name:'Cornered Border Extension', src:'/img/frames/margins/blackCorners.png'}]; //defines available frames availableFrames = [ {name:'Black Border Extension', src:'/img/frames/margins/blackBorderExtension.png', bounds:bounds}, {name:'Borderless Border Extension', src:'/img/frames/margins/borderlessBorderExtension.png', bounds:bounds}, {name:'Box Topper Border Extension', src:'/img/frames/margins/boxTopperBorderExtension.png', bounds:bounds}, {name:'Black Corners', src:'/img/frames/margins/blackCorners.png', bounds:bounds}, + {name:'White Border Extension', src:'/img/frames/white.png', ogBounds:ogBounds, bounds:bounds, masks:masks, noDefaultMask:true}, + {name:'Silver Border Extension', src:'/img/frames/silver.png', ogBounds:ogBounds, bounds:bounds, masks:masks, noDefaultMask:true}, + {name:'Gold Border Extension', src:'/img/frames/gold.png', ogBounds:ogBounds, bounds:bounds, masks:masks, noDefaultMask:true} ]; //disables/enables the "Load Frame Version" button document.querySelector('#loadFrameVersion').disabled = false; diff --git a/js/frames/packMysticalArchive.js b/js/frames/packMysticalArchive.js index d418ae67..79bea42f 100644 --- a/js/frames/packMysticalArchive.js +++ b/js/frames/packMysticalArchive.js @@ -16,7 +16,7 @@ availableFrames = [ document.querySelector('#loadFrameVersion').disabled = false; //defines process for loading this version, if applicable document.querySelector('#loadFrameVersion').onclick = async function() { - notify("To change the color of your mana cost, use {manacolor#}, but replace '#' with your desired color. 'white', 'blue', 'black', 'red', and 'green', as well as hex/html color codes are currently supported.", 15) + // notify("To change the color of your mana cost, use {manacolor#}, but replace '#' with your desired color. 'white', 'blue', 'black', 'red', and 'green', as well as hex/html color codes are currently supported.", 15) //resets things so that every frame doesn't have to await resetCardIrregularities(); //sets card version @@ -33,7 +33,7 @@ document.querySelector('#loadFrameVersion').onclick = async function() { resetWatermark(); //text loadTextOptions({ - mana: {name:'Mana Cost', text:'', y:0.0613, width:0.9292, height:71/2100, oneLine:true, size:71/1638, align:'right', manaCost:true, manaSpacing:0, manaPrefix:'outline', manaSymbolColor:'white'}, + mana: {name:'Mana Cost', text:'', y:0.0613, width:0.9292, height:71/2100, oneLine:true, size:71/1638, align:'right', manaCost:true, manaSpacing:0, manaPrefix:'outline'/*, manaSymbolColor:'white'*/}, title: {name:'Title', text:'', x:0.0854, y:0.0522, width:0.8292, height:0.0543, oneLine:true, font:'belerenb', size:0.0381}, type: {name:'Type', text:'', x:0.0854, y:0.5664, width:0.8292, height:0.0543, oneLine:true, font:'belerenb', size:0.0324}, rules: {name:'Rules Text', text:'', x:0.0934, y:0.6303, width:0.8134, height:0.2875, size:0.0362}, diff --git a/js/frames/packSeventh.js b/js/frames/packSeventh.js index dd6279ba..2694aaff 100644 --- a/js/frames/packSeventh.js +++ b/js/frames/packSeventh.js @@ -1,5 +1,6 @@ //Create objects for common properties across available frames var masks = [{src:'/img/frames/seventh/regular/seventhMaskPinline.png', name:'Pinline'}, {src:'/img/frames/seventh/regular/seventhMaskRules.png', name:'Rules'}, {src:'/img/frames/seventh/regular/seventhMaskFrame.png', name:'Frame'}, {src:'/img/frames/seventh/regular/seventhMaskBorder.png', name:'Border'}]; +var borderMask = [{src:'/img/frames/seventh/regular/seventhMaskBorder.png', name:'Border'}] var bounds = {x:0.7573, y:0.8848, width:0.188, height:0.0733}; //defines available frames availableFrames = [ @@ -16,7 +17,10 @@ availableFrames = [ {name:'Black Land Frame', src:'/img/frames/seventh/regular/seventhFrameBL.png', masks:masks}, {name:'Red Land Frame', src:'/img/frames/seventh/regular/seventhFrameRL.png', masks:masks}, {name:'Green Land Frame', src:'/img/frames/seventh/regular/seventhFrameGL.png', masks:masks}, - {name:'DCI Star', src:'/img/frames/seventh/seventhFoilStamp.png', bounds:{x:0.1089, y:0.8345, width:0.4033, height:0.1107}} + {name:'DCI Star', src:'/img/frames/seventh/seventhFoilStamp.png', bounds:{x:0.1089, y:0.8345, width:0.4033, height:0.1107}}, + {name:'White Border', src:'/img/frames/white.png', masks:borderMask, noDefaultMask:true}, + {name:'Silver Border', src:'/img/frames/silver.png', masks:borderMask, noDefaultMask:true}, + {name:'Gold Border', src:'/img/frames/gold.png', masks:borderMask, noDefaultMask:true} ]; //disables/enables the "Load Frame Version" button document.querySelector('#loadFrameVersion').disabled = false;