diff --git a/src/interaction/siRules.js b/src/interaction/siRules.js
index 67e7b9027eb801e876c556f4161c344d0c2c866e..bf16d17c1e88f97ce39dd2f074a9510d9a9c4dc4 100644
--- a/src/interaction/siRules.js
+++ b/src/interaction/siRules.js
@@ -98,152 +98,151 @@ App.UI.SlaveInteract.rules = function(slave) {
p = document.createElement('p');
App.UI.DOM.appendNewElement("h3", p, `Other Rules`);
- // Living
if (slave.fuckdoll > 0) {
App.UI.DOM.appendNewElement("span", p, "Rules have little meaning for living sex toys", "note");
} else {
+ // Living
penthouseCensus();
p.append("Living standard: ");
- }
- if (setup.facilityCareers.includes(slave.assignment)) {
- App.UI.DOM.appendNewElement("span", p, ` ${His} living conditions are managed by ${his} assignment.`, "note");
- } else if ((slave.assignment === "be your Head Girl") && (V.HGSuite === 1)) {
- App.UI.DOM.appendNewElement("span", p, ` ${He} has ${his} own little luxurious room in the penthouse with everything ${he} needs to be a proper Head Girl.`, "note");
- } else if ((slave.assignment === "guard you") && (V.dojo > 1)) {
- App.UI.DOM.appendNewElement("span", p, ` ${He} has a comfortable room in the armory to call ${his} own.`, "note");
- } else {
- choices = [
- {value: "spare"},
- {value: "normal"},
- ];
- if (canMoveToRoom(slave) || slave.rules.living === "luxurious") {
- choices.push({value: "luxurious"});
+
+ if (setup.facilityCareers.includes(slave.assignment)) {
+ App.UI.DOM.appendNewElement("span", p, ` ${His} living conditions are managed by ${his} assignment.`, "note");
+ } else if ((slave.assignment === "be your Head Girl") && (V.HGSuite === 1)) {
+ App.UI.DOM.appendNewElement("span", p, ` ${He} has ${his} own little luxurious room in the penthouse with everything ${he} needs to be a proper Head Girl.`, "note");
+ } else if ((slave.assignment === "guard you") && (V.dojo > 1)) {
+ App.UI.DOM.appendNewElement("span", p, ` ${He} has a comfortable room in the armory to call ${his} own.`, "note");
} else {
- choices.push({
- title: `Luxurious`,
- disabled: ["No luxurious rooms available"]
- });
+ choices = [
+ {value: "spare"},
+ {value: "normal"},
+ ];
+ if (canMoveToRoom(slave) || slave.rules.living === "luxurious") {
+ choices.push({value: "luxurious"});
+ } else {
+ choices.push({
+ title: `Luxurious`,
+ disabled: ["No luxurious rooms available"]
+ });
+ }
+
+ p.append(listChoices(choices, "living"));
}
- p.append(listChoices(choices, "living"));
- }
+ // Rest
+ if (["be a servant", "be a subordinate slave", "get milked", "please you", "serve in the club", "serve the public", "whore", "work as a farmhand", "work in the brothel", "work a glory hole"].includes(slave.assignment) || (V.dairyRestraintsSetting < 2 && slave.assignment === "work in the dairy")) {
+ div = document.createElement("div");
+ div.append("Sleep rules: ");
+ choices = [
+ {value: "none"},
+ {value: "cruel"},
+ {value: "restrictive"},
+ {value: "permissive"},
+ {value: "mandatory"},
+ ];
+ div.append(listChoices(choices, "rest"));
+ p.append(div);
+ }
- // Rest
- if (["be a servant", "be a subordinate slave", "get milked", "please you", "serve in the club", "serve the public", "whore", "work as a farmhand", "work in the brothel", "work a glory hole"].includes(slave.assignment) || (V.dairyRestraintsSetting < 2 && slave.assignment === "work in the dairy")) {
- div = document.createElement("div");
- div.append("Sleep rules: ");
- choices = [
- {value: "none"},
- {value: "cruel"},
- {value: "restrictive"},
- {value: "permissive"},
- {value: "mandatory"},
- ];
- div.append(listChoices(choices, "rest"));
- p.append(div);
- }
+ // Mobility Aids
+ if (!canWalk(slave) && canMove(slave)) {
+ div = document.createElement("div");
+ div.append("Use of mobility aids: ");
+ choices = [
+ {value: "restrictive"},
+ {value: "permissive"},
+ ];
+ div.append(listChoices(choices, "mobility"));
+ p.append(div);
+ }
- // Mobility Aids
- if (slave.fuckdoll > 0) {
- // Sex toys don't move around on their own//
- } else if (!canWalk(slave) && canMove(slave)) {
+ // Punishment
div = document.createElement("div");
- div.append("Use of mobility aids: ");
+ div.append("Typical punishment: ");
choices = [
- {value: "restrictive"},
- {value: "permissive"},
+ {value: "confinement"},
+ {value: "whipping"},
+ {value: "chastity"},
+ {value: "situational"},
];
- div.append(listChoices(choices, "mobility"));
+ div.append(listChoices(choices, "punishment"));
p.append(div);
- }
- // Punishment
- div = document.createElement("div");
- div.append("Typical punishment: ");
- choices = [
- {value: "confinement"},
- {value: "whipping"},
- {value: "chastity"},
- {value: "situational"},
- ];
- div.append(listChoices(choices, "punishment"));
- p.append(div);
-
- // Reward
- div = document.createElement("div");
- div.append("Typical reward: ");
- choices = [
- {value: "relaxation"},
- {value: "drugs"},
- {value: "orgasm"},
- {value: "situational"},
- ];
- div.append(listChoices(choices, "reward"));
- p.append(div);
-
- // Lactation
- if (slave.lactation !== 2) {
+ // Reward
div = document.createElement("div");
- div.append("Lactation maintenance: ");
+ div.append("Typical reward: ");
choices = [
- {
- title: "Left alone",
- value: "none",
- },
+ {value: "relaxation"},
+ {value: "drugs"},
+ {value: "orgasm"},
+ {value: "situational"},
];
+ div.append(listChoices(choices, "reward"));
+ p.append(div);
- if (slave.lactation === 0) {
- choices.push(
- {
- title: "Induce lactation",
- value: "induce",
- }
- );
- } else {
- choices.push(
+ // Lactation
+ if (slave.lactation !== 2) {
+ div = document.createElement("div");
+ div.append("Lactation maintenance: ");
+ choices = [
{
- title: "Maintain lactation",
- value: "maintain",
- }
- );
+ title: "Left alone",
+ value: "none",
+ },
+ ];
+
+ if (slave.lactation === 0) {
+ choices.push(
+ {
+ title: "Induce lactation",
+ value: "induce",
+ }
+ );
+ } else {
+ choices.push(
+ {
+ title: "Maintain lactation",
+ value: "maintain",
+ }
+ );
+ }
+ div.append(listChoices(choices, "lactation"));
+ p.append(div);
}
- div.append(listChoices(choices, "lactation"));
- p.append(div);
- }
- p.append(orgasm(slave));
+ p.append(orgasm(slave));
+
+ if (slave.voice !== 0) {
+ div = document.createElement("div");
+ div.append("Speech rules: ");
+ choices = [
+ {value: "restrictive"},
+ {value: "permissive"},
+ ];
+ if (slave.accent > 0 && slave.accent < 4) {
+ choices.push(
+ {value: "accent elimination"},
+ );
+ } else if (slave.accent > 3) {
+ choices.push(
+ {value: "language lessons"},
+ );
+ }
+ div.append(listChoices(choices, "speech"));
+ p.append(div);
+ }
- if (slave.voice !== 0) {
div = document.createElement("div");
- div.append("Speech rules: ");
+ div.append("Relationship rules: ");
choices = [
{value: "restrictive"},
+ {value: "just friends"},
{value: "permissive"},
];
- if (slave.accent > 0 && slave.accent < 4) {
- choices.push(
- {value: "accent elimination"},
- );
- } else if (slave.accent > 3) {
- choices.push(
- {value: "language lessons"},
- );
- }
- div.append(listChoices(choices, "speech"));
+ div.append(listChoices(choices, "relationship"));
p.append(div);
- }
- div = document.createElement("div");
- div.append("Relationship rules: ");
- choices = [
- {value: "restrictive"},
- {value: "just friends"},
- {value: "permissive"},
- ];
- div.append(listChoices(choices, "relationship"));
- p.append(div);
-
- p.append(smartSettings(slave));
+ p.append(smartSettings(slave));
+ }
frag.append(p);
return frag;
diff --git a/src/interaction/siWardrobe.js b/src/interaction/siWardrobe.js
index f91a4c7c3276dba9dc9bc044b9f16c5622235d9e..553180d0779c0dd76a72129f53b3a2a5df4f4acd 100644
--- a/src/interaction/siWardrobe.js
+++ b/src/interaction/siWardrobe.js
@@ -7,19 +7,21 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
} = getPronouns(slave);
const el = new DocumentFragment();
el.append(clothes());
- el.append(collar());
- el.append(mask());
- el.append(mouth());
- el.append(armAccessory());
- el.append(shoes());
- el.append(legAccessory());
- el.append(bellyAccessory());
- el.append(buttplug());
- el.append(buttplugAttachment());
- el.append(vaginalAccessory());
- el.append(vaginalAttachment());
- el.append(dickAccessory());
- el.append(chastity());
+ if (slave.fuckdoll === 0) {
+ el.append(collar());
+ el.append(mask());
+ el.append(mouth());
+ el.append(armAccessory());
+ el.append(shoes());
+ el.append(legAccessory());
+ el.append(bellyAccessory());
+ el.append(buttplug());
+ el.append(buttplugAttachment());
+ el.append(vaginalAccessory());
+ el.append(vaginalAttachment());
+ el.append(dickAccessory());
+ el.append(chastity());
+ }
App.UI.DOM.appendNewElement("h3", el, `Shopping`);
el.append(shopping());
@@ -107,9 +109,6 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
}
function collar() {
- if (slave.fuckdoll !== 0) {
- return;
- }
// <<= App.Desc.collar($activeSlave)>>
let el = document.createElement('div');
@@ -175,9 +174,6 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
}
function mask() {
- if (slave.fuckdoll !== 0) {
- return;
- }
let el = document.createElement('div');
let label = document.createElement('div');
@@ -234,9 +230,6 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
}
function mouth() {
- if (slave.fuckdoll !== 0) {
- return;
- }
let el = document.createElement('div');
let label = document.createElement('div');
@@ -281,10 +274,6 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
}
function armAccessory() {
- if (slave.fuckdoll !== 0) {
- return;
- }
-
let el = document.createElement('div');
// App.Desc.armwear(slave)
@@ -319,9 +308,6 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
}
function shoes() {
- if (slave.fuckdoll !== 0) {
- return;
- }
let el = document.createElement('div');
let label = document.createElement('div');
@@ -376,10 +362,6 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
}
function legAccessory() {
- if (slave.fuckdoll !== 0) {
- return;
- }
-
let el = document.createElement('div');
let label = document.createElement('div');
@@ -413,9 +395,6 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
}
function bellyAccessory() {
- if (slave.fuckdoll !== 0) {
- return;
- }
// <<waistDescription>><<= App.Desc.pregnancy($activeSlave)>><<clothingCorsetDescription>>
let choiceOptionsArray = [];
choiceOptionsArray.push({text: `None`, updateSlave: {bellyAccessory: `none`}});
@@ -470,11 +449,7 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
}
function buttplug() {
- if (slave.fuckdoll !== 0) {
- return;
- }
// App.Desc.buttplug(slave)
-
let el = document.createElement('div');
let label = document.createElement('div');
@@ -521,7 +496,7 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
function buttplugAttachment() {
let el = document.createElement('div');
- if (slave.fuckdoll !== 0 || slave.buttplug === "none") {
+ if (slave.buttplug === "none") {
return el;
}
@@ -568,10 +543,6 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
}
function vaginalAccessory() {
- if (slave.fuckdoll !== 0) {
- return;
- }
-
// <<vaginalAccessoryDescription>>
let el = document.createElement('div');
@@ -620,7 +591,7 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
function vaginalAttachment() {
let el = document.createElement('div');
- if (slave.fuckdoll !== 0 || (["none", "bullet vibrator", "smart bullet vibrator"].includes(slave.vaginalAccessory))) {
+ if (["none", "bullet vibrator", "smart bullet vibrator"].includes(slave.vaginalAccessory)) {
return el;
}
@@ -667,9 +638,6 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
}
function dickAccessory() {
- if (slave.fuckdoll !== 0) {
- return;
- }
// <<= App.Desc.dickAccessory($activeSlave)>>
let el = document.createElement('div');
@@ -716,10 +684,6 @@ App.UI.SlaveInteract.wardrobe = function(slave) {
}
function chastity() {
- if (slave.fuckdoll !== 0) {
- return;
- }
-
let el = document.createElement('div');
let label = document.createElement('div');