From cb6dacd20aeff7ff94e42c9b68da84c1b5475db1 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Sun, 24 Jan 2021 20:06:10 +0100
Subject: [PATCH] Only allow presets of devotion/trust in starting girls,
removing text box.
---
js/003-data/startingGirlsData.js | 18 ++++++++++++++++++
src/npc/startingGirls/startingGirls.js | 23 +++++------------------
2 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/js/003-data/startingGirlsData.js b/js/003-data/startingGirlsData.js
index 2a647269195..86e157aa8b3 100644
--- a/js/003-data/startingGirlsData.js
+++ b/js/003-data/startingGirlsData.js
@@ -98,5 +98,23 @@ App.Data.StartingGirls = {
{name: "Basic", value: 15, max: 30},
{name: "Skilled", value: 35, max: 60},
{name: "Expert", value: 65, max: 999}
+ ],
+ devotion: [
+ {name: "Utterly hateful", value: -100, max: -95},
+ {name: "Hateful", value: -70, max: -50},
+ {name: "Resistant", value: -35, max: -20},
+ {name: "Ambivalent", value: 0, max: 20},
+ {name: "Accepting", value: 35, max: 50},
+ {name: "Devoted", value: 70, max: 95},
+ {name: "Worshipful", value: 100, max: 999}
+ ],
+ trust: [
+ {name: "Abjectly terrified", value: -100, max: -95},
+ {name: "Terrified", value: -70, max: -50},
+ {name: "Frightened", value: -35, max: -20},
+ {name: "Fearful", value: 0, max: 20},
+ {name: "Careful", value: 35, max: 50},
+ {name: "Trusting", value: 70, max: 95},
+ {name: "Absolute trust", value: 100, max: 999}
]
};
diff --git a/src/npc/startingGirls/startingGirls.js b/src/npc/startingGirls/startingGirls.js
index 9107e55671c..2b595a01de0 100644
--- a/src/npc/startingGirls/startingGirls.js
+++ b/src/npc/startingGirls/startingGirls.js
@@ -1264,14 +1264,8 @@ App.StartingGirls.mental = function(slave) {
options.addOption("Education", "intelligenceImplant", slave)
.addValueList([["Uneducated", 0], ["Educated", 15], ["Well educated", 30]]);
- option = options.addOption("Devotion", "devotion", slave).showTextBox()
- .addRange(-100, -95, "<", "Utterly hateful")
- .addRange(-70, -50, "<", "Hateful")
- .addRange(-35, -20, "<", "Resistant")
- .addRange(0, 20, "<", "Ambivalent")
- .addRange(35, 50, "<", "Accepting")
- .addRange(70, 95, "<", "Devoted")
- .addRange(100, 95, ">=", "Worshipful");
+ option = options.addOption("Devotion", "devotion", slave);
+ App.StartingGirls.addSet(option, App.Data.StartingGirls.devotion);
if (slave.devotion > 20) {
r = [];
r.push("Starting slaves incur");
@@ -1292,16 +1286,9 @@ App.StartingGirls.mental = function(slave) {
option.addComment(`<span class="warning">${r.join(" ")}</span>`);
}
- options.addOption("Trust", "trust", slave).showTextBox()
- .addRange(-100, -95, "<", "Abjectly terrified")
- .addRange(-70, -50, "<", "Terrified")
- .addRange(-35, -20, "<", "Frightened")
- .addRange(0, 20, "<", "Fearful")
- .addRange(35, 50, "<", "Careful")
- .addRange(70, 95, "<", "Trusting")
- .addRange(100, 95, ">=", "Absolute trust");
-
-
+ App.StartingGirls.addSet(
+ options.addOption("Trust", "trust", slave),
+ App.Data.StartingGirls.trust);
if (slave.fetishKnown === 0) {
options.addOption("Fetish", "fetishKnown", slave)
--
GitLab