diff --git a/.eslintrc.json b/.eslintrc.json
index 9e05ffd3bbf624b971744663397094336e140e43..40306b2f37321f533f26f843fc27e6b391ab859d 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -87,6 +87,7 @@
"allowSingleLine": true
}
],
+ "no-sequences": "warn",
"jsdoc/check-alignment": 1,
"jsdoc/check-examples": 0, // interferes with SugarCube examples
"jsdoc/check-indentation": 0,
diff --git a/src/data/backwardsCompatibility/backwardsCompatibility.js b/src/data/backwardsCompatibility/backwardsCompatibility.js
index 0a655ca6c7a8d454a2acda62ada4cac74871e46a..f48faf2a5e71884ca03987708a37fa579d90f668 100644
--- a/src/data/backwardsCompatibility/backwardsCompatibility.js
+++ b/src/data/backwardsCompatibility/backwardsCompatibility.js
@@ -335,15 +335,21 @@ App.Update.globalVariables = function(node) {
}
if (typeof V.arcologies[0].FSAztecRevivalist === "undefined") {
for (let bci = 0; bci < V.arcologies.length; bci++) {
- V.arcologies[bci].FSAztecRevivalist = "unset", V.arcologies[bci].FSAztecRevivalistDecoration = 0;
+ V.arcologies[bci].FSAztecRevivalist = "unset";
+ V.arcologies[bci].FSAztecRevivalistDecoration = 0;
}
- V.arcologies[0].FSAztecRevivalistLaw = 0, V.arcologies[0].FSAztecRevivalistSMR = 0;
+ V.arcologies[0].FSAztecRevivalistLaw = 0;
+ V.arcologies[0].FSAztecRevivalistSMR = 0;
}
if (typeof V.arcologies[0].FSHedonisticDecadence === "undefined") {
for (let bci = 0; bci < V.arcologies.length; bci++) {
- V.arcologies[bci].FSHedonisticDecadence = "unset", V.arcologies[bci].FSHedonisticDecadenceDecoration = 0;
+ V.arcologies[bci].FSHedonisticDecadence = "unset";
+ V.arcologies[bci].FSHedonisticDecadenceDecoration = 0;
}
- V.arcologies[0].FSHedonisticDecadenceLaw = 0, V.arcologies[0].FSHedonisticDecadenceLaw2 = 0, V.arcologies[0].FSHedonisticDecadenceSMR = 0, V.arcologies[0].FSHedonisticDecadenceResearch = 0;
+ V.arcologies[0].FSHedonisticDecadenceLaw = 0;
+ V.arcologies[0].FSHedonisticDecadenceLaw2 = 0;
+ V.arcologies[0].FSHedonisticDecadenceSMR = 0;
+ V.arcologies[0].FSHedonisticDecadenceResearch = 0;
}
if (typeof V.arcologies[0].FSHedonisticDecadenceDietResearch === "undefined") {
V.arcologies[0].FSHedonisticDecadenceDietResearch = 0;
@@ -356,43 +362,61 @@ App.Update.globalVariables = function(node) {
}
if (typeof V.arcologies[0].FSIntellectualDependency === "undefined") {
for (let bci = 0; bci < V.arcologies.length; bci++) {
- V.arcologies[bci].FSIntellectualDependency = "unset", V.arcologies[bci].FSIntellectualDependencyDecoration = 0;
+ V.arcologies[bci].FSIntellectualDependency = "unset";
+ V.arcologies[bci].FSIntellectualDependencyDecoration = 0;
}
- V.arcologies[0].FSIntellectualDependencyLaw = 0, V.arcologies[0].FSIntellectualDependencyLawBeauty = 0, V.arcologies[0].FSIntellectualDependencySMR = 0, V.arcologies[0].FSIntellectualDependencyResearch = 0;
+ V.arcologies[0].FSIntellectualDependencyLaw = 0;
+ V.arcologies[0].FSIntellectualDependencyLawBeauty = 0;
+ V.arcologies[0].FSIntellectualDependencySMR = 0;
+ V.arcologies[0].FSIntellectualDependencyResearch = 0;
}
if (typeof V.arcologies[0].FSSlaveProfessionalism === "undefined") {
for (let bci = 0; bci < V.arcologies.length; bci++) {
- V.arcologies[bci].FSSlaveProfessionalism = "unset", V.arcologies[bci].FSSlaveProfessionalismDecoration = 0;
+ V.arcologies[bci].FSSlaveProfessionalism = "unset";
+ V.arcologies[bci].FSSlaveProfessionalismDecoration = 0;
}
- V.arcologies[0].FSSlaveProfessionalismLaw = 0, V.arcologies[0].FSSlaveProfessionalismSMR = 0, V.arcologies[0].FSSlaveProfessionalismResearch = 0;
+ V.arcologies[0].FSSlaveProfessionalismLaw = 0;
+ V.arcologies[0].FSSlaveProfessionalismSMR = 0;
+ V.arcologies[0].FSSlaveProfessionalismResearch = 0;
}
if (typeof V.arcologies[0].FSPetiteAdmiration === "undefined") {
for (let bci = 0; bci < V.arcologies.length; bci++) {
- V.arcologies[bci].FSPetiteAdmiration = "unset", V.arcologies[bci].FSPetiteAdmirationDecoration = 0;
+ V.arcologies[bci].FSPetiteAdmiration = "unset";
+ V.arcologies[bci].FSPetiteAdmirationDecoration = 0;
}
- V.arcologies[0].FSPetiteAdmirationLaw = 0, V.arcologies[0].FSPetiteAdmirationLaw2 = 0, V.arcologies[0].FSPetiteAdmirationSMR = 0, V.arcologies[0].FSPetiteAdmirationResearch = 0;
+ V.arcologies[0].FSPetiteAdmirationLaw = 0;
+ V.arcologies[0].FSPetiteAdmirationLaw2 = 0;
+ V.arcologies[0].FSPetiteAdmirationSMR = 0;
+ V.arcologies[0].FSPetiteAdmirationResearch = 0;
}
if (typeof V.arcologies[0].FSStatuesqueGlorification === "undefined") {
for (let bci = 0; bci < V.arcologies.length; bci++) {
- V.arcologies[bci].FSStatuesqueGlorification = "unset", V.arcologies[bci].FSStatuesqueGlorificationDecoration = 0;
+ V.arcologies[bci].FSStatuesqueGlorification = "unset";
+ V.arcologies[bci].FSStatuesqueGlorificationDecoration = 0;
}
- V.arcologies[0].FSStatuesqueGlorificationLaw = 0, V.arcologies[0].FSStatuesqueGlorificationLaw2 = 0, V.arcologies[0].FSStatuesqueGlorificationSMR = 0, V.arcologies[0].FSStatuesqueGlorificationResearch = 0;
+ V.arcologies[0].FSStatuesqueGlorificationLaw = 0;
+ V.arcologies[0].FSStatuesqueGlorificationLaw2 = 0;
+ V.arcologies[0].FSStatuesqueGlorificationSMR = 0;
+ V.arcologies[0].FSStatuesqueGlorificationResearch = 0;
}
if (typeof V.arcologies[0].FSCummunism === "undefined") {
for (let bci = 0; bci < V.arcologies.length; bci++) {
- V.arcologies[bci].FSCummunism = "unset", V.arcologies[bci].FSCummunismDecoration = 0;
+ V.arcologies[bci].FSCummunism = "unset";
+ V.arcologies[bci].FSCummunismDecoration = 0;
}
V.arcologies[0].FSCummunismResearch = 0;
}
if (typeof V.arcologies[0].FSIncestFetishist === "undefined") {
for (let bci = 0; bci < V.arcologies.length; bci++) {
- V.arcologies[bci].FSIncestFetishist = "unset", V.arcologies[bci].FSIncestFetishistDecoration = 0;
+ V.arcologies[bci].FSIncestFetishist = "unset";
+ V.arcologies[bci].FSIncestFetishistDecoration = 0;
}
V.arcologies[0].FSIncestFetishistResearch = 0;
}
for (let bci = 0; bci < V.arcologies.length; bci++) {
if (V.arcologies[bci].FSHedonisticDecadence === 0) {
- V.arcologies[bci].FSHedonisticDecadence = "unset", V.arcologies[bci].FSHedonisticDecadenceDecoration = 0;
+ V.arcologies[bci].FSHedonisticDecadence = "unset";
+ V.arcologies[bci].FSHedonisticDecadenceDecoration = 0;
}
}
if (typeof V.arcologies[0].FSPhysicalIdealistLaw === "undefined") {
@@ -1161,7 +1185,8 @@ App.Update.slaveVariables = function(node) {
let Slave = V.slaves[bci];
if (typeof Slave !== "object") {
- V.slaves.deleteAt(bci), bci--;
+ V.slaves.deleteAt(bci);
+ bci--;
continue;
}
@@ -1252,7 +1277,8 @@ App.Update.genePoolRecords = function(node) {
/* first check for duplicate IDs, keep the first entry and delete the others */
for (let bci2 = bci + 1; bci2 < V.genePool.length; bci2++) {
if (V.genePool[bci2].ID === slave.ID) {
- V.genePool.deleteAt(bci2), bci2--;
+ V.genePool.deleteAt(bci2);
+ bci2--;
}
}
}
@@ -1288,7 +1314,8 @@ App.Update.genePoolRecords = function(node) {
}
}
if (dontDeleteMe === 0) {
- V.genePool.deleteAt(bci), bci--;
+ V.genePool.deleteAt(bci);
+ bci--;
continue;
}
if (typeof slave.origSkin === "undefined") {
diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index 9eedbf0d2cbd0a8fb272403c7af5f322ccdc2aa1..320fc4c93aac9bf2c105bc91959fdb0567db6c15 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -2204,7 +2204,8 @@ App.UI.SlaveInteract.custom = (function() {
}
function intro(slave) {
- V.oldName = slave.slaveName, V.oldSurname = slave.slaveSurname;
+ V.oldName = slave.slaveName;
+ V.oldSurname = slave.slaveSurname;
let intro = document.createElement('p');
intro.className = "scene-intro";
intro.append(`You may enter custom descriptors for your slave's hair color, hair style, tattoos, or anything else here. After typing, press `);
diff --git a/src/interaction/wardrobeUse.js b/src/interaction/wardrobeUse.js
index 44173c6b895558ebd8c68cd02b79fba753b444dc..495f52b6abe36896695f8a50c10a235e21459452 100644
--- a/src/interaction/wardrobeUse.js
+++ b/src/interaction/wardrobeUse.js
@@ -3,8 +3,8 @@ App.UI.Wardrobe = {};
App.UI.Wardrobe.clothes = function(slave) {
const {
// eslint-disable-next-line no-unused-vars
- he, him, his, hers, himself, boy, He, His
- } = getPronouns(slave);
+ he, him, his, hers, himself, boy, He, His
+ } = getPronouns(slave);
let el = document.createElement('div');
let links;
@@ -382,8 +382,8 @@ App.UI.Wardrobe.legAccessory = function(slave) {
const {
// eslint-disable-next-line no-unused-vars
- he, him, his, hers, himself, boy, He, His
- } = getPronouns(slave);
+ he, him, his, hers, himself, boy, He, His
+ } = getPronouns(slave);
let el = document.createElement('div');
@@ -425,8 +425,8 @@ App.UI.Wardrobe.bellyAccessory = function(slave) {
const {
// eslint-disable-next-line no-unused-vars
- he, him, his, hers, himself, boy, He, His
- } = getPronouns(slave);
+ he, him, his, hers, himself, boy, He, His
+ } = getPronouns(slave);
let choiceOptionsArray = [];
choiceOptionsArray.push({text: `None`, updateSlave: {bellyAccessory: `none`}});
@@ -490,8 +490,8 @@ App.UI.Wardrobe.buttplug = function(slave) {
const {
// eslint-disable-next-line no-unused-vars
- he, him, his, hers, himself, boy, He, His
- } = getPronouns(slave);
+ he, him, his, hers, himself, boy, He, His
+ } = getPronouns(slave);
let el = document.createElement('div');
@@ -549,8 +549,8 @@ App.UI.Wardrobe.buttplugAttachment = function(slave) {
const {
// eslint-disable-next-line no-unused-vars
- he, him, his, hers, himself, boy, He, His
- } = getPronouns(slave);
+ he, him, his, hers, himself, boy, He, His
+ } = getPronouns(slave);
let el = document.createElement('div');
@@ -607,8 +607,8 @@ App.UI.Wardrobe.vaginalAccessory = function(slave) {
// <<vaginalAccessoryDescription>>
const {
// eslint-disable-next-line no-unused-vars
- he, him, his, hers, himself, boy, He, His
- } = getPronouns(slave);
+ he, him, his, hers, himself, boy, He, His
+ } = getPronouns(slave);
let el = document.createElement('div');
@@ -667,8 +667,8 @@ App.UI.Wardrobe.vaginalAttachment = function(slave) {
const {
// eslint-disable-next-line no-unused-vars
- he, him, his, hers, himself, boy, He, His
- } = getPronouns(slave);
+ he, him, his, hers, himself, boy, He, His
+ } = getPronouns(slave);
let el = document.createElement('div');
@@ -725,8 +725,8 @@ App.UI.Wardrobe.dickAccessory = function(slave) {
const {
// eslint-disable-next-line no-unused-vars
- he, him, his, hers, himself, boy, He, His
- } = getPronouns(slave);
+ he, him, his, hers, himself, boy, He, His
+ } = getPronouns(slave);
let el = document.createElement('div');
@@ -782,7 +782,7 @@ App.UI.Wardrobe.chastity = function(slave) {
const {
// eslint-disable-next-line no-unused-vars
- he, him, his, hers, himself, boy, He, His
+ he, him, his, hers, himself, boy, He, His
} = getPronouns(slave);
let el = document.createElement('div');
@@ -881,7 +881,7 @@ App.UI.Wardrobe.colorOptions = function(slave, update) {
let colorChoice = App.UI.DOM.colorInput(
slave[update],
v => {
- slave[update] = v,
+ slave[update] = v;
App.UI.Wardrobe.refreshAll(slave);
}
);
@@ -892,7 +892,7 @@ App.UI.Wardrobe.colorOptions = function(slave, update) {
App.UI.DOM.link(
` Reset`,
() => {
- delete slave[update],
+ delete slave[update];
App.UI.Wardrobe.refreshAll(slave);
},
)
diff --git a/src/npc/interaction/fAbuse.tw b/src/npc/interaction/fAbuse.tw
index 3576b3642a3f38bab98acd39ecb32b7edf812c50..34bec7207e359d2f668dc1736df19e1a53c97f16 100644
--- a/src/npc/interaction/fAbuse.tw
+++ b/src/npc/interaction/fAbuse.tw
@@ -126,7 +126,7 @@
<<case "attractive lingerie">>
$He almost tears $his delicate lingerie in $his haste to avoid punishment.
<<case "a succubus outfit">>
- <<if !["a corset", "an extreme corest"].includes(getSlave($AS).bellyAccessory)>>
+ <<if ["a corset", "an extreme corset"].includes(getSlave($AS).bellyAccessory)>>
$He struggles with $his leather corset.
<<else>>
Panic sets in as $he hastily sheds what's left of $his outfit.
@@ -302,7 +302,7 @@
<<case "slutty jewelry">>
$He hurriedly strips fine jewelry from $his neck, wrist<<if hasBothArms(getSlave($AS))>>s<</if>> and ankle<<if hasBothLegs(getSlave($AS))>>s<</if>>.
<<case "a courtesan dress">>
- <<if !["a corset", "an extreme corest"].includes(getSlave($AS).bellyAccessory)>>
+ <<if ["a corset", "an extreme corset"].includes(getSlave($AS).bellyAccessory)>>
$His fingers fumble desperately with the straps of $his corset, knowing there is still a lot of dress left to remove after it.
<<else>>
Panic sets in as $he realizes just how much dress is left to remove. In $his haste, $he hooks a sleeve with $his foot and falls flat, exposing $his bare ass.
@@ -313,10 +313,10 @@
<</if>>
<</if>>
-<<if (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 60)>>
- $He seems to be a bit expectant of what is to come.
-<<elseif (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 95)>>
+<<if (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 95)>>
The slap seems to have excited $him, seeing $his hard nipples and wet pussy, and $his eyes practically beg for more.
+<<elseif (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 60)>>
+ $He seems to be a bit expectant of what is to come.
<</if>>
<<if ($PC.dick != 0)>>
@@ -324,10 +324,10 @@
<<else>>
<<if hasAnyArms(getSlave($AS)) && (getSlave($AS).clothes !== "no clothing")>>While $he strips, you<<else>>You<</if>> don a cruelly large strap-on, earning
<</if>>
-<<if (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 60)>>
- a shy look
-<<elseif (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 95)>>
+<<if (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 95)>>
a sultry look
+<<elseif (getSlave($AS).fetish == "masochist") && (getSlave($AS).fetishKnown == 1) && (getSlave($AS).fetishStrength > 60)>>
+ a shy look
<<else>>
a frightened glance
<</if>>