diff --git a/creator/index.php b/creator/index.php
index c63d625f..bb898516 100644
--- a/creator/index.php
+++ b/creator/index.php
@@ -86,16 +86,16 @@ include('../globalHTML/header-1.php');
-
+
\ No newline at end of file
diff --git a/img/force.jpg b/img/force.jpg
deleted file mode 100644
index 9319a4a5..00000000
Binary files a/img/force.jpg and /dev/null differ
diff --git a/img/frames/cornerCutoutThumb.png b/img/frames/cornerCutoutThumb.png
new file mode 100644
index 00000000..8a9a15e7
Binary files /dev/null and b/img/frames/cornerCutoutThumb.png differ
diff --git a/img/frames/delete.png b/img/frames/delete.png
deleted file mode 100644
index 67292adb..00000000
Binary files a/img/frames/delete.png and /dev/null differ
diff --git a/img/frames/goldThumb.png b/img/frames/goldThumb.png
new file mode 100644
index 00000000..e159b818
Binary files /dev/null and b/img/frames/goldThumb.png differ
diff --git a/img/frames/m15/m15MaskBorderSliverCrownThumb.png b/img/frames/m15/m15MaskBorderSliverCrownThumb.png
index 4e715af7..15458d0c 100644
Binary files a/img/frames/m15/m15MaskBorderSliverCrownThumb.png and b/img/frames/m15/m15MaskBorderSliverCrownThumb.png differ
diff --git a/img/frames/m15/m15MaskBorderSliverThumb.png b/img/frames/m15/m15MaskBorderSliverThumb.png
index 7d7217a3..5de3c683 100644
Binary files a/img/frames/m15/m15MaskBorderSliverThumb.png and b/img/frames/m15/m15MaskBorderSliverThumb.png differ
diff --git a/img/frames/maskMiddleThirdThumb.png b/img/frames/maskMiddleThirdThumb.png
new file mode 100644
index 00000000..441fc9e7
Binary files /dev/null and b/img/frames/maskMiddleThirdThumb.png differ
diff --git a/img/frames/maskRightHalfThumb.png b/img/frames/maskRightHalfThumb.png
new file mode 100644
index 00000000..8faaf11f
Binary files /dev/null and b/img/frames/maskRightHalfThumb.png differ
diff --git a/img/frames/silverThumb.png b/img/frames/silverThumb.png
new file mode 100644
index 00000000..211203a9
Binary files /dev/null and b/img/frames/silverThumb.png differ
diff --git a/img/frames/whiteThumb.png b/img/frames/whiteThumb.png
new file mode 100644
index 00000000..57e8279a
Binary files /dev/null and b/img/frames/whiteThumb.png differ
diff --git a/js/creator-8.js b/js/creator-9.js
similarity index 98%
rename from js/creator-8.js
rename to js/creator-9.js
index 6d47fb42..758f2417 100644
--- a/js/creator-8.js
+++ b/js/creator-9.js
@@ -331,8 +331,11 @@ function frameOptionClicked(event) {
}
clickedFrameOption.classList.add('selected');
selectedFrameIndex = getElementIndex(clickedFrameOption);
- document.querySelector('#mask-picker').innerHTML = '
No Mask
';
- selectedMaskIndex = 0;
+ if (!availableFrames[selectedFrameIndex].noDefaultMask) {
+ document.querySelector('#mask-picker').innerHTML = '
No Mask
';
+ } else {
+ document.querySelector('#mask-picker').innerHTML = '';
+ }
document.querySelector('#selectedPreview').innerHTML = '(Selected: ' + availableFrames[selectedFrameIndex].name + ', No Mask)';
if (availableFrames[selectedFrameIndex].masks) {
availableFrames[selectedFrameIndex].masks.forEach(item => {
@@ -351,10 +354,13 @@ function frameOptionClicked(event) {
document.querySelector('#mask-picker').appendChild(maskOption);
});
}
+ var firstChild = document.querySelector('#mask-picker').firstChild;
+ firstChild.classList.add('selected');
+ firstChild.click();
}
function maskOptionClicked(event) {
var clickedMaskOption = event.target.closest('.mask-option');
- document.querySelector('.mask-option.selected').classList.remove('selected');
+ (document.querySelector('.mask-option.selected').classList || document.querySelector('body').classList).remove('selected');
clickedMaskOption.classList.add('selected');
selectedMaskIndex = getElementIndex(clickedMaskOption);
var selectedMaskName = 'No Mask'
@@ -365,8 +371,10 @@ function addFrame(additionalMasks = [], loadingFrame = false) {
var frameToAdd = JSON.parse(JSON.stringify(availableFrames[selectedFrameIndex]));
var maskThumbnail = true;
if (!loadingFrame) {
- if (frameToAdd.masks && selectedMaskIndex > 0) {
- frameToAdd.masks = frameToAdd.masks.slice(selectedMaskIndex - 1, selectedMaskIndex);
+ var noDefaultMask = 0;
+ if (frameToAdd.noDefaultMask) {noDefaultMask = 1;}
+ if (frameToAdd.masks && selectedMaskIndex + noDefaultMask > 0) {
+ frameToAdd.masks = frameToAdd.masks.slice(selectedMaskIndex - 1 + noDefaultMask, selectedMaskIndex + noDefaultMask);
} else {
frameToAdd.masks = [];
maskThumbnail = false;
@@ -1398,5 +1406,5 @@ if (!localStorage.getItem('autoLoadFrameVersion')) {
}
document.querySelector('#autoLoadFrameVersion').checked = 'true' == localStorage.getItem('autoLoadFrameVersion');
document.querySelector('#info-number').value = date.getFullYear();
-loadScript('/js/frames/groupStandard-2.js');
+loadScript('/js/frames/groupStandard-3.js');
loadAvailableCards();
diff --git a/js/frames/groupModal.js b/js/frames/groupModal-1.js
similarity index 78%
rename from js/frames/groupModal.js
rename to js/frames/groupModal-1.js
index eac81e9f..c0e54bd9 100644
--- a/js/frames/groupModal.js
+++ b/js/frames/groupModal-1.js
@@ -6,5 +6,6 @@ loadFramePacks([
{name:'Floating Legend Crowns', value:'M15LegendCrownsFloating'},
{name:'Inner Crowns', value:'M15InnerCrowns'},
{name:'Holo Stamps', value:'M15HoloStamps'},
- {name:'Dark Power/Toughness', value:'M15DarkPT'}
+ {name:'Dark Power/Toughness', value:'M15DarkPT'},
+ {name:'Colored Borders', value:'M15Borders'}
])
\ No newline at end of file
diff --git a/js/frames/groupPromo.js b/js/frames/groupPromo-1.js
similarity index 78%
rename from js/frames/groupPromo.js
rename to js/frames/groupPromo-1.js
index 79f900f4..ee7d41c2 100644
--- a/js/frames/groupPromo.js
+++ b/js/frames/groupPromo-1.js
@@ -6,5 +6,6 @@ loadFramePacks([
{name:'Floating Legend Crowns', value:'M15LegendCrownsFloating'},
{name:'Inner Crowns', value:'M15InnerCrowns'},
{name:'Holo Stamps', value:'M15HoloStamps'},
- {name:'Dark Power/Toughness', value:'M15DarkPT'}
+ {name:'Dark Power/Toughness', value:'M15DarkPT'},
+ {name:'Colored Borders', value:'M15Borders'}
])
\ No newline at end of file
diff --git a/js/frames/groupSaga.js b/js/frames/groupSaga-1.js
similarity index 78%
rename from js/frames/groupSaga.js
rename to js/frames/groupSaga-1.js
index f36ae9d1..b8843ca4 100644
--- a/js/frames/groupSaga.js
+++ b/js/frames/groupSaga-1.js
@@ -3,6 +3,7 @@ loadFramePacks([
{name:'Addons', value:'disabled'},
{name:'Legend Crowns', value:'M15LegendCrowns'},
{name:'Inner Crowns', value:'M15InnerCrowns'},
- {name:'Holo Stamps', value:'M15HoloStamps'}
+ {name:'Holo Stamps', value:'M15HoloStamps'},
+ {name:'Colored Borders', value:'M15Borders'}
])
notify('When you load the Saga frame version, a "Saga" tab will appear. This tab controls the placement and chapter counts for Saga chapters.')
\ No newline at end of file
diff --git a/js/frames/groupShowcase-2.js b/js/frames/groupShowcase-3.js
similarity index 90%
rename from js/frames/groupShowcase-2.js
rename to js/frames/groupShowcase-3.js
index 1c90cb2a..d3eb64a2 100644
--- a/js/frames/groupShowcase-2.js
+++ b/js/frames/groupShowcase-3.js
@@ -19,5 +19,6 @@ loadFramePacks([
{name:'Floating Legend Crowns', value:'M15LegendCrownsFloating'},
{name:'Inner Crowns', value:'M15InnerCrowns'},
{name:'Holo Stamps', value:'M15HoloStamps'},
- {name:'Dark Power/Toughness', value:'M15DarkPT'}
+ {name:'Dark Power/Toughness', value:'M15DarkPT'},
+ {name:'Colored Borders', value:'M15Borders'}
])
\ No newline at end of file
diff --git a/js/frames/groupStandard-2.js b/js/frames/groupStandard-3.js
similarity index 93%
rename from js/frames/groupStandard-2.js
rename to js/frames/groupStandard-3.js
index 47b69fcd..642f7145 100644
--- a/js/frames/groupStandard-2.js
+++ b/js/frames/groupStandard-3.js
@@ -6,6 +6,7 @@ loadFramePacks([
{name:'Inner Crowns', value:'M15InnerCrowns'},
{name:'Holo Stamps', value:'M15HoloStamps'},
{name:'Dark Power/Toughness', value:'M15DarkPT'},
+ {name:'Colored Borders', value:'M15Borders'},
{name:'Other Frames', value:'disabled'},
{name:'Lands', value:'M15Lands'},
{name:'Snow', value:'M15Snow'},
diff --git a/js/frames/groupTextless-2.js b/js/frames/groupTextless-3.js
similarity index 85%
rename from js/frames/groupTextless-2.js
rename to js/frames/groupTextless-3.js
index a8c8d18c..f81185bb 100644
--- a/js/frames/groupTextless-2.js
+++ b/js/frames/groupTextless-3.js
@@ -10,5 +10,6 @@ loadFramePacks([
{name:'Floating Legend Crowns', value:'M15LegendCrownsFloating'},
{name:'Inner Crowns', value:'M15InnerCrowns'},
{name:'Holo Stamps', value:'M15HoloStamps'},
- {name:'Dark Power/Toughness', value:'M15DarkPT'}
+ {name:'Dark Power/Toughness', value:'M15DarkPT'},
+ {name:'Colored Borders', value:'M15Borders'}
])
\ No newline at end of file
diff --git a/js/frames/groupToken-1.js b/js/frames/groupToken-2.js
similarity index 77%
rename from js/frames/groupToken-1.js
rename to js/frames/groupToken-2.js
index 8b823e05..df29506c 100644
--- a/js/frames/groupToken-1.js
+++ b/js/frames/groupToken-2.js
@@ -6,5 +6,6 @@ loadFramePacks([
{name:'Floating Legend Crowns', value:'M15LegendCrownsFloating'},
{name:'Inner Crowns', value:'M15InnerCrowns'},
{name:'Holo Stamps', value:'M15HoloStamps'},
- {name:'Dark Power/Toughness', value:'M15DarkPT'}
+ {name:'Dark Power/Toughness', value:'M15DarkPT'},
+ {name:'Colored Borders', value:'M15Borders'}
])
\ No newline at end of file
diff --git a/js/frames/packM15Borders.js b/js/frames/packM15Borders.js
new file mode 100644
index 00000000..e7122bbc
--- /dev/null
+++ b/js/frames/packM15Borders.js
@@ -0,0 +1,14 @@
+//Create objects for common properties across available frames
+var masks = [{src:'/img/frames/m15/m15MaskBorderSliver.png', name:'Border'}, {src:'/img/frames/m15/m15MaskBorderSliverCrown.png', name:'Border (With Crown)'}];
+//defines available frames
+availableFrames = [
+ {name:'White Border', src:'/img/frames/white.png', masks:masks, noDefaultMask:true},
+ {name:'White Border', src:'/img/frames/silver.png', masks:masks, noDefaultMask:true},
+ {name:'White Border', src:'/img/frames/gold.png', masks:masks, noDefaultMask:true},
+];
+//disables/enables the "Load Frame Version" button
+document.querySelector('#loadFrameVersion').disabled = true;
+//defines process for loading this version, if applicable
+document.querySelector('#loadFrameVersion').onclick = null;
+//loads available frames
+loadFramePack();
\ No newline at end of file