From cf5face23a6b78f85c78990ec81a3cf7a6290193 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Mon, 1 Mar 2021 00:18:12 +0100
Subject: [PATCH] Remove neutral option styling.
It looks bad and the default is already neutral anyways.
---
css/gui/options.css | 8 --------
src/events/intro/introSummary.js | 2 +-
src/events/intro/pcAppearance.js | 2 +-
src/gui/options/options.js | 4 ++--
src/gui/options/optionsGroup.js | 11 -----------
src/uncategorized/costsBudget.tw | 2 +-
src/uncategorized/repBudget.tw | 2 +-
7 files changed, 6 insertions(+), 25 deletions(-)
diff --git a/css/gui/options.css b/css/gui/options.css
index 8ccbff90610..606c2979f5d 100644
--- a/css/gui/options.css
+++ b/css/gui/options.css
@@ -57,14 +57,6 @@ div.options-group button.off:hover {
background-color: #6a1b16;
}
-div.options-group button.selected.neutral {
- background-color: #4d4d00;
-}
-
-div.options-group button.neutral:hover {
- background-color: #666600;
-}
-
div.options-group .comment {
color: gray;
font-style: italic;
diff --git a/src/events/intro/introSummary.js b/src/events/intro/introSummary.js
index 3cc3f2acc63..f030ba63f97 100644
--- a/src/events/intro/introSummary.js
+++ b/src/events/intro/introSummary.js
@@ -848,7 +848,7 @@ App.Intro.summary = function() {
options = new App.UI.OptionsGroup();
options.addOption("Slave aging", "seeAge")
- .addValue("Enabled", 1).on().addValue("Celebrate birthdays, but don't age.", 2).neutral().addValue("Disabled", 0).off();
+ .addValue("Enabled", 1).on().addValue("Celebrate birthdays, but don't age.", 2).addValue("Disabled", 0).off();
options.addOption("Slave age distribution", "pedo_mode").addComment("In loli mode most new slaves are under the age of 18. May not apply to custom slaves and slaves from specific events.")
.addValue("Loli mode", 1, () => V.minimumSlaveAge = 5).addValue("Normal mode", 0);
diff --git a/src/events/intro/pcAppearance.js b/src/events/intro/pcAppearance.js
index 8ab31e42072..c40fac981cf 100644
--- a/src/events/intro/pcAppearance.js
+++ b/src/events/intro/pcAppearance.js
@@ -137,7 +137,7 @@ App.UI.Player.design = function() {
}
option = options.addOption("Player aging is", "playerAging")
- .addValue("Enabled", 2).on().addValue("Celebrate birthdays, but don't age.", 1).neutral().addValue("Disabled", 0).off();
+ .addValue("Enabled", 2).on().addValue("Celebrate birthdays, but don't age.", 1).addValue("Disabled", 0).off();
if (!V.cheatMode) {
option.addComment("This option cannot be changed during the game.");
}
diff --git a/src/gui/options/options.js b/src/gui/options/options.js
index 66a4e2d7feb..2c2934f6f84 100644
--- a/src/gui/options/options.js
+++ b/src/gui/options/options.js
@@ -793,7 +793,7 @@ App.UI.optionsPassage = function() {
.addValue("Shown", 1).on().addValue("Hidden", 0).off();
options.addOption("Slave aging", "seeAge")
- .addValue("Enabled", 1).on().addValue("Celebrate birthdays, but don't age.", 2).neutral().addValue("Disabled", 0).off();
+ .addValue("Enabled", 1).on().addValue("Celebrate birthdays, but don't age.", 2).addValue("Disabled", 0).off();
el.append(options.render());
@@ -1052,7 +1052,7 @@ App.UI.artOptions = function() {
.addValue("Enabled", 1).on().addValue("Disabled", 0).off();
options.addOption("Height scaling", "seeHeight")
- .addValue("All images", 2).on().addValue("Small images", 1).neutral().addValue("Disabled", 0).off();
+ .addValue("All images", 2).on().addValue("Small images", 1).addValue("Disabled", 0).off();
options.addOption("Clothing erection bulges are", "showClothingErection")
.addValue("Enabled", true).on().addValue("Disabled", false).off();
diff --git a/src/gui/options/optionsGroup.js b/src/gui/options/optionsGroup.js
index c56a48914f4..9482d87a667 100644
--- a/src/gui/options/optionsGroup.js
+++ b/src/gui/options/optionsGroup.js
@@ -183,15 +183,6 @@ App.UI.OptionsGroup = (function() {
return this;
}
- /**
- * Mark option as neutral to style differently.
- * @returns {Option}
- */
- neutral() {
- this.valuePairs.last().neutral = true;
- return this;
- }
-
/**
* Puts the options in side a pulldown if there are at least 6.
* Not counting text boxes or comments.
@@ -231,8 +222,6 @@ App.UI.OptionsGroup = (function() {
button.classList.add("on");
} else if (value.off) {
button.classList.add("off");
- } else if (value.neutral) {
- button.classList.add("neutral");
}
if (value.mode === "custom") {
button.onclick = () => {
diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw
index 82e4afb5dc5..44e3f27614f 100644
--- a/src/uncategorized/costsBudget.tw
+++ b/src/uncategorized/costsBudget.tw
@@ -78,7 +78,7 @@
<span class="detail">Your weekly costs are as follows:</span>
<<set _options = new App.UI.OptionsGroup()>>
<<run _options.addOption("", "costsBudget", $showAllEntries)
-.addValue("Normal", 0).on().addValue("Show Empty Entries", 1).neutral()>>
+.addValue("Normal", 0).on().addValue("Show Empty Entries", 1)>>
<<includeDOM _options.render()>>
/* Table of Totals */
diff --git a/src/uncategorized/repBudget.tw b/src/uncategorized/repBudget.tw
index ef2534a8043..6d6a831f74a 100644
--- a/src/uncategorized/repBudget.tw
+++ b/src/uncategorized/repBudget.tw
@@ -19,7 +19,7 @@
//Your weekly reputation changes are as follows://
<<set _options = new App.UI.OptionsGroup()>>
<<run _options.addOption("", "repBudget", $showAllEntries)
-.addValue("Normal", 0).on().addValue("Show Empty Entries", 1).neutral()>>
+.addValue("Normal", 0).on().addValue("Show Empty Entries", 1)>>
<<includeDOM _options.render()>>
/* Table of Totals */
--
GitLab