diff --git a/art/after-school.eno b/art/after-school.eno index 78af6cb..0cad9ea 100644 --- a/art/after-school.eno +++ b/art/after-school.eno @@ -9,6 +9,3 @@ Two young girls are facing towards the viewer. The one on the left has blond hai This was sitting in sketch form for a few years, and I finally decided to color it. I quite like the expressions the two are making :-) -- Description - -Tags: -- landscape diff --git a/art/bard.eno b/art/bard.eno index 611d7a5..f80295a 100644 --- a/art/bard.eno +++ b/art/bard.eno @@ -12,3 +12,4 @@ This is a full painting I did of my FFXIV character. Overall, I'm pretty happy w Characters: - Juritta +- FFXIV diff --git a/art/chips.eno b/art/chips.eno new file mode 100644 index 0000000..8c047e7 --- /dev/null +++ b/art/chips.eno @@ -0,0 +1,15 @@ +-- Alt Text + +A succubus is sitting on a dull red couch. She has four arms, and holding a game +controller in one pair, and eating chips in another hand. + +-- Alt Text + +-- Description + +She looks pretty comfy on that couch, don't you think? + +-- Description + +Characters: +- Merume diff --git a/art/underwear.eno b/art/underwear.eno new file mode 100644 index 0000000..0f559cf --- /dev/null +++ b/art/underwear.eno @@ -0,0 +1,10 @@ +-- Alt Text + +A four armed succubus is sitting, standing straight and holding her tail in one +hand. She is holding her tight chest, and taking off her clothes. She is put +against a nice pink background. + +-- Alt Text + +Characters: +- Merume diff --git a/art/viera-street.eno b/art/viera-street.eno new file mode 100644 index 0000000..be42802 --- /dev/null +++ b/art/viera-street.eno @@ -0,0 +1,16 @@ +-- Alt Text + +A bunny girl is looking out into the distance, but breathing out her streetwear jacket. +Underneath the jacket is a crop top, and she's wearing some dark baggy pants. + +-- Alt Text + +-- Description + +As you can probably tell, I LOVE this streetwear set in FFXIV. + +-- Description + +Characters: +- Juritta +- FFXIV diff --git a/art/working-out.eno b/art/working-out.eno new file mode 100644 index 0000000..8ad0d27 --- /dev/null +++ b/art/working-out.eno @@ -0,0 +1,6 @@ +-- Alt Text + +A young woman is looking to the right, and stretching out her black leggings. She is +wearing a bra and looks pretty tired. She has dark purple hair. + +-- Alt Text diff --git a/content/art/after-school.md b/content/art/after-school.md index 132c386..9243ef8 100644 --- a/content/art/after-school.md +++ b/content/art/after-school.md @@ -5,7 +5,6 @@ date: 2022-07-31 slug: after-school characters: arttags: -- landscape --- ![ Two young girls are facing towards the viewer. The one on the left has blond hair, and doing a peace sign. The other girl is laughing and laying her hands on her skirt. They're in the street, with a stone wall and houses in the distance. diff --git a/content/art/after-the-rain.md b/content/art/after-the-rain.md index 5d824d1..b962e1f 100644 --- a/content/art/after-the-rain.md +++ b/content/art/after-the-rain.md @@ -4,7 +4,7 @@ layout: art-detail date: 2022-04-27 slug: after-the-rain characters: -- mysterious swordswoman +- Mysterious Swordswoman arttags: --- ![ diff --git a/content/art/bard.md b/content/art/bard.md index fbaad32..4e1351b 100644 --- a/content/art/bard.md +++ b/content/art/bard.md @@ -4,7 +4,8 @@ layout: art-detail date: 2022-08-20 slug: bard characters: -- juritta +- Juritta +- FFXIV arttags: --- ![ diff --git a/content/art/chips.md b/content/art/chips.md index b868efa..c4cdf96 100644 --- a/content/art/chips.md +++ b/content/art/chips.md @@ -1,8 +1,18 @@ --- -slug: chips title: Chips +layout: art-detail date: 2022-01-01 excludefeed: true -layout: art-detail +slug: chips +characters: +- Merume +arttags: --- -![](/art/chips.webp) +![ +A succubus is sitting on a dull red couch. She has four arms, and holding a game +controller in one pair, and eating chips in another hand. +](/art/chips.webp) +### Commentary + +She looks pretty comfy on that couch, don't you think? + diff --git a/content/art/eva-girls.md b/content/art/eva-girls.md index 0c1e920..91a2c57 100644 --- a/content/art/eva-girls.md +++ b/content/art/eva-girls.md @@ -4,9 +4,9 @@ layout: art-detail date: 2021-12-23 slug: eva-girls characters: -- asuka -- rei -- mari +- Asuka +- Rei +- Mari arttags: --- ![ diff --git a/content/art/grocery-shopping.md b/content/art/grocery-shopping.md index a83cf5d..c8d7f8e 100644 --- a/content/art/grocery-shopping.md +++ b/content/art/grocery-shopping.md @@ -4,7 +4,7 @@ layout: art-detail date: 2022-12-02 slug: grocery-shopping characters: -- merume +- Merume arttags: --- ![ diff --git a/content/art/mari-and-asuka.md b/content/art/mari-and-asuka.md index 9353a75..8029f33 100644 --- a/content/art/mari-and-asuka.md +++ b/content/art/mari-and-asuka.md @@ -4,8 +4,8 @@ layout: art-detail date: 2021-12-25 slug: mari-and-asuka characters: -- mari -- asuka +- Mari +- Asuka arttags: --- ![ diff --git a/content/art/mythra.md b/content/art/mythra.md index 1d53b3c..e3eebeb 100644 --- a/content/art/mythra.md +++ b/content/art/mythra.md @@ -4,7 +4,7 @@ layout: art-detail date: 2022-11-11 slug: mythra characters: -- mythra +- Mythra arttags: --- ![ diff --git a/content/art/summer-byleth.md b/content/art/summer-byleth.md index 97a970a..1298fae 100644 --- a/content/art/summer-byleth.md +++ b/content/art/summer-byleth.md @@ -4,7 +4,7 @@ layout: art-detail date: 2022-05-30 slug: summer-byleth characters: -- byleth +- Byleth arttags: --- ![ diff --git a/content/art/summer-eva-girls.md b/content/art/summer-eva-girls.md index 2931c6c..d9e17aa 100644 --- a/content/art/summer-eva-girls.md +++ b/content/art/summer-eva-girls.md @@ -4,9 +4,9 @@ layout: art-detail date: 2022-07-27 slug: summer-eva-girls characters: -- mari -- asuka -- rei +- Mari +- Asuka +- Rei arttags: --- ![ diff --git a/content/art/underwear.md b/content/art/underwear.md index da250ff..3304dcf 100644 --- a/content/art/underwear.md +++ b/content/art/underwear.md @@ -1,8 +1,15 @@ --- -slug: underwear title: Underwear +layout: art-detail date: 2022-01-01 excludefeed: true -layout: art-detail +slug: underwear +characters: +- Merume +arttags: --- -![](/art/underwear.webp) +![ +A four armed succubus is sitting, standing straight and holding her tail in one +hand. She is holding her tight chest, and taking off her clothes. She is put +against a nice pink background. +](/art/underwear.webp) diff --git a/content/art/viera-street.md b/content/art/viera-street.md index f9dc1d9..f355898 100644 --- a/content/art/viera-street.md +++ b/content/art/viera-street.md @@ -1,8 +1,19 @@ --- -slug: viera-street title: Viera Streetwear +layout: art-detail date: 2022-01-01 excludefeed: true -layout: art-detail +slug: viera-street +characters: +- Juritta +- FFXIV +arttags: --- -![](/art/viera-street.webp) +![ +A bunny girl is looking out into the distance, but breathing out her streetwear jacket. +Underneath the jacket is a crop top, and she's wearing some dark baggy pants. +](/art/viera-street.webp) +### Commentary + +As you can probably tell, I LOVE this streetwear set in FFXIV. + diff --git a/content/art/working-out.md b/content/art/working-out.md index 26768d1..75b94d1 100644 --- a/content/art/working-out.md +++ b/content/art/working-out.md @@ -1,8 +1,13 @@ --- -slug: working-out title: Working Out +layout: art-detail date: 2022-01-01 excludefeed: true -layout: art-detail +slug: working-out +characters: +arttags: --- -![](/art/working-out.webp) +![ +A young woman is looking to the right, and stretching out her black leggings. She is +wearing a bra and looks pretty tired. She has dark purple hair. +](/art/working-out.webp) diff --git a/scripts/gen_art.py b/scripts/gen_art.py index 5f1ef99..f4a4e8a 100644 --- a/scripts/gen_art.py +++ b/scripts/gen_art.py @@ -29,7 +29,7 @@ def parse_art(title, year, date, original_filename, filename, file): f.write("characters:\n") for character in document.list('Characters').items(): - f.write("- " + character.required_string_value().lower() + "\n") + f.write("- " + character.required_string_value() + "\n") f.write("arttags:\n") for tag in document.list('Tags').items(): @@ -43,10 +43,11 @@ def parse_art(title, year, date, original_filename, filename, file): f.write(filename) f.write('.webp)\n') - f.write('### Commentary\n') + if document.optional_field('Description'): + f.write('### Commentary\n') - f.write(document.field('Description').required_string_value()) - f.write('\n') + f.write(document.field('Description').required_string_value()) + f.write('\n') def parse_art_piece(json, year, date): filename_without_ext = os.path.splitext(json["filename"])[0] @@ -138,6 +139,9 @@ with open('../data/art.json', 'r') as f: f.write('---\n') + num_eno = 0 + num_noneno = 0 + for category in art_data["categories"]: for year in category["years"]: for piece in year["pieces"]: @@ -146,14 +150,18 @@ with open('../data/art.json', 'r') as f: path = os.path.join(art_data_directory, filename_without_ext + ".eno") if os.path.isfile(path): + num_eno = num_eno + 1 with open(path) as f: if "date" in piece.keys(): parse_art(piece["title"], year["year"], piece["date"], art_output_directory + "/" + filename_without_ext, filename_without_ext, f.read()) else: parse_art(piece["title"], year["year"], None, art_output_directory + "/" + filename_without_ext, filename_without_ext, f.read()) else: + num_noneno = num_noneno + 1 if "date" in piece.keys(): parse_art_piece(piece, year["year"], piece["date"]) else: parse_art_piece(piece, year["year"], None) + print("Art coverage: {}/{}".format(num_eno, num_eno + num_noneno)); + diff --git a/themes/red/layouts/_default/art-detail.html b/themes/red/layouts/_default/art-detail.html index 5133375..01b1b6e 100644 --- a/themes/red/layouts/_default/art-detail.html +++ b/themes/red/layouts/_default/art-detail.html @@ -10,7 +10,7 @@ Date