diff --git a/compile.sh b/compile.sh
index b692df31e8c0a83832be58e45fc61a255f9abfaf..4e6e278336b7d12ffe8afd3fa051ed572a40b428 100755
--- a/compile.sh
+++ b/compile.sh
@@ -13,6 +13,7 @@ Options:
-h, --help Show this help text
-s, --sanity Run sanityCheck
-q, --quiet Suppress terminal output
+ -t, --themes Generate theme files
HelpText
}
@@ -110,6 +111,9 @@ else
-q | --quiet)
output=/dev/null
;;
+ -t | --themes)
+ themes="true"
+ ;;
*)
echoError "Unknown argument $1."
displayHelp
@@ -134,3 +138,16 @@ else
compile
echoMessage "Compilation finished."
fi
+
+# compile themes
+if [[ "$themes" ]]; then
+ (
+ cd themes/ || exit
+ for D in *; do
+ if [ -d "${D}" ]; then
+ ../devTools/concatFiles.sh "${D}"/ '*.css' ../bin/"${D}".css
+ fi
+ done
+ )
+ echoMessage "Themes compiled"
+fi
diff --git a/src/endWeek/saDrugs.js b/src/endWeek/saDrugs.js
index ee40ac4a5775becca185531c84087b654162b0a9..5692a51a3e48783cc601568eae594cc825e90a15 100644
--- a/src/endWeek/saDrugs.js
+++ b/src/endWeek/saDrugs.js
@@ -35,7 +35,7 @@ App.SlaveAssignment.drugs = (function() {
if (slave.drugs !== "no drugs") {
drugEffects(slave);
}
- if (slave.pregControl !== "none") {
+ if (slave.pregControl !== "none" && slave.pregKnown === 1) {
pregnancyDrugEffects(slave);
}
if (slave.curatives > 1) {
@@ -1968,5 +1968,9 @@ App.SlaveAssignment.drugs = (function() {
}
break;
}
+ if (slave.pregControl !== "none" && slave.pregKnown === 0) {
+ r += ` ${He} is not pregnant; use of pregnancy controlling drugs will have no effect. <span class="yellow">${His} drug regimen has been ended.</span>`;
+ slave.pregControl = "none";
+ }
}
})();
diff --git a/src/gui/theming.js b/src/gui/theming.js
index 038a21fcf6d06b9441daf2852408d1fbf375dafe..08bf7e627f8175d8e1be77badcc6279bf2febc44 100644
--- a/src/gui/theming.js
+++ b/src/gui/theming.js
@@ -45,10 +45,7 @@ App.UI.Theme = (function() {
*/
function load(filename) {
V.theme = filename;
-
currentThemeElement = newTheme(filename);
-
- document.head.appendChild(currentThemeElement);
}
function unload() {
@@ -71,16 +68,22 @@ App.UI.Theme = (function() {
if (filename !== undefined) {
devTheme = newTheme(filename);
-
- document.head.appendChild(devTheme);
+ // make it unique to force reloading instead of using the cached version
+ devTheme.href += `?id=${Date.now()}`;
}
}
+ /**
+ * Creates an new theme and adds it to the head element
+ * @param {string} filename
+ * @returns {HTMLLinkElement}
+ */
function newTheme(filename) {
const theme = document.createElement("link");
theme.setAttribute("rel", "stylesheet");
theme.setAttribute("type", "text/css");
theme.setAttribute("href", `./${filename}`);
+ document.head.appendChild(theme);
return theme;
}
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index 52bfb0c62b35d07a8aef7903c0bbcb2fc602abd5..97424dd6dfae18a16170bd41a462bdb8d7ff10a5 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -602,7 +602,7 @@
<</if>>
<<set _option = _options.addOption("Teeth", "teeth", $activeSlave)
- .addValueList([["Croooked", "crooked"], ["Gapped", "gapped"], ["Braces", "straightening braces"]])>>
+ .addValueList([["Crooked", "crooked"], ["Gapped", "gapped"], ["Braces", "straightening braces"]])>>
<<if $activeSlave.physicalAge >= 12>>
<<if $activeSlave.teeth == "baby" || $activeSlave.teeth == "mixed">>
<<set $activeSlave.teeth = "normal">>
@@ -650,7 +650,7 @@
.addValueList([["Very narrow", -2], ["Narrow", -1], ["Normal", 0], ["Broad", 1], ["Very broad", 2]])>>
<<run _options.addOption("Butt", "butt", $activeSlave)
- .addValueList([["Flat", 0], ["Small", 1], ["Plumb", 2], ["Big", 3], ["Huge", 4], ["Enormous", 5], ["Gigantic", 6], ["Massive", 7]])>>
+ .addValueList([["Flat", 0], ["Small", 1], ["Plump", 2], ["Big", 3], ["Huge", 4], ["Enormous", 5], ["Gigantic", 6], ["Massive", 7]])>>
<<run _options.addOption("Anus", "anus", $activeSlave)
.addValueList([["Virgin", 0], ["Normal", 1], ["Veteran", 2], ["Gaping", 3]])>>
diff --git a/themes/light/01-variables/colors.css b/themes/light/01-variables/colors.css
new file mode 100644
index 0000000000000000000000000000000000000000..f1ccb1ab9141237f246f8a73b4895d096d2808b0
--- /dev/null
+++ b/themes/light/01-variables/colors.css
@@ -0,0 +1,18 @@
+:root {
+ /* base */
+ --background-color: #fff;
+ --sidebar-color: #ccf;
+ --sidebar-hover-color: #99f;
+ --text-color: #000;
+ --divider-color: #888;
+
+ /* button */
+ --button-color: #b38cd9;
+ --button-border-color: #9966cc;
+ --button-selected-color: #663399;
+ --button-hover-color: #ccb3e6;
+ --button-disabled-color: #80609f;
+
+ --link-color: #1c377d;
+ --link-hover-color: #2a53bb;
+}
diff --git a/themes/light/02-sugarcube/01-init-screen.css b/themes/light/02-sugarcube/01-init-screen.css
new file mode 100644
index 0000000000000000000000000000000000000000..13d22e295f595e0effc535ef7c0ea843cd0d873b
--- /dev/null
+++ b/themes/light/02-sugarcube/01-init-screen.css
@@ -0,0 +1,4 @@
+#init-screen {
+ color: var(--text-color);
+ background-color: var(--background-color);
+}
diff --git a/themes/light/02-sugarcube/03-core.css b/themes/light/02-sugarcube/03-core.css
new file mode 100644
index 0000000000000000000000000000000000000000..1dff3183705f2b8e229125642d7508dcd26c8698
--- /dev/null
+++ b/themes/light/02-sugarcube/03-core.css
@@ -0,0 +1,44 @@
+body {
+ color: var(--text-color);
+ background-color: var(--background-color);
+}
+
+a {
+ color: var(--link-color);
+}
+
+a:hover {
+ color: var(--link-hover-color);
+}
+
+button {
+ color: var(--text-color);
+ background-color: var(--button-color);
+ border: 1px solid var(--button-border-color);
+}
+
+button:hover {
+ background-color: var(--button-hover-color);
+ border-color: var(--button-border-color);
+}
+
+button:disabled {
+ background-color: var(--button-disabled-color);
+ border: 1px solid var(--button-border-color);
+}
+
+input, select, textarea {
+ color: #333;
+ background-color: transparent;
+ border: 1px solid var(--button-border-color);
+}
+
+input:not(:disabled):focus, select:not(:disabled):focus, textarea:not(:disabled):focus,
+input:not(:disabled):hover, select:not(:disabled):hover, textarea:not(:disabled):hover {
+ background-color: #e5d9f2;
+ border-color: var(--button-selected-color);
+}
+
+hr {
+ border-top: 1px solid var(--divider-color);
+}
diff --git a/themes/light/02-sugarcube/07-ui-dialog.css b/themes/light/02-sugarcube/07-ui-dialog.css
new file mode 100644
index 0000000000000000000000000000000000000000..a31570106256cb9399fa7716e30c5781e6ca7c93
--- /dev/null
+++ b/themes/light/02-sugarcube/07-ui-dialog.css
@@ -0,0 +1,10 @@
+#ui-dialog-titlebar {
+ background-color: var(--divider-color);
+}
+#ui-dialog-body {
+ background-color: var(--sidebar-color);
+ border: 1px solid var(--divider-color);
+}
+#ui-dialog-body hr {
+ background-color: var(--divider-color);
+}
diff --git a/themes/light/02-sugarcube/08-ui.css b/themes/light/02-sugarcube/08-ui.css
new file mode 100644
index 0000000000000000000000000000000000000000..3d4f9732b216cb30b68710395c185e27946954ce
--- /dev/null
+++ b/themes/light/02-sugarcube/08-ui.css
@@ -0,0 +1,10 @@
+/* Saves dialog styling. */
+#ui-dialog-body.saves > *:not(:first-child) {
+ border-top-color: var(--divider-color);
+}
+#ui-dialog-body.saves tr:not(:first-child) {
+ border-top-color: var(--divider-color);
+}
+#ui-dialog-body.saves .empty {
+ color: var(--text-color);
+}
diff --git a/themes/light/02-sugarcube/09-ui-bar.css b/themes/light/02-sugarcube/09-ui-bar.css
new file mode 100644
index 0000000000000000000000000000000000000000..16b3d0ea5bf623e2dcb9eb95751edc33849f8e50
--- /dev/null
+++ b/themes/light/02-sugarcube/09-ui-bar.css
@@ -0,0 +1,33 @@
+#ui-bar {
+ background-color: var(--sidebar-color);
+ border-right: 1px solid var(--divider-color);
+}
+#ui-bar a:hover {
+ text-decoration: underline;
+}
+#ui-bar hr {
+ border-color: var(--divider-color);
+}
+#ui-bar-toggle{
+ color: #444;
+ border: 1px solid var(--divider-color);
+ border-right: none;
+}
+#ui-bar-toggle:hover {
+ background-color: var(--sidebar-hover-color);
+ border-color: var(--divider-color);
+}
+#menu ul {
+ border: 1px solid var(--divider-color);
+}
+#menu li:not(:first-child) {
+ border-top: 1px solid var(--divider-color);
+}
+#menu li a {
+ color: var(--text-color);
+ background-color: transparent;
+ border: none;
+}
+#menu li a:hover {
+ background-color: var(--sidebar-hover-color);
+}
diff --git a/themes/light/arcologyBuilding.css b/themes/light/arcologyBuilding.css
new file mode 100644
index 0000000000000000000000000000000000000000..5cae3dcc760d24fa44cc6abe73ff2cbaf7cc464d
--- /dev/null
+++ b/themes/light/arcologyBuilding.css
@@ -0,0 +1,18 @@
+div.building.basement {
+ border-top-color: #999;
+ background-image: repeating-linear-gradient(135deg, transparent, transparent 20px, #999 20px, #999 30px);
+}
+
+div.building div.innerCell {
+ background-color: var(--background-color);
+}
+
+div.building div.decorative {
+ outline-color: black;
+}
+
+/* introduction special formatting */
+/* makes all links unusable */
+.intro div.building a {
+ color: var(--text-color);
+}
diff --git a/themes/light/options.css b/themes/light/options.css
new file mode 100644
index 0000000000000000000000000000000000000000..88e25e7e362d0ee0669b6fb4c471dcd7a7e7c8e7
--- /dev/null
+++ b/themes/light/options.css
@@ -0,0 +1,3 @@
+div.options-group span.comment {
+ color: #575757;
+}
diff --git a/themes/light/quicklinks.css b/themes/light/quicklinks.css
new file mode 100644
index 0000000000000000000000000000000000000000..1aa56a6a2807153a48b1a51437728f2eeabd6620
--- /dev/null
+++ b/themes/light/quicklinks.css
@@ -0,0 +1,13 @@
+div.quick-links div.toggle {
+ background-color: var(--button-color);
+}
+
+div.quick-links div.toggle:hover {
+ background-color: var(--button-hover-color);
+}
+
+div.quick-links div.menu-link {
+ background-color: var(--button-disabled-color);
+ border-color: var(--button-border-color);
+ box-shadow: var(--button-border-color);
+}
diff --git a/themes/themes.md b/themes/themes.md
new file mode 100644
index 0000000000000000000000000000000000000000..92cb3198767a3d60fd7f0c20955d8ed1b2ef82b7
--- /dev/null
+++ b/themes/themes.md
@@ -0,0 +1,9 @@
+# Themes
+
+Every subdirectory is a distinct theme. The compiled theme is placed in `bin/` and can be loaded ingame via the options
+page.
+
+## Creating new themes
+
+Files inside these directories are combined into one CSS file based on
+alphabetical ordering. The light theme is recommended as a base for creating new themes.