From 26fa5f09c0c0d089c0f007c936ec1d30204e4865 Mon Sep 17 00:00:00 2001
From: Skriv <skrivelese@gmail.com>
Date: Sat, 25 May 2019 14:23:03 +0200
Subject: [PATCH] initial commit
---
src/endWeek/saStayConfined.js | 2 +-
src/endWeek/saWhore.js | 26 ++++----------------------
src/endWeek/saWorkAGloryHole.js | 2 +-
src/endWeek/saWorkTheFarm.js | 2 +-
src/interaction/main/toychest.js | 2 +-
src/interaction/main/useGuard.js | 2 +-
src/js/DefaultRules.js | 31 +++++++------------------------
src/js/assayJS.js | 2 +-
src/js/assignJS.js | 11 ++---------
9 files changed, 19 insertions(+), 61 deletions(-)
diff --git a/src/endWeek/saStayConfined.js b/src/endWeek/saStayConfined.js
index a76ddbb0f2c..d1daa0a7b46 100644
--- a/src/endWeek/saStayConfined.js
+++ b/src/endWeek/saStayConfined.js
@@ -4,7 +4,7 @@
*/
window.saStayConfined = function saStayConfined(slave) {
const V = State.variables;
- /* eslint-disable */
+ /* eslint-disable no-unused*/
const pronouns = getPronouns(slave);
const he = pronouns.pronoun;
const him = pronouns.object;
diff --git a/src/endWeek/saWhore.js b/src/endWeek/saWhore.js
index 2cc8bfc1ab9..48acba4e0ac 100644
--- a/src/endWeek/saWhore.js
+++ b/src/endWeek/saWhore.js
@@ -43,7 +43,7 @@ window.saWhore = (function saWhore() {
updateNonSlaveVariables(slave); // must be run before applyFSDecoration() or you will face NaNs
if (slave.assignment === "work in the brothel" || slave.assignment === "be the Madam") {
// By being at the end, every slave after the first will get a bonus. By moving it up, the first can enjoy it too. slaveJobValues() checks Edo Revivalist, so here we are.
- applyFSDecoration(slave);
+ applyFSDecoration();
}
addCash(slave);
sexCounts(slave);
@@ -934,7 +934,7 @@ window.saWhore = (function saWhore() {
r += ` ${His} high voice contributes to ${his} girlish image, so ${he} does even better.`;
}
} else if (arcology.FSPhysicalIdealist !== "unset") { // no muscle malus for muscle loving societies
- if (arcology.FSPhysicalIdealistStrongFat === 1 && slave.weight <= 30) { // reduced weight malus for fat loving societies
+ if ((arcology.FSPhysicalIdealistStrongFat === 1 && slave.weight <= 30) || slave.weight <= 10) { // reduced weight malus for fat loving societies
if (arcology.FSSlimnessEnthusiast > 20) {
r += ` ${He} makes extra ¤ due to ${his} fashionably sleek little body.`;
} else {
@@ -942,28 +942,10 @@ window.saWhore = (function saWhore() {
}
if (canTalk(slave) && slave.voice > 2) {
r += ` ${His} high voice contributes to ${his} girlish image, so ${he} does even better.`;
- }
- } else if (slave.weight <= 10) {
- if (arcology.FSSlimnessEnthusiast > 20) {
- r += ` ${He} makes extra ¤ due to ${his} fashionably sleek little body.`;
- } else {
- r += ` ${He} receives extra ¤ for having a sleek, girlish figure.`;
- }
- if (canTalk(slave) && slave.voice > 2) {
- r += ` ${His} high voice contributes to ${his} girlish image, so ${he} does even better.`;
- }
+ }r += ` ${His} high voice contributes to ${his} girlish image, so ${he} does even better.`;
}
} else if (arcology.FSHedonisticDecadence !== "unset" && slave.weight <= 30) { // reduced weight malus for fat loving societies
- if (arcology.FSHedonisticDecadenceStrongFat === 1) { // no muscle malus for muscle loving societies
- if (arcology.FSSlimnessEnthusiast > 20) {
- r += ` ${He} makes extra ¤ due to ${his} fashionably sleek little body.`;
- } else {
- r += ` ${He} receives extra ¤ for having a sleek, girlish figure.`;
- }
- if (canTalk(slave) && slave.voice > 2) {
- r += ` ${His} high voice contributes to ${his} girlish image, so ${he} does even better.`;
- }
- } else if (slave.muscles <= 30) {
+ if (arcology.FSHedonisticDecadenceStrongFat === 1 || slave.muscles <= 30) { // no muscle malus for muscle loving societies
if (arcology.FSSlimnessEnthusiast > 20) {
r += ` ${He} makes extra ¤ due to ${his} fashionably sleek little body.`;
} else {
diff --git a/src/endWeek/saWorkAGloryHole.js b/src/endWeek/saWorkAGloryHole.js
index ca4aefb3ab2..b441cbd5526 100644
--- a/src/endWeek/saWorkAGloryHole.js
+++ b/src/endWeek/saWorkAGloryHole.js
@@ -5,7 +5,7 @@ window.saWorkAGloryHole = (function saWorkAGloryHole() {
let r;
let beauty;
let FResult;
- /* eslint-disable */
+ /* eslint-disable no-unused*/
let pronouns;
let he;
let him;
diff --git a/src/endWeek/saWorkTheFarm.js b/src/endWeek/saWorkTheFarm.js
index f62056a106b..e3c766dbdb6 100644
--- a/src/endWeek/saWorkTheFarm.js
+++ b/src/endWeek/saWorkTheFarm.js
@@ -6,7 +6,7 @@ window.saWorkTheFarm = function saWorkTheFarm(slave) {
"use strict";
const V = State.variables;
const arcology = V.arcologies[0];
- /* eslint-disable */
+ /* eslint-disable no-unused*/
const pronouns = getPronouns(slave);
const he = pronouns.pronoun;
const him = pronouns.object;
diff --git a/src/interaction/main/toychest.js b/src/interaction/main/toychest.js
index 1e82154d406..69a1a3f6f05 100644
--- a/src/interaction/main/toychest.js
+++ b/src/interaction/main/toychest.js
@@ -3,7 +3,7 @@ App.Interact.ToyChest = function(slave) {
"use strict";
const V = State.variables;
let r = ``;
- /* eslint-disable */
+ /* eslint-disable no-unused*/
let pronouns = getPronouns(slave);
let he = pronouns.pronoun;
let him = pronouns.object;
diff --git a/src/interaction/main/useGuard.js b/src/interaction/main/useGuard.js
index 1ad32f94395..973cb5d41e8 100644
--- a/src/interaction/main/useGuard.js
+++ b/src/interaction/main/useGuard.js
@@ -3,7 +3,7 @@
App.Interact.UseGuard = function(slave) {
"use strict";
let r = ``;
- /* eslint-disable */
+ /* eslint-disable no-unused*/
let pronouns = getPronouns(slave);
let he = pronouns.pronoun;
let him = pronouns.object;
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 90ed3d4ce5e..7468526eeea 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -804,15 +804,7 @@ window.DefaultRules = (function() {
break;
}
} else {
- switch (slave.vaginalAttachment) {
- case "none":
- r += `<br>${slave.slaveName} has been instructed not to use any vaginal accessories.`;
- break;
-
- default:
- r += `<br>${slave.slaveName} has been given a ${slave.vaginalAttachment}.`;
- break;
- }
+ r += `<br>${slave.slaveName} has been instructed not to use any vaginal accessories.`;
}
}
}
@@ -1092,14 +1084,10 @@ window.DefaultRules = (function() {
} else if ((rule.buttplugAttachment !== undefined) && (rule.buttplugAttachment !== "no default setting")) {
if ((slave.buttplugAttachment !== rule.buttplugAttachment)) {
slave.buttplugAttachment = rule.buttplugAttachment;
- switch (slave.buttplugAttachment) {
- case "none":
- r += `<br>${slave.slaveName} has been instructed not to use an attachment for ${his} anal accessory.`;
- break;
-
- default:
- r += `<br>${slave.slaveName} has been given a ${slave.buttplugAttachment} to attach to ${his} buttplug.`;
- break;
+ if (slave.buttplugAttachment === "none") {
+ r += `<br>${slave.slaveName} has been instructed not to use an attachment for ${his} anal accessory.`;
+ } else {
+ r += `<br>${slave.slaveName} has been given a ${slave.buttplugAttachment} to attach to ${his} buttplug.`;
}
}
}
@@ -1544,19 +1532,14 @@ window.DefaultRules = (function() {
break;
case "breast injections":
- if (!(slave.boobs < 48000)) {
- flag = false;
- }
- break;
-
case "hyper breast injections":
- if (!(slave.boobs < 48000)) {
+ if (slave.boobs >= 48000) {
flag = false;
}
break;
case "breast redistributors":
- if (!(slave.boobs - slave.boobsImplant > 100)) {
+ if (slave.boobs - slave.boobsImplant <= 100) {
flag = false;
}
break;
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 1512dd218a3..bb407e6e961 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -1349,7 +1349,7 @@ window.SlaveTitle = function SlaveTitle(slave) {
if (slave.butt >= 12) {
r = `colossal assed ${r}`;
- } else if (slave.butt >= 12) {
+ } else if (slave.butt >= 10) {
r = `massive assed ${r}`;
} else if (slave.butt >= 8) {
r = `fat assed ${r}`;
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index 317a0d21efd..c1f8481323b 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -46,14 +46,7 @@ window.assignJob = function assignJob(slave, job) {
slave.assignmentVisible = 0;
V.cellblockSlaves++;
V.CellBiIDs.push(slave.ID);
- switch (V.cellblockDecoration) {
- case "Paternalist":
- slave.livingRules = "normal";
- break;
- default:
- slave.livingRules = "spare";
- break;
- }
+ slave.livingRules = (V.cellblockDecoration === "Paternalist") ? "normal" : "spare";
break;
case "get treatment in the clinic":
@@ -617,7 +610,7 @@ App.UI.SlaveInteract = {
/** @type {App.Entity.SlaveState} */
const slave = State.variables.activeSlave;
if ((slave.assignment === "please you") || (slave.assignment === "serve in the master suite") || (slave.assignment === "be your Concubine")) {
- res += '__Fucktoy use preference__: <strong><span id = "hole">' + slave.toyHole + '</span></strong>.';
+ res += `__Fucktoy use preference__: <strong><span id = "hole">${slave.toyHole}</span></strong>.`;
/** @type {string[]} */
let links = [];
links.push('<<link "Mouth">><<set $activeSlave.toyHole = "mouth">><<replace "#hole">>$activeSlave.toyHole<</replace>><</link>>');
--
GitLab