Add Memory Corridor margins and artifact/land frames

joshbirnholz · Jul 28, 2024 · d80d600 · d80d600
1 parent 1bd91d3
commit d80d600
Show file tree

Hide file tree

Showing 35 changed files with 39 additions and 3 deletions.
diff --git a/img/frames/memoryCorridor/a.png b/img/frames/memoryCorridor/a.png
diff --git a/img/frames/memoryCorridor/aThumb.png b/img/frames/memoryCorridor/aThumb.png
diff --git a/img/frames/memoryCorridor/b.png b/img/frames/memoryCorridor/b.png
diff --git a/img/frames/memoryCorridor/g.png b/img/frames/memoryCorridor/g.png
diff --git a/img/frames/memoryCorridor/l.png b/img/frames/memoryCorridor/l.png
diff --git a/img/frames/memoryCorridor/lThumb.png b/img/frames/memoryCorridor/lThumb.png
diff --git a/img/frames/memoryCorridor/m.png b/img/frames/memoryCorridor/m.png
diff --git a/img/frames/memoryCorridor/margins/a.png b/img/frames/memoryCorridor/margins/a.png
diff --git a/img/frames/memoryCorridor/margins/aThumb.png b/img/frames/memoryCorridor/margins/aThumb.png
diff --git a/img/frames/memoryCorridor/margins/b.png b/img/frames/memoryCorridor/margins/b.png
diff --git a/img/frames/memoryCorridor/margins/bThumb.png b/img/frames/memoryCorridor/margins/bThumb.png
diff --git a/img/frames/memoryCorridor/margins/g.png b/img/frames/memoryCorridor/margins/g.png
diff --git a/img/frames/memoryCorridor/margins/gThumb.png b/img/frames/memoryCorridor/margins/gThumb.png
diff --git a/img/frames/memoryCorridor/margins/l.png b/img/frames/memoryCorridor/margins/l.png
diff --git a/img/frames/memoryCorridor/margins/lThumb.png b/img/frames/memoryCorridor/margins/lThumb.png
diff --git a/img/frames/memoryCorridor/margins/m.png b/img/frames/memoryCorridor/margins/m.png
diff --git a/img/frames/memoryCorridor/margins/mThumb.png b/img/frames/memoryCorridor/margins/mThumb.png
diff --git a/img/frames/memoryCorridor/margins/maskHighlights.png b/img/frames/memoryCorridor/margins/maskHighlights.png
diff --git a/img/frames/memoryCorridor/margins/maskHighlightsThumb.png b/img/frames/memoryCorridor/margins/maskHighlightsThumb.png
diff --git a/img/frames/memoryCorridor/margins/r.png b/img/frames/memoryCorridor/margins/r.png
diff --git a/img/frames/memoryCorridor/margins/rThumb.png b/img/frames/memoryCorridor/margins/rThumb.png
diff --git a/img/frames/memoryCorridor/margins/u.png b/img/frames/memoryCorridor/margins/u.png
diff --git a/img/frames/memoryCorridor/margins/uThumb.png b/img/frames/memoryCorridor/margins/uThumb.png
diff --git a/img/frames/memoryCorridor/margins/w.png b/img/frames/memoryCorridor/margins/w.png
diff --git a/img/frames/memoryCorridor/margins/wThumb.png b/img/frames/memoryCorridor/margins/wThumb.png
diff --git a/img/frames/memoryCorridor/pt/a.png b/img/frames/memoryCorridor/pt/a.png
diff --git a/img/frames/memoryCorridor/pt/aThumb.png b/img/frames/memoryCorridor/pt/aThumb.png
diff --git a/img/frames/memoryCorridor/pt/l.png b/img/frames/memoryCorridor/pt/l.png
diff --git a/img/frames/memoryCorridor/pt/lThumb.png b/img/frames/memoryCorridor/pt/lThumb.png
diff --git a/img/frames/memoryCorridor/r.png b/img/frames/memoryCorridor/r.png
diff --git a/img/frames/memoryCorridor/u.png b/img/frames/memoryCorridor/u.png
diff --git a/img/frames/memoryCorridor/w.png b/img/frames/memoryCorridor/w.png
diff --git a/js/frames/groupMargin.js b/js/frames/groupMargin.js
@@ -1,8 +1,9 @@
 loadFramePacks([
 	{name:'Generic Margins', value:'Margin-1'},
+	{name:'Memory Corridor Margins', value:'MarginMemoryCorridor'},
 	{name:'Breaking News Margin', value:'MarginBreakingNews'},
-	{name:'Vault Margin', value:'MarginVault'},
-	{name:'Wanted Poster Margin', value:'MarginWanted'},
+	{name:'Vault Margins', value:'MarginVault'},
+	{name:'Wanted Poster Margins', value:'MarginWanted'},
 	{name:'Enchanting Tales Margins', value:'MarginEnchantingTales'},
 	{name:'LTR Ring Margins', value:'MarginRing'},
 	{name:'D&D Module Margins', value:'MarginDNDModule'},

diff --git a/js/frames/packMarginMemoryCorridor.js b/js/frames/packMarginMemoryCorridor.js
@@ -0,0 +1,31 @@
+//Create objects for common properties across available frames
+var bounds = {x:-89/2010, y:-81/2814, width:2188/2010, height:2976/2814};
+var ogBounds = {x:0, y:0, width:1, height:1};
+var masks = [{src:'/img/frames/memoryCorridor/margins/maskHighlights.png', name:'Highlights'}];
+//defines available frames
+availableFrames = [
+	{name:'White Extension', src:'/img/frames/memoryCorridor/margins/w.png', bounds:bounds, ogBounds:ogBounds, masks:masks},
+	{name:'Blue Extension', src:'/img/frames/memoryCorridor/margins/u.png', bounds:bounds, ogBounds:ogBounds, masks:masks},
+	{name:'Black Extension', src:'/img/frames/memoryCorridor/margins/b.png', bounds:bounds, ogBounds:ogBounds, masks:masks},
+	{name:'Red Extension', src:'/img/frames/memoryCorridor/margins/r.png', bounds:bounds, ogBounds:ogBounds, masks:masks},
+	{name:'Green Extension', src:'/img/frames/memoryCorridor/margins/g.png', bounds:bounds, ogBounds:ogBounds, masks:masks},
+	{name:'Multicolored Extension', src:'/img/frames/memoryCorridor/margins/m.png', bounds:bounds, ogBounds:ogBounds, masks:masks},
+	{name:'Artifact Extension', src:'/img/frames/memoryCorridor/margins/a.png', bounds:bounds, ogBounds:ogBounds, masks:masks},
+	{name:'Land Extension', src:'/img/frames/memoryCorridor/margins/l.png', bounds:bounds, ogBounds:ogBounds, masks:masks},
+];
+//disables/enables the "Load Frame Version" button
+document.querySelector('#loadFrameVersion').disabled = false;
+
+document.querySelector('#loadFrameVersion').onclick = async function() {
+	loadMarginVersion();
+
+	await resetCardIrregularities({canvas:[getStandardWidth(), getStandardHeight(), 89/2010, 81/2814], resetOthers:false});
+
+	drawTextBuffer();
+	drawFrames();
+	bottomInfoEdited();
+	watermarkEdited();
+	drawNewGuidelines();
+}
+//loads available frames
+loadFramePack();
diff --git a/js/frames/packMemoryCorridor.js b/js/frames/packMemoryCorridor.js
@@ -11,13 +11,17 @@ availableFrames = [
 	{name:'Red Frame', src:'/img/frames/memoryCorridor/r.png', masks: masks},
 	{name:'Green Frame', src:'/img/frames/memoryCorridor/g.png', masks: masks},
 	{name:'Multicolored Frame', src:'/img/frames/memoryCorridor/m.png', masks: masks},
+	{name:'Artifact Frame', src:'/img/frames/memoryCorridor/a.png', masks: masks},
+	{name:'Land Frame', src:'/img/frames/memoryCorridor/l.png', masks: masks},
 
 	{name:'White Power/Toughness Box', src:'/img/frames/memoryCorridor/pt/w.png', bounds: bptBounds},
 	{name:'Blue Power/Toughness Box', src:'/img/frames/memoryCorridor/pt/u.png', bounds: bptBounds},
 	{name:'Black Power/Toughness Box', src:'/img/frames/memoryCorridor/pt/b.png', bounds: bptBounds},
 	{name:'Red Power/Toughness Box', src:'/img/frames/memoryCorridor/pt/r.png', bounds: bptBounds},
 	{name:'Green Power/Toughness Box', src:'/img/frames/memoryCorridor/pt/g.png', bounds: bptBounds},
 	{name:'Multicolored Power/Toughness Box', src:'/img/frames/memoryCorridor/pt/m.png', bounds: bptBounds},
+	{name:'Artifact Power/Toughness Box', src:'/img/frames/memoryCorridor/pt/a.png', bounds: bptBounds},
+	{name:'Land Power/Toughness Box', src:'/img/frames/memoryCorridor/pt/l.png', bounds: bptBounds},
 
 	{name:'Gold Holo Stamp', src: '/img/frames/memoryCorridor/stamp-gold.png', bounds: stampBounds},
 	{name:'Gray Holo Stamp', src: '/img/frames/memoryCorridor/stamp.png', bounds: stampBounds}
@@ -29,7 +33,7 @@ document.querySelector('#loadFrameVersion').onclick = async function() {
 	//resets things so that every frame doesn't have to
 	await resetCardIrregularities();
 	//sets card version
-	card.version = 'pipboy';
+	card.version = 'memoryCorridor';
 	//art bounds
 	card.artBounds = {x:0, y:0, width:2010/2010, height:1587/2814};
 	autoFitArt();