From 4e0fd5c722dd1d7c38c7696b04cbdad485372a28 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Sun, 15 Nov 2020 15:05:56 -0800
Subject: [PATCH] Fix some wrong things
---
src/endWeek/reports/brothelReport.js | 3 +--
src/js/slaveSummaryWidgets.js | 2 +-
src/markets/specificMarkets/slaveShelter.js | 2 +-
src/npc/generate/newSlaveIntro.js | 8 ++++----
src/npc/infants/InfantState.js | 2 +-
src/npc/surgery/surgery.js | 2 +-
6 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/endWeek/reports/brothelReport.js b/src/endWeek/reports/brothelReport.js
index a2bc80d7005..ff94e170ad0 100644
--- a/src/endWeek/reports/brothelReport.js
+++ b/src/endWeek/reports/brothelReport.js
@@ -212,7 +212,7 @@ App.EndWeek.brothelReport = function() {
App.Events.addNode(el, r);
if ((SL + V.brothelSlavesGettingHelp < 10) && V.MadamNoSex !== 1 && !slaveResting(S.Madam)) {
- let oldCash = V.cash;
+ const oldCash = V.cash;
if (V.showEWD !== 0) {
App.Events.addParagraph(
el,
@@ -233,7 +233,6 @@ App.EndWeek.brothelReport = function() {
]
);
profits += V.cash - oldCash;
- oldCash = V.cash;
}
}
}
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 8922b784515..80c2ef83d6e 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -934,7 +934,7 @@ App.UI.SlaveSummary = function() {
if (slave.custom.label) {
helpers.makeSpan(res, `${capFirstChar(slave.custom.label)}.`, ["custom-label"]);
}
- if ((slave.relationship !== 0) || (slave.relationship !== 0) || (abbrSettings.clothes === 2) || (abbrSettings.rulesets === 2)) {
+ if ((slave.relationship !== 0) || (totalRelatives(slave) > 0) || (abbrSettings.clothes === 2) || (abbrSettings.rulesets === 2)) {
para = helpers.makeParagraph(res);
}
delegates.relations(slave, para);
diff --git a/src/markets/specificMarkets/slaveShelter.js b/src/markets/specificMarkets/slaveShelter.js
index fbc363122d8..734f28ab826 100644
--- a/src/markets/specificMarkets/slaveShelter.js
+++ b/src/markets/specificMarkets/slaveShelter.js
@@ -283,7 +283,7 @@ App.Markets["Slave Shelter"] = function() {
minAge = 30;
maxAge = 42;
}
- V.shelterSlave = GenerateNewSlave("XX", {minAge: minAge, maxAge: maxAge, disableDisability: 1});
+ V.shelterSlave = GenerateNewSlave("XX", {minAge: minAge, maxAge: maxAge, disableDisability: 1, ageOverridesPedoMode: pedo});
V.shelterSlave.origin = "$His previous owner discarded $him after many pregnancies.";
V.shelterSlave.career = "a breeder";
V.shelterSlave.devotion = jsRandom(-75, -60);
diff --git a/src/npc/generate/newSlaveIntro.js b/src/npc/generate/newSlaveIntro.js
index c59d7323b9b..1a1f214ec93 100644
--- a/src/npc/generate/newSlaveIntro.js
+++ b/src/npc/generate/newSlaveIntro.js
@@ -1919,11 +1919,11 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
} else {
r.push(`${he} sits back up, you tell ${him} calmly and bluntly what ${his} new tattoo says:`);
if (slave.stampTat === "advertisements") {
- "Fuck My Ass.";
+ r.push(`"Fuck My Ass."`);
} else if (slave.stampTat === "rude words") {
- "Rear Entrance.";
+ r.push(`"Rear Entrance."`);
} else if (slave.stampTat === "degradation") {
- "Anal Whore.";
+ r.push(`"Anal Whore."`);
}
}
} else {
@@ -2103,7 +2103,7 @@ App.UI.newSlaveIntro = function(slave, slave2, {tankBorn = false, momInterest =
result(slave) {
const r = [];
r.push(`${He} is much too thin and seems to shirk any offered food, but there is an easy solution to that. If ${he} refuses to eat, ${he} can be made to. Pulling the reluctant slave to the feeders, binding ${him} tightly to a chair, and attaching a hose to the slave food nozzle, you give ${him} a choice; suck the hose willingly or have it forced down ${his} throat. ${He} glares defiantly and keeps ${his} mouth firmly shut. You clamp down on ${his} nose, inevitably forcing ${him} to open ${his} mouth to breath. In that moment, you shove the hose in and down ${his} throat, carefully directing it down into ${his} stomach. ${He} gags as you turn on the flow, ${his} eyes filling with tears as ${he} feels the warm food travel down the tube and into ${his} stomach. ${He} sobs as ${his} belly steadily swells with unwelcome sustenance, ${his} eyes pleading with you, desperate to let you know ${he}'ll be good. You ignore ${him}, letting ${him} fill until ${his} belly is noticeably distended compared to ${his} thin frame. Once you feel ${he} has had enough, you pull the hose from ${his} gut, spraying ${his} face with food in the process, and tell ${him} it will go right back in if ${he} doesn't keep it all down. ${He} <span class="gold">nods fearfully,</span> anything to not go through that again. ${He} hobbles away once freed,`);
- r.push(`one hand covering ${his} retching mouth and the other clasping ${his} <span class="mediumorchid">hated, food bloated middle.</span>`); //TODO: revise for hands
+ r.push(`one hand covering ${his} retching mouth and the other clasping ${his} <span class="mediumorchid">hated, food bloated middle.</span>`); // TODO: revise for hands
slave.devotion -= 10;
slave.trust -= 10;
return r.join(" ");
diff --git a/src/npc/infants/InfantState.js b/src/npc/infants/InfantState.js
index bad32d73198..86f2b4d8e24 100644
--- a/src/npc/infants/InfantState.js
+++ b/src/npc/infants/InfantState.js
@@ -39,7 +39,7 @@ App.Facilities.Nursery.InfantState = class InfantState {
this.markings = "none";
/**
* The infant's eyes
- * @type App.Entity.EyeState
+ * @type {App.Entity.EyeState}
*/
this.eye = new App.Entity.EyeState();
/** hair color */
diff --git a/src/npc/surgery/surgery.js b/src/npc/surgery/surgery.js
index 611388f00dd..dad460bba00 100644
--- a/src/npc/surgery/surgery.js
+++ b/src/npc/surgery/surgery.js
@@ -727,7 +727,7 @@ globalThis.setEyeColor = function(slave, color, side = "both") {
* @param {string} sclera
* @param {string} side
*/
-globalThis.setEyeColorFull = function(slave, iris = "brown", pupil = "circular", sclera = "white", side) {
+globalThis.setEyeColorFull = function(slave, iris = "brown", pupil = "circular", sclera = "white", side = "both") {
if (side === "both") {
setEyeColorFull(slave, iris, pupil, sclera, "left");
setEyeColorFull(slave, iris, pupil, sclera, "right");
--
GitLab