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

Extended art short auto frame.

Browse Source
This commit is contained in:
Josh Birnholz
2022-11-28 03:02:29 -05:00
committed by Josh birnholz
parent 8e2dd0b5de
commit 4e89b6c5a1
3 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
creator/index.html
View File

@@ -636,6 +636,7 @@
<option value="false">Disabled</option> <option value="false">Disabled</option>
<option value="M15Regular-1">Regular</option> <option value="M15Regular-1">Regular</option>
<option value="M15BoxTopper">Extended Art (Regular)</option> <option value="M15BoxTopper">Extended Art (Regular)</option>
<option value="M15ExtendedArtShort">Extended Art (Shorter Textbox)</option>
<option value="UB">Universes Beyond</option> <option value="UB">Universes Beyond</option>
<option value="Etched">Etched</option> <option value="Etched">Etched</option>
<option value="Seventh">Seventh Edition</option> <option value="Seventh">Seventh Edition</option>

58
js/creator-23.js
View File

@@ -665,7 +665,10 @@ function autoFrame() {
autoSeventhEditionFrame(colors, card.text.mana.text, card.text.type.text, card.text.pt.text); autoSeventhEditionFrame(colors, card.text.mana.text, card.text.type.text, card.text.pt.text);
} else if (frame == 'M15BoxTopper') { } else if (frame == 'M15BoxTopper') {
group = 'Showcase-5'; group = 'Showcase-5';
autoExtendedArtFrame(colors, card.text.mana.text, card.text.type.text, card.text.pt.text); autoExtendedArtFrame(colors, card.text.mana.text, card.text.type.text, card.text.pt.text, false);
} else if (frame == 'M15ExtendedArtShort') {
group = 'Showcase-5';
autoExtendedArtFrame(colors, card.text.mana.text, card.text.type.text, card.text.pt.text, true);
} }
if (autoFramePack != frame) { if (autoFramePack != frame) {
@@ -778,7 +781,7 @@ async function autoM15Frame(colors, mana_cost, type_line, power) {
await card.frames.forEach(item => addFrame([], item)); await card.frames.forEach(item => addFrame([], item));
card.frames.reverse(); card.frames.reverse();
} }
async function autoExtendedArtFrame(colors, mana_cost, type_line, power) { async function autoExtendedArtFrame(colors, mana_cost, type_line, power, short) {
var frames = card.frames.filter(frame => frame.name.includes('Extension')); var frames = card.frames.filter(frame => frame.name.includes('Extension'));
//clear the draggable frames //clear the draggable frames
@@ -795,38 +798,38 @@ async function autoExtendedArtFrame(colors, mana_cost, type_line, power) {
// Set frames // Set frames
if (type_line.includes('Legendary')) { if (type_line.includes('Legendary')) {
frames.push(makeExtendedArtFrameByLetter(properties.pinlineRules, "Crown Outline", false, style)); frames.push(makeExtendedArtFrameByLetter(properties.pinlineRules, "Crown Outline", false, style, short));
if (style == 'Nyx') { if (style == 'Nyx') {
frames.push(makeExtendedArtFrameByLetter(properties.innerCrown, 'Inner Crown', false, style)); frames.push(makeExtendedArtFrameByLetter(properties.innerCrown, 'Inner Crown', false, style, short));
} }
if (properties.pinlineRulesRight) { if (properties.pinlineRulesRight) {
frames.push(makeExtendedArtFrameByLetter(properties.pinlineRulesRight, 'Crown', true, style)); frames.push(makeExtendedArtFrameByLetter(properties.pinlineRulesRight, 'Crown', true, style, short));
} }
frames.push(makeExtendedArtFrameByLetter(properties.pinlineRules, "Crown", false, style)); frames.push(makeExtendedArtFrameByLetter(properties.pinlineRules, "Crown", false, style, short));
frames.push(makeExtendedArtFrameByLetter(properties.pinlineRules, "Crown Border Cover", false, style)); frames.push(makeExtendedArtFrameByLetter(properties.pinlineRules, "Crown Border Cover", false, style, short));
} else { } else {
frames.push(makeExtendedArtFrameByLetter(properties.pinlineRules, "Title Cutout", false, style)); frames.push(makeExtendedArtFrameByLetter(properties.pinlineRules, "Title Cutout", false, style, short));
} }
if (properties.pt) { if (properties.pt) {
frames.push(makeExtendedArtFrameByLetter(properties.pt, 'PT', false, style)); frames.push(makeExtendedArtFrameByLetter(properties.pt, 'PT', false, style, short));
} }
if (properties.pinlineRulesRight) { if (properties.pinlineRulesRight) {
frames.push(makeExtendedArtFrameByLetter(properties.pinlineRulesRight, 'Pinline', true, style)); frames.push(makeExtendedArtFrameByLetter(properties.pinlineRulesRight, 'Pinline', true, style, short));
} }
frames.push(makeExtendedArtFrameByLetter(properties.pinlineRules, 'Pinline', false, style)); frames.push(makeExtendedArtFrameByLetter(properties.pinlineRules, 'Pinline', false, style, short));
frames.push(makeExtendedArtFrameByLetter(properties.typeTitle, 'Type', false, style)); frames.push(makeExtendedArtFrameByLetter(properties.typeTitle, 'Type', false, style, short));
frames.push(makeExtendedArtFrameByLetter(properties.typeTitle, 'Title', false, style)); frames.push(makeExtendedArtFrameByLetter(properties.typeTitle, 'Title', false, style, short));
if (properties.pinlineRulesRight) { if (properties.pinlineRulesRight) {
frames.push(makeExtendedArtFrameByLetter(properties.pinlineRulesRight, 'Rules', true, style)); frames.push(makeExtendedArtFrameByLetter(properties.pinlineRulesRight, 'Rules', true, style, short));
} }
frames.push(makeExtendedArtFrameByLetter(properties.pinlineRules, 'Rules', false, style)); frames.push(makeExtendedArtFrameByLetter(properties.pinlineRules, 'Rules', false, style, short));
if (properties.frameRight) { if (properties.frameRight) {
frames.push(makeExtendedArtFrameByLetter(properties.frameRight, 'Frame', true, style)); frames.push(makeExtendedArtFrameByLetter(properties.frameRight, 'Frame', true, style, short));
} }
frames.push(makeExtendedArtFrameByLetter(properties.frame, 'Frame', false, style)); frames.push(makeExtendedArtFrameByLetter(properties.frame, 'Frame', false, style, short));
frames.push(makeExtendedArtFrameByLetter(properties.frame, 'Border', false, style)); frames.push(makeExtendedArtFrameByLetter(properties.frame, 'Border', false, style, short));
if (card.text.pt && type_line.includes('Vehicle') && !card.text.pt.text.includes('fff')) { if (card.text.pt && type_line.includes('Vehicle') && !card.text.pt.text.includes('fff')) {
card.text.pt.text = '{fontcolor#fff}' + card.text.pt.text; card.text.pt.text = '{fontcolor#fff}' + card.text.pt.text;
@@ -1014,7 +1017,7 @@ function makeM15FrameByLetter(letter, mask = false, maskToRightHalf = false, sty
return frame; return frame;
} }
function makeExtendedArtFrameByLetter(letter, mask = false, maskToRightHalf = false, style = 'regular') { function makeExtendedArtFrameByLetter(letter, mask = false, maskToRightHalf = false, style = 'regular', short = false) {
letter = letter.toUpperCase(); letter = letter.toUpperCase();
var frameNames = { var frameNames = {
'W': 'White', 'W': 'White',
@@ -1123,12 +1126,18 @@ function makeExtendedArtFrameByLetter(letter, mask = false, maskToRightHalf = fa
} }
var frame = { var frame = {
'name': frameName + ' Frame', 'name': frameName + ' Frame'
'src': '/img/frames/m15/boxTopper/m15BoxTopperFrame' + letter + '.png',
} }
if (style != 'regular') { if (style != 'regular') {
frame.src = '/img/frames/extended/regular/' + style.toLowerCase() + '/' + letter.toLowerCase() + '.png'; frame.src = '/img/frames/extended/regular/' + style.toLowerCase() + '/' + letter.toLowerCase() + '.png';
if (short) {
frame.src = frame.src.replace('/regular/', '/shorter/');
}
} else if (short) {
frame.src = '/img/frames/m15/boxTopper/short/' + letter.toLowerCase() + '.png';
} else {
frame.src = '/img/frames/m15/boxTopper/m15BoxTopperFrame' + letter + '.png';
} }
if (mask) { if (mask) {
@@ -1139,6 +1148,13 @@ function makeExtendedArtFrameByLetter(letter, mask = false, maskToRightHalf = fa
'name': 'Title Cutout' 'name': 'Title Cutout'
} }
] ]
} else if (short && ['Frame', 'Rules', 'Type', 'Pinline'].includes(mask)) {
frame.masks = [
{
'src': '/img/frames/m15/boxTopper/short/' + mask.toLowerCase().replace('rules', 'text') + '.svg',
'name': mask
}
]
} else { } else {
frame.masks = [ frame.masks = [
{ {

2
js/frames/packM15BoxTopper.js
View File

@@ -1,5 +1,5 @@
//Create objects for common properties across available frames //Create objects for common properties across available frames
var masks = [{src:'/img/frames/m15/regular/m15MaskPinline.png', name:'Pinline'}, {src:'/img/frames/m15/regular/m15MaskTitle.png', name:'Title'}, {src:'/img/frames/m15/regular/m15MaskType.png', name:'Type'}, {src:'/img/frames/m15/regular/m15MaskRules.png', name:'Rules'}, {src:'/img/frames/m15/regular/m15MaskFrame.png', name:'Frame'}, {src:'/img/frames/m15/regular/m15MaskBorder.png', name:'Border'}]; var masks = [{src:'/img/frames/m15/regular/m15MaskPinlineSuper.png', name:'Pinline'}, {src:'/img/frames/m15/regular/m15MaskTitle.png', name:'Title'}, {src:'/img/frames/m15/regular/m15MaskType.png', name:'Type'}, {src:'/img/frames/m15/regular/m15MaskRules.png', name:'Rules'}, {src:'/img/frames/m15/regular/m15MaskFrame.png', name:'Frame'}, {src:'/img/frames/m15/regular/m15MaskBorder.png', name:'Border'}];
var bounds = {x:0.7573, y:0.8848, width:0.188, height:0.0733}; var bounds = {x:0.7573, y:0.8848, width:0.188, height:0.0733};
//defines available frames //defines available frames
availableFrames = [ availableFrames = [