v7 - Astolfo, Maika, Rias, & Rei (#33)

* Added v9 girls

* Updated changelog

CHANGELOG.md

@@ -1,6 +1,29 @@
 Changelog
 ---
 
+# 7.0.0 [Astolfo, Maika, Rias, & Rei]
+
+## 4 New Themes
+
+From the Fate series:
+
+- Astolfo (Dark)
+
+From the Highschool DxD series:
+
+- Rias: Onyx (a darker theme)
+
+From the Blend S series:
+
+- Sakuranomiya Maika (Dark)
+
+From the Neon Genesis Evangelion series:
+
+- Ayanami Rei (Dark)
+
+![v14 Girls](https://doki.assets.unthrottled.io/misc/v14_girls.png)
+
+
 # 6.0.1 [GitHub updates]
 
 - Updated the coloring of:

buildSrc/assets/themes/blendS/maika/dark/maika.dark.github.definition.json

@@ -0,0 +1,7 @@
+{
+  "id": "6106e529-efef-444d-9db0-a9b0b444cf1b",
+  "overrides": {},
+  "laf": {},
+  "syntax": {},
+  "colors": {}
+}

buildSrc/assets/themes/eva/rei/dark/rei.dark.github.definition.json

@@ -0,0 +1,7 @@
+{
+  "id": "c262185d-9682-413b-9143-85a2dda76b2f",
+  "overrides": {},
+  "laf": {},
+  "syntax": {},
+  "colors": {}
+}

buildSrc/assets/themes/fate/astolfo/dark/astolfo.dark.github.definition.json

@@ -0,0 +1,7 @@
+{
+  "id": "930c70c8-474e-4e2d-a223-d1e2b9da4fb1",
+  "overrides": {},
+  "laf": {},
+  "syntax": {},
+  "colors": {}
+}

buildSrc/assets/themes/highSchoolDxD/rias/onyx/rias.onyx.github.definition.json

@@ -0,0 +1,7 @@
+{
+  "id": "ea9a13f6-fa7f-46a4-ba6e-6cefe1f55160",
+  "overrides": {},
+  "laf": {},
+  "syntax": {},
+  "colors": {}
+}

buildSrc/src/BuildThemes.ts

@@ -6,7 +6,6 @@ import {
   fillInTemplateScript,
   MasterDokiThemeDefinition,
   resolvePaths,
-  resolveStickerPath
 } from 'doki-build-source';
 
 type GitHubDokiThemeDefinition = BaseAppDokiThemeDefinition;
@@ -17,17 +16,29 @@ const fs = require('fs');
 
 const {
   repoDirectory,
-  templateDirectoryPath,
+  masterThemeDefinitionDirectoryPath,
+  appTemplatesDirectoryPath,
 } = resolvePaths(__dirname);
 
+function resolveStickerPath(
+  themeDefinitionPath: string,
+  sticker: string,
+) {
+  const stickerPath = path.resolve(
+    path.resolve(themeDefinitionPath, '..'),
+    sticker
+  );
+  return stickerPath.substr(masterThemeDefinitionDirectoryPath.length + '/definitions'.length);
+}
+
 const themesOutputDirectoryTemplateDirectoryPath = path.resolve(
   repoDirectory,
   'themes',
 );
 
 
 function constructGitHubName(dokiTheme: MasterDokiThemeDefinition) {
-  return dokiTheme.name.replace(/ /g, '_').toLowerCase();
+  return getName(dokiTheme).replace(/ /g, '_').toLowerCase();
 }
 
 function buildCssTemplate(
@@ -63,7 +74,7 @@ function evaluateTemplate(
     dokiThemeDefinition, dokiTemplateDefinitions,
   );
   const themeName = constructGitHubName(dokiThemeDefinition);
-  const themeProperName = dokiThemeDefinition.name.split(" ")
+  const themeProperName = getName(dokiThemeDefinition).split(" ")
     .map(part => capitalize(part))
     .join('');
 
@@ -73,14 +84,13 @@ function evaluateTemplate(
       {
         ...namedColors,
         ...dokiThemeGitHubDefinition.colors,
-        displayName: dokiThemeDefinition.name,
+        displayName: getName(dokiThemeDefinition),
         version: packageJson.version,
         themeName,
         themeProperName,
         stickerPath: resolveStickerPath(
           dokiFileDefinitionPath,
           dokiThemeDefinition.stickers.default,
-          __dirname
         ),
         accentColorEditor: dokiThemeDefinition.overrides?.editorScheme?.colors?.accentColor ||
           dokiThemeDefinition.colors.accentColor,
@@ -95,8 +105,9 @@ function evaluateTemplate(
 function createDokiTheme(
   dokiFileDefinitionPath: string,
   dokiThemeDefinition: MasterDokiThemeDefinition,
-  dokiTemplateDefinitions: DokiThemeDefinitions,
+  _: DokiThemeDefinitions,
   dokiThemeGitHubDefinition: GitHubDokiThemeDefinition,
+  dokiTemplateDefinitions: DokiThemeDefinitions,
 ) {
   try {
     return {
@@ -128,7 +139,7 @@ evaluateTemplates(
   .then(dokiThemes =>
     Promise.resolve()
       // local cached CSS (fast)
-      .then(() => fs.readFileSync(path.resolve(templateDirectoryPath, 'tempCss.css.txt'), {encoding: "utf-8"}))
+      .then(() => fs.readFileSync(path.resolve(appTemplatesDirectoryPath, 'tempCss.css.txt'), {encoding: "utf-8"}))
       .then(baseCssTemplate => {
         console.log('Css Re-Mapped');
         // write css files
@@ -144,3 +155,7 @@ evaluateTemplates(
   .then(() => {
     console.log('Theme Generation Complete!');
   });
+
+  function getName(dokiDefinition: MasterDokiThemeDefinition) {
+  return dokiDefinition.name.replace(':', '');
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "doki-theme-github",
-  "version": "6.0.1",
+  "version": "7.0.0",
   "dependencies": {
   }
 }

themes/aqua.user.css

@@ -1,7 +1,7 @@
 /* ==UserStyle==
 @name           Doki-Theme: Aqua
 @namespace      github.com/doki-theme
-@version        6.0.1
+@version        7.0.0
 @description    Browse code with your waifu.
 @author         Unthrottled
 @license        MIT