diff --git a/src/events/RE/reArcologyInspection.js b/src/events/RE/reArcologyInspection.js
index bbf3d2850c2b33c7335c0abc24850fe15f6421fa..e7a4da784de79631d72466dcdefe87dacef519c1 100644
--- a/src/events/RE/reArcologyInspection.js
+++ b/src/events/RE/reArcologyInspection.js
@@ -444,10 +444,10 @@ App.Events.REArcologyInspection = class REArcologyInspection extends App.Events.
function virginityWarning() {
const virgins = [];
- if (agent && (agent.vagina === 0 || agent.anus == 0)) {
+ if (agent && (agent.vagina === 0 || agent.anus === 0)) {
virgins.push(agent.slaveName);
}
- if (agentLover && (agentLover.vagina === 0 || agentLover.anus == 0)) {
+ if (agentLover && (agentLover.vagina === 0 || agentLover.anus === 0)) {
virgins.push(agentLover.slaveName);
}
if (virgins.length > 0) {
diff --git a/src/events/RE/rePregInventorFCTV.js b/src/events/RE/rePregInventorFCTV.js
index 2188745323520742d1598c77fa984914684c3a08..8ac5cd92523094777e587882f5dc6d5e07c46d9e 100644
--- a/src/events/RE/rePregInventorFCTV.js
+++ b/src/events/RE/rePregInventorFCTV.js
@@ -53,7 +53,7 @@ App.Events.rePregInventorFCTV = class rePregInventorFCTV extends App.Events.Base
const responses = [];
if (V.PC.skill.hacking >= 100) {
- new App.Events.Result(`Manipulate the FCTV algorithms`, manipulate);
+ responses.push(new App.Events.Result(`Manipulate the FCTV algorithms`, manipulate));
}
responses.push(new App.Events.Result(`Spend ${cashFormat(10000)} to fund additional advertising`, advertising));
responses.push(new App.Events.Result(`Trust in your slave`, trust));
diff --git a/src/events/RE/reRelativeRecruiter.js b/src/events/RE/reRelativeRecruiter.js
index f1405dfab40662fb03dfc121b94e4d8c92211756..340d7aaeb9305fd083d4f63a3ccf9ff2a21fbf00 100644
--- a/src/events/RE/reRelativeRecruiter.js
+++ b/src/events/RE/reRelativeRecruiter.js
@@ -485,7 +485,7 @@ App.Events.RERelativeRecruiter = class RERelativeRecruiter extends App.Events.Ba
slave.skill.oral = 35;
slave.skill.anal = 75;
slave.hLength = random(10, 20);
- slave.hStyle = either("buzzcut", "long", "neat", "trimmed");
+ slave.hStyle = either("buzzcut", "neat", "trimmed");
slave.voice = 1;
slave.energy = 0;
slave.balls = 0;
diff --git a/src/events/RE/reShelterInspection.js b/src/events/RE/reShelterInspection.js
index 5931bcc201462d1fc0f3957139d6827b7f0475f4..496ca07c5069ae3f67b764918f06925cf72dad98 100644
--- a/src/events/RE/reShelterInspection.js
+++ b/src/events/RE/reShelterInspection.js
@@ -256,11 +256,10 @@ App.Events.REShelterInspection = class REShelterInspection extends App.Events.B
function allow() {
let r = [];
const el = new DocumentFragment();
- let _inspectionContinues = 1;
r.push(`You have ${him2} ushered up to your office, and order ${inspectee.slaveName} brought in.`);
/*
-
+ let _inspectionContinues = 1;
if (isAmputee(inspectee) && !isAmputee(originSlave)) {
r.push(`You may have lopped off the poor ${girl}'s arms and legs, a fact not lost on the inspector. ${He2} can barely conceal ${his2} terror as ${he2} makes lengthy notes on ${his2} tablet before practically running out of the penthouse.`);
V.shelterAbuse += 10;
diff --git a/src/events/RECI/butthole.js b/src/events/RECI/butthole.js
index d3a97aeb9f74ce57a960195a17476ec1900d25fa..0f87c857782f4e189d5469a6bb2b5661fb6804c2 100644
--- a/src/events/RECI/butthole.js
+++ b/src/events/RECI/butthole.js
@@ -26,7 +26,7 @@ App.Events.RECIButthole = class RECIButthole extends App.Events.BaseEvent {
let [eventSlave] = this.actors.map(a => getSlave(a));
const {
// eslint-disable-next-line no-unused-vars
- He, he, His, his, hers, him, himself, girl, woman, loli
+ He, he, His, his, him, himself, girl, woman, loli
} = getPronouns(eventSlave);
const {title: Master, say: say} = getEnunciation(eventSlave);
const belly = bellyAdjective(eventSlave);
@@ -302,10 +302,7 @@ App.Events.RECIButthole = class RECIButthole extends App.Events.BaseEvent {
function DoubleTeam(partner) {
let container = document.createDocumentFragment();
const partnerSlave = partner;
- const {
- // eslint-disable-next-line no-unused-vars
- He2, he2, His2, his2, hers2, him2, himself2, girl2
- } = getPronouns(partnerSlave).appendSuffix('2');
+ const {He2, he2, his2, him2, himself2} = getPronouns(partnerSlave).appendSuffix('2');
const {title: Master2} = getEnunciation(partnerSlave);
// replace slave art
diff --git a/src/events/RECI/feminization.js b/src/events/RECI/feminization.js
index 2d278430d847708279eb9ea0af409ababb847f99..7d0a004602f9b3132272a5bbdccd7c4537b75209 100644
--- a/src/events/RECI/feminization.js
+++ b/src/events/RECI/feminization.js
@@ -32,10 +32,7 @@ App.Events.RECIFeminization = class RECIFeminization extends App.Events.BaseEven
execute(node) {
/** @type {Array<App.Entity.SlaveState>} */
let [eventSlave] = this.actors.map(a => getSlave(a));
- const {
- // eslint-disable-next-line no-unused-vars
- He, he, His, his, hers, him, himself, girl
- } = getPronouns(eventSlave);
+ const {He, he, His, his, him, himself, girl} = getPronouns(eventSlave);
const {title: Master, say: say} = getEnunciation(eventSlave);
const desc = SlaveTitle(eventSlave);
const legs = hasBothLegs(eventSlave) ? "legs" : "leg";
diff --git a/src/events/RECI/orientation.js b/src/events/RECI/orientation.js
index 7c8e701f9d0bf35c110bb4b4f80a79ca99a1c15b..d021dbb6dfa09005d0bccef65bf71eeabf0b445f 100644
--- a/src/events/RECI/orientation.js
+++ b/src/events/RECI/orientation.js
@@ -25,10 +25,7 @@ App.Events.RECIOrientation = class RECIOrientation extends App.Events.BaseEvent
execute(node) {
/** @type {Array<App.Entity.SlaveState>} */
let [eventSlave] = this.actors.map(a => getSlave(a));
- const {
- // eslint-disable-next-line no-unused-vars
- He, he, His, his, hers, him, himself, girl
- } = getPronouns(eventSlave);
+ const {He, he, his, him, himself, girl} = getPronouns(eventSlave);
const {title: Master} = getEnunciation(eventSlave);
const belly = bellyAdjective(eventSlave);
const desc = SlaveTitle(eventSlave);
diff --git a/src/events/RECI/ugly.js b/src/events/RECI/ugly.js
index 76b80c69d324dfc469958afc1dd4516bd387ff5c..95ca6f23c68ef02e7ca5c1764680155d12685f14 100644
--- a/src/events/RECI/ugly.js
+++ b/src/events/RECI/ugly.js
@@ -26,10 +26,7 @@ App.Events.RECIUgly = class RECIUgly extends App.Events.BaseEvent {
execute(node) {
/** @type {Array<App.Entity.SlaveState>} */
let [eventSlave] = this.actors.map(a => getSlave(a));
- const {
- // eslint-disable-next-line no-unused-vars
- He, he, His, his, hers, him, himself, girl
- } = getPronouns(eventSlave);
+ const {He, he, His, his, him, himself, girl} = getPronouns(eventSlave);
const {title: Master, say: say} = getEnunciation(eventSlave);
const freeMovement = (canWalk(eventSlave) || (canMove(eventSlave) && eventSlave.rules.mobility === "permissive"));
diff --git a/src/events/RESS/assFitting.js b/src/events/RESS/assFitting.js
index c86a7a4ba39842bca5a192b61309ff09f04078a6..299bb57e90bf5adc4468657ca443ded752f8c506 100644
--- a/src/events/RESS/assFitting.js
+++ b/src/events/RESS/assFitting.js
@@ -7,7 +7,7 @@ App.Events.RESSAssFitting = class RESSAssFitting extends App.Events.BaseEvent {
return [
[ // single event slave
s => s.fetish !== "mindbroken",
- s => s.assignment !== "work as a servant",
+ s => s.assignment !== Job.QUARTER,
s => s.devotion > 20,
s => s.butt > 5,
s => ["a bimbo outfit", "a biyelgee costume", "a bunny outfit", "a burkini", "a cheerleader outfit", "a comfortable bodysuit", "a dirndl", "a fallen nuns habit", "a huipil", "a latex catsuit", "a leotard", "a long qipao", "a maternity dress", "a military uniform", "a monokini", "a mounty outfit", "a nice nurse outfit", "a red army uniform", "a scalemail bikini", "a schoolgirl outfit", "a schutzstaffel uniform", "a slutty nurse outfit", "a slutty outfit", "a slutty qipao", "a slutty schutzstaffel uniform", "a succubus outfit", "attractive lingerie for a pregnant woman", "attractive lingerie", "battlearmor", "chains", "clubslut netting", "conservative clothing", "cutoffs and a t-shirt", "kitty lingerie", "lederhosen", "nice business attire", "overalls", "restrictive latex", "striped panties", "slutty business attire", "slutty jewelry", "spats and a tank top", "stretch pants and a crop-top", "uncomfortable straps", "Western clothing", "Imperial Plate", "a tight Imperial bodysuit"].includes(s.clothes),
diff --git a/src/events/RESS/hotPC.js b/src/events/RESS/hotPC.js
index 45f6f499040428cc56145b92462f64bd1213dfcb..99fa49a67dac71ff32ff6017cc9919073d844835 100644
--- a/src/events/RESS/hotPC.js
+++ b/src/events/RESS/hotPC.js
@@ -157,7 +157,7 @@ App.Events.RESSHotPC = class RESSHotPC extends App.Events.BaseEvent {
t = [];
App.Events.addResponses(frag, [
- ((canDoVaginal(eventSlave) || canDoAnal(eventSlave)))
+ (canDoVaginal(eventSlave) || canDoAnal(eventSlave))
? new App.Events.Result(`Fuck ${him} right here`, fuck, virginityWarning())
: new App.Events.Result(virginityWarning()),
new App.Events.Result(`Have ${him} lick you clean`, lick),
diff --git a/src/events/RESS/obedientIdiot.js b/src/events/RESS/obedientIdiot.js
index 23598c22a531fb28503c7e6ae9abe04f7517f425..9d2edffc55a0a6027e923ab5d2e1203fcc6c591e 100644
--- a/src/events/RESS/obedientIdiot.js
+++ b/src/events/RESS/obedientIdiot.js
@@ -76,7 +76,7 @@ App.Events.RESSObedientIdiot = class RESSObedientIdiot extends App.Events.BaseEv
t.push(`${He} mumbles a hesitant question:`);
t.push(Spoken(eventSlave, `"${eventSlave.rudeTitle === 1 ? PoliteRudeTitle(eventSlave) : Master}, am I a good slave?"`));
}
- t.push(`You tell ${him} that ${he} is, running a hand ${eventSlave.hStyle === "shaved bald" ? `across ${his} bald scalp` : `through ${his} hair`}. ${He} seems <span class="devotion inc">reassured,</span> and <span class="trust inc">thankful</span> when you give ${him} a cup of ${his} proper rations from your own hand.`);
+ t.push(`You tell ${him} that ${he} is, running a hand ${eventSlave.hStyle.includes("bald") ? `across ${his} bald scalp` : `through ${his} hair`}. ${He} seems <span class="devotion inc">reassured,</span> and <span class="trust inc">thankful</span> when you give ${him} a cup of ${his} proper rations from your own hand.`);
eventSlave.devotion += 2;
eventSlave.trust += 2;
diff --git a/src/events/RETS/reBoobCollision.js b/src/events/RETS/reBoobCollision.js
index f83112180ac0ee45dd6ee807180fe5e15462094a..f09e2804c761be4f69cc9d938f6a1b6c4e08a6cb 100644
--- a/src/events/RETS/reBoobCollision.js
+++ b/src/events/RETS/reBoobCollision.js
@@ -65,7 +65,7 @@ App.Events.RETSBoobCollision = class RETSBoobCollision extends App.Events.BaseEv
t.push(`huge boobs getting in the way`);
}
t.push(`as ${he} rushes around. Returning from the shower to the sleeping area, ${he} turns a corner and runs hard into`);
- t.push(App.UI.DOM.combineNodes(contextualIntro(eventSlave, subSlave, "DOM"),"."));
+ t.push(App.UI.DOM.combineNodes(contextualIntro(eventSlave, subSlave, "DOM"), "."));
t.push(`Both slaves are nude, and the collision of their massive breasts makes an audibly painful smack. ${eventSlave.slaveName} has enough momentum that ${he} overbears the top-heavy ${subSlave.slaveName} entirely. The poor`);
if (subSlave.physicalAge > 30) {
t.push(woman2);
diff --git a/src/events/RETS/reCockmilkInterception.js b/src/events/RETS/reCockmilkInterception.js
index 405c391289ebb2dcb5f490f363cf0fa4963f06be..b8e6b31138ae645ea56c1cdf5e4bf88d118f00df 100644
--- a/src/events/RETS/reCockmilkInterception.js
+++ b/src/events/RETS/reCockmilkInterception.js
@@ -547,7 +547,7 @@ App.Events.RETSCockmilkInterception = class RETSCockmilkInterception extends App
t = [];
t.push(`You order ${slave.slaveName} to put the dick back where it belongs and come out from under there. There's a lewd noise as ${he} spits out ${subSlave.slaveName}'s penis.`, Spoken(slave, `"Yes, ${getWrittenTitle(slave)}!"`), `${he} ${say}s automatically, knowing your voice, and ${he} scrabbles to obey, stuffing poor moaning ${subSlave.slaveName}'s member back in its proper cum receptacle before hurriedly scooting out from under,`);
- if (slave.clitSetting === "cumslut") { // is cumslut missing from slavestate clitSetting or is this incorrect??
+ if (slave.clitSetting === "oral") {
t.push(`gasping with the stimulation applied by ${his} smart piercing, which is encouraging ${him} to suck dick.`);
} else if (slave.belly >= 10000) {
t.push(`a struggle considering just how big ${his}`);
diff --git a/src/events/assistant/assistantSP.js b/src/events/assistant/assistantSP.js
index 32e9a9d441619bbe18f369af9d7b68ea56a5a4ff..2e05964e0f9bc99df3f5537e89f6ce99e28f6265 100644
--- a/src/events/assistant/assistantSP.js
+++ b/src/events/assistant/assistantSP.js
@@ -19,7 +19,7 @@ App.Events.assistantSP = class assistantSP extends App.Events.BaseEvent {
let r = [];
V.assistant.options = 1;
- const slave = V.slaves.find(s => s.rules.release.masturbation === 1 || s.assignment === "take classes") || V.slaves.random();
+ const slave = V.slaves.find(s => s.rules.release.masturbation === 1 || s.assignment === Job.CLASSES) || V.slaves.random();
const {him} = getPronouns(slave);
const artFrame = V.seeImages ? node.append(App.UI.DOM.assistantArt(3)) : new DocumentFragment();
diff --git a/src/events/intro/introSummary.js b/src/events/intro/introSummary.js
index 80c9e0b4f2af68799083f352ed63b4002e36fbbb..4841494db14a3bddc92cbc3eb37678d63ff37afc 100644
--- a/src/events/intro/introSummary.js
+++ b/src/events/intro/introSummary.js
@@ -711,4 +711,4 @@ App.Intro.economy = function(isIntro) {
V.modCost = Math.trunc(5000 / V.economy);
V.surgeryCost = Math.trunc(30000 / V.economy);
}
-}
+};
diff --git a/src/events/nonRandom/pAbducted.js b/src/events/nonRandom/pAbducted.js
index 723c2191f4dbf83b003427ace82fade2cf66d778..4067dd1b46a36f9635ab6bdc7c18a1dc14ce351e 100644
--- a/src/events/nonRandom/pAbducted.js
+++ b/src/events/nonRandom/pAbducted.js
@@ -59,7 +59,7 @@ App.Events.pAbducted = class pAbducted extends App.Events.BaseEvent {
V.fcnn.push("...is stable after altercation and plans for increased security measures following...");
r.push(`You quickly manage to gain the upper hand, pulling yourself out of the bag and getting a good look at the would-be kidnapper. Being bested by a child was not in his plans and, short of options, draws a knife and <span class="red">drives it into your stomach.</span> Realizing what he just did, he panics and flees, leaving you bleeding, his blade still stuck in you.`);
- if (V.PC.medicine < 0) {
+ if (V.PC.skill.medicine < 0) {
r.push(`You cry out as you yank the weapon from your body, and clutching the gushing wound, hobble back the way you came — the way back to safety. The world spins as you lose consciousnesses.`);
App.Events.addParagraph(node, r);
r = [];
@@ -193,7 +193,7 @@ App.Events.pAbducted = class pAbducted extends App.Events.BaseEvent {
}
cashX(forceNeg(contractCost), "slaveTransfer", abductor);
- r.push(`You declare ${his} holes fair game for the entire arcology. ${He} spends a torturous day in the stocks before being hauled in for enslavement, somewhat <span class="health.dec">the worse for wear</span> and <span class="red">acting oddly</span> due to ${his} ordeal, bruises all over ${his} body, cum leaking from ${his} <span class="lime">loosened</span> anus${(rapist.vagina > -1) ? ` and <span class="lime">fucked-out</span> pussy` : ``}. The public <span class="green">enjoys the fun.</span>`);
+ r.push(`You declare ${his} holes fair game for the entire arcology. ${He} spends a torturous day in the stocks before being hauled in for enslavement, somewhat <span class="health.dec">the worse for wear</span> and <span class="red">acting oddly</span> due to ${his} ordeal, bruises all over ${his} body, cum leaking from ${his} <span class="lime">loosened</span> anus${(abductor.vagina > -1) ? ` and <span class="lime">fucked-out</span> pussy` : ``}. The public <span class="green">enjoys the fun.</span>`);
repX(500, "event");
V.arcologies[0].prosperity += 2;
r.push(App.UI.newSlaveIntro(abductor));
diff --git a/src/events/nonRandom/rival/pHostageAcquisition.js b/src/events/nonRandom/rival/pHostageAcquisition.js
index 0b64f56c067a26c10470fd9313190e54b80ef745..895c76bd3ed83fa2b8564d359269ca9339339493 100644
--- a/src/events/nonRandom/rival/pHostageAcquisition.js
+++ b/src/events/nonRandom/rival/pHostageAcquisition.js
@@ -12,7 +12,6 @@ App.Events.pHostageAcquisition = function() {
he, his, him, girl, woman
} = getPronouns(V.hostage);
V.hostageRescued = 0;
- // V.hostage.ID += 55555;
V.hostage.weekAcquired = V.week;
let _closer = 0;
diff --git a/src/events/nonRandom/rival/pRivalryHostage.js b/src/events/nonRandom/rival/pRivalryHostage.js
index c1f2f8157b328085aa4e858a696b1e21d00f3217..ea44ed3de3aff9aa690acb7d65bdd81a12cb9186 100644
--- a/src/events/nonRandom/rival/pRivalryHostage.js
+++ b/src/events/nonRandom/rival/pRivalryHostage.js
@@ -119,7 +119,7 @@ App.Events.pRivalryHostage = function() {
} else if (V.PC.career === "street urchin") {
r.push(`time on the streets.`);
if (V.hostage.actualAge >= V.PC.actualAge + 6) {
- r.push(`${He} was a charming homeless ${girl} that kept a watchful eye on you to make sure you stayed safe, as if ${he} were your big ${brother}. ${He} even helped you become a gang initiate.`);
+ r.push(`${He} was a charming homeless ${girl} that kept a watchful eye on you to make sure you stayed safe, as if ${he} were your big ${sister}. ${He} even helped you become a gang initiate.`);
} else {
r.push(`${He} was another destitute child that you spent most of your time with. You foraged for scraps together, kept each other warm at night, and even became initiates into the same gang.`);
}
@@ -204,7 +204,7 @@ App.Events.pRivalryHostage = function() {
} else if (V.PC.career === "slave tender") {
r.push(`time looking after slaves.`);
if (V.hostage.actualAge >= V.PC.actualAge + 6) {
- r.push(`${He} was a pretty, if slightly scary, older ${girl} that kept a watchful eye over the slaves and you, almost like a grumpy big ${brother}.`);
+ r.push(`${He} was a pretty, if slightly scary, older ${girl} that kept a watchful eye over the slaves and you, almost like a grumpy big ${sister}.`);
} else {
r.push(`${He} was a little ${girl} that helped clean and feed the slaves with you. You made a pretty good team; if a new capture thought it would be easy to overpower a child, they'd quickly learn to watch their back.`);
}
@@ -217,7 +217,7 @@ App.Events.pRivalryHostage = function() {
r.push(`${He} was a pretty little groupie who flitted from entourage to entourage. You were never particularly close,`);
} else if (V.PC.career === "child star") {
if (V.hostage.actualAge >= V.PC.actualAge + 6) {
- r.push(`${He} older ${girl} that not only acted as your ${brother} on the set, but also taught in the ins and outs of show business.`);
+ r.push(`${He} older ${girl} that not only acted as your ${sister} on the set, but also taught in the ins and outs of show business.`);
} else {
r.push(`${He} was a child star that was often booked alongside you. So much so, you started to be treated more like siblings than competitors.`);
}
diff --git a/src/events/scheduled/seRaiding.js b/src/events/scheduled/seRaiding.js
index a886c959483bf52abd94e9ee23dea0841adf4460..d4f96c85d406243b2317fd6c7562903b5713cd76 100644
--- a/src/events/scheduled/seRaiding.js
+++ b/src/events/scheduled/seRaiding.js
@@ -437,7 +437,8 @@ App.Events.SERaiding = class SERaiding extends App.Events.BaseEvent {
slave.skill.combat = 1;
slave.intelligence = random(20, 60);
slave.intelligenceImplant = 15;
- slave.hStyle = either("short", "very short");
+ slave.hStyle = either("buzzcut", "bun", "shaved", "neat");
+ slave.hLength = jsRandom(1, 9);
slave.boobs = 150;
slave.vagina = -1;
slave.clit = 0;
@@ -958,7 +959,7 @@ App.Events.SERaiding = class SERaiding extends App.Events.BaseEvent {
r.push(`teen`);
} else if (slave.visualAge <= 24) {
r.push(`young`);
- } else if (slave.visualAge <= 32) {
+ } else if (slave.visualAge <= 32) { // do nothing
} else {
r.push(`old`);
}