diff --git a/fonts/goudy-medieval.ttf b/fonts/goudy-medieval.ttf index 3f0c59e3..b058b6d5 100644 Binary files a/fonts/goudy-medieval.ttf and b/fonts/goudy-medieval.ttf differ diff --git a/img/frames/seventh/foilStar.svg b/img/frames/seventh/foilStar.svg new file mode 100644 index 00000000..6756d2f6 --- /dev/null +++ b/img/frames/seventh/foilStar.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/img/frames/seventh/foilStarThumb.png b/img/frames/seventh/foilStarThumb.png new file mode 100644 index 00000000..86e12c97 Binary files /dev/null and b/img/frames/seventh/foilStarThumb.png differ diff --git a/img/frames/seventh/regular/a.png b/img/frames/seventh/regular/a.png new file mode 100644 index 00000000..ac2de756 Binary files /dev/null and b/img/frames/seventh/regular/a.png differ diff --git a/img/frames/seventh/regular/aThumb.png b/img/frames/seventh/regular/aThumb.png new file mode 100644 index 00000000..fa744ea5 Binary files /dev/null and b/img/frames/seventh/regular/aThumb.png differ diff --git a/img/frames/seventh/regular/b.png b/img/frames/seventh/regular/b.png new file mode 100644 index 00000000..1c055035 Binary files /dev/null and b/img/frames/seventh/regular/b.png differ diff --git a/img/frames/seventh/regular/bThumb.png b/img/frames/seventh/regular/bThumb.png new file mode 100644 index 00000000..ba84a757 Binary files /dev/null and b/img/frames/seventh/regular/bThumb.png differ diff --git a/img/frames/seventh/regular/bl.png b/img/frames/seventh/regular/bl.png new file mode 100644 index 00000000..f442370c Binary files /dev/null and b/img/frames/seventh/regular/bl.png differ diff --git a/img/frames/seventh/regular/blThumb.png b/img/frames/seventh/regular/blThumb.png new file mode 100644 index 00000000..52347c3f Binary files /dev/null and b/img/frames/seventh/regular/blThumb.png differ diff --git a/img/frames/seventh/regular/border.svg b/img/frames/seventh/regular/border.svg new file mode 100644 index 00000000..9dc0033f --- /dev/null +++ b/img/frames/seventh/regular/border.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/img/frames/seventh/regular/borderThumb.png b/img/frames/seventh/regular/borderThumb.png new file mode 100644 index 00000000..018814d8 Binary files /dev/null and b/img/frames/seventh/regular/borderThumb.png differ diff --git a/img/frames/seventh/regular/frame.svg b/img/frames/seventh/regular/frame.svg new file mode 100644 index 00000000..aa21e1f7 --- /dev/null +++ b/img/frames/seventh/regular/frame.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/img/frames/seventh/regular/frameThumb.png b/img/frames/seventh/regular/frameThumb.png new file mode 100644 index 00000000..02945fb9 Binary files /dev/null and b/img/frames/seventh/regular/frameThumb.png differ diff --git a/img/frames/seventh/regular/g.png b/img/frames/seventh/regular/g.png new file mode 100644 index 00000000..9959e5d7 Binary files /dev/null and b/img/frames/seventh/regular/g.png differ diff --git a/img/frames/seventh/regular/gThumb.png b/img/frames/seventh/regular/gThumb.png new file mode 100644 index 00000000..cea27a13 Binary files /dev/null and b/img/frames/seventh/regular/gThumb.png differ diff --git a/img/frames/seventh/regular/gl.png b/img/frames/seventh/regular/gl.png new file mode 100644 index 00000000..1eac63ff Binary files /dev/null and b/img/frames/seventh/regular/gl.png differ diff --git a/img/frames/seventh/regular/glThumb.png b/img/frames/seventh/regular/glThumb.png new file mode 100644 index 00000000..9eb83fdf Binary files /dev/null and b/img/frames/seventh/regular/glThumb.png differ diff --git a/img/frames/seventh/regular/l.png b/img/frames/seventh/regular/l.png new file mode 100644 index 00000000..777ec991 Binary files /dev/null and b/img/frames/seventh/regular/l.png differ diff --git a/img/frames/seventh/regular/lThumb.png b/img/frames/seventh/regular/lThumb.png new file mode 100644 index 00000000..9e64a707 Binary files /dev/null and b/img/frames/seventh/regular/lThumb.png differ diff --git a/img/frames/seventh/regular/m.png b/img/frames/seventh/regular/m.png new file mode 100644 index 00000000..a50767d4 Binary files /dev/null and b/img/frames/seventh/regular/m.png differ diff --git a/img/frames/seventh/regular/mThumb.png b/img/frames/seventh/regular/mThumb.png new file mode 100644 index 00000000..9c5b3ba3 Binary files /dev/null and b/img/frames/seventh/regular/mThumb.png differ diff --git a/img/frames/seventh/regular/pinline.svg b/img/frames/seventh/regular/pinline.svg new file mode 100644 index 00000000..ba7772b2 --- /dev/null +++ b/img/frames/seventh/regular/pinline.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/img/frames/seventh/regular/pinlineThumb.png b/img/frames/seventh/regular/pinlineThumb.png new file mode 100644 index 00000000..6da63ac7 Binary files /dev/null and b/img/frames/seventh/regular/pinlineThumb.png differ diff --git a/img/frames/seventh/regular/r.png b/img/frames/seventh/regular/r.png new file mode 100644 index 00000000..cf85b9dc Binary files /dev/null and b/img/frames/seventh/regular/r.png differ diff --git a/img/frames/seventh/regular/rThumb.png b/img/frames/seventh/regular/rThumb.png new file mode 100644 index 00000000..d84647c9 Binary files /dev/null and b/img/frames/seventh/regular/rThumb.png differ diff --git a/img/frames/seventh/regular/rl.png b/img/frames/seventh/regular/rl.png new file mode 100644 index 00000000..1fc22945 Binary files /dev/null and b/img/frames/seventh/regular/rl.png differ diff --git a/img/frames/seventh/regular/rlThumb.png b/img/frames/seventh/regular/rlThumb.png new file mode 100644 index 00000000..e0a601f7 Binary files /dev/null and b/img/frames/seventh/regular/rlThumb.png differ diff --git a/img/frames/seventh/regular/rules.svg b/img/frames/seventh/regular/rules.svg new file mode 100644 index 00000000..ce90b1d0 --- /dev/null +++ b/img/frames/seventh/regular/rules.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/img/frames/seventh/regular/rulesThumb.png b/img/frames/seventh/regular/rulesThumb.png new file mode 100644 index 00000000..353676e4 Binary files /dev/null and b/img/frames/seventh/regular/rulesThumb.png differ diff --git a/img/frames/seventh/regular/seventhFrameA.png b/img/frames/seventh/regular/seventhFrameA.png deleted file mode 100644 index 81ec1b38..00000000 Binary files a/img/frames/seventh/regular/seventhFrameA.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameAThumb.png b/img/frames/seventh/regular/seventhFrameAThumb.png deleted file mode 100644 index d6448097..00000000 Binary files a/img/frames/seventh/regular/seventhFrameAThumb.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameB.png b/img/frames/seventh/regular/seventhFrameB.png deleted file mode 100644 index 94c70b97..00000000 Binary files a/img/frames/seventh/regular/seventhFrameB.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameBL.png b/img/frames/seventh/regular/seventhFrameBL.png deleted file mode 100644 index 528e6bc3..00000000 Binary files a/img/frames/seventh/regular/seventhFrameBL.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameBLThumb.png b/img/frames/seventh/regular/seventhFrameBLThumb.png deleted file mode 100644 index 25b40759..00000000 Binary files a/img/frames/seventh/regular/seventhFrameBLThumb.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameBThumb.png b/img/frames/seventh/regular/seventhFrameBThumb.png deleted file mode 100644 index d6e2aae1..00000000 Binary files a/img/frames/seventh/regular/seventhFrameBThumb.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameCL.png b/img/frames/seventh/regular/seventhFrameCL.png deleted file mode 100644 index d0cb3429..00000000 Binary files a/img/frames/seventh/regular/seventhFrameCL.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameCLThumb.png b/img/frames/seventh/regular/seventhFrameCLThumb.png deleted file mode 100644 index ca8e6b11..00000000 Binary files a/img/frames/seventh/regular/seventhFrameCLThumb.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameG.png b/img/frames/seventh/regular/seventhFrameG.png deleted file mode 100644 index 39409f90..00000000 Binary files a/img/frames/seventh/regular/seventhFrameG.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameGL.png b/img/frames/seventh/regular/seventhFrameGL.png deleted file mode 100644 index 9c7cc815..00000000 Binary files a/img/frames/seventh/regular/seventhFrameGL.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameGLThumb.png b/img/frames/seventh/regular/seventhFrameGLThumb.png deleted file mode 100644 index e7ddefc1..00000000 Binary files a/img/frames/seventh/regular/seventhFrameGLThumb.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameGThumb.png b/img/frames/seventh/regular/seventhFrameGThumb.png deleted file mode 100644 index 4ef4016e..00000000 Binary files a/img/frames/seventh/regular/seventhFrameGThumb.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameM.png b/img/frames/seventh/regular/seventhFrameM.png deleted file mode 100644 index 8f214238..00000000 Binary files a/img/frames/seventh/regular/seventhFrameM.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameMThumb.png b/img/frames/seventh/regular/seventhFrameMThumb.png deleted file mode 100644 index 91b368f4..00000000 Binary files a/img/frames/seventh/regular/seventhFrameMThumb.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameR.png b/img/frames/seventh/regular/seventhFrameR.png deleted file mode 100644 index 10fae618..00000000 Binary files a/img/frames/seventh/regular/seventhFrameR.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameRL.png b/img/frames/seventh/regular/seventhFrameRL.png deleted file mode 100644 index 5abe15f6..00000000 Binary files a/img/frames/seventh/regular/seventhFrameRL.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameRLThumb.png b/img/frames/seventh/regular/seventhFrameRLThumb.png deleted file mode 100644 index 8dc2588f..00000000 Binary files a/img/frames/seventh/regular/seventhFrameRLThumb.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameRThumb.png b/img/frames/seventh/regular/seventhFrameRThumb.png deleted file mode 100644 index 2f841405..00000000 Binary files a/img/frames/seventh/regular/seventhFrameRThumb.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameU.png b/img/frames/seventh/regular/seventhFrameU.png deleted file mode 100644 index 78a1039c..00000000 Binary files a/img/frames/seventh/regular/seventhFrameU.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameUL.png b/img/frames/seventh/regular/seventhFrameUL.png deleted file mode 100644 index 69ba154d..00000000 Binary files a/img/frames/seventh/regular/seventhFrameUL.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameULThumb.png b/img/frames/seventh/regular/seventhFrameULThumb.png deleted file mode 100644 index 24fed5df..00000000 Binary files a/img/frames/seventh/regular/seventhFrameULThumb.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameUThumb.png b/img/frames/seventh/regular/seventhFrameUThumb.png deleted file mode 100644 index f55350d4..00000000 Binary files a/img/frames/seventh/regular/seventhFrameUThumb.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameW.png b/img/frames/seventh/regular/seventhFrameW.png deleted file mode 100644 index 29a69872..00000000 Binary files a/img/frames/seventh/regular/seventhFrameW.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameWL.png b/img/frames/seventh/regular/seventhFrameWL.png deleted file mode 100644 index d71b0c8d..00000000 Binary files a/img/frames/seventh/regular/seventhFrameWL.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameWLThumb.png b/img/frames/seventh/regular/seventhFrameWLThumb.png deleted file mode 100644 index 57fb188b..00000000 Binary files a/img/frames/seventh/regular/seventhFrameWLThumb.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhFrameWThumb.png b/img/frames/seventh/regular/seventhFrameWThumb.png deleted file mode 100644 index d637ae1f..00000000 Binary files a/img/frames/seventh/regular/seventhFrameWThumb.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhMaskBorder.png b/img/frames/seventh/regular/seventhMaskBorder.png deleted file mode 100644 index ee74d92e..00000000 Binary files a/img/frames/seventh/regular/seventhMaskBorder.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhMaskBorderThumb.png b/img/frames/seventh/regular/seventhMaskBorderThumb.png deleted file mode 100644 index 41e18ff5..00000000 Binary files a/img/frames/seventh/regular/seventhMaskBorderThumb.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhMaskFrame.png b/img/frames/seventh/regular/seventhMaskFrame.png deleted file mode 100644 index a5acaed2..00000000 Binary files a/img/frames/seventh/regular/seventhMaskFrame.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhMaskFrameThumb.png b/img/frames/seventh/regular/seventhMaskFrameThumb.png deleted file mode 100644 index 881cfac0..00000000 Binary files a/img/frames/seventh/regular/seventhMaskFrameThumb.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhMaskPinline.png b/img/frames/seventh/regular/seventhMaskPinline.png deleted file mode 100644 index f7983f35..00000000 Binary files a/img/frames/seventh/regular/seventhMaskPinline.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhMaskPinlineThumb.png b/img/frames/seventh/regular/seventhMaskPinlineThumb.png deleted file mode 100644 index d2fd56e5..00000000 Binary files a/img/frames/seventh/regular/seventhMaskPinlineThumb.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhMaskRules.png b/img/frames/seventh/regular/seventhMaskRules.png deleted file mode 100644 index 632c0a17..00000000 Binary files a/img/frames/seventh/regular/seventhMaskRules.png and /dev/null differ diff --git a/img/frames/seventh/regular/seventhMaskRulesThumb.png b/img/frames/seventh/regular/seventhMaskRulesThumb.png deleted file mode 100644 index 79703645..00000000 Binary files a/img/frames/seventh/regular/seventhMaskRulesThumb.png and /dev/null differ diff --git a/img/frames/seventh/regular/u.png b/img/frames/seventh/regular/u.png new file mode 100644 index 00000000..20a7fe8f Binary files /dev/null and b/img/frames/seventh/regular/u.png differ diff --git a/img/frames/seventh/regular/uThumb.png b/img/frames/seventh/regular/uThumb.png new file mode 100644 index 00000000..f42fd085 Binary files /dev/null and b/img/frames/seventh/regular/uThumb.png differ diff --git a/img/frames/seventh/regular/ul.png b/img/frames/seventh/regular/ul.png new file mode 100644 index 00000000..256e80f7 Binary files /dev/null and b/img/frames/seventh/regular/ul.png differ diff --git a/img/frames/seventh/regular/ulThumb.png b/img/frames/seventh/regular/ulThumb.png new file mode 100644 index 00000000..2c34f4c8 Binary files /dev/null and b/img/frames/seventh/regular/ulThumb.png differ diff --git a/img/frames/seventh/regular/w.png b/img/frames/seventh/regular/w.png new file mode 100644 index 00000000..0d5190d5 Binary files /dev/null and b/img/frames/seventh/regular/w.png differ diff --git a/img/frames/seventh/regular/wThumb.png b/img/frames/seventh/regular/wThumb.png new file mode 100644 index 00000000..769db502 Binary files /dev/null and b/img/frames/seventh/regular/wThumb.png differ diff --git a/img/frames/seventh/regular/wl.png b/img/frames/seventh/regular/wl.png new file mode 100644 index 00000000..da480cdd Binary files /dev/null and b/img/frames/seventh/regular/wl.png differ diff --git a/img/frames/seventh/regular/wlThumb.png b/img/frames/seventh/regular/wlThumb.png new file mode 100644 index 00000000..9725f6ac Binary files /dev/null and b/img/frames/seventh/regular/wlThumb.png differ diff --git a/img/frames/seventh/seventhFoilStamp.png b/img/frames/seventh/seventhFoilStamp.png deleted file mode 100644 index dbee3ead..00000000 Binary files a/img/frames/seventh/seventhFoilStamp.png and /dev/null differ diff --git a/img/frames/seventh/seventhFoilStampThumb.png b/img/frames/seventh/seventhFoilStampThumb.png deleted file mode 100644 index d5f9c1c8..00000000 Binary files a/img/frames/seventh/seventhFoilStampThumb.png and /dev/null differ diff --git a/js/creator-22.js b/js/creator-22.js index f351bef1..adb40090 100644 --- a/js/creator-22.js +++ b/js/creator-22.js @@ -796,9 +796,9 @@ function writeText(textObject, targetContext) { paragraphContext.clearRect(0, 0, paragraphCanvas.width, paragraphCanvas.height); lineContext.clearRect(0, 0, lineCanvas.width, lineCanvas.height); lineCanvas.style.letterSpacing = textObject.kerning || '0px'; - if (textFont == 'goudymedieval') { - lineCanvas.style.letterSpacing = '3.5px'; - } + // if (textFont == 'goudymedieval') { + // lineCanvas.style.letterSpacing = '3.5px'; + // } lineContext.font = textFontStyle + textSize + 'px ' + textFont + textFontExtension; lineContext.fillStyle = textColor; lineContext.shadowColor = textShadowColor; diff --git a/js/frames/groupMisc-2.js b/js/frames/groupMisc-2.js index f107d556..125f8c38 100644 --- a/js/frames/groupMisc-2.js +++ b/js/frames/groupMisc-2.js @@ -1,5 +1,5 @@ loadFramePacks([ - {name:'Conspiracies (Draft Matters)', value:'Conspiracy'}, + {name:'Old', value:'disabled'}, {name:'Future Shifted', value:'FutureRegular'}, {name:'Seventh Edition', value:'Seventh'}, {name:'Fifth Edition', value:'SeventhButFifth'}, diff --git a/js/frames/packSeventh.js b/js/frames/packSeventh.js index 3a6cc616..6983c4cc 100644 --- a/js/frames/packSeventh.js +++ b/js/frames/packSeventh.js @@ -1,23 +1,22 @@ //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}; +var masks = [{src:'/img/frames/seventh/regular/pinline.svg', name:'Pinline'}, {src:'/img/frames/seventh/regular/rules.svg', name:'Rules'}, {src:'/img/frames/seventh/regular/frame.svg', name:'Frame'}, {src:'/img/frames/seventh/regular/border.svg', name:'Border'}]; +var borderMask = [{src:'/img/frames/seventh/regular/border.svg', name:'Border'}] //defines available frames availableFrames = [ - {name:'White Frame', src:'/img/frames/seventh/regular/seventhFrameW.png', masks:masks}, - {name:'Blue Frame', src:'/img/frames/seventh/regular/seventhFrameU.png', masks:masks}, - {name:'Black Frame', src:'/img/frames/seventh/regular/seventhFrameB.png', masks:masks}, - {name:'Red Frame', src:'/img/frames/seventh/regular/seventhFrameR.png', masks:masks}, - {name:'Green Frame', src:'/img/frames/seventh/regular/seventhFrameG.png', masks:masks}, - {name:'Multicolored Frame', src:'/img/frames/seventh/regular/seventhFrameM.png', masks:masks}, - {name:'Artifact Frame', src:'/img/frames/seventh/regular/seventhFrameA.png', masks:masks}, - {name:'Land Frame', src:'/img/frames/seventh/regular/seventhFrameCL.png', masks:masks}, - {name:'White Land Frame', src:'/img/frames/seventh/regular/seventhFrameWL.png', masks:masks}, - {name:'Blue Land Frame', src:'/img/frames/seventh/regular/seventhFrameUL.png', masks:masks}, - {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:'White Frame', src:'/img/frames/seventh/regular/w.png', masks:masks}, + {name:'Blue Frame', src:'/img/frames/seventh/regular/u.png', masks:masks}, + {name:'Black Frame', src:'/img/frames/seventh/regular/b.png', masks:masks}, + {name:'Red Frame', src:'/img/frames/seventh/regular/r.png', masks:masks}, + {name:'Green Frame', src:'/img/frames/seventh/regular/g.png', masks:masks}, + {name:'Multicolored Frame', src:'/img/frames/seventh/regular/m.png', masks:masks}, + {name:'Artifact Frame', src:'/img/frames/seventh/regular/a.png', masks:masks}, + {name:'Land Frame', src:'/img/frames/seventh/regular/l.png', masks:masks}, + {name:'White Land Frame', src:'/img/frames/seventh/regular/wl.png', masks:masks}, + {name:'Blue Land Frame', src:'/img/frames/seventh/regular/ul.png', masks:masks}, + {name:'Black Land Frame', src:'/img/frames/seventh/regular/bl.png', masks:masks}, + {name:'Red Land Frame', src:'/img/frames/seventh/regular/rl.png', masks:masks}, + {name:'Green Land Frame', src:'/img/frames/seventh/regular/gl.png', masks:masks}, + {name:'DCI Star', src:'/img/frames/seventh/foilStar.svg'}, {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} @@ -31,27 +30,27 @@ document.querySelector('#loadFrameVersion').onclick = async function() { //sets card version card.version = 'seventh'; //art bounds - card.artBounds = {x:0.117, y:0.0973, width:0.7662, height:0.4466}; + card.artBounds = {x:0.12, y:0.0991, width:0.76, height:0.4429}; autoFitArt(); //set symbol bounds - card.setSymbolBounds = {x:0.8914, y:0.5748, width:0.12, height:0.0381, vertical:'center', horizontal: 'right'}; + card.setSymbolBounds = {x:0.9, y:0.5739, width:0.12, height:0.0372, vertical:'center', horizontal: 'right'}; resetSetSymbol(); //watermark bounds card.watermarkBounds = {x:0.18, y:0.64, width:0.64, height:0.24}; resetWatermark(); //text loadTextOptions({ - mana: {name:'Mana Cost', text:'', x:0.108, y:0.0505, width:0.8147, height:72/2100, oneLine:true, size:72/1638, align:'right', manaCost:true, manaSpacing:0.0014}, - title: {name:'Title', text:'', x:0.108, y:0.0448, width:0.784, height:0.0405, oneLine:true, font:'goudymedieval', size:0.0405, color:'white', shadowX:0.002, shadowY:0.0015}, + mana: {name:'Mana Cost', text:'', x:0.1067, y:0.0539, width:0.8174, height:72/2100, oneLine:true, size:72/1638, align:'right', manaCost:true}, + title: {name:'Title', text:'', x:0.1134, y:0.0481, width:0.7734, height:0.041, oneLine:true, font:'goudymedieval', size:0.041, color:'white', shadowX:0.002, shadowY:0.0015}, type: {name:'Type', text:'', x:0.1074, y:0.5486, width:0.7852, height:0.0543, oneLine:true, size:0.032, color:'white', shadowX:0.002, shadowY:0.0015}, - rules: {name:'Rules Text', text:'', x:0.126, y:0.6074, width:0.748, height:0.2724, size:0.0362}, - pt: {name:'Power/Toughness', text:'', x:0.8, y:0.8981, width:0.1367, height:0.0453, size:0.0453, oneLine:true, align:'center', color:'white', shadowX:0.002, shadowY:0.0015} + rules: {name:'Rules Text', text:'', x:0.128, y:0.6067, width:0.744, height:0.2724, size:0.0358}, + pt: {name:'Power/Toughness', text:'', x:0.8074, y:0.9043, width:0.1367, height:0.0429, size:0.0429, oneLine:true, align:'center', color:'white', shadowX:0.002, shadowY:0.0015} }); //bottom info loadBottomInfo({ - top: {text:'Illus: {elemidinfo-artist}', x:0.0614, y:1883/2100, width:0.8774, height:0.0281, oneLine:true, size:0.0281, align:'center', shadowX:0.0014, shadowY:0.001, color:'white'}, - wizards: {name:'wizards', text:'\u2122 & \u00a9 ' + date.getFullYear() + ' Wizards of the Coast', x:0.0614, y:1942/2100, width:0.8774, height:0.0172, oneLine:true, size:0.0172, align:'center', shadowX:0.0014, shadowY:0.001, color:'white'}, - bottom: {text:'NOT FOR SALE CardConjurer.com', x:0.0614, y:1980/2100, width:0.8774, height:26/2100, oneLine:true, size:26/2100, align:'center', shadowX:0.0014, shadowY:0.001, color:'white'} + top: {text:'Illus: {elemidinfo-artist}', x:0.1, y:1872/2100, width:0.8, height:0.0267, oneLine:true, size:0.0267, align:'center', shadowX:0.0021, shadowY:0.0015, color:'white'}, + wizards: {name:'wizards', text:'\u2122 & \u00a9 ' + date.getFullYear() + ' Wizards of the Coast, Inc. {elemidinfo-number}', x:0.1, y:1933/2100, width:0.8, height:0.0172, oneLine:true, size:0.0172, align:'center', shadowX:0.0014, shadowY:0.001, color:'white'}, + bottom: {text:'NOT FOR SALE CardConjurer.com', x:0.1, y:1973/2100, width:0.8, height:26/2100, oneLine:true, size:26/2100, align:'center', shadowX:0.0014, shadowY:0.001, color:'white'} }); } //loads available frames diff --git a/js/frames/packSeventhButFifth.js b/js/frames/packSeventhButFifth.js index 69dcb4c5..ec26ebef 100644 --- a/js/frames/packSeventhButFifth.js +++ b/js/frames/packSeventhButFifth.js @@ -1,23 +1,22 @@ //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}; +var masks = [{src:'/img/frames/seventh/regular/pinline.svg', name:'Pinline'}, {src:'/img/frames/seventh/regular/rules.svg', name:'Rules'}, {src:'/img/frames/seventh/regular/frame.svg', name:'Frame'}, {src:'/img/frames/seventh/regular/border.svg', name:'Border'}]; +var borderMask = [{src:'/img/frames/seventh/regular/border.svg', name:'Border'}] //defines available frames availableFrames = [ - {name:'White Frame', src:'/img/frames/seventh/regular/seventhFrameW.png', masks:masks}, - {name:'Blue Frame', src:'/img/frames/seventh/regular/seventhFrameU.png', masks:masks}, - {name:'Black Frame', src:'/img/frames/seventh/regular/seventhFrameB.png', masks:masks}, - {name:'Red Frame', src:'/img/frames/seventh/regular/seventhFrameR.png', masks:masks}, - {name:'Green Frame', src:'/img/frames/seventh/regular/seventhFrameG.png', masks:masks}, - {name:'Multicolored Frame', src:'/img/frames/seventh/regular/seventhFrameM.png', masks:masks}, - {name:'Artifact Frame', src:'/img/frames/seventh/regular/seventhFrameA.png', masks:masks}, - {name:'Land Frame', src:'/img/frames/seventh/regular/seventhFrameCL.png', masks:masks}, - {name:'White Land Frame', src:'/img/frames/seventh/regular/seventhFrameWL.png', masks:masks}, - {name:'Blue Land Frame', src:'/img/frames/seventh/regular/seventhFrameUL.png', masks:masks}, - {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:'White Frame', src:'/img/frames/seventh/regular/w.png', masks:masks}, + {name:'Blue Frame', src:'/img/frames/seventh/regular/u.png', masks:masks}, + {name:'Black Frame', src:'/img/frames/seventh/regular/b.png', masks:masks}, + {name:'Red Frame', src:'/img/frames/seventh/regular/r.png', masks:masks}, + {name:'Green Frame', src:'/img/frames/seventh/regular/g.png', masks:masks}, + {name:'Multicolored Frame', src:'/img/frames/seventh/regular/m.png', masks:masks}, + {name:'Artifact Frame', src:'/img/frames/seventh/regular/a.png', masks:masks}, + {name:'Land Frame', src:'/img/frames/seventh/regular/l.png', masks:masks}, + {name:'White Land Frame', src:'/img/frames/seventh/regular/wl.png', masks:masks}, + {name:'Blue Land Frame', src:'/img/frames/seventh/regular/ul.png', masks:masks}, + {name:'Black Land Frame', src:'/img/frames/seventh/regular/bl.png', masks:masks}, + {name:'Red Land Frame', src:'/img/frames/seventh/regular/rl.png', masks:masks}, + {name:'Green Land Frame', src:'/img/frames/seventh/regular/gl.png', masks:masks}, + {name:'DCI Star', src:'/img/frames/seventh/foilStar.svg'}, {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} @@ -29,29 +28,29 @@ document.querySelector('#loadFrameVersion').onclick = async function() { //resets things so that every frame doesn't have to await resetCardIrregularities(); //sets card version - card.version = 'seventh'; + card.version = 'fifth'; //art bounds - card.artBounds = {x:0.117, y:0.0973, width:0.7662, height:0.4466}; + card.artBounds = {x:0.12, y:0.0991, width:0.76, height:0.4429}; autoFitArt(); //set symbol bounds - card.setSymbolBounds = {x:0.8914, y:0.5748, width:0.12, height:0.0381, vertical:'center', horizontal: 'right'}; + card.setSymbolBounds = {x:0.9, y:0.5739, width:0.12, height:0.0372, vertical:'center', horizontal: 'right'}; resetSetSymbol(); //watermark bounds card.watermarkBounds = {x:0.18, y:0.64, width:0.64, height:0.24}; resetWatermark(); //text loadTextOptions({ - mana: {name:'Mana Cost', text:'', x:0.108, y:0.0505, width:0.8147, height:72/2100, oneLine:true, size:72/1638, align:'right', manaCost:true, manaSpacing:0.0014}, - title: {name:'Title', text:'', x:0.108, y:0.0448, width:0.784, height:0.0405, oneLine:true, font:'goudymedieval', size:0.0405, color:'white', shadowX:0.002, shadowY:0.0015}, + mana: {name:'Mana Cost', text:'', x:0.1067, y:0.0539, width:0.8174, height:72/2100, oneLine:true, size:72/1638, align:'right', manaCost:true}, + title: {name:'Title', text:'', x:0.1134, y:0.0481, width:0.7734, height:0.041, oneLine:true, font:'goudymedieval', size:0.041, color:'white', shadowX:0.002, shadowY:0.0015}, type: {name:'Type', text:'', x:0.1074, y:0.5486, width:0.7852, height:0.0543, oneLine:true, size:0.032, color:'white', shadowX:0.002, shadowY:0.0015}, - rules: {name:'Rules Text', text:'', x:0.126, y:0.6074, width:0.748, height:0.2724, size:0.0362}, - pt: {name:'Power/Toughness', text:'', x:0.8, y:0.8981, width:0.1367, height:0.0453, size:0.0453, oneLine:true, align:'center', color:'white', shadowX:0.002, shadowY:0.0015} + rules: {name:'Rules Text', text:'', x:0.128, y:0.6067, width:0.744, height:0.2724, size:0.0358}, + pt: {name:'Power/Toughness', text:'', x:0.8074, y:0.9043, width:0.1367, height:0.0429, size:0.0429, oneLine:true, align:'center', color:'white', shadowX:0.002, shadowY:0.0015} }); //bottom info loadBottomInfo({ - top: {text:'Illus: {elemidinfo-artist}', x:0.1, y:1883/2100, width:0.8774, height:0.0281, oneLine:true, size:0.0281, shadowX:0.0014, shadowY:0.001, color:'white'}, - wizards: {name:'wizards', text:'\u2122 & \u00a9 ' + date.getFullYear() + ' Wizards of the Coast', x:0.1, y:1942/2100, width:0.8774, height:0.0172, oneLine:true, size:0.0172, shadowX:0.0014, shadowY:0.001, color:'white'}, - bottom: {text:'NOT FOR SALE CardConjurer.com', x:0.1, y:1980/2100, width:0.8774, height:26/2100, oneLine:true, size:26/2100, shadowX:0.0014, shadowY:0.001, color:'white'} + top: {text:'Illus: {elemidinfo-artist}', x:0.1, y:1872/2100, width:0.8, height:0.0267, oneLine:true, size:0.0267, shadowX:0.0021, shadowY:0.0015, color:'white'}, + wizards: {name:'wizards', text:'\u2122 & \u00a9 ' + date.getFullYear() + ' Wizards of the Coast, Inc. {elemidinfo-number}', x:0.1, y:1933/2100, width:0.8, height:0.0172, oneLine:true, size:0.0172, shadowX:0.0014, shadowY:0.001, color:'white'}, + bottom: {text:'NOT FOR SALE CardConjurer.com', x:0.1, y:1973/2100, width:0.8, height:26/2100, oneLine:true, size:26/2100, shadowX:0.0014, shadowY:0.001, color:'white'} }); } //loads available frames