From a31327f86acac69f8cdc181107e6a0ad7745e4f2 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Sun, 30 Aug 2020 16:33:15 -0700
Subject: [PATCH] JSDoc walkPast, and fix some bugs so revealed
---
src/interaction/main/walkPast.js | 61 +++++++++++++++++++++++++++++---
1 file changed, 56 insertions(+), 5 deletions(-)
diff --git a/src/interaction/main/walkPast.js b/src/interaction/main/walkPast.js
index 4cf926401d8..b06dd69419d 100644
--- a/src/interaction/main/walkPast.js
+++ b/src/interaction/main/walkPast.js
@@ -160,6 +160,11 @@ globalThis.walkPast = (function() {
return frag;
}
+ /** Generate walkpast for the main slave we're looking at
+ * @param {App.Entity.SlaveState} activeSlave
+ * @param {number} seed
+ * @returns {string}
+ */
function primeSlave(activeSlave, seed) {
let r = "";
@@ -174,6 +179,11 @@ globalThis.walkPast = (function() {
return r;
}
+ /** Generate walkpast for the rival of the slave we're looking at
+ * @param {App.Entity.SlaveState} activeSlave
+ * @param {number} seed
+ * @returns {string}
+ */
function rivalSlave(activeSlave, seed) {
partnerSlave = getSlave(activeSlave.rivalryTarget);
let r = "";
@@ -199,12 +209,16 @@ globalThis.walkPast = (function() {
return r + ` `;
}
+ /** Generate walkpast for the lover of the slave we're looking at
+ * @param {App.Entity.SlaveState} activeSlave
+ * @returns {string}
+ */
function loverSlave(activeSlave) {
t = "";
partnerSlave = getSlave(activeSlave.relationshipTarget);
const fuckSeed = jsRandom(1, 100);
const seed = jsRandom(1, 100);
- const name = activeSlave.name;
+ const name = activeSlave.slaveName;
const race = (V.seeRace ? activeSlave.race : "");
const {
@@ -1391,6 +1405,10 @@ globalThis.walkPast = (function() {
return t + ` `;
}
+ /** Generate walkpast for a relative of the slave we're looking at
+ * @param {App.Entity.SlaveState} activeSlave
+ * @returns {string}
+ */
function relatedSlave(activeSlave) {
let r = "";
const fuckSeed = jsRandom(1, 100);
@@ -1424,6 +1442,11 @@ globalThis.walkPast = (function() {
return r + ` `;
}
+ /** Generate walkpast for a given slave
+ * @param {App.Entity.SlaveState} slave
+ * @param {number} seed
+ * @returns {string}
+ */
function walkPasts(slave, seed) {
const {
he, him, his, hers, himself, boy,
@@ -2031,6 +2054,10 @@ globalThis.walkPast = (function() {
return t + ` `;
}
+ /** Generate boob text for a given slave
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string}
+ */
function boobWatch(slave) {
const pronouns = getPronouns(slave);
const {
@@ -2463,6 +2490,10 @@ globalThis.walkPast = (function() {
return t;
}
+ /** Generate butt text for a given slave
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string}
+ */
function buttWatch(slave) {
const {
he, him, his, hers, himself, boy,
@@ -2806,6 +2837,10 @@ globalThis.walkPast = (function() {
return t;
}
+ /** Generate belly text for a given slave
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string}
+ */
function bellyWatch(slave) {
const {
he, him, his, hers, himself, boy,
@@ -7639,6 +7674,10 @@ globalThis.walkPast = (function() {
return t;
}
+ /** Generate vagina text for a given slave
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string}
+ */
function vaginaWatch(slave) {
const {
he, him, his, hers, himself, boy,
@@ -8200,16 +8239,20 @@ globalThis.walkPast = (function() {
}
if ((slave.vaginalAccessory === "long dildo") || (slave.vaginalAccessory === "long, large dildo") || (slave.vaginalAccessory === "long, huge dildo")) {
t += `With every motion ${he} makes, ${his} dildo shifts, bulging out ${his} stomach.`;
- if ((slave.buttPlug === "long plug") || (slave.buttPlug === "long, large plug") || (slave.buttPlug === "long, huge plug")) {
+ if ((slave.buttplug === "long plug") || (slave.buttplug === "long, large plug") || (slave.buttplug === "long, huge plug")) {
t += `Beside it, a second bulge caused by ${his} extra long buttplug.`;
}
- } else if ((slave.buttPlug === "long plug") || (slave.buttPlug === "long, large plug") || (slave.buttPlug === "long, huge plug")) {
+ } else if ((slave.buttplug === "long plug") || (slave.buttplug === "long, large plug") || (slave.buttplug === "long, huge plug")) {
t += `With every motion ${he} makes, ${his} buttplug shifts, bulging out ${his} stomach.`;
}
return t;
}
+ /** Generate dick text for a given slave
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string}
+ */
function dickWatch(slave) {
const {
he, him, his, hers, himself, boy,
@@ -8771,16 +8814,20 @@ globalThis.walkPast = (function() {
}
if ((slave.vaginalAccessory === "long dildo") || (slave.vaginalAccessory === "long, large dildo") || (slave.vaginalAccessory === "long, huge dildo")) {
t += `With every motion ${he} makes, ${his} dildo shifts, bulging out ${his} stomach.`;
- if ((slave.buttPlug === "long plug") || (slave.buttPlug === "long, large plug") || (slave.buttPlug === "long, huge plug")) {
+ if ((slave.buttplug === "long plug") || (slave.buttplug === "long, large plug") || (slave.buttplug === "long, huge plug")) {
t += `Beside it, a second bulge caused by ${his} extra long buttplug.`;
}
- } else if ((slave.buttPlug === "long plug") || (slave.buttPlug === "long, large plug") || (slave.buttPlug === "long, huge plug")) {
+ } else if ((slave.buttplug === "long plug") || (slave.buttplug === "long, large plug") || (slave.buttplug === "long, huge plug")) {
t += `With every motion ${he} makes, ${his} buttplug shifts, bulging out ${his} stomach.`;
}
return t;
}
+ /** Generate anus text for a given slave
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string}
+ */
function anusWatch(slave) {
const {
he, him, his, hers, himself, boy,
@@ -9096,6 +9143,10 @@ globalThis.walkPast = (function() {
return t;
}
+ /** Generate lip/mouth text for a given slave
+ * @param {App.Entity.SlaveState} slave
+ * @returns {string}
+ */
function lipWatch(slave) {
const {
he, him, his, hers, himself, boy,
--
GitLab