diff --git a/js/003-data/slaveMods.js b/js/003-data/slaveMods.js
index b5d8e78164b5f2378e5cb699a66c5dbab78dfc3a..fa46443c69a254b80d419702babfd509f527eb31 100644
--- a/js/003-data/slaveMods.js
+++ b/js/003-data/slaveMods.js
@@ -385,14 +385,12 @@ App.Medicine.Modification.hairStyles = {
{
title: "Apply hair growth stimulating treatment",
hLength: 0,
- requirements: function(slave) { return (slave.hLength === 1); }
+ requirements: slave => !slave.bald
},
{
title: "Apply extensions",
onApplication: function(slave) { slave.hLength += 10; },
- requirements: function(slave) { return (!slave.hLength === 1 && slave.hLength < 150); }
+ requirements: slave => !slave.bald && slave.hLength < 150
},
]
};
-
-
diff --git a/src/js/utilsFC.js b/src/js/utilsFC.js
index cfa0bab20e893c0d6c5b0f187127f335bf6f503b..078f647039cbdfdafc67e166c1fe6c6e003a2f05 100644
--- a/src/js/utilsFC.js
+++ b/src/js/utilsFC.js
@@ -2935,9 +2935,9 @@ globalThis.penthouseCensus = function() {
* @returns {App.Entity.SlaveState[]} array of slaves employed at the job or facility, sorted in accordance to user choice
*/
App.Utils.sortedEmployees = function(jobOrFacility) {
- const emploees = jobOrFacility.employees();
- SlaveSort.slaves(emploees);
- return emploees;
+ const employees = jobOrFacility.employees();
+ SlaveSort.slaves(employees);
+ return employees;
};
/**
diff --git a/src/npc/databases/dSlavesDatabase.js b/src/npc/databases/dSlavesDatabase.js
index 9fe6b3e5c7f092181899a347e3a52c5eb6b346c0..02f590e2357e5d9d9a26b473bde7847f073ea162 100644
--- a/src/npc/databases/dSlavesDatabase.js
+++ b/src/npc/databases/dSlavesDatabase.js
@@ -425,7 +425,7 @@ App.Data.HeroSlaves.D = [
weight: -20,
height: 152,
race: "white",
- markings: "freckled",
+ markings: "freckles",
eye: {origColor: "blue"},
origHColor: "blonde",
pubicHColor: "blonde",
@@ -1248,9 +1248,9 @@ App.Data.HeroSlaves.D = [
skill: {
vaginal: 100,
oral: 100,
- anal: 100
+ anal: 100,
+ entertainment: 35,
},
- entertainment: 35,
intelligence: 20,
intelligenceImplant: 30,
attrXX: 80,
@@ -1405,9 +1405,9 @@ App.Data.HeroSlaves.D = [
skill: {
vaginal: 35,
oral: 35,
- anal: 35
+ anal: 35,
+ combat: 1,
},
- combat: 1,
intelligence: -30,
attrXY: 40,
fetishKnown: 1,
@@ -1595,7 +1595,7 @@ App.Data.HeroSlaves.D = [
devotion: 100,
height: 190,
nationality: "Irish",
- markings: "freckled",
+ markings: "freckles",
race: "white",
eye: {origColor: "green"},
origHColor: "red",
@@ -1872,7 +1872,7 @@ App.Data.HeroSlaves.D = [
health: {condition: 20},
devotion: 40,
weight: 20,
- reace: "white",
+ race: "white",
origHColor: "black",
pubicHColor: "black",
origSkin: "light",
@@ -1970,9 +1970,9 @@ App.Data.HeroSlaves.D = [
nosePiercing: 1,
skill: {
vaginal: 15,
- oral: 15
+ oral: 15,
+ anal: 100,
},
- anal: 100,
attrXX: 80,
attrXY: 40,
fetishKnown: 1
@@ -2217,7 +2217,7 @@ App.Data.HeroSlaves.D = [
devotion: -25,
weight: 20,
height: 157,
- reace: "white",
+ race: "white",
origSkin: "white",
hLength: 60,
hStyle: "neat",
@@ -2420,9 +2420,9 @@ App.Data.HeroSlaves.D = [
ovaries: 1,
skill: {
vaginal: 15,
- oral: 15
+ oral: 15,
+ anal: 15,
},
- anal: 15,
intelligence: random(96, 100),
intelligenceImplant: 30,
attrXY: 40,
@@ -2467,7 +2467,7 @@ App.Data.HeroSlaves.D = [
custom: {desc: "$He has a heart shaped face and many scars."},
faceShape: "cute",
hips: 3,
- markings: "beauty"
+ markings: "beauty mark"
},
/* Fixed customdesc syntax, changed eye color, added piercings, increased waist -BoneyM*/
{
@@ -2631,7 +2631,7 @@ App.Data.HeroSlaves.D = [
ovaries: 1,
nosePiercing: 1,
attrXY: 40,
- fetish: "arrogant",
+ behavioralFlaw: "arrogant",
fetishKnown: 1,
sexualFlaw: "hates penetration"
},
@@ -2844,9 +2844,9 @@ App.Data.HeroSlaves.D = [
vaginal: 35,
oral: 35,
anal: 35,
- whoring: 15
+ whoring: 15,
+ entertainment: 15,
},
- entertainment: 15,
clothes: "a slave gown",
intelligence: 30,
intelligenceImplant: 30,
@@ -2893,7 +2893,7 @@ App.Data.HeroSlaves.D = [
attrXY: 40,
fetishKnown: 1,
behavioralFlaw: "bitchy",
- sexualFlaw: "crude "
+ sexualFlaw: "crude"
},
/* mischievous tease*/
/* Reduced height, added entertainskill, added bitchy, changed eyes -BoneyM*/
@@ -3235,7 +3235,7 @@ App.Data.HeroSlaves.D = [
vaginaLube: 1,
clit: 2,
clitPiercing: 2,
- clitSetting: "lesbian",
+ clitSetting: "women",
anus: 2,
ovaries: 1,
anusTat: "bleached",
@@ -3349,9 +3349,9 @@ App.Data.HeroSlaves.D = [
vaginal: 35,
oral: 100,
anal: 100,
- whoring: 15
+ whoring: 15,
+ entertainment: 15,
},
- entertainment: 15,
clothes: "a comfortable bodysuit",
collar: "pretty jewelry",
shoes: "heels",
@@ -3415,9 +3415,9 @@ App.Data.HeroSlaves.D = [
vaginal: 100,
oral: 100,
anal: 35,
- whoring: 15
+ whoring: 15,
+ entertainment: 15,
},
- entertainment: 15,
clothes: "a slutty outfit",
intelligence: -30,
attrXY: 40,
@@ -3555,8 +3555,8 @@ App.Data.HeroSlaves.D = [
attrXX: 80,
attrXY: 0,
fetishKnown: 1,
- behavioralFlaw: "bitchy",
- sexualFlaw: "hates men",
+ behavioralFlaw: "hates men",
+ sexualFlaw: "crude",
custom: {desc: "$He absolutely detests men."},
career: "a principal"
},
@@ -3603,9 +3603,9 @@ App.Data.HeroSlaves.D = [
vaginal: 100,
oral: 100,
anal: 100,
- whoring: 100
+ whoring: 100,
+ entertainment: 35,
},
- entertainment: 35,
combat: 0,
collar: "heavy gold",
shoes: "flats",
@@ -3649,9 +3649,9 @@ App.Data.HeroSlaves.D = [
vaginal: 100,
oral: 100,
anal: 100,
- whoring: 100
+ whoring: 100,
+ entertainment: 35,
},
- entertainment: 35,
collar: "heavy gold",
shoes: "heels",
intelligence: 96,
@@ -3839,9 +3839,9 @@ App.Data.HeroSlaves.D = [
ovaries: 1,
skill: {
oral: 15,
- anal: 15
+ anal: 15,
+ whoring: 15,
},
- whoring: 15,
attrXY: 40,
behavioralFlaw: "hates women",
custom: {desc: "The pale skin within $his tan lines is lightly freckled."},
@@ -4651,7 +4651,6 @@ App.Data.HeroSlaves.Dextreme = [
fetish: "boobs",
fetishStrength: 70,
behavioralFlaw: "arrogant",
- sexualFlaw: "hates men",
custom: {desc: "$He has an identical twin sister named Kennerly, from whom $he hates to be parted. They're from the former United States."},
mother: -9999,
father: -9998
@@ -4698,7 +4697,6 @@ App.Data.HeroSlaves.Dextreme = [
fetish: "boobs",
fetishStrength: 70,
behavioralFlaw: "arrogant",
- sexualFlaw: "hates men",
custom: {desc: "$He has an identical twin sister named Camille, from whom $he hates to be parted. They're from the former United States."},
mother: -9999,
father: -9998
diff --git a/src/npc/databases/ddSlavesDatabase.js b/src/npc/databases/ddSlavesDatabase.js
index 4659e96168274e491a8f9f0add374f102aede5e1..ae6f30bab726563420f4649ce0255dffae38ac94 100644
--- a/src/npc/databases/ddSlavesDatabase.js
+++ b/src/npc/databases/ddSlavesDatabase.js
@@ -528,7 +528,7 @@ App.Data.HeroSlaves.DD = [
devotion: 60,
race: "white",
nationality: "Irish",
- markings: "freckled",
+ markings: "freckles",
eye: {origColor: "blue"},
origHColor: "red",
pubicHColor: "red",
@@ -602,7 +602,7 @@ App.Data.HeroSlaves.DD = [
devotion: 100,
nationality: "Irish",
race: "white",
- markings: "freckled",
+ markings: "freckles",
eye: {origColor: "green"},
origHColor: "red",
pubicHColor: "red",
diff --git a/src/npc/databases/dfSlavesDatabase.js b/src/npc/databases/dfSlavesDatabase.js
index 290c8c7cf435833dbe612ba371975bf81f86ccde..60e7cb94785699a3ee7b1587df2efe0d633789ee 100644
--- a/src/npc/databases/dfSlavesDatabase.js
+++ b/src/npc/databases/dfSlavesDatabase.js
@@ -127,7 +127,7 @@ App.Data.HeroSlaves.DF = [
teeth: "removable",
clitPiercing: 2,
lipsPiercing: 2,
- counter: {PbirthsTotal: 1}
+ counter: {birthsTotal: 1}
},
/* vibe nips, saliva implant*/
{
diff --git a/src/npc/descriptions/drugs.js b/src/npc/descriptions/drugs.js
index 158effb501c72aa0c83a962deb57aee845e9fc1c..1f4a34e433f593dc0d8f44761f78532c9296f3ea 100644
--- a/src/npc/descriptions/drugs.js
+++ b/src/npc/descriptions/drugs.js
@@ -251,7 +251,7 @@ App.Desc.drugs = function(slave) {
function aphrodisiacs() {
const r = [];
- if (slave.aphrodisiacs > 0 || slave.inflationType === "aphrodisiacs") {
+ if (slave.aphrodisiacs > 0 || slave.inflationType === "aphrodisiac") {
if (slave.fetish === "mindbroken") {
ignoredRule = 1;
} else if (disobedience(slave) !== 0) {
@@ -259,22 +259,22 @@ App.Desc.drugs = function(slave) {
} else {
ignoredRule = 0;
}
- if (slave.inflationType === "aphrodisiacs" || slave.aphrodisiacs > 1) {
- if (slave.inflationType === "aphrodisiacs") {
+ if (slave.inflationType === "aphrodisiac" || slave.aphrodisiacs > 1) {
+ if (slave.inflationType === "aphrodisiac") {
r.push(`${He}'s literally full of`);
} else {
r.push(`${He}'s swimming in`);
}
if (!hasAnyArms(slave)) {
r.push(`aphrodisiacs, but is an amputee, so ${he} cannot touch ${himself}. ${He} writhes with extreme sexual frustration, desperately trying to relieve`);
- if (slave.inflationType === "aphrodisiacs") {
+ if (slave.inflationType === "aphrodisiac") {
r.push(`${himself}, but only managing to stir up the aphrodisiacs contained in ${his} gut, strengthening their effects even more.`);
} else {
r.push(`${himself}.`);
}
} else if (slave.rules.release.masturbation === 0 && slave.rules.release.master === 0 && ignoredRule === 0) {
r.push(`aphrodisiacs, but is not permitted to touch ${him}self nor beg you for release. ${He} writhes with extreme sexual frustration, desperate to not break the rules in front of`);
- if (slave.inflationType === "aphrodisiacs") {
+ if (slave.inflationType === "aphrodisiac") {
r.push(`you, but only manages to stir up the aphrodisiacs contained in ${his} gut, further strengthening their effects on ${him}.`);
} else {
r.push(`you.`);
@@ -312,7 +312,7 @@ App.Desc.drugs = function(slave) {
} else {
r.push(`viciously gropes, kneads and milks ${his} breasts, only stopping to occasionally focus on ${his} erect nipples.`);
}
- if (slave.inflationType === "aphrodisiacs") {
+ if (slave.inflationType === "aphrodisiac") {
r.push(`${His} frantic attempts force ${his} distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in ${his} gut and strengthening their effects even more.`);
}
} else {
@@ -354,7 +354,7 @@ App.Desc.drugs = function(slave) {
}
r.push(`to vigorously fuck ${his} favorite hole.`);
}
- if (slave.inflationType === "aphrodisiacs") {
+ if (slave.inflationType === "aphrodisiac") {
r.push(`${His} frantic attempts force ${his} distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in ${his} gut and strengthening their effects even more.`);
}
} else {
@@ -401,12 +401,12 @@ App.Desc.drugs = function(slave) {
}
r.push(`to fuck ${his} own ass.`);
}
- if (slave.inflationType === "aphrodisiacs") {
+ if (slave.inflationType === "aphrodisiac") {
r.push(`${His} frantic attempts force ${his} distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in ${his} gut and strengthening their effects even more.`);
}
} else {
r.push(`aphrodisiacs, but is wearing full chastity and cannot touch ${him}self. ${He} writhes with extreme sexual frustration, desperately trying to relieve`);
- if (slave.inflationType === "aphrodisiacs") {
+ if (slave.inflationType === "aphrodisiac") {
r.push(`${himself}, but only managing to stir up the aphrodisiacs contained in ${his} gut, strengthening their effects even more`);
} else {
r.push(`${himself}.`);
@@ -489,7 +489,7 @@ App.Desc.drugs = function(slave) {
} else {
r.push(`${His} cock is painfully engorged.`);
}
- if (slave.inflationType === "aphrodisiacs") {
+ if (slave.inflationType === "aphrodisiac") {
r.push(`${His} frantic masturbation forces ${his} distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in ${his} gut and strengthening their effects even more.`);
}
}
@@ -565,12 +565,12 @@ App.Desc.drugs = function(slave) {
}
r.push(`to fuck ${his} own ass.`);
}
- if (slave.inflationType === "aphrodisiacs") {
+ if (slave.inflationType === "aphrodisiac") {
r.push(`${His} frantic attempts force ${his} distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in ${his} gut and strengthening their effects even more.`);
}
} else {
r.push(`aphrodisiacs, but is wearing a chastity belt and cannot touch ${him}self. ${He} writhes with extreme sexual frustration, desperately trying to relieve`);
- if (slave.inflationType === "aphrodisiacs") {
+ if (slave.inflationType === "aphrodisiac") {
r.push(`${himself}, but only managing to stir up the aphrodisiacs contained in ${his} gut, strengthening their effects even more.`);
} else {
r.push(`${himself}.`);
@@ -665,12 +665,12 @@ App.Desc.drugs = function(slave) {
}
r.push(`to fuck ${his} own ass.`);
}
- if (slave.inflationType === "aphrodisiacs") {
+ if (slave.inflationType === "aphrodisiac") {
r.push(`${His} frantic attempts force ${his} distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in ${his} gut and strengthening their effects even more.`);
}
} else {
r.push(`aphrodisiacs, but is wearing a chastity cage and cannot touch ${him}self. ${He} writhes with extreme sexual frustration, desperately trying to relieve`);
- if (slave.inflationType === "aphrodisiacs") {
+ if (slave.inflationType === "aphrodisiac") {
r.push(`${himself}, but only managing to stir up the aphrodisiacs contained in ${his} gut, strengthening their effects even more`);
} else {
r.push(`${himself}.`);
@@ -757,7 +757,7 @@ App.Desc.drugs = function(slave) {
if (canDoAnal(slave)) {
if (slave.anus === 0) {
r.push(`plays with a nipple with one hand while furiously rubbing ${his} virgin anus and the sensitive perineum beneath it with the other, desperately trying to get ${him}self off.`);
- if (slave.inflationType === "aphrodisiacs") {
+ if (slave.inflationType === "aphrodisiac") {
r.push(`${His} frantic attempts force ${his} distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in ${his} gut and strengthening their effects even more.`);
}
} else {
@@ -770,7 +770,7 @@ App.Desc.drugs = function(slave) {
r.push(`a finger`);
}
r.push(`to fuck ${his} own ass.`);
- if (slave.inflationType === "aphrodisiacs") {
+ if (slave.inflationType === "aphrodisiac") {
r.push(`${His} frantic attempts force ${his} distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in ${his} gut and strengthening their effects even more.`);
}
}
@@ -779,7 +779,7 @@ App.Desc.drugs = function(slave) {
} else {
r.push(`writhes with extreme sexual frustration, desperately trying to relieve ${him}self despite ${his} anal chastity.`);
}
- if (slave.inflationType === "aphrodisiacs") {
+ if (slave.inflationType === "aphrodisiac") {
r.push(`${His} frantic attempts force ${his} distended middle to jiggle obscenely, stirring up the aphrodisiacs contained in ${his} gut and strengthening their effects even more.`);
}
} else {
diff --git a/src/npc/generate/generateMarketSlave.js b/src/npc/generate/generateMarketSlave.js
index 1fd4b5a734329064f1e2b8c9d46a691b88095e69..048c48b543107bcf1f3fc2d2ecf7ccfddb8d4600 100644
--- a/src/npc/generate/generateMarketSlave.js
+++ b/src/npc/generate/generateMarketSlave.js
@@ -1385,7 +1385,7 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
slaveGen = jsEither([10, 20]);
slave.lips += slaveGen;
slave.lipsImplant += slaveGen;
- slave.waist = Math.trunc(slave.waist, -100, 15);
+ slave.waist = Math.clamp(slave.waist, -100, 15);
if (slave.face < 40) {
slave.faceImplant = 20*jsRandom(0, 1);
slave.face = Math.clamp(slave.face+slave.faceImplant, -100, 100);
@@ -2220,8 +2220,8 @@ globalThis.generateMarketSlave = function(market = "kidnappers", numArcology = 1
if (V.TFS.schoolUpgrade === 1) {
slave.sexualQuirk = "caring";
}
- slave.sexualFlaw = jsEither(["hates women", "none"]);
- slave.behavioralFlaw = jsEither(["arrogant", "none"]);
+ slave.sexualFlaw = "none";
+ slave.behavioralFlaw = jsEither(["hates women", "arrogant", "none"]);
slave.fetishStrength = 100;
slave.fetishKnown = 0;
slave.attrKnown = 0;