From 5ec2c17eb52b30115da8780a364a472f21204559 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 15 Jun 2020 03:03:51 -0400
Subject: [PATCH] skin and fixes
---
devNotes/legacy files/walkPast.txt | 6 +++---
src/interaction/main/walkPast.js | 6 +++---
src/npc/descriptions/belly/bellyInflation.js | 4 ++--
src/npc/descriptions/longSlave.js | 6 +++---
src/npc/descriptions/skin.js | 10 +++++-----
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/devNotes/legacy files/walkPast.txt b/devNotes/legacy files/walkPast.txt
index f3a7fa026e4..8078b3fdee1 100644
--- a/devNotes/legacy files/walkPast.txt
+++ b/devNotes/legacy files/walkPast.txt
@@ -2937,7 +2937,7 @@
$His massive bare jiggling gut catches your eye.
<</switch>>
<<elseif $activeSlave.inflation == 3>>
- <<= App.Desc.bellyInflation($activeSlave)>>
+ <<= App.Desc.bellyInflation({slave: $activeSlave, saleDescription: 0})>>
<<switch $activeSlave.clothes>>
<<case "a Fuckdoll suit">>
Its suit is expressly designed to encourage use of its holes.
@@ -3165,7 +3165,7 @@
$His big bare jiggling gut catches your eye.
<</switch>>
<<elseif $activeSlave.inflation == 2>>
- <<= App.Desc.bellyInflation($activeSlave)>>
+ <<= App.Desc.bellyInflation({slave: $activeSlave, saleDescription: 0})>>
<<switch $activeSlave.clothes>>
<<case "a Fuckdoll suit">>
Its suit is expressly designed to encourage use of its holes.
@@ -3319,7 +3319,7 @@
$His bare, jiggling, fat gut catches your eye.
<</switch>>
<<elseif $activeSlave.inflation == 1>>
- <<= App.Desc.bellyInflation($activeSlave)>>
+ <<= App.Desc.bellyInflation({slave: $activeSlave, saleDescription: 0})>>
<<switch $activeSlave.clothes>>
<<case "a Fuckdoll suit">>
Its suit is expressly designed to encourage use of its holes.
diff --git a/src/interaction/main/walkPast.js b/src/interaction/main/walkPast.js
index aaab51c27ab..c4253190f88 100644
--- a/src/interaction/main/walkPast.js
+++ b/src/interaction/main/walkPast.js
@@ -6405,7 +6405,7 @@ globalThis.walkPast = (function() {
t += `${His} massive bare jiggling gut catches your eye.`;
}
} else if (slave.inflation === 3) {
- t += `${App.Desc.bellyInflation(slave)} `;
+ t += `${App.Desc.bellyInflation({slave: slave, saleDescription: 0})} `;
t += `${App.Desc.mods(slave, "belly")} `;
switch (slave.clothes) {
case "a Fuckdoll suit":
@@ -7035,7 +7035,7 @@ globalThis.walkPast = (function() {
t += `${His} big bare jiggling gut catches your eye.`;
}
} else if (slave.inflation === 2) {
- t += `${App.Desc.bellyInflation(slave)} `;
+ t += `${App.Desc.bellyInflation({slave: slave, saleDescription: 0})} `;
t += `${App.Desc.mods(slave, "belly")} `;
switch (slave.clothes) {
case "a Fuckdoll suit":
@@ -7458,7 +7458,7 @@ globalThis.walkPast = (function() {
t += `${His} bare, jiggling, fat gut catches your eye.`;
}
} else if (slave.inflation === 1) {
- t += `${App.Desc.bellyInflation(slave)} `;
+ t += `${App.Desc.bellyInflation({slave: slave, saleDescription: 0})} `;
t += `${App.Desc.mods(slave, "belly")} `;
switch (slave.clothes) {
case "a Fuckdoll suit":
diff --git a/src/npc/descriptions/belly/bellyInflation.js b/src/npc/descriptions/belly/bellyInflation.js
index 056d132f3dc..d0ad752e9d4 100644
--- a/src/npc/descriptions/belly/bellyInflation.js
+++ b/src/npc/descriptions/belly/bellyInflation.js
@@ -2,7 +2,7 @@
* @param {App.Entity.SlaveState} slave
* @returns {string}
*/
-App.Desc.bellyInflation = function(slave) {
+App.Desc.bellyInflation = function({slave, saleDescription, eventDescription, applyLaw} = {}) {
const r = [];
const {
he, him, his, hers, himself, boy, He, His
@@ -54,7 +54,7 @@ App.Desc.bellyInflation = function(slave) {
}
}
- if (V.showClothing === 1 && V.saleDescription === 0) {
+ if (V.showClothing === 1 && saleDescription === 0) {
if (V.surgeryDescription === 0) {
if (slave.inflation === 3) {
if (slave.bellyAccessory === "an extreme corset") {
diff --git a/src/npc/descriptions/longSlave.js b/src/npc/descriptions/longSlave.js
index 96de4bd31da..e71af04b9c1 100644
--- a/src/npc/descriptions/longSlave.js
+++ b/src/npc/descriptions/longSlave.js
@@ -420,7 +420,7 @@ App.Desc.longSlave = function({slave = V.activeSlave, saleDescription = V.saleDe
r.push(App.Desc.mods(slave, "ankle"));
r.push(App.Desc.mods(slave, "foot"));
r.push(App.Desc.heels(slave));
- r.push(App.Desc.skin(slave));
+ r.push(App.Desc.skin({slave: slave, saleDescription: saleDescription}));
if (saleDescription === 1) {
r.push(App.Desc.accent(slave));
@@ -717,9 +717,9 @@ App.Desc.longSlave = function({slave = V.activeSlave, saleDescription = V.saleDe
if (slave.inflation > 0) {
// to be obsoleted with phase 4
- r.push(App.Desc.bellyInflation(slave));
+ r.push(App.Desc.bellyInflation({slave: slave, saleDescription: saleDescription}));
} else if (slave.bellyImplant >= 2000) {
- r.push(App.Desc.bellyImplant({slave: slave, saleDescription: 0}));
+ r.push(App.Desc.bellyImplant({slave: slave, saleDescription: saleDescription}));
} else {
r.push(App.Desc.belly({slave: slave, saleDescription: saleDescription}));
}
diff --git a/src/npc/descriptions/skin.js b/src/npc/descriptions/skin.js
index 31e5547693a..e55f972efbf 100644
--- a/src/npc/descriptions/skin.js
+++ b/src/npc/descriptions/skin.js
@@ -2,7 +2,7 @@
* @param {App.Entity.SlaveState} slave
* @returns {string}
*/
-App.Desc.skin = function(slave) {
+App.Desc.skin = function({slave, saleDescription, eventDescription, applyLaw} = {}) {
let r = [];
const {
he, him, his, hers, himself, boy, He, His
@@ -29,9 +29,9 @@ App.Desc.skin = function(slave) {
r.push(`<span class="tan">${slave.race},</span> and ${his} skin is`);
r = r.concat(freckles());
r = r.concat(tanned());
- if (slave.race !== slave.origRace && V.saleDescription !== 1) {
+ if (slave.race !== slave.origRace && saleDescription !== 1) {
r.push(`${He} has received plastic surgery to appear ${slave.race}; ${he} is originally ${slave.origRace}.`);
- } else if (slave.race !== slave.origRace && V.saleDescription === 1) {
+ } else if (slave.race !== slave.origRace && saleDescription === 1) {
if (V.PC.skill.medicine >= 100) {
r.push(`Thanks to your medical experience, you can easily tell that ${he} was originally ${slave.origRace}, but surgically modified.`);
} else if (V.PC.skill.medicine >= 50) {
@@ -46,9 +46,9 @@ App.Desc.skin = function(slave) {
r.push(`Ethnically, ${he}'s <span class="tan">${slave.race},</span> and ${his} skin is`);
r = r.concat(freckles());
r = r.concat(tanned());
- if (slave.race !== slave.origRace && V.saleDescription !== 1) {
+ if (slave.race !== slave.origRace && saleDescription !== 1) {
r.push(`${He} has received plastic surgery to appear ${slave.race}; ${he} is originally ${slave.origRace}`);
- } else if (slave.race !== slave.origRace && V.saleDescription === 1) {
+ } else if (slave.race !== slave.origRace && saleDescription === 1) {
if (V.PC.skill.medicine >= 100) {
r.push(`Thanks to your medical experience, you can easily tell that ${he} was originally ${slave.origRace}, but surgically modified.`);
} else if (V.PC.skill.medicine >= 50) {
--
GitLab