diff --git a/src/events/intro/introSummary.js b/src/events/intro/introSummary.js
index ca397aefc6761114a304decd765d5684140b09d0..32357cf84a0a625aa450a5ab62c4a085485b8b9f 100644
--- a/src/events/intro/introSummary.js
+++ b/src/events/intro/introSummary.js
@@ -139,6 +139,7 @@ App.Intro.summary = function() {
if (V.freshPC === 1 || V.saveImported === 0) {
switch (V.PC.career) {
case "wealth":
+ case "celebrity":
if (V.PC.vagina === 1) {
V.PC.vagina = 2;
}
@@ -158,11 +159,6 @@ App.Intro.summary = function() {
case "medicine":
V.PC.skill.medicine = 100;
break;
- case "celebrity":
- if (V.PC.vagina === 1) {
- V.PC.vagina = 2;
- }
- break;
case "BlackHat":
V.PC.skill.hacking = 100;
break;
@@ -403,7 +399,7 @@ App.Intro.summary = function() {
if (V.terrain !== "oceanic") {
// TODO: this is from original, but seems unused?
- option = options.addOption(`The Free City is located in <strong>${V.continent}</strong>.`, "continent")
+ options.addOption(`The Free City is located in <strong>${V.continent}</strong>.`, "continent")
.addValue("North America").addCallback(() => V.language = "English")
.addValue("South America").addCallback(() => V.language = "Spanish")
.addValue("Brazil").addCallback(() => V.language = "Portuguese")
diff --git a/src/events/intro/pcAppearance.js b/src/events/intro/pcAppearance.js
index 9468771f11d8d28f54d940a53e64aed7166bc039..96b5024ccaee1d0cc7e6bd95e6ca3d56a2f23e11 100644
--- a/src/events/intro/pcAppearance.js
+++ b/src/events/intro/pcAppearance.js
@@ -384,16 +384,20 @@ App.UI.Player.design = function() {
.addRange(16, 37, "<=", "Pregnant").addCallback(() => { V.PC.pregType = 1; V.PC.labor = 0; })
.addRange(40, 42, "<=", "Ready to drop").addCallback(() => { V.PC.pregType = 1; V.PC.labor = 0; })
.addRange(43, 42, ">", "Ready to drop with octuplets").addCallback(() => { V.PC.pregType = 8; V.PC.labor = 1; });
+ const r =[];
if (V.cheatMode) {
option.showTextBox();
- option.addComment(`how far along your pregnancy is (pregMood kicks in at 24+ weeks) - -2: infertile, -1: contraceptives, 0: not pregnant, 1 - 42: pregnant, 43+: giving birth`);
+ r.push(`How far along your pregnancy is (pregMood kicks in at 24+ weeks) - -2: infertile, -1: contraceptives, 0: not pregnant, 1 - 42: pregnant, 43+: giving birth.`);
}
if (V.PC.preg === -1) {
- option.addComment("You can't get pregnant, however there will be a slight increase to living expenses.");
+ r.push("You can't get pregnant, however there will be a slight increase to living expenses.");
}
if (V.PC.counter.birthsTotal > 0) {
- options.addOption("").addComment(`You have given birth to <strong>${V.PC.counter.birthsTotal}</strong> babies.`);
+ r.push(`You have given birth to <strong>${V.PC.counter.birthsTotal}</strong> babies.`);
+ }
+ if (r.length >0) {
+ option.addComment(r.join(" "));
}
option = options.addOption("Hormone effects", "pregMood", V.PC)
@@ -409,8 +413,8 @@ App.UI.Player.design = function() {
}
if (V.cheatMode) {
- option = options.addOption("Fetus Count", "pregType", V.PC).showTextBox().addComment(`how many you're having (1-8)`);
- option = options.addOption("Pregnancy Source", "pregSource", V.PC)
+ options.addOption("Fetus Count", "pregType", V.PC).showTextBox().addComment(`how many you're having (1-8)`);
+ options.addOption("Pregnancy Source", "pregSource", V.PC)
.addValueList([
["Unknown", 0],
["Self-impregnation", -1],
diff --git a/src/events/intro/pcBodyIntro.js b/src/events/intro/pcBodyIntro.js
index f22df55907db368a7b9cf8cda7ceb257ba3a63f5..64a220a2604b7079caeee607ff05d190c7dac2bb 100644
--- a/src/events/intro/pcBodyIntro.js
+++ b/src/events/intro/pcBodyIntro.js
@@ -52,18 +52,18 @@ App.Intro.PCBodyIntro = function() {
}
// Lower deck
- comment = `These options will affect sex scenes. Feminine options will increase difficulty.`;
r = [];
+ let option;
r.push(`Behind the front of my tailored`);
if (V.PC.dick !== 0) {
if (V.PC.vagina !== -1) {
r.push(`slacks, <strong>both a penis and a vagina.</strong>`);
- options.addOption(r.join(" "))
+ option = options.addOption(r.join(" "))
.customButton("Remove the penis", penisRemove, "PC Body Intro")
.customButton("Remove the vagina", vaginaRemove, "PC Body Intro");
} else {
r.push(`slacks, a <strong>penis.</strong>`);
- options.addOption(r.join(" "))
+ option = options.addOption(r.join(" "))
.customButton(
"Switch to vagina",
() => {
@@ -77,7 +77,7 @@ App.Intro.PCBodyIntro = function() {
}
} else {
r.push(`skirt, a <strong>vagina.</strong>`);
- options.addOption(r.join(" "))
+ option = options.addOption(r.join(" "))
.customButton(
"Switch to penis",
() => {
@@ -89,6 +89,7 @@ App.Intro.PCBodyIntro = function() {
)
.customButton("Add a penis", penisAdd, "PC Body Intro");
}
+ option.addComment(`These options will affect sex scenes. Feminine options will increase difficulty.`);
el.append(options.render());
diff --git a/src/facilities/bodyModification/bodyModification.js b/src/facilities/bodyModification/bodyModification.js
index f0161b7a3b8699b2d36872e4368a938365b042e2..0a58c4b87cff41042d0c782b326e8ea7f7f276e3 100644
--- a/src/facilities/bodyModification/bodyModification.js
+++ b/src/facilities/bodyModification/bodyModification.js
@@ -147,9 +147,7 @@ App.UI.bodyModification = function(slave, cheat = false) {
r.push(`No matter how you chose to apply it, being scarred <span class="health.dec"> hurt ${his} health a little.</span>`);
healthDamage(slave, 10);
}
- r.push(`Afterwards you seal the wounds with a white medical spray. Infection is no risk to `);
- slave.slaveName;
- r.push(` thanks to your curatives, but in order to form obvious scar tissue you had to keep air out and delay normal healing as long as possible.`);
+ r.push(`Afterwards you seal the wounds with a white medical spray. Infection is no risk to ${slave.slaveName} thanks to your curatives, but in order to form obvious scar tissue you had to keep air out and delay normal healing as long as possible.`);
scarApplied = false;
}
if (slave.fetish !== "mindbroken" && slave.fuckdoll === 0) {
@@ -359,7 +357,7 @@ App.UI.bodyModification = function(slave, cheat = false) {
// DESCRIPTIONS
App.UI.DOM.appendNewElement("h2", el, "Tattoos");
- for (const [name, place] of tattooLocations) {
+ for (const name of tattooLocations.keys()) {
r.push(App.UI.DOM.makeElement("div", App.Desc.tattoo(slave, name)));
}
if (r.length === 0) {