diff --git a/css/style-9.css b/css/style-9.css index f1497f94..dde033ee 100644 --- a/css/style-9.css +++ b/css/style-9.css @@ -114,6 +114,16 @@ @font-face { font-family: specialelite; src: url('../fonts/SpecialElite-Regular.ttf') format('truetype'); + font-family: neosans; + src: url('../fonts/NeoSansProRegular.OTF') format('opentype'); +} +@font-face { + font-family: neosansitalic; + src: url('../fonts/NeoSansProItalic.OTF') format('opentype'); +} +@font-face { + font-family: ocra; + src: url('../fonts/OCR A Std Regular.ttf') format('truetype'); } /*Variables*/ :root { diff --git a/fonts/NeoSansProItalic.OTF b/fonts/NeoSansProItalic.OTF new file mode 100644 index 00000000..937f5f58 Binary files /dev/null and b/fonts/NeoSansProItalic.OTF differ diff --git a/fonts/NeoSansProRegular.OTF b/fonts/NeoSansProRegular.OTF new file mode 100644 index 00000000..c1c338ac Binary files /dev/null and b/fonts/NeoSansProRegular.OTF differ diff --git a/fonts/OCR A Std Regular.ttf b/fonts/OCR A Std Regular.ttf new file mode 100644 index 00000000..b6bdbc2e Binary files /dev/null and b/fonts/OCR A Std Regular.ttf differ diff --git a/img/frames/pipboy/a.png b/img/frames/pipboy/a.png new file mode 100644 index 00000000..8f4d714c Binary files /dev/null and b/img/frames/pipboy/a.png differ diff --git a/img/frames/pipboy/aThumb.png b/img/frames/pipboy/aThumb.png new file mode 100644 index 00000000..7d415104 Binary files /dev/null and b/img/frames/pipboy/aThumb.png differ diff --git a/img/frames/pipboy/b.png b/img/frames/pipboy/b.png new file mode 100644 index 00000000..3862b96c Binary files /dev/null and b/img/frames/pipboy/b.png differ diff --git a/img/frames/pipboy/bThumb.png b/img/frames/pipboy/bThumb.png new file mode 100644 index 00000000..219ea1f2 Binary files /dev/null and b/img/frames/pipboy/bThumb.png differ diff --git a/img/frames/pipboy/cover.png b/img/frames/pipboy/cover.png new file mode 100644 index 00000000..e5cea31c Binary files /dev/null and b/img/frames/pipboy/cover.png differ diff --git a/img/frames/pipboy/coverThumb.png b/img/frames/pipboy/coverThumb.png new file mode 100644 index 00000000..861d06cd Binary files /dev/null and b/img/frames/pipboy/coverThumb.png differ diff --git a/img/frames/pipboy/crown/a.png b/img/frames/pipboy/crown/a.png new file mode 100644 index 00000000..4d796746 Binary files /dev/null and b/img/frames/pipboy/crown/a.png differ diff --git a/img/frames/pipboy/crown/aThumb.png b/img/frames/pipboy/crown/aThumb.png new file mode 100644 index 00000000..36d38d73 Binary files /dev/null and b/img/frames/pipboy/crown/aThumb.png differ diff --git a/img/frames/pipboy/crown/b.png b/img/frames/pipboy/crown/b.png new file mode 100644 index 00000000..34bc16d4 Binary files /dev/null and b/img/frames/pipboy/crown/b.png differ diff --git a/img/frames/pipboy/crown/bThumb.png b/img/frames/pipboy/crown/bThumb.png new file mode 100644 index 00000000..a75f941a Binary files /dev/null and b/img/frames/pipboy/crown/bThumb.png differ diff --git a/img/frames/pipboy/crown/g.png b/img/frames/pipboy/crown/g.png new file mode 100644 index 00000000..3fbefaae Binary files /dev/null and b/img/frames/pipboy/crown/g.png differ diff --git a/img/frames/pipboy/crown/gThumb.png b/img/frames/pipboy/crown/gThumb.png new file mode 100644 index 00000000..616ab1cb Binary files /dev/null and b/img/frames/pipboy/crown/gThumb.png differ diff --git a/img/frames/pipboy/crown/m.png b/img/frames/pipboy/crown/m.png new file mode 100644 index 00000000..ab47967a Binary files /dev/null and b/img/frames/pipboy/crown/m.png differ diff --git a/img/frames/pipboy/crown/mThumb.png b/img/frames/pipboy/crown/mThumb.png new file mode 100644 index 00000000..00e7f7b3 Binary files /dev/null and b/img/frames/pipboy/crown/mThumb.png differ diff --git a/img/frames/pipboy/crown/r.png b/img/frames/pipboy/crown/r.png new file mode 100644 index 00000000..712b08d2 Binary files /dev/null and b/img/frames/pipboy/crown/r.png differ diff --git a/img/frames/pipboy/crown/rThumb.png b/img/frames/pipboy/crown/rThumb.png new file mode 100644 index 00000000..2676f14a Binary files /dev/null and b/img/frames/pipboy/crown/rThumb.png differ diff --git a/img/frames/pipboy/crown/u.png b/img/frames/pipboy/crown/u.png new file mode 100644 index 00000000..66be8cbe Binary files /dev/null and b/img/frames/pipboy/crown/u.png differ diff --git a/img/frames/pipboy/crown/uThumb.png b/img/frames/pipboy/crown/uThumb.png new file mode 100644 index 00000000..966de624 Binary files /dev/null and b/img/frames/pipboy/crown/uThumb.png differ diff --git a/img/frames/pipboy/crown/w.png b/img/frames/pipboy/crown/w.png new file mode 100644 index 00000000..29afc9e9 Binary files /dev/null and b/img/frames/pipboy/crown/w.png differ diff --git a/img/frames/pipboy/crown/wThumb.png b/img/frames/pipboy/crown/wThumb.png new file mode 100644 index 00000000..cb80eab5 Binary files /dev/null and b/img/frames/pipboy/crown/wThumb.png differ diff --git a/img/frames/pipboy/g.png b/img/frames/pipboy/g.png new file mode 100644 index 00000000..635a97d0 Binary files /dev/null and b/img/frames/pipboy/g.png differ diff --git a/img/frames/pipboy/gThumb.png b/img/frames/pipboy/gThumb.png new file mode 100644 index 00000000..d3efbeba Binary files /dev/null and b/img/frames/pipboy/gThumb.png differ diff --git a/img/frames/pipboy/m.png b/img/frames/pipboy/m.png new file mode 100644 index 00000000..44384681 Binary files /dev/null and b/img/frames/pipboy/m.png differ diff --git a/img/frames/pipboy/mThumb.png b/img/frames/pipboy/mThumb.png new file mode 100644 index 00000000..81d67aa6 Binary files /dev/null and b/img/frames/pipboy/mThumb.png differ diff --git a/img/frames/pipboy/maskRight.png b/img/frames/pipboy/maskRight.png new file mode 100644 index 00000000..ad6ce9b6 Binary files /dev/null and b/img/frames/pipboy/maskRight.png differ diff --git a/img/frames/pipboy/nickname.png b/img/frames/pipboy/nickname.png new file mode 100644 index 00000000..58982e98 Binary files /dev/null and b/img/frames/pipboy/nickname.png differ diff --git a/img/frames/pipboy/nicknameThumb.png b/img/frames/pipboy/nicknameThumb.png new file mode 100644 index 00000000..5e9c43ed Binary files /dev/null and b/img/frames/pipboy/nicknameThumb.png differ diff --git a/img/frames/pipboy/pt.png b/img/frames/pipboy/pt.png new file mode 100644 index 00000000..f0d6b9b5 Binary files /dev/null and b/img/frames/pipboy/pt.png differ diff --git a/img/frames/pipboy/ptThumb.png b/img/frames/pipboy/ptThumb.png new file mode 100644 index 00000000..5697dde5 Binary files /dev/null and b/img/frames/pipboy/ptThumb.png differ diff --git a/img/frames/pipboy/r.png b/img/frames/pipboy/r.png new file mode 100644 index 00000000..dc048ea4 Binary files /dev/null and b/img/frames/pipboy/r.png differ diff --git a/img/frames/pipboy/rThumb.png b/img/frames/pipboy/rThumb.png new file mode 100644 index 00000000..8bf52575 Binary files /dev/null and b/img/frames/pipboy/rThumb.png differ diff --git a/img/frames/pipboy/stamp.png b/img/frames/pipboy/stamp.png new file mode 100644 index 00000000..65cb2b2d Binary files /dev/null and b/img/frames/pipboy/stamp.png differ diff --git a/img/frames/pipboy/stampGray.png b/img/frames/pipboy/stampGray.png new file mode 100644 index 00000000..a30fa88d Binary files /dev/null and b/img/frames/pipboy/stampGray.png differ diff --git a/img/frames/pipboy/stampGrayThumb.png b/img/frames/pipboy/stampGrayThumb.png new file mode 100644 index 00000000..c7b7b9cd Binary files /dev/null and b/img/frames/pipboy/stampGrayThumb.png differ diff --git a/img/frames/pipboy/stampThumb.png b/img/frames/pipboy/stampThumb.png new file mode 100644 index 00000000..767e4eb4 Binary files /dev/null and b/img/frames/pipboy/stampThumb.png differ diff --git a/img/frames/pipboy/u.png b/img/frames/pipboy/u.png new file mode 100644 index 00000000..21ea1955 Binary files /dev/null and b/img/frames/pipboy/u.png differ diff --git a/img/frames/pipboy/uThumb.png b/img/frames/pipboy/uThumb.png new file mode 100644 index 00000000..cefe96b3 Binary files /dev/null and b/img/frames/pipboy/uThumb.png differ diff --git a/img/frames/pipboy/w.png b/img/frames/pipboy/w.png new file mode 100644 index 00000000..21c224cb Binary files /dev/null and b/img/frames/pipboy/w.png differ diff --git a/img/frames/pipboy/wThumb.png b/img/frames/pipboy/wThumb.png new file mode 100644 index 00000000..4a7d6786 Binary files /dev/null and b/img/frames/pipboy/wThumb.png differ diff --git a/js/creator-23.js b/js/creator-23.js index 073df398..1e5afb95 100644 --- a/js/creator-23.js +++ b/js/creator-23.js @@ -3538,7 +3538,7 @@ function writeText(textObject, targetContext) { } lineContext.drawImage(getManaSymbol(barImageName).image, canvasMargin + (textWidth - barWidth) / 2, canvasMargin + barDistance * textSize, barWidth, barHeight); } else if (possibleCode == 'i') { - if (textFont == 'gilllsans') { + if (textFont == 'gilllsans' || textFont == 'neosans') { textFontExtension = 'italic'; } else if (textFont == 'mplantin') { textFontExtension = 'i'; diff --git a/js/frameSearch.js b/js/frameSearch.js index 0bf45a53..f6b41952 100644 --- a/js/frameSearch.js +++ b/js/frameSearch.js @@ -38,6 +38,7 @@ const frameNames = new Map ([ //showcase ['Dossier (MKM)', 'Dossier'], ['Scrolls of Middle-earth (LTR)', 'Scroll'], + ['Pip-Boy (PIP)', 'Pipboy'], ['Enchanting Tales (WOT)', 'EnchantingTales'], ['TARDIS (WHO)', 'TARDIS'], ['Ring (LTR)', 'Ring'], diff --git a/js/frames/groupShowcase-5.js b/js/frames/groupShowcase-5.js index c341a504..80aef84c 100644 --- a/js/frames/groupShowcase-5.js +++ b/js/frames/groupShowcase-5.js @@ -1,5 +1,6 @@ loadFramePacks([ {name:'Set Showcase Frames (Chronological)', value:'disabled'}, + {name:'Pip-Boy (PIP)', value:'Pipboy'}, {name:'Dossier (MKM)', value:'Dossier'}, {name:'Scrolls of Middle-earth (LTR)', value:'Scroll'}, {name:'Enchanting Tales (WOT)', value:'EnchantingTales'}, diff --git a/js/frames/packPipboy.js b/js/frames/packPipboy.js new file mode 100644 index 00000000..c2a89844 --- /dev/null +++ b/js/frames/packPipboy.js @@ -0,0 +1,60 @@ +//Create objects for common properties across available frames +var masks = [{src:'/img/frames/m15/regular/m15MaskPinline.png', name:'Pinline'}, {src:'/img/frames/m15/regular/m15MaskTitle.png', name:'Title'}, {src:'/img/frames/m15/regular/m15MaskType.png', name:'Type'}, {src:'/img/frames/m15/regular/m15MaskRules.png', name:'Rules'}, {src:'/img/frames/m15/regular/m15MaskFrame.png', name:'Frame'}, {src:'/img/frames/m15/regular/m15MaskBorder.png', name:'Border'}]; +var bounds = {x:157/2010, y:362/2814, width:1697/2010, height:1152/2814}; +var crownBounds = {x:41/2010, y:39/2814, width:1794/2010, height:143/2814}; +//defines available frames +availableFrames = [ + {name:'White Frame', src:'/img/frames/pipboy/w.png'}, + {name:'Blue Frame', src:'/img/frames/pipboy/u.png'}, + {name:'Black Frame', src:'/img/frames/pipboy/b.png'}, + {name:'Red Frame', src:'/img/frames/pipboy/r.png'}, + {name:'Green Frame', src:'/img/frames/pipboy/g.png'}, + {name:'Multicolored Frame', src:'/img/frames/pipboy/m.png'}, + {name:'Artifact Frame', src:'/img/frames/pipboy/a.png'}, + + {name:'Power/Toughness Box', src: '/img/frames/pipboy/pt.png', bounds:{x:1515/2010, y:2034/2814, width:461/2010, height:639/2814}}, + + {name:'White Legend Crown', src:'/img/frames/pipboy/crown/w.png', bounds: crownBounds}, + {name:'Blue Legend Crown', src:'/img/frames/pipboy/crown/u.png', bounds: crownBounds}, + {name:'Black Legend Crown', src:'/img/frames/pipboy/crown/b.png', bounds: crownBounds}, + {name:'Red Legend Crown', src:'/img/frames/pipboy/crown/r.png', bounds: crownBounds}, + {name:'Green Legend Crown', src:'/img/frames/pipboy/crown/g.png', bounds: crownBounds}, + {name:'Multicolored Legend Crown', src:'/img/frames/pipboy/crown/m.png', bounds: crownBounds}, + {name:'Artifact Legend Crown', src:'/img/frames/pipboy/crown/a.png', bounds: crownBounds}, + + {name:'Gold Holo Stamp', src: '/img/frames/pipboy/stamp.png', bounds: {x:849/2010, y:2513/2814, width:312/2010, height: 188/2814}}, + {name:'Gray Holo Stamp', src: '/img/frames/pipboy/stampGray.png', bounds: {x:849/2010, y:2513/2814, width:312/2010, height: 188/2814}}, + + {name:'Nickname Overlay', src: '/img/frames/pipboy/nickname.png', complementary: 18}, + {name:'Screen Cover', src: '/img/frames/pipboy/cover.png', erase: true} +]; +//disables/enables the "Load Frame Version" button +document.querySelector('#loadFrameVersion').disabled = false; +//defines process for loading this version, if applicable +document.querySelector('#loadFrameVersion').onclick = async function() { + //resets things so that every frame doesn't have to + await resetCardIrregularities(); + replacementMasks = {'Right Half':'/img/frames/pipboy/maskRight.png'}; + //sets card version + card.version = 'pipboy'; + //art bounds + card.artBounds = bounds; + autoFitArt(); + //set symbol bounds + card.setSymbolBounds = {x:0.9213, y:0.5910, width:0.12, height:0.0410, vertical:'center', horizontal: 'right'}; + resetSetSymbol(); + //watermark bounds + card.watermarkBounds = {x:0.5, y:0.7762, width:0.75, height:0.2305}; + resetWatermark(); + //text + loadTextOptions({ + mana: {name:'Mana Cost', text:'', y:0.0613, width:0.9292, height:71/2100, oneLine:true, size:71/1638, align:'right', shadowX:-0.001, shadowY:0.0029, manaCost:true, manaSpacing:0}, + title: {name:'Title', text:'', x:0.0854, y:0.0522, width:0.8292, height:0.0543, oneLine:true, font:'ocra', size:89/2814, kerning:-0.0074, color:'white'}, + nickname: {name:'Nickname', text:'', x:0.14, y:335/2814, width:0.72, height:50/2814, oneLine:true, font:'neosansitalic', size:61/2814, color:'white', align:'center'}, + type: {name:'Type', text:'', x:0.0854, y:0.5664, width:0.8292, height:0.0543, oneLine:true, font:'neosans', size:82/2814, color:'white'}, + rules: {name:'Rules Text', text:'', x:207/2010, y:1815/2814, width:1596/2010, height:729/2814, size:76/2814, font:'neosans', color:'white'}, + pt: {name:'Power/Toughness', text:'', x:0.7928, y:0.902, width:0.1367, height:0.0372, size:0.0372, font:'ocra', oneLine:true, align:'center', color:'white'} + }); +} +//loads available frames +loadFramePack(); \ No newline at end of file