diff --git a/src/art/vector/VectorArtJS.js b/src/art/vector/VectorArtJS.js
index ab842c9c0b06812875be75bd0af263ccf8d04937..f836b7ce2788fad894018c9b4c790f0801c1acb7 100644
--- a/src/art/vector/VectorArtJS.js
+++ b/src/art/vector/VectorArtJS.js
@@ -1337,7 +1337,7 @@ App.Art.vectorArtElement = (function() {
}
/* head addons */
- if (slave.collar === "porcelain mask") {
+ if (slave.faceAccessory === "porcelain mask") {
T.glassesColor = slave.glassesColor || "#FFFFFF"; /* use custom color or white */
} else {
T.glassesColor = slave.glassesColor || "#010101"; /* use custom color or default */
@@ -2513,15 +2513,17 @@ App.Art.vectorArtElement = (function() {
/* ADDONS */
if (slave.fuckdoll === 0) { /* Fuckdolls cannot be decorated */
- if (slave.collar === "dildo gag") {
+ if (slave.mouthAccessory === "dildo gag") {
res.appendChild(useSvg("Art_Vector_Dildo_Gag"));
- } else if (slave.collar === "ball gag") {
+ } else if (slave.mouthAccessory === "ball gag") {
res.appendChild(useSvg("Art_Vector_Ball_Gag"));
- } else if (slave.collar === "bit gag") {
+ } else if (slave.mouthAccessory === "bit gag") {
res.appendChild(useSvg("Art_Vector_Bit_Gag"));
- } else if (slave.collar === "massive dildo gag") {
+ } else if (slave.mouthAccessory === "massive dildo gag") {
res.appendChild(useSvg("Art_Vector_Massive_Dildo_Gag"));
- } else if (slave.collar === "porcelain mask") {
+ }
+
+ if (slave.faceAccessory === "porcelain mask") {
res.appendChild(useSvg("Art_Vector_Porcelain_Mask"));
}
@@ -3040,10 +3042,15 @@ App.Art.legacyVectorArtElement = function() {
case "shock punishment":
case "tight steel":
case "uncomfortable leather":
+ }
+
+ /* Gag */
+ switch (slave.mouthAccessory ) {
case "dildo gag":
addImg(res, `outfit/${slave.collar}`);
}
+
/* Head base image */
if (wearingLatex === true) {
addImg(res, "outfit/head latex");
diff --git a/src/art/vector_revamp/vectorRevampedArtControl.js b/src/art/vector_revamp/vectorRevampedArtControl.js
index b7b6b3bf725b05efaccb1977d94781ce62a1791e..967fd9094a97677955c8258d05aa32f9824e52e4 100644
--- a/src/art/vector_revamp/vectorRevampedArtControl.js
+++ b/src/art/vector_revamp/vectorRevampedArtControl.js
@@ -1647,7 +1647,7 @@ class RevampedArtControl {
}
if (this.showMouth) {
- switch (this.artSlave.collar) {
+ switch (this.artSlave.mouthAccessory) {
case "dildo gag":
result.push("Art_Vector_Revamp_Dildo_Gag");
break;
diff --git a/src/endWeek/saClothes.js b/src/endWeek/saClothes.js
index 593c50e77c984259d65c569e85a76db59f5fbf84..d88165cdefa13ad8d1ef7e97374e7b0b081a10f6 100644
--- a/src/endWeek/saClothes.js
+++ b/src/endWeek/saClothes.js
@@ -32,6 +32,12 @@ App.SlaveAssignment.clothes = (function() {
if (slave.collar !== "none") {
collarEffects(slave);
}
+ if (slave.faceAccessory !== "none") {
+ maskEffects(slave);
+ }
+ if (slave.mouthAccessory !== "none") {
+ mouthEffects(slave);
+ }
chastityEffects(slave);
if (slave.bellyAccessory !== "none") {
bellyAccessories(slave);
@@ -395,25 +401,6 @@ App.SlaveAssignment.clothes = (function() {
} else if (slave.collar === "uncomfortable leather" || slave.collar === "neck corset") {
r.push(`The uncomfortable leather collar ${he}'s wearing <span class="gold">reminds ${him} to be afraid</span> every time ${he} turns ${his} head.`);
slave.trust -= 1;
- } else if (slave.collar === "dildo gag") {
- r.push(`The dildo gag ${he}'s wearing <span class="gold">reminds ${him} to be afraid</span> with every breath ${he} must carefully take through ${his} nose.`);
- slave.trust -= 1;
- } else if (slave.collar === "ball gag") {
- r.push(`The ball gag ${he}'s wearing keeps ${his} mouth filled and, since ${he} can't speak out, forces ${him} <span class="hotpink">to submit</span> to your will. ${He} <span class="gold">fears</span> for ${his} safety with every suppressed word.`);
- slave.devotion++;
- slave.trust -= 2;
- } else if (slave.collar === "bit gag") {
- r.push(`The uncomfortable bit gag ${he}'s wearing keeps ${his} mouth locked and, since ${he} can't speak out, forces ${him} <span class="hotpink">to submit</span> to your will. ${He} <span class="gold">fears</span> for ${his} safety with every suppressed word.`);
- slave.devotion++;
- slave.trust -= 2;
- } else if (slave.collar === "porcelain mask") {
- r.push(`The beautiful porcelain mask ${he}'s wearing slowly erodes ${his} identity, forcing ${him} <span class="hotpink">to submit</span> to your will. ${He} <span class="gold">questions</span> who ${he} is.`);
- slave.devotion++;
- slave.trust -= 2;
- } else if (slave.collar === "massive dildo gag") {
- r.push(`The enormous dildo gag ${he}'s wearing <span class="gold">terrifies ${him}</span> that ${he} will soon be choking down cocks of similar size. ${He} can feel ${his} throat stretching around the giant dildo, and <span class="mediumorchid">resents you</span> for tormenting ${him} this way.`);
- slave.devotion -= 1;
- slave.trust -= 2;
} else if (slave.collar === "shock punishment") {
r.push(`The shock collar ${he}'s wearing makes ${his} frequent, deserved punishments <span class="gold">immediate, inescapable,</span> and <span class="mediumorchid">awful.</span>`);
slave.devotion -= 2;
@@ -447,20 +434,63 @@ App.SlaveAssignment.clothes = (function() {
r.push(`${He} <span class="hotpink">likes</span> how ${his} cow collar encourages everyone to touch ${his} udders.`);
slave.devotion += 1;
}
- } else if (slave.collar === "ball gag" || slave.collar === "bit gag") {
+ }
+ }
+ }
+
+ /**
+ * @param {App.Entity.SlaveState} slave
+ *
+ */
+ function maskEffects(slave) {
+ if (slave.devotion <= 20) {
+ if (slave.collar === "porcelain mask") {
+ r.push(`The beautiful porcelain mask ${he}'s wearing slowly erodes ${his} identity, forcing ${him} <span class="hotpink">to submit</span> to your will. ${He} <span class="gold">questions</span> who ${he} is.`);
+ slave.devotion++;
+ slave.trust -= 2;
+ }
+ } else {
+ if (slave.collar === "porcelain mask") {
if (slave.fetish === "submissive" && slave.fetishStrength > 95) {
- r.push(`${He} <span class="hotpink">loves</span> how ${his} gag forces ${him} to keep silent.`);
+ r.push(`${He} <span class="hotpink">loves</span> how ${his} mask makes ${him} beautiful enough for you.`);
slave.devotion += 1;
} else if (slave.fetish === "submissive" || slave.energy > 95) {
- r.push(`${He} <span class="hotpink">likes</span> how ${his} gag forces ${him} to keep silent.`);
+ r.push(`${He} <span class="hotpink">likes</span> how ${his} mask makes ${him} beautiful enough for you.`);
slave.devotion += 1;
}
- } else if (slave.collar === "porcelain mask") {
+ }
+ }
+ }
+
+ /**
+ * @param {App.Entity.SlaveState} slave
+ *
+ */
+ function mouthEffects(slave) {
+ if (slave.devotion <= 20) {
+ if (slave.collar === "dildo gag") {
+ r.push(`The dildo gag ${he}'s wearing <span class="gold">reminds ${him} to be afraid</span> with every breath ${he} must carefully take through ${his} nose.`);
+ slave.trust -= 1;
+ } else if (slave.collar === "ball gag") {
+ r.push(`The ball gag ${he}'s wearing keeps ${his} mouth filled and, since ${he} can't speak out, forces ${him} <span class="hotpink">to submit</span> to your will. ${He} <span class="gold">fears</span> for ${his} safety with every suppressed word.`);
+ slave.devotion++;
+ slave.trust -= 2;
+ } else if (slave.collar === "bit gag") {
+ r.push(`The uncomfortable bit gag ${he}'s wearing keeps ${his} mouth locked and, since ${he} can't speak out, forces ${him} <span class="hotpink">to submit</span> to your will. ${He} <span class="gold">fears</span> for ${his} safety with every suppressed word.`);
+ slave.devotion++;
+ slave.trust -= 2;
+ } else if (slave.collar === "massive dildo gag") {
+ r.push(`The enormous dildo gag ${he}'s wearing <span class="gold">terrifies ${him}</span> that ${he} will soon be choking down cocks of similar size. ${He} can feel ${his} throat stretching around the giant dildo, and <span class="mediumorchid">resents you</span> for tormenting ${him} this way.`);
+ slave.devotion -= 1;
+ slave.trust -= 2;
+ }
+ } else {
+ if (slave.collar === "ball gag" || slave.collar === "bit gag") {
if (slave.fetish === "submissive" && slave.fetishStrength > 95) {
- r.push(`${He} <span class="hotpink">loves</span> how ${his} mask makes ${him} beautiful enough for you.`);
+ r.push(`${He} <span class="hotpink">loves</span> how ${his} gag forces ${him} to keep silent.`);
slave.devotion += 1;
} else if (slave.fetish === "submissive" || slave.energy > 95) {
- r.push(`${He} <span class="hotpink">likes</span> how ${his} mask makes ${him} beautiful enough for you.`);
+ r.push(`${He} <span class="hotpink">likes</span> how ${his} gag forces ${him} to keep silent.`);
slave.devotion += 1;
}
}
diff --git a/src/endWeek/saPorn.js b/src/endWeek/saPorn.js
index e5b71af2f88ada3a66883cf9c0e0454614a62560..2f51af66f0c395659b80586f570a1b217f323df3 100644
--- a/src/endWeek/saPorn.js
+++ b/src/endWeek/saPorn.js
@@ -114,7 +114,7 @@ App.SlaveAssignment.porn = (function() {
decayRate = 5000;
if (slave.fuckdoll > 0) {
face = 50;
- } else if (slave.collar === "porcelain mask") {
+ } else if (slave.faceAccessory === "porcelain mask") {
face = 20;
} else {
face = slave.face * 4;
@@ -124,7 +124,7 @@ App.SlaveAssignment.porn = (function() {
decayRate = 500;
if (slave.fuckdoll > 0) {
face = 20;
- } else if (slave.collar === "porcelain mask") {
+ } else if (slave.faceAccessory === "porcelain mask") {
face = 50;
} else {
face = slave.face * 2;
@@ -134,7 +134,7 @@ App.SlaveAssignment.porn = (function() {
decayRate = 30;
if (slave.fuckdoll > 0) {
face = 0;
- } else if (slave.collar === "porcelain mask") {
+ } else if (slave.faceAccessory === "porcelain mask") {
face = 0;
} else {
face = slave.face / 20;
@@ -167,7 +167,7 @@ App.SlaveAssignment.porn = (function() {
function faceCommentary(slave) {
if (slave.fuckdoll > 0) {
return;
- } else if (slave.collar === "porcelain mask") {
+ } else if (slave.faceAccessory === "porcelain mask") {
r += `${His} mask adds an air of mystery to ${him}, `;
if (slave.porn.prestige > 1) {
r += `but people wonder if ${he} is trying to hide something. `;
diff --git a/src/interaction/main/walkPast.js b/src/interaction/main/walkPast.js
index 22c8ef88c804b6eb45cac0f692cbec138e61d7e4..587d179da1db92bcb9d5f8dcaaed87a8c8fceac9 100644
--- a/src/interaction/main/walkPast.js
+++ b/src/interaction/main/walkPast.js
@@ -9120,7 +9120,7 @@ globalThis.walkPast = (function() {
t += `<<faceDescription>>`;
t += `<<mouthDescription>>`;
switch (slave.collar) {
- case "a Fuckdoll suit":
+ case "a Fuckdoll suit": // TODO: there does not seem to be documentation for a fuckdoll suit collar.
t += `${His} suit is expressly designed to encourage use of ${his} face hole.`;
break;
case "uncomfortable leather":
@@ -9133,12 +9133,6 @@ globalThis.walkPast = (function() {
case "preg biometrics":
t += `${His} collar reveals everything about ${his} womb, bringing eyes straight to ${his} belly before drawing them back to ${his} neck.`;
break;
- case "dildo gag":
- t += `${His} ring gag would make ${him} ready for oral service, as soon as the formidable dildo it secures down ${his} throat is removed.`;
- break;
- case "massive dildo gag":
- t += `Your eyes are drawn to the distinct bulge in ${his} throat caused by the enormous dildo in it, though ${his} mouth would only be suitable for the largest of cocks right now.`;
- break;
case "shock punishment":
t += `${His} shock collar rests threateningly at ${his} throat, ready to compel ${him} to do anything you wish.`;
break;
@@ -9173,23 +9167,38 @@ globalThis.walkPast = (function() {
case "ancient Egyptian":
t += `${His} wesekh glints richly as ${he} moves, sparkling with opulence and sensuality.`;
break;
+ default:
+ t += `${His} unadorned `;
+ if (V.PC.dick !== 0) {
+ t += `throat is just waiting to be wrapped around a thick shaft.`;
+ } else {
+ t += `lips are just begging for a cunt to lavish attention on.`;
+ }
+ }
+ switch (slave.mouthAccessory ) {
+ case "dildo gag":
+ t += `${His} ring gag would make ${him} ready for oral service, as soon as the formidable dildo it secures down ${his} throat is removed.`;
+ break;
+ case "massive dildo gag":
+ t += `Your eyes are drawn to the distinct bulge in ${his} throat caused by the enormous dildo in it, though ${his} mouth would only be suitable for the largest of cocks right now.`;
+ break;
case "ball gag":
t += `${His} ball gag uncomfortably holds ${his} jaw apart as it fills ${his} mouth.`;
break;
case "bit gag":
t += `${His} bit gag uncomfortably keeps ${him} from closing ${his} jaw; drool visibly pools along the corners of ${his} mouth, where the rod forces back ${his} cheeks.`;
break;
+ case "ring gag":
+ // TODO: add desc
+ break;
+ }
+
+ switch (slave.faceAccessory ) {
case "porcelain mask":
t += `${His} beautiful porcelain mask hides ${his} face and any unsightly facial features.`;
break;
- default:
- t += `${His} unadorned `;
- if (V.PC.dick !== 0) {
- t += `throat is just waiting to be wrapped around a thick shaft.`;
- } else {
- t += `lips are just begging for a cunt to lavish attention on.`;
- }
}
+
if (jsRandom(1, 3) === 1) {
V.target = "FKiss";
} else {
diff --git a/src/js/descriptionWidgets.js b/src/js/descriptionWidgets.js
index 86a273ae8a5ed236e7445f7f2351bc0f2d87d426..1966292bfecd805f3b4f4c8987fba3a2d17bec9d 100644
--- a/src/js/descriptionWidgets.js
+++ b/src/js/descriptionWidgets.js
@@ -1727,3 +1727,37 @@ App.Desc.sexualHistory = function(slave) {
return r;
};
+
+App.Desc.faceAccessory = function(slave) {
+ const {He, his} = getPronouns(slave);
+ switch (slave.faceAccessory) {
+ case "porcelain mask":
+ return `${He} is wearing a beautiful porcelain mask to hide ${his} unsightly facial features.`;
+ }
+};
+
+App.Desc.mouthAccessory = function(slave) {
+ const {He, him, his, himself, girl} = getPronouns(slave);
+ let r = ``;
+ switch (slave.mouthAccessory ) {
+ case "ball gag":
+ r += `${He} is wearing a mouth filling, `;
+ if (slave.makeup === 3 || slave.makeup === 6 || slave.makeup === 8) {
+ r += `slave.hColor`;
+ } else {
+ r += `red`;
+ }
+ r += `ball-shaped gag that prevents ${him} from uttering a word while keeping ${him} uncomfortably aware of ${his} status.`;
+ break;
+ case "bit gag":
+ r += `${He} is wearing a jaw spreading, bar-shaped gag that prevents ${him} from speaking while keeping $him uncomfortably aware of ${his} status.`;
+ break;
+ case "dildo gag":
+ r += `${He} is wearing a sturdy leather collar that continues up to restrict ${his} jaw as well. It holds a ring gag in ${his} mouth, into which slots a formidable inward-facing dildo that reaches down ${his} throat. It can be removed to facefuck ${him}.`;
+ break;
+ case "massive dildo gag":
+ r += `${He} is wearing a sturdy leather collar that continues up to restrict ${his} jaw as well. It acts as an anchor for an enormous inward-facing dildo that reaches deep down ${his} throat. The sheer size of the phallus forces ${his} mouth as wide as it will go and considerably bulges ${his} throat. Fortunately for ${him}, it is designed to allow ${him} to be able to breathe through ${his} nose; though when removed, the poor ${girl} finds ${himself} incapable of closing ${his} mouth for some time.`;
+ break;
+ }
+ return r;
+};
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index 0bda43a6d0514d9952b5887b240c41b42c5d86a9..212e5a2b7d1e3d18a1ba3d1687b55917add380ba 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -816,7 +816,7 @@ globalThis.generateRandomEventPoolStandard = function(eventSlave) {
} /* closes mute exempt */
if (eventSlave.devotion > 20) {
- if (["ball gag", "bit gag", "dildo gag", "massive dildo gag"].includes(eventSlave.collar)) {
+ if (["ball gag", "bit gag", "dildo gag", "massive dildo gag"].includes(eventSlave.mouthAccessory )) {
State.variables.RESSevent.push("gagged slave");
}
}
@@ -1025,7 +1025,7 @@ globalThis.generateRandomEventPoolStandard = function(eventSlave) {
if (eventSlave.voice > 0) {
if (eventSlave.lips <= 95) {
- if (!["ball gag", "bit gag", "dildo gag", "massive dildo gag"].includes(eventSlave.collar)) {
+ if (!["ball gag", "bit gag", "dildo gag", "massive dildo gag"].includes(eventSlave.mouthAccessory)) {
if (eventSlave.accent === 3) {
if (eventSlave.devotion <= 50) {
if (eventSlave.trust > -10) {
@@ -2226,7 +2226,7 @@ globalThis.generateRandomEventPoolServant = function(eventSlave) {
} /* closes mute exempt */
if (eventSlave.devotion > 20) {
- if (["ball gag", "bit gag", "dildo gag", "massive dildo gag"].includes(eventSlave.collar)) {
+ if (["ball gag", "bit gag", "dildo gag", "massive dildo gag"].includes(eventSlave.mouthAccessory)) {
State.variables.RESSevent.push("gagged slave");
}
}
diff --git a/src/js/statsChecker/statsChecker.js b/src/js/statsChecker/statsChecker.js
index a4e164f4b5b78184c147bd750533030f89995935..c30d8c5bf8ea0cee0929d01a6990a5b7e44e9318 100644
--- a/src/js/statsChecker/statsChecker.js
+++ b/src/js/statsChecker/statsChecker.js
@@ -766,13 +766,15 @@ globalThis.canTalk = function(slave, checkLanguage = true) {
return false;
} else if (slave.lips > 95) {
return false;
- } else if (slave.collar === "dildo gag") {
+ } else if (slave.mouthAccessory === "dildo gag") {
return false;
- } else if (slave.collar === "massive dildo gag") {
+ } else if (slave.mouthAccessory === "massive dildo gag") {
return false;
- } else if (slave.collar === "ball gag") {
+ } else if (slave.mouthAccessory === "ball gag") {
return false;
- } else if (slave.collar === "bit gag") {
+ } else if (slave.mouthAccessory === "bit gag") {
+ return false;
+ } else if (slave.mouthAccessory === "ring gag") {
return false;
}
return true;
diff --git a/src/npc/interaction/fDance.tw b/src/npc/interaction/fDance.tw
index c02b251217cac39298301e0494713f3bfccaa1d7..5f6dd21e53418ea14260d3f34684ba42a5eeb376 100644
--- a/src/npc/interaction/fDance.tw
+++ b/src/npc/interaction/fDance.tw
@@ -164,68 +164,84 @@ $His face is
but $he is to terrified of you to see what happens if $he resists
<<else>>
and refuses to comply. In order to make $him obey, a leash is attached from
- <<switch getSlave($AS).collar>>
- <<case "uncomfortable leather">>
- the steel ring on $his leather collar
- <<case "dildo gag">>
- a ring on $his gag strap
- <<case "massive dildo gag">>
- a ring on $his gag strap
- <<case "preg biometrics">>
- $his collar
- <<case "silk ribbon">>
- $his silk ribbon
- <<case "tight steel">>
- $his steel collar
- <<case "porcelain mask">>
- <<if getSlave($AS).nosePiercing == 2>>
- $his nose ring
- <<elseif getSlave($AS).nipplesPiercing == 2>>
- $his nipple chain
- <<else>>
- a collar that is placed around $his neck
- <</if>>
- <<case "shock punishment">>
- $his shock collar
- <<case "neck corset">>
- an O-ring at the from of $his neck corset
- <<case "stylish leather">>
- $his collar
- <<case "satin choker">>
- $his choker collar
- <<case "heavy gold">>
- $He is wearing a heavy gold collar, an outstanding bit of ostentation.
- <<case "pretty jewelry">>
- $his ornate collar
- <<case "bell collar">>
- the ring attaching $his bell to $his collar, and
- <<case "leather with cowbell">>
- the ring attaching $his bell to $his collar, and
- <<case "bowtie">>
- $his bowtie collar
- <<case "ancient Egyptian">>
- <<if getSlave($AS).nosePiercing == 2>>
- $his nose ring
- <<elseif getSlave($AS).nipplesPiercing == 2>>
- $his nipple chain
- <<else>>
- $his wesekh
- <</if>>.
- <<case "ball gag">>
- a ring on the back of $his gag
- <<case "bit gag">>
- the ring on the side of $his bit
- <<case "cruel retirement counter" "nice retirement counter">>
- $his retirement counter
- <<case "default">>
- <<if getSlave($AS).nosePiercing == 2>>
- $his nose ring
- <<elseif getSlave($AS).nipplesPiercing == 2>>
- $his nipple chain
- <<else>>
- a collar that is placed on $his neck for the occasion, and
- <</if>>
- <</switch>>
+ <<if getSlave($AS).collar != "none">>
+ <<switch getSlave($AS).collar>>
+ <<case "uncomfortable leather">>
+ the steel ring on $his leather collar
+ <<case "dildo gag">>
+ a ring on $his gag strap
+ <<case "massive dildo gag">>
+ a ring on $his gag strap
+ <<case "preg biometrics">>
+ $his collar
+ <<case "silk ribbon">>
+ $his silk ribbon
+ <<case "tight steel">>
+ $his steel collar
+ <<case "shock punishment">>
+ $his shock collar
+ <<case "neck corset">>
+ an O-ring at the from of $his neck corset
+ <<case "stylish leather">>
+ $his collar
+ <<case "satin choker">>
+ $his choker collar
+ <<case "heavy gold">>
+ $He is wearing a heavy gold collar, an outstanding bit of ostentation.
+ <<case "pretty jewelry">>
+ $his ornate collar
+ <<case "bell collar">>
+ the ring attaching $his bell to $his collar, and
+ <<case "leather with cowbell">>
+ the ring attaching $his bell to $his collar, and
+ <<case "bowtie">>
+ $his bowtie collar
+ <<case "ancient Egyptian">>
+ <<if getSlave($AS).nosePiercing == 2>>
+ $his nose ring
+ <<elseif getSlave($AS).nipplesPiercing == 2>>
+ $his nipple chain
+ <<else>>
+ $his wesekh
+ <</if>>.
+ <<case "ball gag">>
+ a ring on the back of $his gag
+ <<case "bit gag">>
+ the ring on the side of $his bit
+ <<case "cruel retirement counter" "nice retirement counter">>
+ $his retirement counter
+ <<case "default">>
+ <<if getSlave($AS).nosePiercing == 2>>
+ $his nose ring
+ <<elseif getSlave($AS).nipplesPiercing == 2>>
+ $his nipple chain
+ <<else>>
+ a collar that is placed on $his neck for the occasion, and
+ <</if>>
+ <</switch>>
+ <<elseif getSlave($AS).mouthAccessory != "none">>
+ <<switch getSlave($AS).collar>>
+ <<case "dildo gag">>
+ a ring on $his gag strap
+ <<case "massive dildo gag">>
+ a ring on $his gag strap
+ <<case "ball gag">>
+ a ring on the back of $his gag
+ <<case "bit gag">>
+ the ring on the side of $his bit
+ <</switch>>
+ <<elseif getSlave($AS).faceAccessory != "none">>
+ <<switch getSlave($AS).collar>>
+ <<case "porcelain mask">>
+ <<if getSlave($AS).nosePiercing == 2>>
+ $his nose ring
+ <<elseif getSlave($AS).nipplesPiercing == 2>>
+ $his nipple chain
+ <<else>>
+ a collar that is placed around $his neck
+ <</if>>
+ <</switch>>
+ <</if>>
to the pole in order to keep $him from getting down. Whenever $he stops dancing the chain is tightened a bit more,
<<switch getSlave($AS).collar>>
<<case "uncomfortable leather">>
diff --git a/src/npc/surgery/surgery.js b/src/npc/surgery/surgery.js
index a1b984d2f947c61a89190d2b613eb6c4f34d19e0..3edc3d395cd2a3dbb622d1c610c7efc7f2d61d89 100644
--- a/src/npc/surgery/surgery.js
+++ b/src/npc/surgery/surgery.js
@@ -1104,6 +1104,8 @@ globalThis.beginFuckdoll = function(slave) {
slave.choosesOwnClothes = 0;
slave.clothes = "a Fuckdoll suit";
slave.collar = "none";
+ slave.faceAccessory = "none";
+ slave.mouthAccessory = "none";
if ((!hasAnyLegs(slave)) || (slave.shoes !== "none")) {
slave.shoes = "heels";
}
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index 0449dcf8102d1587e143f62490162e08fedb306d..c69a68d7bdb3ea609b87f64eca017a2cf397ab43 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -194,6 +194,8 @@
<<set $args[0].dietMilk = $args[1].dietMilk>>
<<set $args[0].clothes = $args[1].clothes>>
<<set $args[0].collar = $args[1].collar>>
+ <<set $args[0].faceAccessory = $args[1].faceAccessory >>
+ <<set $args[0].mouthAccessory = $args[1].mouthAccessory >>
<<set $args[0].shoes = $args[1].shoes>>
<<set $args[0].makeup = $args[1].makeup>>
<<set $args[0].nails = $args[1].nails>>
diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw
index df85f4d12a76f15326e0951bf1779262215daf52..41a89d8a37cd6c1fd1f6a72cefaf84eb9817f2aa 100644
--- a/src/uncategorized/REFI.tw
+++ b/src/uncategorized/REFI.tw
@@ -865,7 +865,7 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
<<= VCheck.Vaginal()>>
<<else>>
$He hasn't recovered before $he feels
- <<switch $activeSlave.collar>>
+ <<switch $activeSlave.mouthAccessory>>
<<case "dildo gag" "massive dildo gag">>
the relief of the dildo gag being drawn from $his throat before
<<case "ball gag" "bit gag">>
@@ -1000,7 +1000,7 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
<<= VCheck.Vaginal()>>
<<else>>
$He hasn't recovered before $he feels
- <<switch $activeSlave.collar>>
+ <<switch $activeSlave.mouthAccessory>>
<<case "dildo gag" "massive dildo gag">>
the relief of the dildo gag being drawn from $his throat before
<<case "ball gag" "bit gag">>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index fa3e61a47de0a40fc137528f92b171909eb9dd64..d712bc5cacaff55892324bcf4ccdaad76e0ceb84 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -2908,12 +2908,11 @@ $He comes to a stop right beside your elbow, waiting for further direction, just
<<case "tittymonster inspection">>
You enter your office from other business a few minutes after the scheduled start of <<= App.UI.slaveDescriptionDialog($activeSlave)>>'s inspection. The <<if $boobAccessibility == 1>>accessibility aids for slaves with immobilizing breasts<<else>>slaves who helped $him in<</if>> have gone, leaving $him waiting for you in front of your desk. The sight is an arresting one. $He's kneeling, but $his boobs are so enormous that they're resting on the ground in front of $him, completely concealing $his body below the chest<<if $activeSlave.belly >= 120000>>, save for the protruding mass of $his <<if $activeSlave.pregType > 8>>hyper pregnant<<elseif $activeSlave.pregType > 4>><<print pregNumberName($activeSlave.pregType, 1)>>-filled<<else>>overly distended<</if>> belly<</if>>. With $his arm<<if hasBothArms($activeSlave)>>s<</if>> tucked back, and $his torso, <<if $activeSlave.belly < 120000>><<if $activeSlave.bellyPreg > 100>>pregnancy,<<elseif $activeSlave.belly > 100>>swollen stomach,<<else>>abdomen,<</if>><</if>> and legs hidden, $he appears to consist of a <<if $activeSlave.face > 95>>gorgeous<<elseif $activeSlave.face > 50>>beautiful<<elseif $activeSlave.face >= 10>>pretty<<elseif $activeSlave.face >= 0>>nice<<else>>homely<</if>>, $activeSlave.faceShape face, a
-<<switch $activeSlave.collar>>
-<<case "none" "dildo gag" "ball gag" "bit gag" "massive dildo gag">>
- bare
-<<default>>
+<<if $activeSlave.collar == "none">>
+ none
+<<else>>
collared
-<</switch>>
+<</if>>
neck, $activeSlave.skin, <<if $activeSlave.muscles > 95>>hugely muscled<<elseif $activeSlave.muscles > 30>>strong<<elseif $activeSlave.shoulders > 0>>broad<<elseif $activeSlave.shoulders < 0>>feminine<<elseif $activeSlave.muscles > 5>>toned<<else>>soft<</if>> shoulders, and below that, breasts<<if $activeSlave.belly >= 120000>> parted by $his _belly dome of a stomach<</if>>. $He greets you <<if $activeSlave.devotion > 50>>devotedly, behaving for all the world like $he's pleased to be<<elseif $activeSlave.devotion >= -20>>properly, with just a hint of unhappiness about being<<else>>with more than a hint of resentment over being<</if>> pinned to the floor by $his own tits.
<<case "bonded love">>
@@ -4155,13 +4154,13 @@ beside your desk to await further orders. It occurs to you, gazing down at your
<<case "gagged slave">>
You cross paths with <<= App.UI.slaveDescriptionDialog($activeSlave)>> as $he returns from $activeSlave.assignment after a long day. One of the things most readily apparent about $activeSlave.slaveName is the
-<<if ($activeSlave.collar == "ball gag")>>
+<<if ($activeSlave.mouthAccessory == "ball gag")>>
ball gag keeping $his mouth filled,
-<<elseif ($activeSlave.collar == "bit gag")>>
+<<elseif ($activeSlave.mouthAccessory == "bit gag")>>
cruel bit gag keeping $his jaw locked,
-<<elseif ($activeSlave.collar == "dildo gag")>>
+<<elseif ($activeSlave.mouthAccessory == "dildo gag")>>
dildo gag filling $his mouth and throat,
-<<elseif ($activeSlave.collar == "massive dildo gag")>>
+<<elseif ($activeSlave.mouthAccessory == "massive dildo gag")>>
dildo gag hugely distending $his throat,
<</if>>
the existence of which is a constant reminder to $him of $his submission to you and your immense power over $him.
@@ -19380,7 +19379,7 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
<<link "Give $him something else to gag on">>
<<replace "#result">>
- As pleasant an image as $activeSlave.slaveName's mouth filled by a $activeSlave.collar is, one of $his mouth's primary purposes is still to provide you with ample <<if $PC.dick != 0>>blowjobs<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>cunnilingus<</if>>. With $activeSlave.slaveName already kneeling, it is merely a matter of undoing $his gag before you can put $his mouth to work.
+ As pleasant an image as $activeSlave.slaveName's mouth filled by a $activeSlave.mouthAccessory is, one of $his mouth's primary purposes is still to provide you with ample <<if $PC.dick != 0>>blowjobs<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>cunnilingus<</if>>. With $activeSlave.slaveName already kneeling, it is merely a matter of undoing $his gag before you can put $his mouth to work.
<<if $activeSlave.skill.oral >= 100>>
Though $he has spent much time gagged, $his mastery at giving oral is unaffected.
<<elseif $activeSlave.skill.oral > 60>>
@@ -19412,20 +19411,20 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
<</link>>
<br><<link "Remove the gag for a few minutes">>
<<replace "#result">>
- You wordlessly remove the $activeSlave.collar and watch as $activeSlave.slaveName opens and closes $his mouth testingly, as if $he has forgotten what it feels like to do so without obstruction. Though you eventually return to the gag to its rightful place in $his mouth, $he @@.mediumaquamarine;trusts you more@@ for granting $him a few moments respite from the gag.
+ You wordlessly remove the $activeSlave.mouthAccessory and watch as $activeSlave.slaveName opens and closes $his mouth testingly, as if $he has forgotten what it feels like to do so without obstruction. Though you eventually return to the gag to its rightful place in $his mouth, $he @@.mediumaquamarine;trusts you more@@ for granting $him a few moments respite from the gag.
<<set $activeSlave.trust += 4>>
<</replace>>
<</link>>
<br><<link "Torment $him with the gag">>
<<replace "#result">>
- Though having a $activeSlave.collar constrict $his mouth is torment enough, you take the time to linger and add to $his torturous existence. $activeSlave.slaveName soon discovers that the straps of a gag can always be made tighter, the
- <<if ($activeSlave.collar == "ball gag")>>
+ Though having a $activeSlave.mouthAccessory constrict $his mouth is torment enough, you take the time to linger and add to $his torturous existence. $activeSlave.slaveName soon discovers that the straps of a gag can always be made tighter, the
+ <<if ($activeSlave.mouthAccessory == "ball gag")>>
ball can always be made larger,
- <<elseif ($activeSlave.collar == "bit gag")>>
+ <<elseif ($activeSlave.mouthAccessory == "bit gag")>>
the bit can always be made thicker,
- <<elseif ($activeSlave.collar == "dildo gag")>>
+ <<elseif ($activeSlave.mouthAccessory == "dildo gag")>>
the dildo can always be made larger,
- <<elseif ($activeSlave.collar == "massive dildo gag")>>
+ <<elseif ($activeSlave.mouthAccessory == "massive dildo gag")>>
the dildo can always be made wider and longer,
<</if>>
and the punishments rendered for daring to show any discomfort can always be harsher and stricter. Come the end of your session with $him, $activeSlave.slaveName <<if $activeSlave.fetish == "masochist">> is mortified by the intensity of $his orgasms, @@.hotpink;and more convinced than ever that $he's a pain slut,@@ and yet<</if>> @@.gold;scuttles away quickly, having learnt a harsh lesson about your power over $his body.@@
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 7481e8a2993a5674152e1d566ab0eb4f06196905..e975241557b4f9072f6df7b7420ce4c531bb3ed9 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -365,7 +365,7 @@
<<set $slaves[$i].diet = "healthy">>
<</if>>
<<if $dairyRestraintsSetting > 1>>
- <<set $slaves[$i].collar = "none", $slaves[$i].choosesOwnClothes = 0, $slaves[$i].clothes = "no clothing", $slaves[$i].vaginalAccessory = "none", $slaves[$i].vaginalAttachment = "none", $slaves[$i].dickAccessory = "none", $slaves[$i].buttplug = "none", $slaves[$i].chastityAnus = 0, $slaves[$i].chastityPenis = 0, $slaves[$i].chastityVagina = 0>>
+ <<set $slaves[$i].collar = "none", $slaves[$i].faceAccessory = "none", $slaves[$i].mouthAccessory = "none", $slaves[$i].choosesOwnClothes = 0, $slaves[$i].clothes = "no clothing", $slaves[$i].vaginalAccessory = "none", $slaves[$i].vaginalAttachment = "none", $slaves[$i].dickAccessory = "none", $slaves[$i].buttplug = "none", $slaves[$i].chastityAnus = 0, $slaves[$i].chastityPenis = 0, $slaves[$i].chastityVagina = 0>>
<</if>>
<<switch $dairyDecoration>>
<<case "Arabian Revivalist" "Aztec Revivalist" "Chattel Religionist" "Chinese Revivalist" "Degradationist" "Edo Revivalist" "Egyptian Revivalist" "Roman Revivalist" "Subjugationist" "Supremacist">>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 1ae369626da629dd78ddb72c359497420ce333a4..82cb1109e2488a930f43cb0df1d06e543e66a0ea 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1902,6 +1902,8 @@ $He is
<<if $activeSlave.fuckdoll == 0>>
<<collarDescription>>
+ <<= App.Desc.faceAccessory($activeSlave)>>
+ <<= App.Desc.mouthAccessory($activeSlave)>>
<<if ($activeSlave.relationship > 4)>>
<<if hasAnyArms($activeSlave)>>
$He has a simple gold band on the little finger of $his <<if !hasLeftArm($activeSlave)>>right<<else>>left<</if>> hand.
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 384aa92f8749652c400a601dfe98500dd5098eaf..9d62a044c20d7b1c7904f274ca2a65b5a482c25c 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -187,7 +187,7 @@
<</if>>
<<elseif ($slaves[$i].fetish == "cumslut")>>
<<if ($cumslutID == 0)>>
- <<if !["dildo gag", "massive dildo gag", "ball gag", "bit gag"].includes($slaves[$i].collar)>>
+ <<if !["dildo gag", "massive dildo gag", "ball gag", "bit gag"].includes($slaves[$i].mouthAccessory)>>
<<set $cumslutID = $slaves[$i].ID>>
<</if>>
<</if>>
diff --git a/src/uncategorized/reBoomerang.tw b/src/uncategorized/reBoomerang.tw
index ed98acb50cd33914c9753acec6f6229369d93d0f..1343e924d6501ee9ad55bc9f81b5b830a210a314 100644
--- a/src/uncategorized/reBoomerang.tw
+++ b/src/uncategorized/reBoomerang.tw
@@ -18,7 +18,7 @@ Your work is interrupted by $assistant.name with an alert from the entrance to t
brings up the relevant feeds. There's a naked body crumpled pathetically against one wall of the entryway, beneath the communications panel. It's <<= SlaveFullName($activeSlave)>>, whom you sold _weeks weeks ago. $He's looking up into one of the cameras plaintively.
"Plea<<s>>e take me back," $he whispers, not wanting to draw the attention of passersby, and knowing that $his faint words will be picked up and amplified for you.
-<<set $activeSlave.collar = "none", $activeSlave.choosesOwnClothes = 0, $activeSlave.clothes = "no clothing", $activeSlave.buttplug = "none", $activeSlave.vaginalAccessory = "none", $activeSlave.dickAccessory = "none", $activeSlave.chastityAnus = 0, $activeSlave.chastityPenis = 0, $activeSlave.chastityVagina = 0>>
+<<set $activeSlave.collar = "none", $activeSlave.faceAccessory = "none", $activeSlave.mouthAccessory = "none", $activeSlave.choosesOwnClothes = 0, $activeSlave.clothes = "no clothing", $activeSlave.buttplug = "none", $activeSlave.vaginalAccessory = "none", $activeSlave.dickAccessory = "none", $activeSlave.chastityAnus = 0, $activeSlave.chastityPenis = 0, $activeSlave.chastityVagina = 0>>
<<run setHealth($activeSlave, jsRandom(-40, -25), $activeSlave.health.shortDamage + jsRandom(0, 10), $activeSlave.health.longDamage + jsRandom(0, 10))>>
/* ------------------ pregnancy setup start here----------------- */
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index 66c9faa27605e2950b953bd49ab01a52efdba21a..dc89add51c0cf72db20c5faa2458a671ae4fcc6c 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -3744,10 +3744,6 @@ $His
<<switch $activeSlave.collar>>
<<case "uncomfortable leather">>
$He is wearing an uncomfortable leather collar with a useful steel ring in front.
- <<case "dildo gag">>
- $He is wearing a sturdy leather collar that continues up to restrict $his jaw as well. It holds a ring gag in $his mouth, into which slots a formidable inward-facing dildo that reaches down $his throat. It can be removed to facefuck $him.
- <<case "massive dildo gag">>
- $He is wearing a sturdy leather collar that continues up to restrict $his jaw as well. It acts as an anchor for an enormous inward-facing dildo that reaches deep down $his throat. The sheer size of the phallus forces $his mouth as wide as it will go and considerably bulges $his throat. Fortunately for $him, it is designed to allow $him to be able to breathe through $his nose; though when removed, the poor $girl finds $himself incapable of closing $his mouth for some time.
<<case "preg biometrics">>
<<if $activeSlave.pregSource > 0>>
<<set _daddy = findFather($activeSlave.pregSource), _daddy = _daddy.slaveName>>
@@ -3809,8 +3805,6 @@ $His
$He is wearing a tight silk ribbon fitted to $his neck, it is oddly elegant.
<<case "tight steel">>
$He is wearing a tight steel collar whose restricting metal touch $he cannot escape.
- <<case "porcelain mask">>
- $He is wearing a beautiful porcelain mask to hide $his unsightly facial features.
<<case "shock punishment">>
$He is wearing a utilitarian collar with a punishment device at $his throat to administer agonizing shocks.
<<case "neck corset">>
@@ -3831,10 +3825,6 @@ $His
$He is wearing the collar from a white formal shirt, and a black bowtie, though these conceal an actual collar that works perfectly well for restraint.
<<case "ancient Egyptian">>
$He is wearing a beautiful golden wesekh, a collar that spreads from $his neck out onto both shoulders and down $his front.
- <<case "ball gag">>
- $He is wearing a mouth filling, <<if $activeSlave.makeup == 3 || $activeSlave.makeup == 6 || $activeSlave.makeup == 8>>$activeSlave.hColor<<else>>red<</if>> ball-shaped gag that prevents $him from uttering a word while keeping $him uncomfortably aware of $his status.
- <<case "bit gag">>
- $He is wearing a jaw spreading, bar-shaped gag that prevents $him from speaking while keeping $him uncomfortably aware of $his status.
<<case "cruel retirement counter" "nice retirement counter">>
$He is wearing a <<if $activeSlave.collar == "cruel retirement counter">>heavy metal collar<<else>>nice collar, almost a necklace,<</if>> with a small numerical display reading
<<if $activeSlave.indenture > -1>>