From f2648509f7e794b64e197bf224c6a1ad80b70832 Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Mon, 15 Jun 2020 03:00:06 -0400 Subject: [PATCH] belly implant and fixes --- devNotes/legacy files/walkPast.txt | 12 ++++++------ .../nursery/widgets/children/longChildDescription.js | 6 +++--- src/interaction/main/walkPast.js | 12 ++++++------ src/npc/descriptions/belly/bellyImplant.js | 10 +++++----- src/npc/descriptions/longSlave.js | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/devNotes/legacy files/walkPast.txt b/devNotes/legacy files/walkPast.txt index c040a926272..f3a7fa026e4 100644 --- a/devNotes/legacy files/walkPast.txt +++ b/devNotes/legacy files/walkPast.txt @@ -2256,7 +2256,7 @@ <</if>> <<else>> /* implant descs */ <<if $activeSlave.bellyImplant >= 32000>> - <<= App.Desc.bellyImplant($activeSlave)>> + <<= App.Desc.bellyImplant({slave: $activeSlave, saleDescription: 0})>> <<switch $activeSlave.clothes>> <<case "a very tight corset">> $His corset struggles to contain $his enormous belly. @@ -2302,7 +2302,7 @@ $His bare enormous stomach catches your eye. <</switch>> <<elseif $activeSlave.bellyImplant >= 16000>> - <<= App.Desc.bellyImplant($activeSlave)>> + <<= App.Desc.bellyImplant({slave: $activeSlave, saleDescription: 0})>> <<switch $activeSlave.clothes>> <<case "a very tight corset">> $His corset struggles to contain $his giant belly. @@ -2414,7 +2414,7 @@ $His massive bare jiggling gut catches your eye. <</switch>> <<elseif $activeSlave.bellyImplant >= 8000>> - <<= App.Desc.bellyImplant($activeSlave)>> + <<= App.Desc.bellyImplant({slave: $activeSlave, saleDescription: 0})>> <<switch $activeSlave.clothes>> <<case "conservative clothing">> $His taut blouse shows off $his huge belly. @@ -2642,7 +2642,7 @@ $His big bare jiggling gut catches your eye. <</switch>> <<elseif $activeSlave.bellyImplant >= 4000>> - <<= App.Desc.bellyImplant($activeSlave)>> + <<= App.Desc.bellyImplant({slave: $activeSlave, saleDescription: 0})>> <<switch $activeSlave.clothes>> <<case "conservative clothing">> $His taut blouse shows off $his big belly. @@ -2716,7 +2716,7 @@ $His bare belly catches your eye. <</switch>> <<elseif $activeSlave.weight >= 95>> - <<= App.Desc.bellyImplant($activeSlave)>> + <<= App.Desc.bellyImplant({slave: $activeSlave, saleDescription: 0})>> <<switch $activeSlave.clothes>> <<case "a Fuckdoll suit">> Its suit is expressly designed to encourage use of its holes. @@ -2792,7 +2792,7 @@ $His bare, jiggling, fat gut catches your eye. <</switch>> <<elseif $activeSlave.bellyImplant >= 2000>> - <<= App.Desc.bellyImplant($activeSlave)>> + <<= App.Desc.bellyImplant({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/facilities/nursery/widgets/children/longChildDescription.js b/src/facilities/nursery/widgets/children/longChildDescription.js index 41d6e727587..259d7a63e12 100644 --- a/src/facilities/nursery/widgets/children/longChildDescription.js +++ b/src/facilities/nursery/widgets/children/longChildDescription.js @@ -7922,14 +7922,14 @@ App.Facilities.Nursery.LongChildDescription = function(child) { if (child.inflation > 0) { V.activeSlave = child; - r += `${App.Desc.bellyInflation(slave)} `; // TODO: + r += `${App.Desc.bellyInflation({slave: $activeSlave, saleDescription: 0})} `; // TODO: } else if (child.bellyImplant >= 2000) { V.activeSlave = child; - r += App.Desc.bellyImplant($activeSlave); // TODO: + r += App.Desc.bellyImplant({slave: $activeSlave, saleDescription: 0}); // TODO: r += ` `; } else { V.activeSlave = child; - r += `${App.Desc.belly($activeSlave)} `; // TODO: + r += `${App.Desc.belly({slave: $activeSlave, saleDescription: 0})} `; // TODO: } r += butt(child); diff --git a/src/interaction/main/walkPast.js b/src/interaction/main/walkPast.js index 595cab90701..aaab51c27ab 100644 --- a/src/interaction/main/walkPast.js +++ b/src/interaction/main/walkPast.js @@ -4500,7 +4500,7 @@ globalThis.walkPast = (function() { } } else { /* implant descs */ if (slave.bellyImplant >= 32000) { - t += `${App.Desc.bellyImplant(slave)} `; + t += `${App.Desc.bellyImplant({slave: slave, saleDescription: 0})} `; t += `${App.Desc.mods(slave, "belly")} `; switch (slave.clothes) { case "a very tight corset": @@ -4647,7 +4647,7 @@ globalThis.walkPast = (function() { t += `${His} bare enormous stomach catches your eye.`; } } else if (slave.bellyImplant >= 16000) { - t += `${App.Desc.bellyImplant(slave)} `; + t += `${App.Desc.bellyImplant({slave: slave, saleDescription: 0})} `; t += `${App.Desc.mods(slave, "belly")} `; switch (slave.clothes) { case "a very tight corset": @@ -4968,7 +4968,7 @@ globalThis.walkPast = (function() { t += `${His} massive bare jiggling gut catches your eye.`; } } else if (slave.bellyImplant >= 8000) { - t += `${App.Desc.bellyImplant(slave)} `; + t += `${App.Desc.bellyImplant({slave: slave, saleDescription: 0})} `; t += `${App.Desc.mods(slave, "belly")} `; switch (slave.clothes) { case "conservative clothing": @@ -5598,7 +5598,7 @@ globalThis.walkPast = (function() { t += `${His} big bare jiggling gut catches your eye.`; } } else if (slave.bellyImplant >= 4000) { - t += `${App.Desc.bellyImplant(slave)} `; + t += `${App.Desc.bellyImplant({slave: slave, saleDescription: 0})} `; t += `${App.Desc.mods(slave, "belly")} `; switch (slave.clothes) { case "conservative clothing": @@ -5805,7 +5805,7 @@ globalThis.walkPast = (function() { t += `${His} bare belly catches your eye.`; } } else if (slave.weight >= 95) { - t += `${App.Desc.bellyImplant(slave)} `; + t += `${App.Desc.bellyImplant({slave: slave, saleDescription: 0})} `; t += `${App.Desc.mods(slave, "belly")} `; switch (slave.clothes) { case "a Fuckdoll suit": @@ -6015,7 +6015,7 @@ globalThis.walkPast = (function() { t += `${His} bare, jiggling, fat gut catches your eye.`; } } else if (slave.bellyImplant >= 2000) { - t += `${App.Desc.bellyImplant(slave)} `; + t += `${App.Desc.bellyImplant({slave: slave, saleDescription: 0})} `; t += `${App.Desc.mods(slave, "belly")} `; switch (slave.clothes) { case "a Fuckdoll suit": diff --git a/src/npc/descriptions/belly/bellyImplant.js b/src/npc/descriptions/belly/bellyImplant.js index 9730fd178c9..40a4f384e51 100644 --- a/src/npc/descriptions/belly/bellyImplant.js +++ b/src/npc/descriptions/belly/bellyImplant.js @@ -2,7 +2,7 @@ * @param {App.Entity.SlaveState} slave * @returns {string} */ -App.Desc.bellyImplant = function(slave) { +App.Desc.bellyImplant = function({slave, saleDescription, eventDescription, applyLaw} = {}) { const r = []; const { he, him, his, hers, himself, boy, He, His, girl @@ -129,7 +129,7 @@ App.Desc.bellyImplant = function(slave) { function clothing() { const r = []; - if (V.showClothing === 1 && V.saleDescription === 0) { + if (V.showClothing === 1 && saleDescription === 0) { if (V.surgeryDescription === 0) { if (slave.bellyImplant >= 32000) { if (slave.bellyAccessory === "an extreme corset") { @@ -2270,7 +2270,7 @@ App.Desc.bellyImplant = function(slave) { if (V.pregAccessibility === 1) { r.push(`Fortunately for ${him}, the penthouse is adapted for daily life with a belly`); } else { - if (V.saleDescription === 1) { + if (saleDescription === 1) { r.push(`${He}'ll have`); } else { r.push(`${He} has`); @@ -2302,7 +2302,7 @@ App.Desc.bellyImplant = function(slave) { if (V.pregAccessibility === 1) { r.push(`Fortunately for ${him}, the penthouse is adapted for daily life with a belly`); } else { - if (V.saleDescription === 1) { + if (saleDescription === 1) { r.push(`${He}'ll have`); } else { r.push(`${He} has`); @@ -2334,7 +2334,7 @@ App.Desc.bellyImplant = function(slave) { if (V.pregAccessibility === 1) { r.push(`Fortunately for ${him}, the penthouse is adapted for daily life with a belly`); } 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 c53822ca2a2..96de4bd31da 100644 --- a/src/npc/descriptions/longSlave.js +++ b/src/npc/descriptions/longSlave.js @@ -719,7 +719,7 @@ App.Desc.longSlave = function({slave = V.activeSlave, saleDescription = V.saleDe // to be obsoleted with phase 4 r.push(App.Desc.bellyInflation(slave)); } else if (slave.bellyImplant >= 2000) { - r.push(App.Desc.bellyImplant(slave)); + r.push(App.Desc.bellyImplant({slave: slave, saleDescription: 0})); } else { r.push(App.Desc.belly({slave: slave, saleDescription: saleDescription})); } -- GitLab