From bc0f1902c8665c94394a270ba5f97aea8683ce8b Mon Sep 17 00:00:00 2001 From: lowercasedonkey <lowercasedonkey@gmail.com> Date: Mon, 15 Jun 2020 13:34:34 -0400 Subject: [PATCH] cleanup because we have defaults --- devNotes/legacy files/walkPast.txt | 62 ++++++++--------- src/Mods/SecExp/secExpSmilingMan.tw | 2 +- src/facilities/nursery/childInteract.tw | 4 +- src/facilities/nursery/infantInteract.tw | 4 +- .../nursery/nurseryRetrievalWorkaround.tw | 2 +- .../widgets/children/longChildDescription.js | 14 ++-- src/interaction/main/walkPast.js | 66 +++++++++---------- src/interaction/wardrobeUse.js | 4 +- src/npc/interaction/fBeg.tw | 2 +- src/pregmod/incubatorRetrievalWorkaround.tw | 2 +- src/uncategorized/genericPlotEvents.tw | 4 +- src/uncategorized/pSnatchAndGrabResult.tw | 2 +- src/uncategorized/reFSAcquisition.tw | 2 +- src/uncategorized/slaveInteract.tw | 2 +- 14 files changed, 86 insertions(+), 86 deletions(-) diff --git a/devNotes/legacy files/walkPast.txt b/devNotes/legacy files/walkPast.txt index de5fea1418b..9b097945d0f 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({slave: $activeSlave, market: 0})>> + <<= App.Desc.butt({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "a Fuckdoll suit">> Its suit is expressly designed to encourage use of its rear hole. @@ -1366,7 +1366,7 @@ <<if $activeSlave.inflation == 0>> <<if $activeSlave.bellyImplant < 2000>> <<if $activeSlave.belly >= 600000>> - <<= App.Desc.belly({slave: $activeSlave, market: 0})>> + <<= App.Desc.belly({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "a very tight corset">> $His corset struggles to contain $his enormous belly. @@ -1406,7 +1406,7 @@ $His bare enormous squirming pregnant belly catches your eye. <</switch>> <<elseif $activeSlave.belly >= 300000>> - <<= App.Desc.belly({slave: $activeSlave, market: 0})>> + <<= App.Desc.belly({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "a very tight corset">> $His corset struggles to contain $his giant belly. @@ -1450,7 +1450,7 @@ $His bare giant pregnant belly catches your eye. <</switch>> <<elseif $activeSlave.weight > 190>> - <<= App.Desc.belly({slave: $activeSlave, market: 0})>> + <<= App.Desc.belly({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "a Fuckdoll suit">> $His massive gut is alluringly smooth under the tight suit. @@ -1508,7 +1508,7 @@ $His massive bare jiggling gut catches your eye. <</switch>> <<elseif $activeSlave.belly >= 10000 || ($activeSlave.bellyAccessory == "a huge empathy belly") || ($activeSlave.bellyAccessory == "a large empathy belly")>> - <<= App.Desc.belly({slave: $activeSlave, market: 0})>> + <<= App.Desc.belly({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "conservative clothing">> $His taut blouse shows off $his huge belly. @@ -1580,7 +1580,7 @@ $His bare huge pregnant belly catches your eye. <</switch>> <<elseif $activeSlave.weight > 160>> - <<= App.Desc.belly({slave: $activeSlave, market: 0})>> + <<= App.Desc.belly({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "a Fuckdoll suit">> $His giant gut is alluringly smooth under the tight suit. @@ -1648,7 +1648,7 @@ $His giant bare jiggling gut catches your eye. <</switch>> <<elseif $activeSlave.weight > 130>> - <<= App.Desc.belly({slave: $activeSlave, market: 0})>> + <<= App.Desc.belly({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "a Fuckdoll suit">> $His big gut is perfectly smoothed by the tight latex. @@ -1720,7 +1720,7 @@ $His big bare jiggling gut catches your eye. <</switch>> <<elseif $activeSlave.bellyPreg >= 5000 || ($activeSlave.bellyAccessory == "a medium empathy belly")>> - <<= App.Desc.belly({slave: $activeSlave, market: 0})>> + <<= App.Desc.belly({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "conservative clothing">> $His taut blouse shows off $his big belly. @@ -1792,7 +1792,7 @@ $His bare pregnant belly catches your eye. <</switch>> <<elseif $activeSlave.weight >= 95>> - <<= App.Desc.belly({slave: $activeSlave, market: 0})>> + <<= App.Desc.belly({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "a Fuckdoll suit">> Its suit is expressly designed to encourage use of its holes. @@ -1868,7 +1868,7 @@ $His bare, jiggling, fat gut catches your eye. <</switch>> <<elseif $activeSlave.bellyPreg >= 1500 || ($activeSlave.bellyAccessory == "a small empathy belly")>> - <<= App.Desc.belly({slave: $activeSlave, market: 0})>> + <<= App.Desc.belly({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "a Fuckdoll suit">> Its suit is expressly designed to encourage use of its holes. @@ -1942,13 +1942,13 @@ $His barely visible pregnancy catches your eye. <</switch>> <<else>> - <<= App.Desc.belly({slave: $activeSlave, market: 0})>> + <<= App.Desc.belly({slave: $activeSlave})>> <<if $activeSlave.weight >= 30>> Slight jiggling can be seen in $his chubby belly as $he moves. <</if>> - <<= App.Desc.crotch({slave: $activeSlave, market: 0})>> - <<= App.Desc.dick({slave: $activeSlave, market: 0})>> - <<= App.Desc.vagina({slave: $activeSlave, market: 0})>> + <<= App.Desc.crotch({slave: $activeSlave})>> + <<= App.Desc.dick({slave: $activeSlave})>> + <<= App.Desc.vagina({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "a Fuckdoll suit">> Its suit is expressly designed to encourage use of its holes. @@ -2256,7 +2256,7 @@ <</if>> <<else>> /* implant descs */ <<if $activeSlave.bellyImplant >= 32000>> - <<= App.Desc.bellyImplant({slave: $activeSlave, market: 0})>> + <<= App.Desc.bellyImplant({slave: $activeSlave})>> <<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({slave: $activeSlave, market: 0})>> + <<= App.Desc.bellyImplant({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "a very tight corset">> $His corset struggles to contain $his giant belly. @@ -2352,7 +2352,7 @@ $His bare giant belly catches your eye. <</switch>> <<elseif $activeSlave.weight > 190>> - <<= App.Desc.belly({slave: $activeSlave, market: 0})>> + <<= App.Desc.belly({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "a Fuckdoll suit">> $His massive gut is alluringly smooth under the tight suit. @@ -2414,7 +2414,7 @@ $His massive bare jiggling gut catches your eye. <</switch>> <<elseif $activeSlave.bellyImplant >= 8000>> - <<= App.Desc.bellyImplant({slave: $activeSlave, market: 0})>> + <<= App.Desc.bellyImplant({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "conservative clothing">> $His taut blouse shows off $his huge belly. @@ -2492,7 +2492,7 @@ $His bare huge belly catches your eye. <</switch>> <<elseif $activeSlave.weight > 160>> - <<= App.Desc.belly({slave: $activeSlave, market: 0})>> + <<= App.Desc.belly({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "a Fuckdoll suit">> $His giant gut is alluringly smooth under the tight suit. @@ -2566,7 +2566,7 @@ $His giant bare jiggling gut catches your eye. <</switch>> <<elseif $activeSlave.weight > 130>> - <<= App.Desc.belly({slave: $activeSlave, market: 0})>> + <<= App.Desc.belly({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "a Fuckdoll suit">> $His big gut is perfectly smoothed by the tight latex. @@ -2642,7 +2642,7 @@ $His big bare jiggling gut catches your eye. <</switch>> <<elseif $activeSlave.bellyImplant >= 4000>> - <<= App.Desc.bellyImplant({slave: $activeSlave, market: 0})>> + <<= App.Desc.bellyImplant({slave: $activeSlave})>> <<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({slave: $activeSlave, market: 0})>> + <<= App.Desc.bellyImplant({slave: $activeSlave})>> <<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({slave: $activeSlave, market: 0})>> + <<= App.Desc.bellyImplant({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "a Fuckdoll suit">> Its suit is expressly designed to encourage use of its holes. @@ -2875,7 +2875,7 @@ <</if>> <<else>> /* inflation descs */ <<if $activeSlave.weight > 190>> - <<= App.Desc.belly({slave: $activeSlave, market: 0})>> + <<= App.Desc.belly({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "a Fuckdoll suit">> $His massive gut is alluringly smooth under the tight suit. @@ -2937,7 +2937,7 @@ $His massive bare jiggling gut catches your eye. <</switch>> <<elseif $activeSlave.inflation == 3>> - <<= App.Desc.bellyInflation({slave: $activeSlave, market: 0})>> + <<= App.Desc.bellyInflation({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "a Fuckdoll suit">> Its suit is expressly designed to encourage use of its holes. @@ -3017,7 +3017,7 @@ $His bare, taut, sloshing belly catches your eye. <</switch>> <<elseif $activeSlave.weight > 160>> - <<= App.Desc.belly({slave: $activeSlave, market: 0})>> + <<= App.Desc.belly({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "a Fuckdoll suit">> $His giant gut is alluringly smooth under the tight suit. @@ -3091,7 +3091,7 @@ $His giant bare jiggling gut catches your eye. <</switch>> <<elseif $activeSlave.weight > 130>> - <<= App.Desc.belly({slave: $activeSlave, market: 0})>> + <<= App.Desc.belly({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "a Fuckdoll suit">> $His big gut is perfectly smoothed by the tight latex. @@ -3165,7 +3165,7 @@ $His big bare jiggling gut catches your eye. <</switch>> <<elseif $activeSlave.inflation == 2>> - <<= App.Desc.bellyInflation({slave: $activeSlave, market: 0})>> + <<= App.Desc.bellyInflation({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "a Fuckdoll suit">> Its suit is expressly designed to encourage use of its holes. @@ -3243,7 +3243,7 @@ $His bare, rounded, sloshing belly catches your eye. <</switch>> <<elseif $activeSlave.weight >= 95>> - <<= App.Desc.belly({slave: $activeSlave, market: 0})>> + <<= App.Desc.belly({slave: $activeSlave})>> <<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({slave: $activeSlave, market: 0})>> + <<= App.Desc.bellyInflation({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "a Fuckdoll suit">> Its suit is expressly designed to encourage use of its holes. @@ -3400,7 +3400,7 @@ <</if>> <<set _target = "FVagina">> <<elseif (_seed > 20)>> - <<= App.Desc.anus({slave: $activeSlave, market: 0})>> + <<= App.Desc.anus({slave: $activeSlave})>> <<switch $activeSlave.clothes>> <<case "a Fuckdoll suit">> Its suit is expressly designed to encourage use of its rear hole. diff --git a/src/Mods/SecExp/secExpSmilingMan.tw b/src/Mods/SecExp/secExpSmilingMan.tw index 391b1a0dbf8..349eb8d4010 100644 --- a/src/Mods/SecExp/secExpSmilingMan.tw +++ b/src/Mods/SecExp/secExpSmilingMan.tw @@ -382,7 +382,7 @@ a second — $he barely manages to recover $his usual demeanor. <</if>> <br><br> - <<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: 0})>> + <<includeDOM App.Desc.longSlave({slave: V.activeSlave})>> <br> <<include "New Slave Intro">> <</if>> <</if>> diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw index 2529ef1cc8a..a75542b1681 100644 --- a/src/facilities/nursery/childInteract.tw +++ b/src/facilities/nursery/childInteract.tw @@ -40,7 +40,7 @@ <<if $seeDetails>> <span id="LCD"> - <<= App.Facilities.Nursery.LongChildDescription({child: $activeChild, market: 0, eventDescription: 0})>> + <<= App.Facilities.Nursery.LongChildDescription({child: $activeChild})>> </span> <br><i> [[Options][$nextLink = passage()]] | @@ -49,7 +49,7 @@ <b> <<link "Update">> <<replace "#LCD">> - <<= App.Facilities.Nursery.LongChildDescription({child: $activeChild, market: 0, eventDescription: 0})>> + <<= App.Facilities.Nursery.LongChildDescription({child: $activeChild})>> <</replace>> <</link>> </b></i> diff --git a/src/facilities/nursery/infantInteract.tw b/src/facilities/nursery/infantInteract.tw index 227b1096973..33469c43411 100644 --- a/src/facilities/nursery/infantInteract.tw +++ b/src/facilities/nursery/infantInteract.tw @@ -30,7 +30,7 @@ <<if $seeDetails>> <span id="LCD"> - <<= App.Facilities.Nursery.LongInfantDescription({child: $activeChild, market: 0, eventDescription: 0})>> + <<= App.Facilities.Nursery.LongInfantDescription({child: $activeChild})>> </span> <br><br> <i> @@ -40,7 +40,7 @@ <b> <<link "Update">> <<replace "#LCD">> - <<= App.Facilities.Nursery.LongInfantDescription({child: $activeChild, market: 0, eventDescription: 0})>> + <<= App.Facilities.Nursery.LongInfantDescription({child: $activeChild})>> <</replace>> <</link>> </b> diff --git a/src/facilities/nursery/nurseryRetrievalWorkaround.tw b/src/facilities/nursery/nurseryRetrievalWorkaround.tw index b9191f5bded..4f6ee19a82b 100644 --- a/src/facilities/nursery/nurseryRetrievalWorkaround.tw +++ b/src/facilities/nursery/nurseryRetrievalWorkaround.tw @@ -6,7 +6,7 @@ $readySlave.slaveName has been discharged from $nurseryName and is ready to beco <<set $activeSlave = $readySlave>> <<set $nurseryBabies-->> -<<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: 0})>> +<<includeDOM App.Desc.longSlave({slave: V.activeSlave})>> <<run newSlave($activeSlave)>> <<set $slaves.push($activeSlave)>> <<set $nextLink = "AS Dump">> diff --git a/src/facilities/nursery/widgets/children/longChildDescription.js b/src/facilities/nursery/widgets/children/longChildDescription.js index d42163880f5..c60869f433c 100644 --- a/src/facilities/nursery/widgets/children/longChildDescription.js +++ b/src/facilities/nursery/widgets/children/longChildDescription.js @@ -6272,7 +6272,7 @@ App.Facilities.Nursery.LongChildDescription = function({child: child, market: ma } } - r += App.Desc.eyes({slave: child, market: 0}); + r += App.Desc.eyes({slave: child}); if (child.fetish === "mindbroken") { r += `However, <span class="coral">${his} mind is fundamentally broken;</span> everything ${he} experiences will quickly be forgotten. `; @@ -7905,15 +7905,15 @@ App.Facilities.Nursery.LongChildDescription = function({child: child, market: ma r += `<br> `; - r += App.Desc.boobs({slave: child, market: 0}); - r += App.Desc.boobsExtra({slave: child, market: 0}); + r += App.Desc.boobs({slave: child}); + r += App.Desc.boobsExtra({slave: child}); if (V.showBodyMods) { r += tats.boobs(child); } r += App.Desc.brand(child, "chest"); r += App.Desc.brand(child, "breast"); r += shoulders(child); - r += App.Desc.nipples({slave: child, market: 0}); + r += App.Desc.nipples({slave: child}); if (V.showBodyMods) { r += piercings.nipples(child); } @@ -7921,14 +7921,14 @@ App.Facilities.Nursery.LongChildDescription = function({child: child, market: ma if (child.inflation > 0) { V.activeSlave = child; - r += `${App.Desc.bellyInflation({slave: child, market: 0})} `; // TODO: + r += `${App.Desc.bellyInflation({slave: child})} `; // TODO: } else if (child.bellyImplant >= 2000) { V.activeSlave = child; - r += App.Desc.bellyImplant({slave: child, market: 0}); // TODO: + r += App.Desc.bellyImplant({slave: child}); // TODO: r += ` `; } else { V.activeSlave = child; - r += `${App.Desc.belly({slave: child, market: 0})} `; // TODO: + r += `${App.Desc.belly({slave: child})} `; // TODO: } r += butt(child); diff --git a/src/interaction/main/walkPast.js b/src/interaction/main/walkPast.js index a0882b8bb72..f2bd9d7ee0f 100644 --- a/src/interaction/main/walkPast.js +++ b/src/interaction/main/walkPast.js @@ -2076,7 +2076,7 @@ globalThis.walkPast = (function() { const breasts = (slave.boobs < 300) ? `flat chest` : `breasts`; - t += ` ${App.Desc.boobs({slave: slave, market: 0})} `; + t += ` ${App.Desc.boobs({slave: slave})} `; switch (slave.clothes) { case "uncomfortable straps": if (slave.boobs < 300) { @@ -2505,7 +2505,7 @@ globalThis.walkPast = (function() { V.target = "FButt"; - t += App.Desc.butt({slave: slave, market: 0}); + t += App.Desc.butt({slave: slave}); t += ` `; switch (slave.clothes) { case "a Fuckdoll suit": @@ -2855,7 +2855,7 @@ globalThis.walkPast = (function() { if (slave.inflation === 0) { if (slave.bellyImplant < 2000) { if (slave.belly >= 600000) { - t += App.Desc.belly({slave: slave, market: 0}); + t += App.Desc.belly({slave: slave}); t += ` `; switch (slave.clothes) { case "a very tight corset": @@ -2986,7 +2986,7 @@ globalThis.walkPast = (function() { t += `${His} bare enormous squirming pregnant belly catches your eye.`; } } else if (slave.belly >= 300000) { - t += App.Desc.belly({slave: slave, market: 0}); + t += App.Desc.belly({slave: slave}); t += ` `; switch (slave.clothes) { case "a very tight corset": @@ -3123,7 +3123,7 @@ globalThis.walkPast = (function() { t += `${His} bare giant pregnant belly catches your eye.`; } } else if (slave.weight > 190) { - t += App.Desc.belly({slave: slave, market: 0}); + t += App.Desc.belly({slave: slave}); t += ` `; switch (slave.clothes) { case "a Fuckdoll suit": @@ -3281,7 +3281,7 @@ globalThis.walkPast = (function() { t += `${His} massive bare jiggling gut catches your eye.`; } } else if (slave.belly >= 10000 || (slave.bellyAccessory === "a huge empathy belly") || (slave.bellyAccessory === "a large empathy belly")) { - t += App.Desc.belly({slave: slave, market: 0}); + t += App.Desc.belly({slave: slave}); t += ` `; switch (slave.clothes) { case "conservative clothing": @@ -3484,7 +3484,7 @@ globalThis.walkPast = (function() { t += `${His} bare huge pregnant belly catches your eye.`; } } else if (slave.weight > 160) { - t += App.Desc.belly({slave: slave, market: 0}); + t += App.Desc.belly({slave: slave}); t += ` `; switch (slave.clothes) { case "a Fuckdoll suit": @@ -3682,7 +3682,7 @@ globalThis.walkPast = (function() { t += `${His} giant bare jiggling gut catches your eye.`; } } else if (slave.weight > 130) { - t += App.Desc.belly({slave: slave, market: 0}); + t += App.Desc.belly({slave: slave}); t += ` `; switch (slave.clothes) { case "a Fuckdoll suit": @@ -3886,7 +3886,7 @@ globalThis.walkPast = (function() { t += `${His} big bare jiggling gut catches your eye.`; } } else if (slave.bellyPreg >= 5000 || (slave.bellyAccessory === "a medium empathy belly")) { - t += App.Desc.belly({slave: slave, market: 0}); + t += App.Desc.belly({slave: slave}); t += ` `; switch (slave.clothes) { case "conservative clothing": @@ -4089,7 +4089,7 @@ globalThis.walkPast = (function() { t += `${His} bare pregnant belly catches your eye.`; } } else if (slave.weight >= 95) { - t += App.Desc.belly({slave: slave, market: 0}); + t += App.Desc.belly({slave: slave}); t += ` `; switch (slave.clothes) { case "a Fuckdoll suit": @@ -4292,7 +4292,7 @@ globalThis.walkPast = (function() { t += `${His} bare, jiggling, fat gut catches your eye.`; } } else if (slave.bellyPreg >= 1500 || (slave.bellyAccessory === "a small empathy belly")) { - t += App.Desc.belly({slave: slave, market: 0}); + t += App.Desc.belly({slave: slave}); t += ` `; switch (slave.clothes) { case "a Fuckdoll suit": @@ -4492,7 +4492,7 @@ globalThis.walkPast = (function() { t += `${His} barely visible pregnancy catches your eye.`; } } else { - t += App.Desc.belly({slave: slave, market: 0}); + t += App.Desc.belly({slave: slave}); t += ` `; if (slave.weight >= 30) { t += `Slight jiggling can be seen in ${his} chubby belly as ${he} moves.`; @@ -4500,7 +4500,7 @@ globalThis.walkPast = (function() { } } else { /* implant descs */ if (slave.bellyImplant >= 32000) { - t += `${App.Desc.bellyImplant({slave: slave, market: 0})} `; + t += `${App.Desc.bellyImplant({slave: slave})} `; 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: slave, market: 0})} `; + t += `${App.Desc.bellyImplant({slave: slave})} `; t += `${App.Desc.mods(slave, "belly")} `; switch (slave.clothes) { case "a very tight corset": @@ -4797,7 +4797,7 @@ globalThis.walkPast = (function() { t += `${His} bare giant belly catches your eye.`; } } else if (slave.weight > 190) { - t += App.Desc.belly({slave: slave, market: 0}); + t += App.Desc.belly({slave: slave}); t += ` `; switch (slave.clothes) { case "a Fuckdoll suit": @@ -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: slave, market: 0})} `; + t += `${App.Desc.bellyImplant({slave: slave})} `; t += `${App.Desc.mods(slave, "belly")} `; switch (slave.clothes) { case "conservative clothing": @@ -5181,7 +5181,7 @@ globalThis.walkPast = (function() { t += `${His} bare huge belly catches your eye.`; } } else if (slave.weight > 160) { - t += App.Desc.belly({slave: slave, market: 0}); + t += App.Desc.belly({slave: slave}); t += ` `; switch (slave.clothes) { case "a Fuckdoll suit": @@ -5388,7 +5388,7 @@ globalThis.walkPast = (function() { t += `${His} giant bare jiggling gut catches your eye.`; } } else if (slave.weight > 130) { - t += App.Desc.belly({slave: slave, market: 0}); + t += App.Desc.belly({slave: slave}); t += ` `; switch (slave.clothes) { case "a Fuckdoll suit": @@ -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: slave, market: 0})} `; + t += `${App.Desc.bellyImplant({slave: slave})} `; 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: slave, market: 0})} `; + t += `${App.Desc.bellyImplant({slave: slave})} `; 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: slave, market: 0})} `; + t += `${App.Desc.bellyImplant({slave: slave})} `; t += `${App.Desc.mods(slave, "belly")} `; switch (slave.clothes) { case "a Fuckdoll suit": @@ -6234,7 +6234,7 @@ globalThis.walkPast = (function() { } } else { /* inflation descs */ if (slave.weight > 190) { - t += App.Desc.belly({slave: slave, market: 0}); + t += App.Desc.belly({slave: slave}); t += ` `; switch (slave.clothes) { case "a Fuckdoll suit": @@ -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: slave, market: 0})} `; + t += `${App.Desc.bellyInflation({slave: slave})} `; t += `${App.Desc.mods(slave, "belly")} `; switch (slave.clothes) { case "a Fuckdoll suit": @@ -6621,7 +6621,7 @@ globalThis.walkPast = (function() { t += `${His} bare, taut, sloshing belly catches your eye.`; } } else if (slave.weight > 160) { - t += App.Desc.belly({slave: slave, market: 0}); + t += App.Desc.belly({slave: slave}); t += ` `; switch (slave.clothes) { case "a Fuckdoll suit": @@ -6828,7 +6828,7 @@ globalThis.walkPast = (function() { t += `${His} giant bare jiggling gut catches your eye.`; } } else if (slave.weight > 130) { - t += App.Desc.belly({slave: slave, market: 0}); + t += App.Desc.belly({slave: slave}); t += ` `; 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: slave, market: 0})} `; + t += `${App.Desc.bellyInflation({slave: slave})} `; t += `${App.Desc.mods(slave, "belly")} `; switch (slave.clothes) { case "a Fuckdoll suit": @@ -7248,7 +7248,7 @@ globalThis.walkPast = (function() { t += `${His} bare, rounded, sloshing belly catches your eye.`; } } else if (slave.weight >= 95) { - t += App.Desc.belly({slave: slave, market: 0}); + t += App.Desc.belly({slave: slave}); t += ` `; 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: slave, market: 0})} `; + t += `${App.Desc.bellyInflation({slave: slave})} `; t += `${App.Desc.mods(slave, "belly")} `; switch (slave.clothes) { case "a Fuckdoll suit": @@ -7684,9 +7684,9 @@ globalThis.walkPast = (function() { V.target = "FVagina"; // Desc dick and vag - t += App.Desc.crotch({slave: slave, market: 0}); + t += App.Desc.crotch({slave: slave}); t += ` `; - t += App.Desc.vagina({slave: slave, market: 0}); + t += App.Desc.vagina({slave: slave}); t += ` `; switch (slave.clothes) { case "a Fuckdoll suit": @@ -8255,9 +8255,9 @@ globalThis.walkPast = (function() { V.target = "FDick"; // Desc dick and vag - t += App.Desc.crotch({slave: slave, market: 0}); + t += App.Desc.crotch({slave: slave}); t += ` `; - t += App.Desc.dick({slave: slave, market: 0}); + t += App.Desc.dick({slave: slave}); t += ` `; switch (slave.clothes) { case "a Fuckdoll suit": @@ -8826,7 +8826,7 @@ globalThis.walkPast = (function() { V.target = "FAnus"; - t += App.Desc.anus({slave: slave, market: 0}); + t += App.Desc.anus({slave: slave}); if (slave.chastityAnus === 0) { t += ` `; switch (slave.clothes) { diff --git a/src/interaction/wardrobeUse.js b/src/interaction/wardrobeUse.js index 2fbbd0422c2..c2429c26c8d 100644 --- a/src/interaction/wardrobeUse.js +++ b/src/interaction/wardrobeUse.js @@ -9,7 +9,7 @@ App.UI.Wardrobe.clothes = function(slave) { let el = document.createElement('div'); let links; if (slave.fuckdoll === 0) { - // <<= App.Desc.clothing({slave: $activeSlave, market: 0})>> + // <<= App.Desc.clothing({slave: $activeSlave})>> let label = document.createElement('div'); label.append(`Clothes: `); @@ -421,7 +421,7 @@ App.UI.Wardrobe.bellyAccessory = function(slave) { if (slave.fuckdoll !== 0) { return; } - // <<waistDescription>><<= App.Desc.pregnancy({slave: $activeSlave, market: 0})>><<clothingCorsetDescription>> + // <<waistDescription>><<= App.Desc.pregnancy({slave: $activeSlave})>><<clothingCorsetDescription>> const { // eslint-disable-next-line no-unused-vars diff --git a/src/npc/interaction/fBeg.tw b/src/npc/interaction/fBeg.tw index 0570ca00327..7115d7e2172 100644 --- a/src/npc/interaction/fBeg.tw +++ b/src/npc/interaction/fBeg.tw @@ -10,7 +10,7 @@ <<setSpokenLocalPronouns $activeSlave $activeSlave>> You call $him over to you for inspection. -<<print App.Desc.boobs({slave: getSlave($AS), market: 0})>> /* this part needs expansion */ +<<print App.Desc.boobs({slave: getSlave($AS)})>> /* this part needs expansion */ You look at $him lustfully and instruct $him to strip. <<if (getSlave($AS).sexualFlaw == "shamefast")>> Tears well up in $his eyes at the idea of showing $his naked body. diff --git a/src/pregmod/incubatorRetrievalWorkaround.tw b/src/pregmod/incubatorRetrievalWorkaround.tw index ac5875e6386..1612446667a 100644 --- a/src/pregmod/incubatorRetrievalWorkaround.tw +++ b/src/pregmod/incubatorRetrievalWorkaround.tw @@ -10,7 +10,7 @@ <<set $activeSlave = $readySlave>> <<set $incubatorSlaves-->> - <<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: 0})>> + <<includeDOM App.Desc.longSlave({slave: V.activeSlave})>> <<if $readySlave.tankBaby != 3>> <<if $incubatorOrgans.length > 0>> <<for _irw = 0; _irw < $incubatorOrgans.length; _irw++>> diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw index eec1ea93c5b..6d9580b0d42 100644 --- a/src/uncategorized/genericPlotEvents.tw +++ b/src/uncategorized/genericPlotEvents.tw @@ -119,7 +119,7 @@ As you step off the elevator, you hear several <<if $seeDicks != 100>>female <</ <br><br> //Enslaving $him will cost <<print cashFormat(_ContractCost)>>. Alternatively, you could sell $him. Less costs, this will bring in <<print cashFormat(_slaveCost)>>.// <br><br> - <<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: 0})>> + <<includeDOM App.Desc.longSlave({slave: V.activeSlave})>> <<elseif $PStrip == 2>> One day, you walk by the commercial space where the strip club that closed was located. It's now advertised as a massage parlor, and indeed, you can see a couple of competent-looking, modestly dressed masseuses seeing to clients. The only chink in the old world decorum is the pretty sign detailing pricing, which lists not only various massages but the masseuses' hands, breasts, mouths,<<if $seeDicks != 100>> pussies,<</if>> and anuses. <br><br> @@ -127,7 +127,7 @@ As you step off the elevator, you hear several <<if $seeDicks != 100>>female <</ <br><br> //Enslaving $him will cost <<print cashFormat(_ContractCost)>>. Alternatively, you could sell $him. Less costs, this will bring in <<print cashFormat(_slaveCost)>>.// <br><br> - <<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: 0})>> + <<includeDOM App.Desc.longSlave({slave: V.activeSlave})>> <<else>> <<setNonlocalPronouns $seeDicks>> One day, you walk by the commercial space where the strip club that closed was located. The <<= _girlU>>s you set up in cheap housing tried to run the place as a worker-owned strip bar for a while, but as you suspected, they were obliged to start whoring in short order. With the price of sex driven so low by slave competition, there's hardly any profit in bodies patrons can't even touch. The <<= _girlU>>s here might be prostitutes now, but they're still free and they're surviving. diff --git a/src/uncategorized/pSnatchAndGrabResult.tw b/src/uncategorized/pSnatchAndGrabResult.tw index 7179a080569..61081b9a345 100644 --- a/src/uncategorized/pSnatchAndGrabResult.tw +++ b/src/uncategorized/pSnatchAndGrabResult.tw @@ -141,6 +141,6 @@ The case prompts you for a handprint code; your hand works just fine. It contain When you state that, apparently, you are, $he climbs out of the case, prostrates $himself in the hall before you, and says reverentially into the floor, "I love you, <<if $PC.title != 0>>Master<<else>>Mistress<</if>>." <br><br> -<<includeDOM App.Desc.longSlave({slave: V.activeSlaves, market: 0})>> +<<includeDOM App.Desc.longSlave({slave: V.activeSlaves})>> <br><<include "New Slave Intro">> diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw index 5c3dbdd88b4..ac9c1aa1713 100644 --- a/src/uncategorized/reFSAcquisition.tw +++ b/src/uncategorized/reFSAcquisition.tw @@ -1522,7 +1522,7 @@ The call comes in from an office, and you suppress the urge to check whether $as <br><br> -<<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: 0})>> +<<includeDOM App.Desc.longSlave({slave: V.activeSlave})>> <br><br> diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw index 8efb2e512ae..c5b6a476392 100644 --- a/src/uncategorized/slaveInteract.tw +++ b/src/uncategorized/slaveInteract.tw @@ -79,7 +79,7 @@ </span> </p> <div class="tabbar"> - <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Description'), jQuery('#LSD').empty().append(App.Desc.longSlave({slave: getSlave(V.activeSlave.ID), market: 0}))" id="tab Description">Description</button> + <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Description'), jQuery('#LSD').empty().append(App.Desc.longSlave({slave: getSlave(V.activeSlave.ID)}))" id="tab Description">Description</button> <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Modify')" id="tab Modify">Modify</button> <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Work')" id="tab Work">Work</button> <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Appearance'), App.UI.Wardrobe.refreshAll(getSlave(V.activeSlave.ID))" id="tab Appearance">Appearance</button> -- GitLab