From 3e10536504f0b8258ee1241716ca0088820c497a Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 15 Jun 2020 09:10:11 -0400
Subject: [PATCH] butt
---
devNotes/legacy files/walkPast.txt | 2 +-
src/interaction/main/walkPast.js | 2 +-
src/npc/descriptions/butt/butt.js | 10 +++++-----
src/npc/descriptions/longSlave.js | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/devNotes/legacy files/walkPast.txt b/devNotes/legacy files/walkPast.txt
index cea73b76a4b..5efe024edf6 100644
--- a/devNotes/legacy files/walkPast.txt
+++ b/devNotes/legacy files/walkPast.txt
@@ -1218,7 +1218,7 @@
<</switch>>
<<set _target = "FBoobs">>
<<elseif (_seed > 60)>>
- <<= App.Desc.butt($activeSlave)>>
+ <<= App.Desc.butt({slave: $activeSlave, saleDescription: 0})>>
<<switch $activeSlave.clothes>>
<<case "a Fuckdoll suit">>
Its suit is expressly designed to encourage use of its rear hole.
diff --git a/src/interaction/main/walkPast.js b/src/interaction/main/walkPast.js
index d1797fd12fc..09359beb931 100644
--- a/src/interaction/main/walkPast.js
+++ b/src/interaction/main/walkPast.js
@@ -2505,7 +2505,7 @@ globalThis.walkPast = (function() {
V.target = "FButt";
- t += App.Desc.butt(slave);
+ t += App.Desc.butt({slave: slave, saleDescription: 0});
t += ` `;
switch (slave.clothes) {
case "a Fuckdoll suit":
diff --git a/src/npc/descriptions/butt/butt.js b/src/npc/descriptions/butt/butt.js
index d01d44bb98f..fd35e0aab3d 100644
--- a/src/npc/descriptions/butt/butt.js
+++ b/src/npc/descriptions/butt/butt.js
@@ -2,12 +2,12 @@
* @param {App.Entity.SlaveState} slave
* @returns {string}
*/
-App.Desc.butt = function(slave) {
+App.Desc.butt = function({slave, saleDescription, eventDescription, applyLaw} = {}) {
const r = [];
const {
he, him, his, hers, himself, girl, He, His
} = getPronouns(slave);
- if (V.showClothing === 1 && V.saleDescription === 0) {
+ if (V.showClothing === 1 && saleDescription === 0) {
if (V.surgeryDescription === 0) {
switch (slave.clothes) {
case "a Fuckdoll suit":
@@ -1221,7 +1221,7 @@ App.Desc.butt = function(slave) {
if (V.buttAccessibility === 1) {
r.push(`Fortunately for ${him}, the penthouse is adapted for daily life with a rear`);
} else {
- if (V.saleDescription === 1) {
+ if (saleDescription === 1) {
r.push(`${He}'ll have`);
} else {
r.push(`${He} has`);
@@ -1267,7 +1267,7 @@ App.Desc.butt = function(slave) {
if (V.buttAccessibility === 1) {
r.push(`Fortunately for ${him}, the penthouse is adapted for daily life with a rear`);
} else {
- if (V.saleDescription === 1) {
+ if (saleDescription === 1) {
r.push(`${He}'ll have`);
} else {
r.push(`${He} has`);
@@ -1313,7 +1313,7 @@ App.Desc.butt = function(slave) {
if (V.buttAccessibility === 1) {
r.push(`Fortunately for ${him}, the penthouse is adapted for daily life with a rear`);
} else {
- if (V.saleDescription === 1) {
+ if (saleDescription === 1) {
r.push(`${He}'ll have`);
} else {
r.push(`${He} has`);
diff --git a/src/npc/descriptions/longSlave.js b/src/npc/descriptions/longSlave.js
index 0d8247aabde..baf94a843d9 100644
--- a/src/npc/descriptions/longSlave.js
+++ b/src/npc/descriptions/longSlave.js
@@ -724,7 +724,7 @@ App.Desc.longSlave = function({slave = V.activeSlave, saleDescription = V.saleDe
r.push(App.Desc.belly({slave: slave, saleDescription: saleDescription}));
}
r.push(App.Desc.mods(slave, "belly"));
- r.push(App.Desc.butt(slave));
+ r.push(App.Desc.butt({slave: slave, saleDescription: saleDescription}));
$(p).append(r.join(` `));
el.appendChild(p);
--
GitLab