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

cross-origin hotfix

Browse Source
This commit is contained in:
Kyle
2021-07-17 21:05:30 -07:00
parent df8e119189
commit 1761736168
6 changed files with 49 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
creator/index.php
View File

@@ -572,5 +572,5 @@ include('../globalHTML/header-1.php');
</h4> </h4>
</div> </div>
</div> </div>
<script defer src='/js/creator-21.js'></script> <script defer src='/js/creator-22.js'></script>
<?php include('../globalHTML/footer.php'); ?> <?php include('../globalHTML/footer.php'); ?>

4
js/creator-21.js → js/creator-22.js
View File

@@ -15,6 +15,10 @@ function fixUri(input) {
return prefix + input; //input.replace('/img/frames', prefix + '/img/frames'); return prefix + input; //input.replace('/img/frames', prefix + '/img/frames');
} }
} }
function setImageUrl(image, source) {
image.crossOrigin = 'anonymous';
image.src = fixUri(source);
}
//card object //card object
var card = {width:1500, height:2100, marginX:0, marginY:0, frames:[], artSource:fixUri('/img/blank.png'), artX:0, artY:0, artZoom:1, artRotate:0, setSymbolSource:fixUri('/img/blank.png'), setSymbolX:0, setSymbolY:0, setSymbolZoom:1, watermarkSource:fixUri('/img/blank.png'), watermarkX:0, watermarkY:0, watermarkZoom:1, watermarkLeft:'none', watermarkRight:'none', watermarkOpacity:0.4, version:'', manaSymbols:[]}; var card = {width:1500, height:2100, marginX:0, marginY:0, frames:[], artSource:fixUri('/img/blank.png'), artX:0, artY:0, artZoom:1, artRotate:0, setSymbolSource:fixUri('/img/blank.png'), setSymbolX:0, setSymbolY:0, setSymbolZoom:1, watermarkSource:fixUri('/img/blank.png'), watermarkX:0, watermarkY:0, watermarkZoom:1, watermarkLeft:'none', watermarkRight:'none', watermarkOpacity:0.4, version:'', manaSymbols:[]};
//core images/masks //core images/masks

2
js/frames/versionClass.js
View File

@@ -31,7 +31,7 @@ if (!loadedVersions.includes('/js/frames/versionClass.js')) {
} }
document.querySelector('#creator-menu-sections').appendChild(newHTML); document.querySelector('#creator-menu-sections').appendChild(newHTML);
var classHeader = new Image(); var classHeader = new Image();
classHeader.src = fixUri('/img/frames/class/header.png'); setImageUrl(classHeader, '/img/frames/class/header.png');
classHeader.onload = classEdited; classHeader.onload = classEdited;
fixClassInputs(classEdited); fixClassInputs(classEdited);
} else { } else {

56
js/frames/versionDungeon.js
View File

@@ -27,34 +27,34 @@ if (!loadedVersions.includes('/js/frames/versionDungeon.js')) {
card.dungeon = {abilities:[1, 1, 1, 0], count:3, x:0.1, width:0.3947}; card.dungeon = {abilities:[1, 1, 1, 0], count:3, x:0.1, width:0.3947};
} }
document.querySelector('#creator-menu-sections').appendChild(newHTML); document.querySelector('#creator-menu-sections').appendChild(newHTML);
var dungeonFXtop = new Image(); dungeonFXtop.src = fixUri('/img/frames/dungeon/walls/fx/top.png'); var dungeonFXtop = new Image(); setImageUrl(dungeonFXtop, '/img/frames/dungeon/walls/fx/top.png');
var dungeonFXleft = new Image(); dungeonFXleft.src = fixUri('/img/frames/dungeon/walls/fx/left.png'); var dungeonFXleft = new Image(); setImageUrl(dungeonFXleft, '/img/frames/dungeon/walls/fx/left.png');
var dungeonFXbottom = new Image(); dungeonFXbottom.src = fixUri('/img/frames/dungeon/walls/fx/bottom.png'); var dungeonFXbottom = new Image(); setImageUrl(dungeonFXbottom, '/img/frames/dungeon/walls/fx/bottom.png');
var dungeonFXright = new Image(); dungeonFXright.src = fixUri('/img/frames/dungeon/walls/fx/right.png'); var dungeonFXright = new Image(); setImageUrl(dungeonFXright, '/img/frames/dungeon/walls/fx/right.png');
var dungeonFXtopright = new Image(); dungeonFXtopright.src = fixUri('/img/frames/dungeon/walls/fx/topright.png'); var dungeonFXtopright = new Image(); setImageUrl(dungeonFXtopright, '/img/frames/dungeon/walls/fx/topright.png');
var dungeonFXtopleft = new Image(); dungeonFXtopleft.src = fixUri('/img/frames/dungeon/walls/fx/topleft.png'); var dungeonFXtopleft = new Image(); setImageUrl(dungeonFXtopleft, '/img/frames/dungeon/walls/fx/topleft.png');
var dungeonFXbottomright = new Image(); dungeonFXbottomright.src = fixUri('/img/frames/dungeon/walls/fx/bottomright.png'); var dungeonFXbottomright = new Image(); setImageUrl(dungeonFXbottomright, '/img/frames/dungeon/walls/fx/bottomright.png');
var dungeonFXbottomleft = new Image(); dungeonFXbottomleft.src = fixUri('/img/frames/dungeon/walls/fx/bottomleft.png'); var dungeonFXbottomleft = new Image(); setImageUrl(dungeonFXbottomleft, '/img/frames/dungeon/walls/fx/bottomleft.png');
var dungeonShapetop = new Image(); dungeonShapetop.src = fixUri('/img/frames/dungeon/walls/shape/top.png'); var dungeonShapetop = new Image(); setImageUrl(dungeonShapetop, '/img/frames/dungeon/walls/shape/top.png');
var dungeonShapeleft = new Image(); dungeonShapeleft.src = fixUri('/img/frames/dungeon/walls/shape/left.png'); var dungeonShapeleft = new Image(); setImageUrl(dungeonShapeleft, '/img/frames/dungeon/walls/shape/left.png');
var dungeonShapebottom = new Image(); dungeonShapebottom.src = fixUri('/img/frames/dungeon/walls/shape/bottom.png'); var dungeonShapebottom = new Image(); setImageUrl(dungeonShapebottom, '/img/frames/dungeon/walls/shape/bottom.png');
var dungeonShaperight = new Image(); dungeonShaperight.src = fixUri('/img/frames/dungeon/walls/shape/right.png'); var dungeonShaperight = new Image(); setImageUrl(dungeonShaperight, '/img/frames/dungeon/walls/shape/right.png');
var dungeonShapetopright = new Image(); dungeonShapetopright.src = fixUri('/img/frames/dungeon/walls/shape/topright.png'); var dungeonShapetopright = new Image(); setImageUrl(dungeonShapetopright, '/img/frames/dungeon/walls/shape/topright.png');
var dungeonShapetopleft = new Image(); dungeonShapetopleft.src = fixUri('/img/frames/dungeon/walls/shape/topleft.png'); var dungeonShapetopleft = new Image(); setImageUrl(dungeonShapetopleft, '/img/frames/dungeon/walls/shape/topleft.png');
var dungeonShapebottomright = new Image(); dungeonShapebottomright.src = fixUri('/img/frames/dungeon/walls/shape/bottomright.png'); var dungeonShapebottomright = new Image(); setImageUrl(dungeonShapebottomright, '/img/frames/dungeon/walls/shape/bottomright.png');
var dungeonShapebottomleft = new Image(); dungeonShapebottomleft.src = fixUri('/img/frames/dungeon/walls/shape/bottomleft.png'); var dungeonShapebottomleft = new Image(); setImageUrl(dungeonShapebottomleft, '/img/frames/dungeon/walls/shape/bottomleft.png');
var dungeonDoorwayShape = new Image(); dungeonDoorwayShape.src = fixUri('/img/frames/dungeon/walls/shape/doorway.png'); var dungeonDoorwayShape = new Image(); setImageUrl(dungeonDoorwayShape, '/img/frames/dungeon/walls/shape/doorway.png');
var dungeonDoorwayFX = new Image(); dungeonDoorwayFX.src = fixUri('/img/frames/dungeon/walls/fx/doorway.png'); var dungeonDoorwayFX = new Image(); setImageUrl(dungeonDoorwayFX, '/img/frames/dungeon/walls/fx/doorway.png');
var dungeonDoorwayArrow = new Image(); dungeonDoorwayArrow.src = fixUri('/img/frames/dungeon/walls/arrow.png'); var dungeonDoorwayArrow = new Image(); setImageUrl(dungeonDoorwayArrow, '/img/frames/dungeon/walls/arrow.png');
var dungeonDoorwayCutout = new Image(); dungeonDoorwayCutout.src = fixUri('/img/frames/dungeon/walls/doorway.png'); var dungeonDoorwayCutout = new Image(); setImageUrl(dungeonDoorwayCutout, '/img/frames/dungeon/walls/doorway.png');
var dungeonOuterShape = new Image(); dungeonOuterShape.src = fixUri('/img/frames/dungeon/walls/shape/outer.png'); var dungeonOuterShape = new Image(); setImageUrl(dungeonOuterShape, '/img/frames/dungeon/walls/shape/outer.png');
var dungeonOuterFX = new Image(); dungeonOuterFX.src = fixUri('/img/frames/dungeon/walls/fx/outer.png'); var dungeonOuterFX = new Image(); setImageUrl(dungeonOuterFX, '/img/frames/dungeon/walls/fx/outer.png');
var dungeonTextureW = new Image(); dungeonTextureW.src = fixUri('/img/frames/dungeon/walls/textures/w.png'); var dungeonTextureW = new Image(); setImageUrl(dungeonTextureW, '/img/frames/dungeon/walls/textures/w.png');
var dungeonTextureU = new Image(); dungeonTextureU.src = fixUri('/img/frames/dungeon/walls/textures/u.png'); var dungeonTextureU = new Image(); setImageUrl(dungeonTextureU, '/img/frames/dungeon/walls/textures/u.png');
var dungeonTextureB = new Image(); dungeonTextureB.src = fixUri('/img/frames/dungeon/walls/textures/b.png'); var dungeonTextureB = new Image(); setImageUrl(dungeonTextureB, '/img/frames/dungeon/walls/textures/b.png');
var dungeonTextureR = new Image(); dungeonTextureR.src = fixUri('/img/frames/dungeon/walls/textures/r.png'); var dungeonTextureR = new Image(); setImageUrl(dungeonTextureR, '/img/frames/dungeon/walls/textures/r.png');
var dungeonTextureG = new Image(); dungeonTextureG.src = fixUri('/img/frames/dungeon/walls/textures/g.png'); var dungeonTextureG = new Image(); setImageUrl(dungeonTextureG, '/img/frames/dungeon/walls/textures/g.png');
var dungeonTextureC = new Image(); dungeonTextureC.src = fixUri('/img/frames/dungeon/walls/textures/c.png'); var dungeonTextureC = new Image(); setImageUrl(dungeonTextureC, '/img/frames/dungeon/walls/textures/c.png');
dungeonTextureC.onload = dungeonEditedBuffer; dungeonTextureC.onload = dungeonEditedBuffer;
} }

26
js/frames/versionPlaneswalker.js
View File

@@ -43,18 +43,18 @@ if (!loadedVersions.includes('/js/frames/versionPlaneswalker.js')) {
window.planeswalkerAbilityLayout = [[[0.7467], [0.6953, 0.822], [0.6639, 0.7467, 0.8362], [0.6505, 0.72, 0.7905, 0.861]],[[0.72], [0.6391, 0.801], [0.5986, 0.72, 0.8415], [0.5986, 0.6796, 0.7605, 0.8415]]]; window.planeswalkerAbilityLayout = [[[0.7467], [0.6953, 0.822], [0.6639, 0.7467, 0.8362], [0.6505, 0.72, 0.7905, 0.861]],[[0.72], [0.6391, 0.801], [0.5986, 0.72, 0.8415], [0.5986, 0.6796, 0.7605, 0.8415]]];
document.querySelector('#creator-menu-sections').appendChild(newHTML); document.querySelector('#creator-menu-sections').appendChild(newHTML);
var plusIcon = new Image(); var plusIcon = new Image();
plusIcon.src = fixUri('/img/frames/planeswalker/planeswalkerPlus.png'); setImageUrl(plusIcon, '/img/frames/planeswalker/planeswalkerPlus.png');
var minusIcon = new Image(); var minusIcon = new Image();
minusIcon.src = fixUri('/img/frames/planeswalker/planeswalkerMinus.png'); setImageUrl(minusIcon, '/img/frames/planeswalker/planeswalkerMinus.png');
var neutralIcon = new Image(); var neutralIcon = new Image();
neutralIcon.src = fixUri('/img/frames/planeswalker/planeswalkerNeutral.png'); setImageUrl(neutralIcon, '/img/frames/planeswalker/planeswalkerNeutral.png');
var lightToDark = new Image(); var lightToDark = new Image();
lightToDark.src = fixUri('/img/frames/planeswalker/abilityLineOdd.png'); setImageUrl(lightToDark, '/img/frames/planeswalker/abilityLineOdd.png');
var darkToLight = new Image(); var darkToLight = new Image();
darkToLight.src = fixUri('/img/frames/planeswalker/abilityLineEven.png'); setImageUrl(darkToLight, '/img/frames/planeswalker/abilityLineEven.png');
var planeswalkerTextMask = new Image(); var planeswalkerTextMask = new Image();
planeswalkerTextMask.onload = function(){fixPlaneswalkerInputs(planeswalkerEdited);} planeswalkerTextMask.onload = function(){fixPlaneswalkerInputs(planeswalkerEdited);}
planeswalkerTextMask.src = fixUri('/img/frames/planeswalker/planeswalkerMaskText.png'); setImageUrl(planeswalkerTextMask, '/img/frames/planeswalker/planeswalkerMaskText.png');
var lightColor = 'white'; var lightColor = 'white';
var darkColor = '#a4a4a4'; var darkColor = '#a4a4a4';
} else { } else {
@@ -66,15 +66,15 @@ function planeswalkerEdited() {
if (card.version == 'planeswalkerTall') { if (card.version == 'planeswalkerTall') {
planeswalkerTall = 1; planeswalkerTall = 1;
if (!planeswalkerTextMask.src.includes('tall')) { if (!planeswalkerTextMask.src.includes('tall')) {
planeswalkerTextMask.src = fixUri('/img/frames/planeswalker/tall/planeswalkerTallMaskRules.png'); setImageUrl(planeswalkerTextMask, '/img/frames/planeswalker/tall/planeswalkerTallMaskRules.png');
} }
} else if (card.version == 'planeswalkerMDFC') { } else if (card.version == 'planeswalkerMDFC') {
if (!planeswalkerTextMask.src.includes('mdfc')) { if (!planeswalkerTextMask.src.includes('mdfc')) {
planeswalkerTextMask.src = fixUri('/img/frames/planeswalker/mdfc/text.svg'); setImageUrl(planeswalkerTextMask, '/img/frames/planeswalker/mdfc/text.svg');
} }
} else { } else {
if (planeswalkerTextMask.src.includes('tall') || planeswalkerTextMask.src.includes('mdfc')) { if (planeswalkerTextMask.src.includes('tall') || planeswalkerTextMask.src.includes('mdfc')) {
planeswalkerTextMask.src = fixUri('/img/frames/planeswalker/planeswalkerMaskText.png'); setImageUrl(planeswalkerTextMask, '/img/frames/planeswalker/planeswalkerMaskText.png');
} }
} }
card.planeswalker.abilities[0] = document.querySelector('#planeswalker-cost-0').value; card.planeswalker.abilities[0] = document.querySelector('#planeswalker-cost-0').value;
@@ -191,12 +191,12 @@ function invertPlaneswalkerColors(reverse = false) {
if (card.planeswalker.invert) { if (card.planeswalker.invert) {
darkColor = '#5b5b5b'; darkColor = '#5b5b5b';
lightColor = 'black'; lightColor = 'black';
lightToDark.src = fixUri('/img/frames/planeswalker/abilityLineOddDarkened.png'); setImageUrl(lightToDark, '/img/frames/planeswalker/abilityLineOddDarkened.png');
darkToLight.src = fixUri('/img/frames/planeswalker/abilityLineEvenDarkened.png'); setImageUrl(darkToLight, '/img/frames/planeswalker/abilityLineEvenDarkened.png');
} else { } else {
darkColor = '#a4a4a4'; darkColor = '#a4a4a4';
lightColor = 'white'; lightColor = 'white';
lightToDark.src = fixUri('/img/frames/planeswalker/abilityLineOdd.png'); setImageUrl(lightToDark, '/img/frames/planeswalker/abilityLineOdd.png');
darkToLight.src = fixUri('/img/frames/planeswalker/abilityLineEven.png'); setImageUrl(darkToLight, '/img/frames/planeswalker/abilityLineEven.png');
} }
} }

4
js/frames/versionSaga.js
View File

@@ -35,9 +35,9 @@ if (!loadedVersions.includes('/js/frames/versionSaga.js')) {
} }
document.querySelector('#creator-menu-sections').appendChild(newHTML); document.querySelector('#creator-menu-sections').appendChild(newHTML);
var sagaChapter = new Image(); var sagaChapter = new Image();
sagaChapter.src = fixUri('/img/frames/saga/sagaChapter.png'); setImageUrl(sagaChapter, '/img/frames/saga/sagaChapter.png');
var sagaDivider = new Image(); var sagaDivider = new Image();
sagaDivider.src = fixUri('/img/frames/saga/sagaDivider.png'); setImageUrl(sagaDivider, '/img/frames/saga/sagaDivider.png');
sagaChapter.onload = sagaDivider.onload = sagaEdited; sagaChapter.onload = sagaDivider.onload = sagaEdited;
fixSagaInputs(sagaEdited); fixSagaInputs(sagaEdited);
} }