diff --git a/img/frames/dndModule/a.svg b/img/frames/dndModule/a.svg new file mode 100644 index 00000000..4560a9ba --- /dev/null +++ b/img/frames/dndModule/a.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/frames/dndModule/aThumb.png b/img/frames/dndModule/aThumb.png new file mode 100644 index 00000000..612095f6 Binary files /dev/null and b/img/frames/dndModule/aThumb.png differ diff --git a/img/frames/dndModule/m.svg b/img/frames/dndModule/m.svg new file mode 100644 index 00000000..651be93f --- /dev/null +++ b/img/frames/dndModule/m.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/frames/dndModule/mThumb.png b/img/frames/dndModule/mThumb.png new file mode 100644 index 00000000..1f191019 Binary files /dev/null and b/img/frames/dndModule/mThumb.png differ diff --git a/img/frames/dndModule/margin/a.svg b/img/frames/dndModule/margin/a.svg new file mode 100644 index 00000000..825771c6 --- /dev/null +++ b/img/frames/dndModule/margin/a.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/frames/dndModule/margin/aThumb.png b/img/frames/dndModule/margin/aThumb.png new file mode 100644 index 00000000..9373815c Binary files /dev/null and b/img/frames/dndModule/margin/aThumb.png differ diff --git a/img/frames/dndModule/margin/b.svg b/img/frames/dndModule/margin/b.svg new file mode 100644 index 00000000..50193048 --- /dev/null +++ b/img/frames/dndModule/margin/b.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/frames/dndModule/margin/bThumb.png b/img/frames/dndModule/margin/bThumb.png new file mode 100644 index 00000000..ab970b7b Binary files /dev/null and b/img/frames/dndModule/margin/bThumb.png differ diff --git a/img/frames/dndModule/margin/c.svg b/img/frames/dndModule/margin/c.svg new file mode 100644 index 00000000..b5479af4 --- /dev/null +++ b/img/frames/dndModule/margin/c.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/frames/dndModule/margin/cThumb.png b/img/frames/dndModule/margin/cThumb.png new file mode 100644 index 00000000..8a714eb8 Binary files /dev/null and b/img/frames/dndModule/margin/cThumb.png differ diff --git a/img/frames/dndModule/margin/g.svg b/img/frames/dndModule/margin/g.svg new file mode 100644 index 00000000..a3786aac --- /dev/null +++ b/img/frames/dndModule/margin/g.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/frames/dndModule/margin/gThumb.png b/img/frames/dndModule/margin/gThumb.png new file mode 100644 index 00000000..3c92be74 Binary files /dev/null and b/img/frames/dndModule/margin/gThumb.png differ diff --git a/img/frames/dndModule/margin/m.svg b/img/frames/dndModule/margin/m.svg new file mode 100644 index 00000000..88a20126 --- /dev/null +++ b/img/frames/dndModule/margin/m.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/frames/dndModule/margin/mThumb.png b/img/frames/dndModule/margin/mThumb.png new file mode 100644 index 00000000..c305d8b6 Binary files /dev/null and b/img/frames/dndModule/margin/mThumb.png differ diff --git a/img/frames/dndModule/margin/r.svg b/img/frames/dndModule/margin/r.svg new file mode 100644 index 00000000..07b0c8dd --- /dev/null +++ b/img/frames/dndModule/margin/r.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/frames/dndModule/margin/rThumb.png b/img/frames/dndModule/margin/rThumb.png new file mode 100644 index 00000000..60c79556 Binary files /dev/null and b/img/frames/dndModule/margin/rThumb.png differ diff --git a/img/frames/dndModule/margin/u.svg b/img/frames/dndModule/margin/u.svg new file mode 100644 index 00000000..4d3ba169 --- /dev/null +++ b/img/frames/dndModule/margin/u.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/frames/dndModule/margin/uThumb.png b/img/frames/dndModule/margin/uThumb.png new file mode 100644 index 00000000..fc214b11 Binary files /dev/null and b/img/frames/dndModule/margin/uThumb.png differ diff --git a/img/frames/dndModule/margin/w.svg b/img/frames/dndModule/margin/w.svg new file mode 100644 index 00000000..4458bd4e --- /dev/null +++ b/img/frames/dndModule/margin/w.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/frames/dndModule/margin/wThumb.png b/img/frames/dndModule/margin/wThumb.png new file mode 100644 index 00000000..36fbba2d Binary files /dev/null and b/img/frames/dndModule/margin/wThumb.png differ diff --git a/js/creator-21.js b/js/creator-21.js index ef952aa5..c36695e1 100644 --- a/js/creator-21.js +++ b/js/creator-21.js @@ -686,7 +686,7 @@ function writeText(textObject, targetContext) { var splitString = '6GJt7eL8'; var rawText = textObject.text if (params.get('copyright') != null && textObject.name == 'wizards' && card.margins) { - rawText = params.get('copyright'); //so people using CC for custom card games can customize their copyright info + rawText = params.get('copyright'); //so people using CC for custom card games without WotC's IP can customize their copyright info } var splitText = rawText.replace(/\n/g, '{line}').replace(/{flavor}/g, '{lns}{bar}{lns}{fixtextalign}{i}').replace(/{/g, splitString + '{').replace(/}/g, '}' + splitString).replace(/ /g, splitString + ' ' + splitString).split(splitString); splitText = splitText.filter(item => item); @@ -1482,10 +1482,12 @@ function importCard(cardObject) { importIndex.innerHTML = null; var optionIndex = 0; cardObject.forEach(card => { - var option = document.createElement('option'); - option.innerHTML = `${card.name} (${card.type_line})`; - option.value = optionIndex; - importIndex.appendChild(option); + if (card.type_line != 'Card') { + var option = document.createElement('option'); + option.innerHTML = `${card.name} (${card.type_line})`; + option.value = optionIndex; + importIndex.appendChild(option); + } optionIndex ++; }); changeCardIndex(); diff --git a/js/frames/groupMargin.js b/js/frames/groupMargin.js index a8385c79..424a596f 100644 --- a/js/frames/groupMargin.js +++ b/js/frames/groupMargin.js @@ -1,5 +1,6 @@ loadFramePacks([ {name:'Generic Margins', value:'Margin-1'}, + {name:'D&D Module Margin', value:'MarginDNDModule'}, {name:'Mystical Archive Margin', value:'MarginMysticalArchive'}, {name:'Unstable Basics Margin', value:'MarginUnstable'} ]) diff --git a/js/frames/packDNDModule.js b/js/frames/packDNDModule.js index e11caae2..ab37868e 100644 --- a/js/frames/packDNDModule.js +++ b/js/frames/packDNDModule.js @@ -5,6 +5,8 @@ availableFrames = [ {name:'Black Frame', src:'/img/frames/dndModule/b.svg'}, {name:'Red Frame', src:'/img/frames/dndModule/r.svg'}, {name:'Green Frame', src:'/img/frames/dndModule/g.svg'}, + {name:'Multicolored Frame', src:'/img/frames/dndModule/m.svg'}, + {name:'Artifact Frame', src:'/img/frames/dndModule/a.svg'}, {name:'Colorless Frame', src:'/img/frames/dndModule/c.svg'} ]; //disables/enables the "Load Frame Version" button diff --git a/js/frames/packMarginDNDModule.js b/js/frames/packMarginDNDModule.js new file mode 100644 index 00000000..ceb491bf --- /dev/null +++ b/js/frames/packMarginDNDModule.js @@ -0,0 +1,20 @@ +//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}; +//defines available frames +availableFrames = [ + {name:'White Extension', src:'/img/frames/dndModule/margin/w.svg', bounds:bounds, ogBounds:ogBounds}, + {name:'Blue Extension', src:'/img/frames/dndModule/margin/u.svg', bounds:bounds, ogBounds:ogBounds}, + {name:'Black Extension', src:'/img/frames/dndModule/margin/b.svg', bounds:bounds, ogBounds:ogBounds}, + {name:'Red Extension', src:'/img/frames/dndModule/margin/r.svg', bounds:bounds, ogBounds:ogBounds}, + {name:'Green Extension', src:'/img/frames/dndModule/margin/g.svg', bounds:bounds, ogBounds:ogBounds}, + {name:'Multicolored Extension', src:'/img/frames/dndModule/margin/m.svg', bounds:bounds, ogBounds:ogBounds}, + {name:'Artifact Extension', src:'/img/frames/dndModule/margin/a.svg', bounds:bounds, ogBounds:ogBounds}, + {name:'Colorless Extension', src:'/img/frames/dndModule/margin/c.svg', bounds:bounds, ogBounds:ogBounds} +]; +//disables/enables the "Load Frame Version" button +document.querySelector('#loadFrameVersion').disabled = false; +//defines process for loading this version, if applicable +document.querySelector('#loadFrameVersion').onclick = loadMarginVersion; +//loads available frames +loadFramePack(); \ No newline at end of file