diff --git a/data/images/cardImages/expedition/new/expeditionNewMaskBorder.png b/data/images/cardImages/expedition/new/expeditionNewMaskBorder.png new file mode 100644 index 00000000..19cfca47 Binary files /dev/null and b/data/images/cardImages/expedition/new/expeditionNewMaskBorder.png differ diff --git a/data/images/cardImages/expedition/new/expeditionNewMaskFrame.png b/data/images/cardImages/expedition/new/expeditionNewMaskFrame.png new file mode 100644 index 00000000..86701ebf Binary files /dev/null and b/data/images/cardImages/expedition/new/expeditionNewMaskFrame.png differ diff --git a/data/images/cardImages/expedition/new/expeditionNewMaskHedrons.png b/data/images/cardImages/expedition/new/expeditionNewMaskHedrons.png new file mode 100644 index 00000000..7f4cdb48 Binary files /dev/null and b/data/images/cardImages/expedition/new/expeditionNewMaskHedrons.png differ diff --git a/data/images/cardImages/expedition/new/expeditionNewMaskText.png b/data/images/cardImages/expedition/new/expeditionNewMaskText.png new file mode 100644 index 00000000..c2590017 Binary files /dev/null and b/data/images/cardImages/expedition/new/expeditionNewMaskText.png differ diff --git a/data/images/cardImages/m15/nickname/m15NicknameMaskTrueName.png b/data/images/cardImages/m15/nickname/m15NicknameMaskTrueName.png new file mode 100644 index 00000000..0468655b Binary files /dev/null and b/data/images/cardImages/m15/nickname/m15NicknameMaskTrueName.png differ diff --git a/data/scripts/main.js b/data/scripts/main.js index ecc3e8ca..876f055c 100644 --- a/data/scripts/main.js +++ b/data/scripts/main.js @@ -161,6 +161,8 @@ class cardPlaceholder { uniqueNumberTracker += 1 } draw() { + mainContext.globalCompositeOperation = 'source-over' + mainContext.globalAlpha = 1 if (this.whatToDraw == textCanvas) { if (currentVersion.includes('m15Planeswalker/')) { mainContext.drawImage(planeswalkerCanvas, 0, 0, cardWidth, cardHeight) diff --git a/data/scripts/versions/expedition/new.js b/data/scripts/versions/expedition/new.js index 9d553907..8d4800c6 100644 --- a/data/scripts/versions/expedition/new.js +++ b/data/scripts/versions/expedition/new.js @@ -1,15 +1,15 @@ if (!loadedVersions.includes('expedition/new')) { loadedVersions.push('expedition/new') - loadMaskImages([['Pinline (expedition new)', '/data/images/cardImages/expedition/new/expeditionNewMaskPinline.png'], ['Type (expedition new)', '/data/images/cardImages/expedition/new/expeditionNewMaskType.png']]) + loadMaskImages([['Pinline (expedition new)', '/data/images/cardImages/expedition/new/expeditionNewMaskPinline.png'], ['Type (expedition new)', '/data/images/cardImages/expedition/new/expeditionNewMaskType.png'], ['Frame (expedition new)', '/data/images/cardImages/expedition/new/expeditionNewMaskFrame.png'], ['Text (expedition new)', '/data/images/cardImages/expedition/new/expeditionNewMaskText.png'], ['Border (expedition new)', '/data/images/cardImages/expedition/new/expeditionNewMaskBorder.png']]) loadFrameImages([ - ['White Frame', '/data/images/cardImages/expedition/new/expeditionNewFrameW.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition new)', 'Title (m15)', 'Type (expedition new)']], - ['Blue Frame', '/data/images/cardImages/expedition/new/expeditionNewFrameU.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition new)', 'Title (m15)', 'Type (expedition new)']], - ['Black Frame', '/data/images/cardImages/expedition/new/expeditionNewFrameB.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition new)', 'Title (m15)', 'Type (expedition new)']], - ['Red Frame', '/data/images/cardImages/expedition/new/expeditionNewFrameR.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition new)', 'Title (m15)', 'Type (expedition new)']], - ['Green Frame', '/data/images/cardImages/expedition/new/expeditionNewFrameG.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition new)', 'Title (m15)', 'Type (expedition new)']], - ['Multicolored Frame', '/data/images/cardImages/expedition/new/expeditionNewFrameM.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition new)', 'Title (m15)', 'Type (expedition new)']], - ['Land Frame', '/data/images/cardImages/expedition/new/expeditionNewFrameL.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition new)', 'Title (m15)', 'Type (expedition new)']], - ['Colorless Frame', '/data/images/cardImages/expedition/new/expeditionNewFrameC.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition new)', 'Title (m15)', 'Type (expedition new)']], + ['White Frame', '/data/images/cardImages/expedition/new/expeditionNewFrameW.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition new)', 'Title (m15)', 'Type (expedition new)', 'Frame (expedition new)', 'Text (expedition new)']], + ['Blue Frame', '/data/images/cardImages/expedition/new/expeditionNewFrameU.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition new)', 'Title (m15)', 'Type (expedition new)', 'Frame (expedition new)', 'Text (expedition new)']], + ['Black Frame', '/data/images/cardImages/expedition/new/expeditionNewFrameB.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition new)', 'Title (m15)', 'Type (expedition new)', 'Frame (expedition new)', 'Text (expedition new)']], + ['Red Frame', '/data/images/cardImages/expedition/new/expeditionNewFrameR.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition new)', 'Title (m15)', 'Type (expedition new)', 'Frame (expedition new)', 'Text (expedition new)']], + ['Green Frame', '/data/images/cardImages/expedition/new/expeditionNewFrameG.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition new)', 'Title (m15)', 'Type (expedition new)', 'Frame (expedition new)', 'Text (expedition new)']], + ['Multicolored Frame', '/data/images/cardImages/expedition/new/expeditionNewFrameM.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition new)', 'Title (m15)', 'Type (expedition new)', 'Frame (expedition new)', 'Text (expedition new)']], + ['Land Frame', '/data/images/cardImages/expedition/new/expeditionNewFrameL.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition new)', 'Title (m15)', 'Type (expedition new)', 'Frame (expedition new)', 'Text (expedition new)']], + ['Colorless Frame', '/data/images/cardImages/expedition/new/expeditionNewFrameC.png', 0, 0, 1, 1, ['Full', 'Pinline (expedition new)', 'Title (m15)', 'Type (expedition new)', 'Frame (expedition new)', 'Text (expedition new)']], ['White Power/Toughness', '/data/images/cardImages/m15/m15PTW.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']], ['Blue Power/Toughness', '/data/images/cardImages/m15/m15PTU.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']], ['Black Power/Toughness', '/data/images/cardImages/m15/m15PTB.png', 1136/1500, 1858/2100, 282/1500, 154/2100, ['Full']], diff --git a/data/scripts/versions/m15/nickname.js b/data/scripts/versions/m15/nickname.js index a5ed026c..251989d3 100644 --- a/data/scripts/versions/m15/nickname.js +++ b/data/scripts/versions/m15/nickname.js @@ -1,8 +1,8 @@ if (!loadedVersions.includes('m15/nickname')) { loadedVersions.push("m15/nickname") - loadMaskImages([['Nickname Legend Crown (m15)', '/data/images/cardImages/m15/m15MaskNicknameLegendCrownStrokeless.png'], ['Nickname Title (m15)', '/data/images/cardImages/m15/m15MaskNicknameTitleStrokeless.png']]) + loadMaskImages([['Nickname Legend Crown (m15)', '/data/images/cardImages/m15/m15MaskNicknameLegendCrownStrokeless.png'], ['Nickname Title (m15)', '/data/images/cardImages/m15/m15MaskNicknameTitleStrokeless.png'], ['Nickname True Name (m15)', '/data/images/cardImages/m15/nickname/m15NicknameMaskTrueName.png']]) loadFrameImages([ - ['Base Nickname Frame', '/data/images/cardImages/m15/m15NicknameTextboxes.png', 0, 0, 1, 1, ['Full', 'Title (m15)', 'Type (m15)', 'Rules (m15)']], + ['Base Nickname Frame', '/data/images/cardImages/m15/m15NicknameTextboxes.png', 0, 0, 1, 1, ['Full', 'Title (m15)', 'Type (m15)', 'Rules (m15)', 'Nickname True Name (m15)']], ['White Nickname Frame', '/data/images/cardImages/m15/m15NicknameFrameW.png', 0, 0, 1, 1, ['Full', 'Pinline (m15)', 'Border (m15)']], ['Blue Nickname Frame', '/data/images/cardImages/m15/m15NicknameFrameU.png', 0, 0, 1, 1, ['Full', 'Pinline (m15)', 'Border (m15)']], ['Black Nickname Frame', '/data/images/cardImages/m15/m15NicknameFrameB.png', 0, 0, 1, 1, ['Full', 'Pinline (m15)', 'Border (m15)']],