diff --git a/creator/index.php b/creator/index.php index 4c81c0a3..504e2f46 100644 --- a/creator/index.php +++ b/creator/index.php @@ -470,5 +470,5 @@ include('../globalHTML/header-1.php'); - + \ No newline at end of file diff --git a/css/style-8.css b/css/style-8.css index 194ba38c..056dcb69 100644 --- a/css/style-8.css +++ b/css/style-8.css @@ -61,12 +61,20 @@ } @font-face { font-family: japanese-title; - src: url("/fonts/NfMotoyaAporoStd-W1.otf"); + src: url("/fonts/NudMotoyaExAporo_W6.ttf"); } @font-face { font-family: japanese; src: url('/fonts/2012c863631ba71f874aba70590795a1.otf'); } +@font-face { + font-family: invocation; + src: url('/fonts/invocation.ttf'); +} +@font-face { + font-family: invocation-text; + src: url('/fonts/shango-gothic-bold.ttf'); +} /*Variables*/ :root { --site-background: url('/img/lowpolyBackground.svg'); diff --git a/fonts/Invocation.ttf b/fonts/Invocation.ttf new file mode 100644 index 00000000..8e5cb0f2 Binary files /dev/null and b/fonts/Invocation.ttf differ diff --git a/fonts/NfMotoyaAporoStd-W1.otf b/fonts/NfMotoyaAporoStd-W1.otf deleted file mode 100644 index ff4554d0..00000000 Binary files a/fonts/NfMotoyaAporoStd-W1.otf and /dev/null differ diff --git a/fonts/NudMotoyaExAporo_W6.ttf b/fonts/NudMotoyaExAporo_W6.ttf new file mode 100644 index 00000000..977ab751 Binary files /dev/null and b/fonts/NudMotoyaExAporo_W6.ttf differ diff --git a/fonts/shango-gothic-bold.ttf b/fonts/shango-gothic-bold.ttf new file mode 100644 index 00000000..4146cdda Binary files /dev/null and b/fonts/shango-gothic-bold.ttf differ diff --git a/js/creator-15.js b/js/creator-16.js similarity index 100% rename from js/creator-15.js rename to js/creator-16.js diff --git a/js/frames/packInvocation.js b/js/frames/packInvocation.js index 442a36ce..63a8b585 100644 --- a/js/frames/packInvocation.js +++ b/js/frames/packInvocation.js @@ -1,6 +1,6 @@ //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:0.7573, y:0.8848, width:0.188, height:0.0733}; +var bounds = {x:0.8587, y:0.8186, width:0.062, height:0.1258}; //defines available frames availableFrames = [ {name:'White Frame', src:'/img/frames/invocation/W.png'}, @@ -10,7 +10,7 @@ availableFrames = [ {name:'Green Frame', src:'/img/frames/invocation/G.png'}, {name:'Multicolored Frame', src:'/img/frames/invocation/M.png'}, {name:'Artifact Frame', src:'/img/frames/invocation/A.png'}, - {name:'Power/Toughness', src:'/img/frames/m15/regular/m15PTW.png', bounds:bounds}, + {name:'Power/Toughness', src:'/img/frames/invocation/pt.png', bounds:bounds}, ]; //disables/enables the "Load Frame Version" button document.querySelector('#loadFrameVersion').disabled = false; @@ -21,10 +21,10 @@ document.querySelector('#loadFrameVersion').onclick = async function() { //sets card version card.version = 'invocation'; //art bounds - card.artBounds = {x:0.0767, y:0.1129, width:0.8476, height:0.4429}; + card.artBounds = {x:0, y:0.1067, width:1, height:0.4386}; autoFitArt(); //set symbol bounds - card.setSymbolBounds = {x:0.9213, y:0.5910, width:0.12, height:0.0410, vertical:'center', horizontal: 'right'}; + card.setSymbolBounds = {x:0.8954, y:0.5910, width:0.12, height:0.0410, vertical:'center', horizontal: 'center'}; resetSetSymbol(); //watermark bounds card.watermarkBounds = {x:0.5, y:0.7762, width:0.75, height:0.2305}; @@ -32,10 +32,10 @@ document.querySelector('#loadFrameVersion').onclick = async function() { //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:'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.086, y:0.6303, width:0.828, height:0.2875, size:0.0362}, - pt: {name:'Power/Toughness', text:'', x:0.7928, y:0.902, width:0.1367, height:0.0372, size:0.0372, font:'belerenbsc', oneLine:true, align:'center'} + title: {name:'Title', text:'', x:0.0727, y:0.05, width:0.8547, height:0.0515, oneLine:true, font:'invocation', size:0.0515}, + type: {name:'Type', text:'', x:0.0767, y:0.5672, width:0.7334, height:0.0496, oneLine:true, font:'invocation', size:0.0496, align:'center'}, + rules: {name:'Rules Text', text:'', x:0.086, y:0.6334, width:0.828, height:0.2429, size:0.0334, font:'invocation-text', align:'center'}, + pt: {name:'Power/Toughness', text:'', x:0.8707, y:0.8315, width:0.0387, height:0.0929, size:0.0372, font:'belerenbsc', align:'center'} }); } //loads available frames