diff --git a/img/frames/adventure/regular/book.svg b/img/frames/adventure/regular/book.svg new file mode 100644 index 00000000..0f716500 --- /dev/null +++ b/img/frames/adventure/regular/book.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/img/frames/adventure/regular/bookThumb.png b/img/frames/adventure/regular/bookThumb.png new file mode 100644 index 00000000..d5b7e116 Binary files /dev/null and b/img/frames/adventure/regular/bookThumb.png differ diff --git a/js/creator-22.js b/js/creator-22.js index f36f63b8..a6c5743c 100644 --- a/js/creator-22.js +++ b/js/creator-22.js @@ -758,6 +758,7 @@ function writeText(textObject, targetContext) { var textFontStyle = textObject.fontStyle || ''; var manaPlacementCounter = 0; var realTextAlign = textAlign; + savedRollYPosition = null; //variables that track various... things? var newLineSpacing = 0; var textSize = startingTextSize; @@ -1012,8 +1013,8 @@ function writeText(textObject, targetContext) { paragraphContext.drawImage(lineCanvas, horizontalAdjust, currentY); lineY = 0; lineContext.clearRect(0, 0, lineCanvas.width, lineCanvas.height); - //boxes for roll a d20 cards - if (savedRollYPosition && (newLineSpacing != 0 || !(newLine && !textOneLine))) { + // boxes for 'roll a d20' cards + if (savedRollYPosition != null && (newLineSpacing != 0 || !(newLine && !textOneLine))) { if (savedRollYPosition != -1) { paragraphContext.globalCompositeOperation = 'destination-over'; paragraphContext.globalAlpha = 0.25; diff --git a/js/frames/packAdventure.js b/js/frames/packAdventure.js index 7bb85224..040820cd 100644 --- a/js/frames/packAdventure.js +++ b/js/frames/packAdventure.js @@ -1,16 +1,16 @@ //Create objects for common properties across available frames -var masks = [{src:'/img/frames/adventure/regular/pinline.svg', name:'Pinline'}, {src:'/img/frames/m15/regular/m15MaskTitle.png', name:'Title'}, {src:'/img/frames/m15/regular/m15MaskType.png', name:'Type'}]; +var masks = [{src:'/img/frames/adventure/regular/pinline.svg', name:'Pinline'}, {src:'/img/frames/m15/regular/m15MaskTitle.png', name:'Title'}, {src:'/img/frames/m15/regular/m15MaskType.png', name:'Type'}, {src:'/img/frames/adventure/regular/book.svg', name:'Rules'}]; var bounds = {x:0.7573, y:0.8848, width:0.188, height:0.0733}; //defines available frames availableFrames = [ - {name:'White Frame', src:'/img/frames/adventure/regular/w.png'}, - {name:'Blue Frame', src:'/img/frames/adventure/regular/u.png'}, - {name:'Black Frame', src:'/img/frames/adventure/regular/b.png'}, - {name:'Red Frame', src:'/img/frames/adventure/regular/r.png'}, - {name:'Green Frame', src:'/img/frames/adventure/regular/g.png'}, - {name:'Multicolored Frame', src:'/img/frames/adventure/regular/m.png'}, - {name:'Artifact Frame', src:'/img/frames/adventure/regular/a.png'}, - {name:'Land Frame', src:'/img/frames/adventure/regular/l.png'}, + {name:'White Frame', src:'/img/frames/adventure/regular/w.png', masks:masks}, + {name:'Blue Frame', src:'/img/frames/adventure/regular/u.png', masks:masks}, + {name:'Black Frame', src:'/img/frames/adventure/regular/b.png', masks:masks}, + {name:'Red Frame', src:'/img/frames/adventure/regular/r.png', masks:masks}, + {name:'Green Frame', src:'/img/frames/adventure/regular/g.png', masks:masks}, + {name:'Multicolored Frame', src:'/img/frames/adventure/regular/m.png', masks:masks}, + {name:'Artifact Frame', src:'/img/frames/adventure/regular/a.png', masks:masks}, + {name:'Land Frame', src:'/img/frames/adventure/regular/l.png', masks:masks}, {name:'White Power/Toughness', src:'/img/frames/m15/regular/m15PTW.png', bounds:bounds}, {name:'Blue Power/Toughness', src:'/img/frames/m15/regular/m15PTU.png', bounds:bounds}, {name:'Black Power/Toughness', src:'/img/frames/m15/regular/m15PTB.png', bounds:bounds},