diff --git a/src/art/vector_revamp/vectorRevampedArtControl.js b/src/art/vector_revamp/vectorRevampedArtControl.js
index 7b54cce54a401b968d9b6b06e611ab917172a645..08722ac290b877e5589e4c8a791922087c3378ab 100644
--- a/src/art/vector_revamp/vectorRevampedArtControl.js
+++ b/src/art/vector_revamp/vectorRevampedArtControl.js
@@ -1076,11 +1076,11 @@ class RevampedArtControl {
get chastityBeltLayer() {
var result = [];
- var isChastityAnalWorn = (this.artSlave.chastityAnus == 1);
+ var isChastityAnalWorn = this.artSlave.chastityAnus == 1;
isChastityAnalWorn = isChastityAnalWorn && this.showChastityAnal;
- var isChastityVaginalWorn = (this.artSlave.chastityVagina == 1);
+ var isChastityVaginalWorn = this.artSlave.chastityVagina == 1;
isChastityVaginalWorn = isChastityVaginalWorn && this.showChastityVaginal;
@@ -1199,7 +1199,7 @@ class RevampedArtControl {
if (!this.showPenis || penisSize < 0)
return result;
- if ((canAchieveErection(this.artSlave) && (this.artSlave.chastityPenis != 1))
+ if (canAchieveErection(this.artSlave) && (this.artSlave.chastityPenis != 1))
{
result.push("Art_Vector_Revamp_Penis_" + penisSize);
diff --git a/src/js/datatypeCleanupJS.js b/src/js/datatypeCleanupJS.js
index beb5c34920ca91dff7363e8ab887b39159430892..2cc0da46cacd8b2148b8bf7d605453db46dfb002 100644
--- a/src/js/datatypeCleanupJS.js
+++ b/src/js/datatypeCleanupJS.js
@@ -373,9 +373,6 @@ window.SlaveDatatypeCleanup = (function SlaveDatatypeCleanup() {
slave.makeup = Math.clamp(+slave.makeup, 0, 8) || 0;
slave.nails = Math.clamp(+slave.nails, 0, 9) || 0;
slave.scars = Math.clamp(+slave.scars, 0, 6) || 0;
- slave.chastityAnus = Math.clamp(+slave.chastityAnus, 0, 1) || 0;
- slave.chastityPenis = Math.clamp(+slave.chastityPenis, 0, 1) || 0;
- slave.chastityVagina = Math.clamp(+slave.chastityVagina, 0, 1) || 0;
slave.choosesOwnClothes = Math.clamp(+slave.choosesOwnClothes, 0, 1) || 0;
if (typeof slave.clothes !== "string") {
slave.clothes = "no clothing";
@@ -948,9 +945,6 @@ window.childCosmeticsDatatypeCleanup = function childCosmeticsDatatypeCleanup(ch
child.makeup = Math.clamp(+child.makeup, 0, 8) || 0;
child.nails = Math.clamp(+child.nails, 0, 9) || 0;
child.scars = Math.clamp(+child.scars, 0, 6) || 0;
- child.chastityAnus = Math.clamp(+child.chastityAnus, 0, 1) || 0;
- child.chastityPenis = Math.clamp(+child.chastityPenis, 0, 1) || 0;
- child.chastityVagina = Math.clamp(+child.chastityVagina, 0, 1) || 0;
child.choosesOwnClothes = Math.clamp(+child.choosesOwnClothes, 0, 1) || 0;
if (typeof child.clothes !== "string") {
child.clothes = "no clothing";
diff --git a/src/js/utilJS.js b/src/js/utilJS.js
index aaff5aa6fbdb055550d70876c9e3cffaa0e97b32..8354706060268f64c62f97fb8d56f7a892712a02 100644
--- a/src/js/utilJS.js
+++ b/src/js/utilJS.js
@@ -1092,7 +1092,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSSupremacist)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSSupremacist / V.FSLockinLevel) / 3, "futureSocieties"); //Reducing the reputation impact of slaves that are not adhering to societal ideals properly
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSSupremacist / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSSupremacist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1102,7 +1102,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSSubjugationist)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSSubjugationist / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSSubjugationist / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSSubjugationist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1112,7 +1112,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSGenderRadicalist)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSGenderRadicalist / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSGenderRadicalist / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSGenderRadicalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1122,7 +1122,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSGenderFundamentalist)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSGenderFundamentalist / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSGenderFundamentalist / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSGenderFundamentalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1132,7 +1132,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSPaternalist)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSPaternalist / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSPaternalist / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSPaternalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1142,7 +1142,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSDegradationist)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSDegradationist / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSDegradationist / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSDegradationist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1152,7 +1152,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSAssetExpansionist)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSAssetExpansionist / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSAssetExpansionist / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSAssetExpansionist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1162,7 +1162,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSSlimnessEnthusiast)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSSlimnessEnthusiast / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSSlimnessEnthusiast / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSSlimnessEnthusiast += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1172,7 +1172,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSTransformationFetishist)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSTransformationFetishist / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSTransformationFetishist / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSTransformationFetishist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1182,7 +1182,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSBodyPurist)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSBodyPurist / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSBodyPurist / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSBodyPurist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1192,7 +1192,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSMaturityPreferentialist)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSMaturityPreferentialist / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSMaturityPreferentialist / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSMaturityPreferentialist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1202,7 +1202,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSYouthPreferentialist)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSYouthPreferentialist / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSYouthPreferentialist / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSYouthPreferentialist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1212,7 +1212,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSPastoralist)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSPastoralist / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSPastoralist / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSPastoralist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1222,7 +1222,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSPhysicalIdealist)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSPhysicalIdealist / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSPhysicalIdealist / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSPhysicalIdealist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1232,7 +1232,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSChattelReligionist)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSChattelReligionist / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSChattelReligionist / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSChattelReligionist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1242,7 +1242,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSRomanRevivalist)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSRomanRevivalist / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSRomanRevivalist / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSRomanRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1252,7 +1252,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.activeArcology.FSAztecRevivalist)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSAztecRevivalist / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSAztecRevivalist / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSAztecRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1262,7 +1262,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSEgyptianRevivalist)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSEgyptianRevivalist / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSEgyptianRevivalist / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSEgyptianRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1272,7 +1272,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSEdoRevivalist)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSEdoRevivalist / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSEdoRevivalist / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSEdoRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1282,7 +1282,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSArabianRevivalist)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSArabianRevivalist / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSArabianRevivalist / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSArabianRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1292,7 +1292,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSChineseRevivalist)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSChineseRevivalist / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSChineseRevivalist / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSChineseRevivalist += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1302,7 +1302,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSRepopulationFocus)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSRepopulationFocus / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSRepopulationFocus / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSRepopulationFocus += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1312,7 +1312,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSRestart)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSRestart / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSRestart / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSRestart += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
@@ -1322,7 +1322,7 @@ window.FSChange = function FSChange(FS, magnitude, bonus_multiplier) {
if (Number.isFinite(V.arcologies[0].FSHedonisticDecadence)) {
if (magnitude < 0) {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSHedonisticDecadence / V.FSLockinLevel) / 3, "futureSocieties");
- } else {
+ } else {
repX(magnitude * V.FSSingleSlaveRep * (V.arcologies[0].FSHedonisticDecadence / V.FSLockinLevel), "futureSocieties");
}
V.arcologies[0].FSHedonisticDecadence += 0.05 * magnitude * V.FSSingleSlaveRep * (bonus_multiplier || 1);
diff --git a/src/js/vignettes.js b/src/js/vignettes.js
index ffe74b82b7a36a75be7bd89bbeb5247dc8674729..7befd99f6dd6c3a8c4ad8ef51872275ae152d167 100644
--- a/src/js/vignettes.js
+++ b/src/js/vignettes.js
@@ -1168,20 +1168,20 @@ window.GetVignette = /** @param {App.Entity.SlaveState} slave */ function GetVig
if (slave.heels === 1 && !(["boots", "extreme heels", "heels", "pumps"].includes(slave.shoes))) {
vignettes.push({
text: `${he} enticed a new customer who had never really considered buttsex before they saw ${him} crawling along with ${his} asshole vulnerable,`,
- type: "rep",
+ type: "cash",
effect: 1,
});
}
if (slave.chastityVagina === 1) {
vignettes.push({
- text: `a wavering customer who was disappointed that ${his} pussy was unavailable decided to try ${his} mouth instead,`,
- type: "rep",
+ text: `a wavering customer who was disappointed that ${his} pussy is unavailable decided to try ${his} ass instead,`,
+ type: "cash",
effect: 1,
});
if (slave.chastityAnus !== 1) {
vignettes.push({
- text: `a wavering customer who was disappointed that ${his} pussy was unavailable decided to try ${his} ass instead,`,
- type: "rep",
+ text: `a wavering customer who was disappointed that ${his} pussy is unavailable decided to try ${his} ass instead,`,
+ type: "cash",
effect: 1,
});
}
@@ -2772,13 +2772,13 @@ window.GetVignette = /** @param {App.Entity.SlaveState} slave */ function GetVig
}
if (slave.chastityVagina === 1) {
vignettes.push({
- text: `a wavering citizen who was disappointed that ${his} pussy was unavailable decided to try ${his} mouth instead,`,
+ text: `a wavering citizen who was disappointed that ${his} pussy is unavailable decided to try ${his} mouth instead,`,
type: "rep",
effect: 1,
});
if (slave.chastityAnus !== 1) {
vignettes.push({
- text: `a wavering citizen who was disappointed that ${his} pussy was unavailable decided to try ${his} ass instead,`,
+ text: `a wavering citizen who was disappointed that ${his} pussy is unavailable decided to try ${his} ass instead,`,
type: "rep",
effect: 1,
});
@@ -3570,22 +3570,6 @@ window.GetVignette = /** @param {App.Entity.SlaveState} slave */ function GetVig
type: "health",
effect: -1,
});
- } else {
- if (slave.missingArms === 3) {
- if (slave.releaseRules === "permissive" || slave.releaseRules === "masturbation") {
- vignettes.push({
- text: `due to the obvious difficulties in ${his} mobility, ${he} spent a lot of time masturbating in bed,`,
- type: "health",
- effect: 0,
- });
- }
- } else {
- vignettes.push({
- text: `${he} was so desperate for sexual relief that ${he} almost threw out ${his} back from trying to hump ${his} own bed,`,
- type: "health",
- effect: -1,
- });
- }
} else {
if (slave.missingArms !== 3) {
if (slave.releaseRules === "permissive" || slave.releaseRules === "masturbation") {