From 1662ea8f26e044d5dc65e2d79f61a5ec1dea428a Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 10 Aug 2020 21:23:00 -0400
Subject: [PATCH] fixes
---
src/npc/children/longChildDescription.js | 18 ++++-----
src/npc/descriptions/style/clothing.js | 2 +-
src/npc/infants/longInfantDescription.js | 2 +-
src/pregmod/FCTV/FCTVshows.js | 47 +++++++++++-------------
4 files changed, 32 insertions(+), 37 deletions(-)
diff --git a/src/npc/children/longChildDescription.js b/src/npc/children/longChildDescription.js
index 4d4611995c1..c3521993d28 100644
--- a/src/npc/children/longChildDescription.js
+++ b/src/npc/children/longChildDescription.js
@@ -4599,7 +4599,7 @@ App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, event
if (((V.week - child.weekAcquired) * 7) + jsRandom(-3, 3)) {
r += `slavery here. There are only a few. `;
} else {
- r += `slavery here: ${weeksOwned} of them. `;
+ r += `slavery here: ${child.weeksOwned} of them. `;
}
}
break;
@@ -4711,7 +4711,7 @@ App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, event
r += `An octopus is tattooed on ${his} upper chest; its tentacles reach down to envelop ${his} breasts, their tips reaching for but not quite reaching each nipple. `;
break;
case "scenes":
- r += `${His} chest is tattooed with lewd scenes; each of ${his} breasts shows a phallus receiving a titfuck while each of ${his} collarbones shows a ${woman} deepthroating a large phallus. `;
+ r += `${His} chest is tattooed with lewd scenes; each of ${his} breasts shows a phallus receiving a titfuck while each of ${his} collarbones shows a woman deepthroating a large phallus. `;
break;
case "bovine patterns":
r += `${His} chest is tattooed to look like a Holstein cow's, with ${his} udders left bare to draw attention to them. `;
@@ -4778,7 +4778,7 @@ App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, event
} else if (child.dick > 0) {
r += `${His} buttocks are tattooed with lewd scenes; each of ${his} buttocks shows a gelding, legs together to conceal ${his} cock and display ${his} anus, while each of ${his} thighs shows a gelding being double penetrated in ${his} gaping anus. `;
} else {
- r += `${His} buttocks are tattooed with lewd scenes; each of ${his} buttocks shows a ${woman} being sodomized while each of ${his} thighs shows a ${woman} being gangbanged in all ${his} holes. `;
+ r += `${His} buttocks are tattooed with lewd scenes; each of ${his} buttocks shows a woman being sodomized while each of ${his} thighs shows a woman being gangbanged in all ${his} holes. `;
}
break;
case "bovine patterns":
@@ -5166,7 +5166,7 @@ App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, event
if (!child.fuckdoll) {
if (hasAnyProstheticEyes(child)) {
- r += `${He} has ${App.Desc.eyesType(slave)}. `;
+ r += `${He} has ${App.Desc.eyesType(child)}. `;
}
if (child.eyewear === "corrective glasses" || child.eyewear === "blurring glasses" || child.eyewear === "glasses") {
@@ -7206,13 +7206,13 @@ App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, event
if (child.relationship >= 3 && totalRelatives(child) > 0) {
const lover = getSlave(child.relationshipTarget);
if (jsDef(lover)) {
- const relTerm = relativeTerm(child, _lover);
+ const relTerm = relativeTerm(child, lover);
if (relTerm !== null) {
r += `${He} is in an <span class="lightgreen">incestuous relationship with ${his} ${relTerm}, ${SlaveFullName(lover)}.</span> `;
}
}
} else if (child.relationship <= -2) {
- const relTerm = relativeTerm(child, $PC);
+ const relTerm = relativeTerm(child, V.PC);
if (relTerm !== null) {
r += `${He} is in an <span class="lightgreen">incestuous relationship with ${his} ${relTerm}, you.</span> `;
}
@@ -7223,11 +7223,11 @@ App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, event
if (jsDef(lcd)) {
r += `${He} `;
if (child.rivalry <= 1) {
- r += `<span class="lightsalmon">dislikes</span> ${SlaveFullName(slaves[Lcd])}. `;
+ r += `<span class="lightsalmon">dislikes</span> ${SlaveFullName(slaves[lcd])}. `;
} else if (child.rivalry <= 2) {
- r += `is ${SlaveFullName(slaves[Lcd])}>>'s <span class="lightsalmon">rival.</span> `;
+ r += `is ${SlaveFullName(slaves[lcd])}>>'s <span class="lightsalmon">rival.</span> `;
} else {
- r += `<span class="lightsalmon">bitterly hates</span> ${SlaveFullName(slaves[Lcd])}>>. `;
+ r += `<span class="lightsalmon">bitterly hates</span> ${SlaveFullName(slaves[lcd])}>>. `;
}
}
}
diff --git a/src/npc/descriptions/style/clothing.js b/src/npc/descriptions/style/clothing.js
index 9fe0884e121..7ba30c337f6 100644
--- a/src/npc/descriptions/style/clothing.js
+++ b/src/npc/descriptions/style/clothing.js
@@ -8,7 +8,7 @@
App.Desc.clothing = function(slave, {market, eventDescription} = {}) {
const r = [];
const {
- he, him, his, hers, himself, boy, He, His
+ he, him, his, He, His
} = getPronouns(slave);
if (V.showClothing === 1 && !market) {
diff --git a/src/npc/infants/longInfantDescription.js b/src/npc/infants/longInfantDescription.js
index f229127e0f3..4a26e56713b 100644
--- a/src/npc/infants/longInfantDescription.js
+++ b/src/npc/infants/longInfantDescription.js
@@ -20,7 +20,7 @@ App.Facilities.Nursery.LongInfantDescription = function(child, {market = 0, even
const
{
- he, him, his, He, His
+ he, his, He
} = getPronouns(child);
if (child.father === -1 && child.mother === -1) {
diff --git a/src/pregmod/FCTV/FCTVshows.js b/src/pregmod/FCTV/FCTVshows.js
index e539f3faf8b..b8299692435 100644
--- a/src/pregmod/FCTV/FCTVshows.js
+++ b/src/pregmod/FCTV/FCTVshows.js
@@ -129,9 +129,9 @@ App.Data.FCTV.actors = {
slave.attrKnown = 1;
slave.fetishKnown = 1;
slave.lips = jsRandom(20, 50);
- slave.fetish = either("cumslut", "cumslut", "humiliation", "pregnancy", "pregnancy", "pregnancy", "submissive");
- slave.behavioralQuirk = either("advocate", "funny", "insecure", "none", "none");
- slave.sexualQuirk = either("caring", "none", "romantic");
+ slave.fetish = jsEither("cumslut", "cumslut", "humiliation", "pregnancy", "pregnancy", "pregnancy", "submissive");
+ slave.behavioralQuirk = jsEither("advocate", "funny", "insecure", "none", "none");
+ slave.sexualQuirk = jsEither("caring", "none", "romantic");
slave.fetishStrength = jsRandom(70, 100);
slave.sexualFlaw = "none";
slave.behavioralFlaw = "none";
@@ -179,11 +179,11 @@ App.Data.FCTV.actors = {
slave.sexualFlaw = "breeder";
slave.behavioralFlaw = "none";
slave.behavioralQuirk = "none";
- slave.sexualQuirk = either("caring", "caring", "romantic");
+ slave.sexualQuirk = jsEither("caring", "caring", "romantic");
slave.intelligence = jsRandom(-15, 80);
slave.intelligenceImplant = 15;
if (V.seeHyperPreg === 0) {
- slave.pregType = either(6, 7, 7, 8);
+ slave.pregType = jsEither(6, 7, 7, 8);
} else {
slave.pregType = jsRandom(10, 16);
}
@@ -222,7 +222,7 @@ App.Data.FCTV.actors = {
slave.attrKnown = 1;
slave.fetishKnown = 1;
slave.sexualQuirk = "none";
- slave.fetish = either("cumslut", "humiliation", "pregnancy", "pregnancy", "submissive");
+ slave.fetish = jsEither("cumslut", "humiliation", "pregnancy", "pregnancy", "submissive");
slave.fetishStrength = jsRandom(70, 100);
slave.sexualFlaw = "none";
slave.behavioralFlaw = "none";
@@ -260,7 +260,7 @@ App.Data.FCTV.actors = {
slave.attrXX = jsRandom(40, 85);
slave.attrKnown = 1;
slave.fetishKnown = 1;
- slave.fetish = either("buttslut", "buttslut", "cumslut", "cumslut", "humiliation", "pregnancy", "pregnancy", "submissive");
+ slave.fetish = jsEither("buttslut", "buttslut", "cumslut", "cumslut", "humiliation", "pregnancy", "pregnancy", "submissive");
slave.fetishStrength = jsRandom(70, 100);
slave.sexualFlaw = "none";
slave.behavioralFlaw = "none";
@@ -295,11 +295,11 @@ App.Data.FCTV.actors = {
slave.preg = 0;
slave.lips = jsRandom(25, 50);
slave.vaginaLube = 2;
- slave.sexualFlaw = either("hates anal", "hates oral", "hates penetration", "idealistic");
- slave.behavioralFlaw = either("arrogant", "bitchy", "hates men");
+ slave.sexualFlaw = jsEither("hates anal", "hates oral", "hates penetration", "idealistic");
+ slave.behavioralFlaw = jsEither("arrogant", "bitchy", "hates men");
slave.energy = 10;
slave.fetish = "none";
- slave.clit = either(3, 3, 4, 4, 5, 8, 10);
+ slave.clit = jsEither(3, 3, 4, 4, 5, 8, 10);
slave.muscles = jsRandom(0, 25);
slave.devotion = jsRandom(-25, 25);
slave.trust = jsRandom(-25, 25);
@@ -338,7 +338,7 @@ App.Data.FCTV.actors = {
slave.preg = 0;
slave.dick = jsRandom(3, 5);
slave.balls = jsRandom(3, 6);
- slave.muscles = either(20, 50);
+ slave.muscles = jsEither(20, 50);
slave.energy = jsRandom(70, 100);
slave.attrXY = jsRandom(70, 100);
slave.attrXX = jsRandom(70, 100);
@@ -412,7 +412,7 @@ App.Data.FCTV.actors = {
races = setup.filterRacesLowercase.filter(race => race !== V.arcologies[0].FSSubjugationistRace);
}
const slave = GenerateNewSlave(gender, {
- ageOverridesPedoMode: 1, disableDisability: 1, minAge: 25, maxAge: 35, race: races.random()
+ ageOverridesPedoMode: 1, disableDisability: 1, minAge: 25, maxAge: 35, race: races.jsRandom()
});
slave.devotion = 45;
slave.trust = 55;
@@ -427,9 +427,9 @@ App.Data.FCTV.actors = {
slave.markings = "none";
if (slave.weight > 130) {
slave.weight -= 100;
- slave.waist = random(-10, 50);
+ slave.waist = jsRandom(-10, 50);
}
- slave.health.condition = random(60, 80);
+ slave.health.condition = jsRandom(60, 80);
return slave;
},
get scientist() {
@@ -441,7 +441,7 @@ App.Data.FCTV.actors = {
races = setup.filterRacesLowercase.filter(race => race !== V.arcologies[0].FSSubjugationistRace);
}
const slave = GenerateNewSlave(gender, {
- ageOverridesPedoMode: 1, disableDisability: 1, minAge: 25, maxAge: 35, race: races.random()
+ ageOverridesPedoMode: 1, disableDisability: 1, minAge: 25, maxAge: 35, race: races.jsRandom()
});
slave.devotion = 0;
@@ -459,9 +459,9 @@ App.Data.FCTV.actors = {
slave.markings = "none";
if (slave.weight > 130) {
slave.weight -= 100;
- slave.waist = random(-10, 50);
+ slave.waist = jsRandom(-10, 50);
}
- slave.health.condition = random(60, 80);
+ slave.health.condition = jsRandom(60, 80);
return slave;
},
get nun() {
@@ -473,7 +473,7 @@ App.Data.FCTV.actors = {
races = setup.filterRacesLowercase.filter(race => race !== V.arcologies[0].FSSubjugationistRace);
}
const slave = GenerateNewSlave(gender, {
- ageOverridesPedoMode: 1, disableDisability: 1, minAge: 25, maxAge: 35, race: races.random()
+ ageOverridesPedoMode: 1, disableDisability: 1, minAge: 25, maxAge: 35, race: races.jsRandom()
});
slave.devotion = jsRandom(45, 60);
@@ -487,9 +487,9 @@ App.Data.FCTV.actors = {
slave.markings = "none";
if (slave.weight > 130) {
slave.weight -= 100;
- slave.waist = random(-10, 50);
+ slave.waist = jsRandom(-10, 50);
}
- slave.health.condition = random(60, 80);
+ slave.health.condition = jsRandom(60, 80);
return slave;
},
get littleCloud() {
@@ -2105,12 +2105,7 @@ App.Data.FCTV.channels = {
} else {
r.push(`you`);
}
- if (V.usedRemote === 1) {
- r.push(`tune to`);
- } else {
- r.push(`begin watching`);
- }
- r.push(`the <i>Age of Slavery</i> channel. With so many new types of arcologies emerging, it's sometimes difficult to tell if you are watching events unfolding on a set or in a real arcology with a historical society.</p>`);
+ r.push(`begin watching the <i>Age of Slavery</i> channel. With so many new types of arcologies emerging, it's sometimes difficult to tell if you are watching events unfolding on a set or in a real arcology with a historical society.</p>`);
return r.join(" ");
},
episode: [
--
GitLab