GithubMirrors/cardconjurer
1
0
Fork 1
mirror of https://github.com/Investigamer/cardconjurer.git synced 2025-07-27 05:14:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

misc

Browse Source
This commit is contained in:
Kyle
2021-05-03 17:43:48 -07:00
parent 37770ed0c1
commit 640a2aefae
35 changed files with 126 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
js/creator-16.js
View File

@@ -369,10 +369,11 @@ function maskOptionClicked(event) {
if (selectedMaskIndex > 0) {selectedMaskName = availableFrames[selectedFrameIndex].masks[selectedMaskIndex - 1].name;}
document.querySelector('#selectedPreview').innerHTML = '(Selected: ' + availableFrames[selectedFrameIndex].name + ', ' + selectedMaskName + ')';
}
function addFrame(additionalMasks = [], loadingFrame = false) {
async function addFrame(additionalMasks = [], loadingFrame = false) {
var frameToAdd = JSON.parse(JSON.stringify(availableFrames[selectedFrameIndex]));
var maskThumbnail = true;
if (!loadingFrame) {
// The frame is being added manually by the user, so we must process which mask(s) they have selected
var noDefaultMask = 0;
if (frameToAdd.noDefaultMask) {noDefaultMask = 1;}
if (frameToAdd.masks && selectedMaskIndex + noDefaultMask > 0) {
@@ -382,6 +383,20 @@ function addFrame(additionalMasks = [], loadingFrame = false) {
maskThumbnail = false;
}
additionalMasks.forEach(item => frameToAdd.masks.push(item));
// Likewise, we now add any complementary frames
if ('complementary' in frameToAdd && frameToAdd.masks.length == 0) {
if (typeof frameToAdd.complementary == 'number') {
frameToAdd.complementary = [frameToAdd.complementary];
}
const realFrameIndex = selectedFrameIndex;
for (const index of frameToAdd.complementary) {
selectedFrameIndex = index;
await addFrame();
}
selectedFrameIndex = realFrameIndex;
} else {
console.log(frameToAdd.masks)
}
} else {
frameToAdd = loadingFrame;
if (frameToAdd.masks.length == 0 || (frameToAdd.masks[0].src.includes('/img/frames/mask'))) {