${flashData.map(flash => flash.act8r8k ? fixWS` -

${flash.act}

` : fixWS`

@@ -755,6 +772,7 @@ function writeMiscellaneousPages() { writeFile('data.js', fixWS` // Yo, this file is gener8ted. Don't mess around with it! window.albumData = ${stringifyAlbumData()}; + window.flashData = ${stringifyFlashData()}; `) ]); } @@ -920,8 +938,9 @@ async function writeArtistPage(artistName) { track.artists.includes(artistName) || track.contributors.some(({ who }) => who === artistName) )); - const artThings = tracksAndAlbums.filter(thing => (thing.coverArtists || []).some(({ who }) => who === artistName)); - const commentaryThings = tracksAndAlbums.filter(thing => thing.commentary && thing.commentary.replace(/<\/?b>/g, '').includes('' + artistName + ':')); + const artThings = justEverythingMan.filter(thing => (thing.coverArtists || []).some(({ who }) => who === artistName)); + const flashes = flashData.filter(flash => (flash.contributors || []).some(({ who }) => who === artistName)); + const commentaryThings = justEverythingMan.filter(thing => thing.commentary && thing.commentary.replace(/<\/?b>/g, '').includes('' + artistName + ':')); const unreleasedTracks = tracks.filter(track => track.album.directory === C.UNRELEASED_TRACKS_DIRECTORY); const releasedTracks = tracks.filter(track => track.album.directory !== C.UNRELEASED_TRACKS_DIRECTORY); @@ -958,6 +977,7 @@ async function writeArtistPage(artistName) { unreleasedTracks.length && `(Unreleased Tracks)` ].filter(Boolean).join(' '), artThings.length && `Art`, + flashes.length && `Flashes & Games`, commentaryThings.length && `Commentary` ].filter(Boolean).join(', ')}

${tracks.length && `

Tracks

`} @@ -981,6 +1001,19 @@ async function writeArtistPage(artistName) { `; }, true, 'artDate')} `} + ${flashes.length && fixWS` +

Flashes & Games

+ ${actChunkedList(flashes, flash => { + const contributionString = flash.contributors.filter(({ who }) => who === artistName).map(getContributionString).join(' '); + return fixWS` +

+ ${flash.name} + ${contributionString && `(${contributionString})`} + (${getDateString({date: flash.date})}) +

+ ` + })} + `} ${commentaryThings.length && fixWS`

Commentary

${albumChunkedList(commentaryThings, thing => { @@ -1030,15 +1063,48 @@ function albumChunkedList(tracks, getLI, showDate = true, dateProperty = 'date') `; } +function actChunkedList(flashes, getLI, showDate = true, dateProperty = 'date') { + return fixWS` +

+ ${flash.act} +

+ `; + if (i > 0) { + return ['

+ `; +} + async function writeFlashPages() { - await progressPromiseAll('Writing Flash pages.', queue(flashData.map(flash => () => flash.page && writeFlashPage(flash)).filter(Boolean))); + await progressPromiseAll('Writing Flash pages.', queue(flashData.map(flash => () => !flash.act8r8k && writeFlashPage(flash)).filter(Boolean))); } async function writeFlashPage(flash) { const kebab = getFlashDirectory(flash); const index = `${C.FLASH_DIRECTORY}/${kebab}/index.html`; - const act6 = flashData.findIndex(f => f.act.startsWith('Act 6')) - const side = (flashData.indexOf(flash) < act6) ? 1 : 2 + const act6 = flashData.findIndex(f => f.act.startsWith('Act 6')); + const postCanon = flashData.findIndex(f => f.act.includes('Post Canon')); + const outsideCanon = postCanon + flashData.slice(postCanon).findIndex(f => !f.act.includes('Post Canon')); + const side = ( + (flashData.indexOf(flash) < act6) ? 1 : + (flashData.indexOf(flash) <= outsideCanon) ? 2 : + 0 + ); await writePage([C.FLASH_DIRECTORY, kebab], flash.name, fixWS`

@@ -1048,15 +1114,24 @@ async function writeFlashPage(flash) {

Side 1 (Acts 1-5)

Side 2 (Acts 6-7)

Outside Canon (Misc. Games)

${act}

${f.name}

${flash.name}

Released ${getDateString(flash)}.

Play on Homestuck (${isNaN(Number(flash.page)) ? 'secret page' : `page ${flash.page}`}).

Contributors:

${artistNames.includes(who) + ? `${who}` + : who + } ${what && `(${getContributionString({what})})`}

Tracks featured in ${flash.name.replace(/\.$/, '')}:

- ${neighm[1]} + ${neeeighm} by ${getArtistString(track.artists)}
@@ -1114,7 +1200,7 @@ function writeListingPages() { const getArtistLI = artistName => fixWS`
${artistName} - (${C.getArtistNumContributions(artistName, {allTracks, albumData})} c.) + (${C.getArtistNumContributions(artistName, {allTracks, albumData, flashData})} c.)