diff --git a/devNotes/legacy files/walkPast.txt b/devNotes/legacy files/walkPast.txt
index 9b097945d0f1653f1a56b3b590dfba67ff81e700..c880e54e5835223df697acac63b68efcce52ee5a 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})>>
+ <<= App.Desc.butt($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})>>
+ <<= App.Desc.belly($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})>>
+ <<= App.Desc.belly($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})>>
+ <<= App.Desc.belly($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})>>
+ <<= App.Desc.belly($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})>>
+ <<= App.Desc.belly($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})>>
+ <<= App.Desc.belly($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})>>
+ <<= App.Desc.belly($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})>>
+ <<= App.Desc.belly($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})>>
+ <<= App.Desc.belly($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})>>
+ <<= App.Desc.belly($activeSlave)>>
<<if $activeSlave.weight >= 30>>
Slight jiggling can be seen in $his chubby belly as $he moves.
<</if>>
- <<= App.Desc.crotch({slave: $activeSlave})>>
- <<= App.Desc.dick({slave: $activeSlave})>>
- <<= App.Desc.vagina({slave: $activeSlave})>>
+ <<= App.Desc.crotch($activeSlave)>>
+ <<= App.Desc.dick($activeSlave)>>
+ <<= App.Desc.vagina($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})>>
+ <<= App.Desc.bellyImplant($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})>>
+ <<= App.Desc.bellyImplant($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})>>
+ <<= App.Desc.belly($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})>>
+ <<= App.Desc.bellyImplant($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})>>
+ <<= App.Desc.belly($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})>>
+ <<= App.Desc.belly($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})>>
+ <<= App.Desc.bellyImplant($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})>>
+ <<= App.Desc.bellyImplant($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})>>
+ <<= App.Desc.bellyImplant($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})>>
+ <<= App.Desc.belly($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})>>
+ <<= App.Desc.bellyInflation($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})>>
+ <<= App.Desc.belly($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})>>
+ <<= App.Desc.belly($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})>>
+ <<= App.Desc.bellyInflation($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})>>
+ <<= App.Desc.belly($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})>>
+ <<= App.Desc.bellyInflation($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})>>
+ <<= App.Desc.anus($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 349eb8d4010d7286ec95aa612fd5f3f8edc31a31..0b772539da302b45c92a89cb337d527e2df51df9 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})>>
+ <<includeDOM App.Desc.longSlave(V.activeSlave)>>
<br> <<include "New Slave Intro">>
<</if>>
<</if>>
diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index a75542b168185bcf1fb9e189b4971354382c4e2b..f8a8a4efe1dd2b261628a1694d674d1e1b5903c4 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})>>
+ <<= App.Facilities.Nursery.LongChildDescription($activeChild)>>
</span>
<br><i>
[[Options][$nextLink = passage()]] |
@@ -49,7 +49,7 @@
<b>
<<link "Update">>
<<replace "#LCD">>
- <<= App.Facilities.Nursery.LongChildDescription({child: $activeChild})>>
+ <<= App.Facilities.Nursery.LongChildDescription($activeChild)>>
<</replace>>
<</link>>
</b></i>
diff --git a/src/facilities/nursery/infantInteract.tw b/src/facilities/nursery/infantInteract.tw
index 33469c434114534d11bf632b5ac19508caa535ae..a19f07c1122dc68ee43f585f3415963063df13b6 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})>>
+ <<= App.Facilities.Nursery.LongInfantDescription($activeChild)>>
</span>
<br><br>
<i>
@@ -40,7 +40,7 @@
<b>
<<link "Update">>
<<replace "#LCD">>
- <<= App.Facilities.Nursery.LongInfantDescription({child: $activeChild})>>
+ <<= App.Facilities.Nursery.LongInfantDescription($activeChild)>>
<</replace>>
<</link>>
</b>
diff --git a/src/facilities/nursery/nurseryRetrievalWorkaround.tw b/src/facilities/nursery/nurseryRetrievalWorkaround.tw
index 4f6ee19a82b6867a418f2c4a904798b8e7c88893..1ca8e7ac184f1d82ba10dbe080a3e7a1ea006040 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})>>
+<<includeDOM App.Desc.longSlave(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 c60869f433cef5e2c5ebd2ed2e0d6cc7bd1493b6..66ca127dd85567f908093d664e5b79976600f1d9 100644
--- a/src/facilities/nursery/widgets/children/longChildDescription.js
+++ b/src/facilities/nursery/widgets/children/longChildDescription.js
@@ -3,7 +3,7 @@
* @param {App.Entity.SlaveState} child
* @returns {string}
*/
-App.Facilities.Nursery.LongChildDescription = function({child: child, market: market, eventDescription: eventDescription} = {}) {
+App.Facilities.Nursery.LongChildDescription = function(child, {market = 0, eventDescription = 0} = {}) {
// declarations
const
@@ -6272,7 +6272,7 @@ App.Facilities.Nursery.LongChildDescription = function({child: child, market: ma
}
}
- r += App.Desc.eyes({slave: child});
+ r += App.Desc.eyes(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});
- r += App.Desc.boobsExtra({slave: child});
+ r += App.Desc.boobs(child);
+ r += App.Desc.boobsExtra(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});
+ r += App.Desc.nipples(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})} `; // TODO:
+ r += `${App.Desc.bellyInflation(child)} `; // TODO:
} else if (child.bellyImplant >= 2000) {
V.activeSlave = child;
- r += App.Desc.bellyImplant({slave: child}); // TODO:
+ r += App.Desc.bellyImplant(child); // TODO:
r += ` `;
} else {
V.activeSlave = child;
- r += `${App.Desc.belly({slave: child})} `; // TODO:
+ r += `${App.Desc.belly(child)} `; // TODO:
}
r += butt(child);
diff --git a/src/facilities/nursery/widgets/infants/longInfantDescription.js b/src/facilities/nursery/widgets/infants/longInfantDescription.js
index ea654664f2e838fdf2e8ca8415e728b17c724fc3..47303ce6e875c2ef845be3471f9933e638d588c2 100644
--- a/src/facilities/nursery/widgets/infants/longInfantDescription.js
+++ b/src/facilities/nursery/widgets/infants/longInfantDescription.js
@@ -3,7 +3,7 @@
* @param {App.Entity.InfantState} child
* @returns {string}
*/
-App.Facilities.Nursery.LongInfantDescription = function({child: child, market: market, eventDescription: eventDescription} = {}) {
+App.Facilities.Nursery.LongInfantDescription = function(child, {market = 0, eventDescription = 0} = {}) {
const
PC = V.PC,
arcology = V.arcologies[0],
diff --git a/src/gui/multipleInspect.js b/src/gui/multipleInspect.js
index 13f043a18b1d05443c82b5589e7800a7f3cb1c9d..ff260842f0be8ac6c72d3ac3d93a34031284deb8 100644
--- a/src/gui/multipleInspect.js
+++ b/src/gui/multipleInspect.js
@@ -13,7 +13,7 @@ App.UI.MultipleInspect = (function() {
for (const slave of slaves) {
tabbar.append(App.UI.tabbar.tabButtonDOM(`slave${slave.ID}`, slave.slaveName));
- frag.append(App.UI.tabbar.makeTabDOM(`slave${slave.ID}`, App.Desc.longSlave({slave: slave, market: market})));
+ frag.append(App.UI.tabbar.makeTabDOM(`slave${slave.ID}`, App.Desc.longSlave(slave, {market: market})));
}
if (slaves.length > 1 && showFamilyTree) {
diff --git a/src/interaction/main/walkPast.js b/src/interaction/main/walkPast.js
index f2bd9d7ee0f0f98ebe7fa75e01d6b9ed911b2e05..3ac1be446457ea070958d604872b9d363ee885c4 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})} `;
+ t += ` ${App.Desc.boobs(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});
+ t += App.Desc.butt(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});
+ t += App.Desc.belly(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});
+ t += App.Desc.belly(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});
+ t += App.Desc.belly(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});
+ t += App.Desc.belly(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});
+ t += App.Desc.belly(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});
+ t += App.Desc.belly(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});
+ t += App.Desc.belly(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});
+ t += App.Desc.belly(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});
+ t += App.Desc.belly(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});
+ t += App.Desc.belly(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})} `;
+ t += `${App.Desc.bellyImplant(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})} `;
+ t += `${App.Desc.bellyImplant(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});
+ t += App.Desc.belly(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})} `;
+ t += `${App.Desc.bellyImplant(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});
+ t += App.Desc.belly(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});
+ t += App.Desc.belly(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})} `;
+ t += `${App.Desc.bellyImplant(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})} `;
+ t += `${App.Desc.bellyImplant(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})} `;
+ t += `${App.Desc.bellyImplant(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});
+ t += App.Desc.belly(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})} `;
+ t += `${App.Desc.bellyInflation(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});
+ t += App.Desc.belly(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});
+ t += App.Desc.belly(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})} `;
+ t += `${App.Desc.bellyInflation(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});
+ t += App.Desc.belly(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})} `;
+ t += `${App.Desc.bellyInflation(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});
+ t += App.Desc.crotch(slave);
t += ` `;
- t += App.Desc.vagina({slave: slave});
+ t += App.Desc.vagina(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});
+ t += App.Desc.crotch(slave);
t += ` `;
- t += App.Desc.dick({slave: slave});
+ t += App.Desc.dick(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});
+ t += App.Desc.anus(slave);
if (slave.chastityAnus === 0) {
t += ` `;
switch (slave.clothes) {
diff --git a/src/interaction/wardrobeUse.js b/src/interaction/wardrobeUse.js
index c2429c26c8d5a8d4db6afb240ffb83e5e97e01a4..ce542db95738e535cb35ce6be78517efdef3f2de 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})>>
+ // <<= App.Desc.clothing($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})>><<clothingCorsetDescription>>
+ // <<waistDescription>><<= App.Desc.pregnancy($activeSlave)>><<clothingCorsetDescription>>
const {
// eslint-disable-next-line no-unused-vars
diff --git a/src/js/utilsSC.js b/src/js/utilsSC.js
index 09b8e589e2f29239269a76b9cb20650e5286d2be..2aec598922d7c4e30a71f338817d95e7eb974c96 100644
--- a/src/js/utilsSC.js
+++ b/src/js/utilsSC.js
@@ -275,7 +275,7 @@ App.UI.disabledLink = function(link, reasons) {
App.UI._showDescriptionDialog = function(slave) {
Dialog.setup(SlaveFullName(slave));
const image = App.UI.DOM.makeElement("div", App.Art.SlaveArtElement(slave, 2, 0), ["imageRef", "medImg"]);
- Dialog.append(image).append(App.Desc.longSlave({slave: slave, eventDescription: 1}));
+ Dialog.append(image).append(App.Desc.longSlave(slave, {eventDescription: 1}));
Dialog.open();
};
diff --git a/src/npc/descriptions/belly/belly.js b/src/npc/descriptions/belly/belly.js
index 47aa5d256c56cba1baabce6816c9d70bc3f38865..59f7a14418d811f2760ee9378d24bc5396fa06a7 100644
--- a/src/npc/descriptions/belly/belly.js
+++ b/src/npc/descriptions/belly/belly.js
@@ -1,11 +1,11 @@
/**
+ * @param {App.Entity.SlaveState} slave
* @param {object} params
- * @param {App.Entity.SlaveState} [params.slave]
* @param {number} [params.market]
* @param {number} [params.eventDescription]
* @returns {string}
*/
-App.Desc.belly = function({slave, market, eventDescription} = {}) {
+App.Desc.belly = function(slave, {market, eventDescription} = {}) {
let heavyBelly;
const r = [];
const {
diff --git a/src/npc/descriptions/belly/bellyImplant.js b/src/npc/descriptions/belly/bellyImplant.js
index f59082684d97be2e653956dcc3f5769b3ef790fb..a224947e300afe42d3a351e26a49b4abef4187ad 100644
--- a/src/npc/descriptions/belly/bellyImplant.js
+++ b/src/npc/descriptions/belly/bellyImplant.js
@@ -1,11 +1,11 @@
/**
+ * @param {App.Entity.SlaveState} slave
* @param {object} params
- * @param {App.Entity.SlaveState} [params.slave]
* @param {number} [params.market]
* @param {number} [params.eventDescription]
* @returns {string}
*/
-App.Desc.bellyImplant = function({slave, market, eventDescription} = {}) {
+App.Desc.bellyImplant = function(slave, {market, eventDescription} = {}) {
const r = [];
const {
he, him, his, hers, himself, boy, He, His, girl
diff --git a/src/npc/descriptions/belly/bellyInflation.js b/src/npc/descriptions/belly/bellyInflation.js
index 470b18fd32ca8c18ef1b8ccd74fb472743214e00..8b9a9ff355f4416f890ab4c16213c70bfd3c4745 100644
--- a/src/npc/descriptions/belly/bellyInflation.js
+++ b/src/npc/descriptions/belly/bellyInflation.js
@@ -1,11 +1,11 @@
/**
+ * @param {App.Entity.SlaveState} slave
* @param {object} params
- * @param {App.Entity.SlaveState} [params.slave]
* @param {number} [params.market]
* @param {number} [params.eventDescription]
* @returns {string}
*/
-App.Desc.bellyInflation = function({slave, market, eventDescription} = {}) {
+App.Desc.bellyInflation = function(slave, {market, eventDescription} = {}) {
const r = [];
const {
he, him, his, hers, himself, boy, He, His
diff --git a/src/npc/descriptions/boobs/boobs.js b/src/npc/descriptions/boobs/boobs.js
index 16e35c15f86d102fbebd8648fc88fb8a443bec6d..2241cf8659c8e48e095618b6ac08e196af12e3c5 100644
--- a/src/npc/descriptions/boobs/boobs.js
+++ b/src/npc/descriptions/boobs/boobs.js
@@ -216,13 +216,13 @@ App.Desc.boobs = function() {
return describe;
/**
+ * @param {App.Entity.SlaveState} slave
* @param {object} params
- * @param {App.Entity.SlaveState} [params.slave]
* @param {number} [params.market]
* @param {number} [params.eventDescription]
* @returns {string}
*/
- function describe({slave, market, eventDescription} = {}) {
+ function describe(slave, {market, eventDescription} = {}) {
if (V.showClothing === 1 && !market) {
return `${outerInspection(slave)} ${detailedInspection(slave)}`;
} else {
@@ -1396,13 +1396,13 @@ App.Desc.boobs = function() {
}();
/**
+ * @param {App.Entity.SlaveState} slave
* @param {object} params
- * @param {App.Entity.SlaveState} [params.slave]
* @param {number} [params.market]
* @param {number} [params.eventDescription]
* @returns {string}
*/
-App.Desc.boobsExtra = function({slave, market, eventDescription} = {}) {
+App.Desc.boobsExtra = function(slave, {market, eventDescription} = {}) {
const thisArcology = V.arcologies[0];
const {he, his, him, He, His, girl} = getPronouns(slave);
@@ -1548,13 +1548,13 @@ App.Desc.boobsExtra = function({slave, market, eventDescription} = {}) {
};
/**
+ * @param {App.Entity.SlaveState} slave
* @param {object} params
- * @param {App.Entity.SlaveState} [params.slave]
* @param {number} [params.market]
* @param {number} [params.eventDescription]
* @returns {string}
*/
-App.Desc.nipples = function({slave, market, eventDescription} = {}) {
+App.Desc.nipples = function(slave, {market, eventDescription} = {}) {
const {he, him, his, He, His} = getPronouns(slave);
const nipColor = nippleColor(slave);
@@ -1744,13 +1744,13 @@ App.Desc.nipples = function({slave, market, eventDescription} = {}) {
};
/**
+ * @param {App.Entity.SlaveState} slave
* @param {object} params
- * @param {App.Entity.SlaveState} [params.slave]
* @param {number} [params.market]
* @param {number} [params.eventDescription]
* @returns {string}
*/
-App.Desc.areola = function({slave, market, eventDescription} = {}) {
+App.Desc.areola = function(slave, {market, eventDescription} = {}) {
const {his, His, him} = getPronouns(slave);
const nipColor = nippleColor(slave);
diff --git a/src/npc/descriptions/butt/anus.js b/src/npc/descriptions/butt/anus.js
index b603ef0a2508685c01d535de80ee36a6d5ef6af2..c190c15f17829d894d34469870f49cde5eaf2025 100644
--- a/src/npc/descriptions/butt/anus.js
+++ b/src/npc/descriptions/butt/anus.js
@@ -1,11 +1,11 @@
/**
+ * @param {App.Entity.SlaveState} slave
* @param {object} params
- * @param {App.Entity.SlaveState} [params.slave]
* @param {number} [params.market]
* @param {number} [params.eventDescription]
* @returns {string}
*/
-App.Desc.anus = function({slave, market, eventDescription} = {}) {
+App.Desc.anus = function(slave, {market, eventDescription} = {}) {
const r = [];
const {
he, him, his, hers, himself, boy, He, His
@@ -103,7 +103,7 @@ App.Desc.anus = function({slave, market, eventDescription} = {}) {
r.push(`${His} asshole looks unusually puffy and sore. ${He}'s either been cruelly assraped lately, or ${he}'s had an irritant placed in ${his} anus.`);
}
- r.push(App.Desc.buttplug({slave: slave, market: market}));
+ r.push(App.Desc.buttplug(slave, {market: market}));
r.push(App.Desc.mods(slave, "anus"));
diff --git a/src/npc/descriptions/butt/butt.js b/src/npc/descriptions/butt/butt.js
index 4b96047f8f44e4a25f03c4d1caded6f869dcf485..a9fb1d2e6d4daffbd32881fee8319cad7bd03a86 100644
--- a/src/npc/descriptions/butt/butt.js
+++ b/src/npc/descriptions/butt/butt.js
@@ -1,11 +1,11 @@
/**
+ * @param {App.Entity.SlaveState} slave
* @param {object} params
- * @param {App.Entity.SlaveState} [params.slave]
* @param {number} [params.market]
* @param {number} [params.eventDescription]
* @returns {string}
*/
-App.Desc.butt = function({slave, market, eventDescription} = {}) {
+App.Desc.butt = function(slave, {market, eventDescription} = {}) {
const r = [];
const {
he, him, his, hers, himself, girl, He, His
diff --git a/src/npc/descriptions/butt/buttplug.js b/src/npc/descriptions/butt/buttplug.js
index bee7d69dd2ada2f797a9019bbe433b38725528db..39d18e2ab992c360e7e5f676d6e75ec6a31de774 100644
--- a/src/npc/descriptions/butt/buttplug.js
+++ b/src/npc/descriptions/butt/buttplug.js
@@ -1,11 +1,11 @@
/**
+ * @param {App.Entity.SlaveState} slave
* @param {object} params
- * @param {App.Entity.SlaveState} [params.slave]
* @param {number} [params.market]
* @param {number} [params.eventDescription]
* @returns {string}
*/
-App.Desc.buttplug = function({slave, market, eventDescription} = {}) {
+App.Desc.buttplug = function(slave, {market, eventDescription} = {}) {
const r = [];
const {
he, him, his, hers, himself, boy, He, His
diff --git a/src/npc/descriptions/crotch/crotch.js b/src/npc/descriptions/crotch/crotch.js
index 939299e7dbd53636374dbb648fbe4f6fc951e234..8cb57e23105305b89b552805c6b56f7e1a80ba12 100644
--- a/src/npc/descriptions/crotch/crotch.js
+++ b/src/npc/descriptions/crotch/crotch.js
@@ -1,11 +1,11 @@
/**
+ * @param {App.Entity.SlaveState} slave
* @param {object} params
- * @param {App.Entity.SlaveState} [params.slave]
* @param {number} [params.market]
* @param {number} [params.eventDescription]
* @returns {string}
*/
-App.Desc.crotch = function({slave, market, eventDescription} = {}) {
+App.Desc.crotch = function(slave, {market, eventDescription} = {}) {
const r = [];
const {
he, him, his, hers, himself, boy, He, His
diff --git a/src/npc/descriptions/crotch/dick.js b/src/npc/descriptions/crotch/dick.js
index 4268aa641123b17e6a11e9cf2367f1f42a7bd379..0ff685e5462d5dfefd36de6c795c17a75fcfeb55 100644
--- a/src/npc/descriptions/crotch/dick.js
+++ b/src/npc/descriptions/crotch/dick.js
@@ -1,11 +1,11 @@
/**
+ * @param {App.Entity.SlaveState} slave
* @param {object} params
- * @param {App.Entity.SlaveState} [params.slave]
* @param {number} [params.market]
* @param {number} [params.eventDescription]
* @returns {string}
*/
-App.Desc.dick = function({slave, market, eventDescription} = {}) {
+App.Desc.dick = function(slave, {market, eventDescription} = {}) {
const r = [];
const {
he, him, his, hers, himself, girl, He, His
diff --git a/src/npc/descriptions/crotch/vagina.js b/src/npc/descriptions/crotch/vagina.js
index 9c24ee92bd587fddcee05b888215834aacd1b336..3a332886557580e956e61c90d13289334121f16a 100644
--- a/src/npc/descriptions/crotch/vagina.js
+++ b/src/npc/descriptions/crotch/vagina.js
@@ -1,11 +1,11 @@
/**
+ * @param {App.Entity.SlaveState} slave
* @param {object} params
- * @param {App.Entity.SlaveState} [params.slave]
* @param {number} [params.market]
* @param {number} [params.eventDescription]
* @returns {string}
*/
-App.Desc.vagina = function({slave, market, eventDescription} = {}) {
+App.Desc.vagina = function(slave, {market, eventDescription} = {}) {
const r = [];
const {
he, him, his, hers, himself, boy, He, His
diff --git a/src/npc/descriptions/descriptionWidgets.js b/src/npc/descriptions/descriptionWidgets.js
index c244c12d85d7424cf470e93b68db6f22ff80df2a..b9f5035a7c033ff5e749065d362e585912f14369 100644
--- a/src/npc/descriptions/descriptionWidgets.js
+++ b/src/npc/descriptions/descriptionWidgets.js
@@ -61,13 +61,13 @@ App.Desc.makeup = function(slave) {
};
/**
+ * @param {App.Entity.SlaveState} slave
* @param {object} params
- * @param {App.Entity.SlaveState} [params.slave]
* @param {number} [params.market]
* @param {number} [params.eventDescription]
* @returns {string} Slave's eyes
*/
-App.Desc.eyes = function({slave, market, eventDescription} = {}) {
+App.Desc.eyes = function(slave, {market, eventDescription} = {}) {
let r = ``;
/* eslint-disable no-unused-vars*/
const {
diff --git a/src/npc/descriptions/heels.js b/src/npc/descriptions/heels.js
index 43f8b73dccf59cab5c4ba48f545cd12949665627..2d68c7f8d7e27924534b1f227a07c2ffd4ed35d7 100644
--- a/src/npc/descriptions/heels.js
+++ b/src/npc/descriptions/heels.js
@@ -1,11 +1,11 @@
/**
+ * @param {App.Entity.SlaveState} slave
* @param {object} params
- * @param {App.Entity.SlaveState} [params.slave]
* @param {number} [params.market]
* @param {number} [params.eventDescription]
* @returns {string}
*/
-App.Desc.heels = function({slave, market, eventDescription} = {}) {
+App.Desc.heels = function(slave, {market, eventDescription} = {}) {
const r = [];
const {
he, him, his, hers, himself, boy, He, His
diff --git a/src/npc/descriptions/longSlave.js b/src/npc/descriptions/longSlave.js
index d88706248b1350a46bd47b2ff16d0252514c3439..63391b391a07ef2d7091d33eccf97aa75b40e2c7 100644
--- a/src/npc/descriptions/longSlave.js
+++ b/src/npc/descriptions/longSlave.js
@@ -1,11 +1,11 @@
/**
+ * @param {App.Entity.SlaveState} slave
* @param {object} params
- * @param {App.Entity.SlaveState} [params.slave]
* @param {string|number} [params.market] 0 if the slave is not for sale. Otherwise a string with the name of the market, partially to determine if laws apply to the market or not.
* @param {number} [params.eventDescription]
* @returns {string}
*/
-App.Desc.longSlave = function({slave = V.activeSlave, market = 0, eventDescription = 0} = {}) {
+App.Desc.longSlave = function(slave = V.activeSlave, {market = 0, eventDescription = 0} = {}) {
const {
He, His, him, he, his
} = getPronouns(slave);
@@ -185,8 +185,8 @@ App.Desc.longSlave = function({slave = V.activeSlave, market = 0, eventDescripti
}
r.push(
- App.Desc.sceneIntro({
- slave: slave, market: market, eventDescription: eventDescription
+ App.Desc.sceneIntro(slave, {
+ market: market, eventDescription: eventDescription
})
);
r.push(App.Desc.name(slave));
@@ -214,7 +214,7 @@ App.Desc.longSlave = function({slave = V.activeSlave, market = 0, eventDescripti
}
}
- r.push(App.Desc.mind({slave: slave, market: market}));
+ r.push(App.Desc.mind(slave, {market: market}));
if (!market) {
if (eventDescription === 0) {
@@ -391,8 +391,8 @@ App.Desc.longSlave = function({slave = V.activeSlave, market = 0, eventDescripti
r = [];
r.push(App.Desc.limbs(slave));
- r.push(App.Desc.clothing({
- slave: slave, market: market, eventDescription: eventDescription
+ r.push(App.Desc.clothing(slave, {
+ market: market, eventDescription: eventDescription
}));
r.push(App.Desc.armwear(slave));
@@ -418,19 +418,19 @@ App.Desc.longSlave = function({slave = V.activeSlave, market = 0, eventDescripti
}
r.push(App.Desc.piercing(slave, "corset"));
- r.push(App.Desc.pregnancy({
- slave: slave, market: market, eventDescription: eventDescription
+ r.push(App.Desc.pregnancy(slave, {
+ market: market, eventDescription: eventDescription
}));
r.push(App.Desc.legs(slave));
r.push(App.Desc.mods(slave, "thigh"));
r.push(App.Desc.mods(slave, "calf"));
r.push(App.Desc.mods(slave, "ankle"));
r.push(App.Desc.mods(slave, "foot"));
- r.push(App.Desc.heels({
- slave: slave, market: market, eventDescription: eventDescription
+ r.push(App.Desc.heels(slave, {
+ market: market, eventDescription: eventDescription
}));
- r.push(App.Desc.skin({
- slave: slave, market: market, eventDescription: eventDescription
+ r.push(App.Desc.skin(slave, {
+ market: market, eventDescription: eventDescription
}));
if (market) {
@@ -715,42 +715,42 @@ App.Desc.longSlave = function({slave = V.activeSlave, market = 0, eventDescripti
p.className = "indent";
r = [];
// Calling all boob widgets
- r.push(App.Desc.boobs({
- slave: slave, market: market, eventDescription: eventDescription
+ r.push(App.Desc.boobs(slave, {
+ market: market, eventDescription: eventDescription
}));
r.push(App.Desc.boobsShape(slave));
- r.push(App.Desc.boobsExtra({
- slave: slave, market: market, eventDescription: eventDescription
+ r.push(App.Desc.boobsExtra(slave, {
+ market: market, eventDescription: eventDescription
}));
r.push(App.Desc.mods(slave, "chest"));
r.push(App.Desc.mods(slave, "breast"));
r.push(App.Desc.shoulders(slave));
- r.push(App.Desc.nipples({
- slave: slave, market: market, eventDescription: eventDescription
+ r.push(App.Desc.nipples(slave, {
+ market: market, eventDescription: eventDescription
}));
r.push(App.Desc.mods(slave, "nipple"));
- r.push(App.Desc.areola({
- slave: slave, market: market, eventDescription: eventDescription, applyLaw: applyLaw
+ r.push(App.Desc.areola(slave, {
+ market: market, eventDescription: eventDescription, applyLaw: applyLaw
}));
r.push(App.Desc.mods(slave, "areolae"));
if (slave.inflation > 0) {
// to be obsoleted with phase 4
- r.push(App.Desc.bellyInflation({
- slave: slave, market: market, eventDescription: eventDescription
+ r.push(App.Desc.bellyInflation(slave, {
+ market: market, eventDescription: eventDescription
}));
} else if (slave.bellyImplant >= 2000) {
- r.push(App.Desc.bellyImplant({
- slave: slave, market: market, eventDescription: eventDescription
+ r.push(App.Desc.bellyImplant(slave, {
+ market: market, eventDescription: eventDescription
}));
} else {
- r.push(App.Desc.belly({
- slave: slave, market: market, eventDescription: eventDescription
+ r.push(App.Desc.belly(slave, {
+ market: market, eventDescription: eventDescription
}));
}
r.push(App.Desc.mods(slave, "belly"));
- r.push(App.Desc.butt({
- slave: slave, market: market, eventDescription: eventDescription
+ r.push(App.Desc.butt(slave, {
+ market: market, eventDescription: eventDescription
}));
$(p).append(r.join(` `));
@@ -760,17 +760,17 @@ App.Desc.longSlave = function({slave = V.activeSlave, market = 0, eventDescripti
p.className = "indent";
r = [];
- r.push(App.Desc.crotch({
- slave: slave, market: market, eventDescription: eventDescription
+ r.push(App.Desc.crotch(slave, {
+ market: market, eventDescription: eventDescription
}));
- r.push(App.Desc.dick({
- slave: slave, market: market, eventDescription: eventDescription
+ r.push(App.Desc.dick(slave, {
+ market: market, eventDescription: eventDescription
}));
- r.push(App.Desc.vagina({
- slave: slave, market: market, eventDescription: eventDescription
+ r.push(App.Desc.vagina(slave, {
+ market: market, eventDescription: eventDescription
}));
- r.push(App.Desc.anus({
- slave: slave, market: market, eventDescription: eventDescription
+ r.push(App.Desc.anus(slave, {
+ market: market, eventDescription: eventDescription
}));
$(p).append(r.join(` `));
diff --git a/src/npc/descriptions/mind.js b/src/npc/descriptions/mind.js
index 08a55dbe284fe7add831807e9f204a5d41ce91c6..49910d4647baffd03584b67a00ef7d3a6a9f9f99 100644
--- a/src/npc/descriptions/mind.js
+++ b/src/npc/descriptions/mind.js
@@ -2,13 +2,13 @@
* @param {App.Entity.SlaveState} slave
* @returns {string}
*/
-App.Desc.mind = function({slave, market, eventDescription} = {}) {
+App.Desc.mind = function(slave, {market, eventDescription} = {}) {
const r = [];
const {
he, him, his, He, His
} = getPronouns(slave);
if (slave.fuckdoll === 0) {
- r.push(App.Desc.eyes({slave: slave, market: market}));
+ r.push(App.Desc.eyes(slave, {market: market}));
if (slave.fetish === "mindbroken") {
r.push(`However, <span class="coral">${his} mind is fundamentally broken;</span> everything ${he} experiences will quickly be forgotten.`);
diff --git a/src/npc/descriptions/sceneIntro.js b/src/npc/descriptions/sceneIntro.js
index d2db325d29e87bf244c92529a304b6e221b4ff62..4ceea4159e9140afb998fb2836de19c039bf7c6c 100644
--- a/src/npc/descriptions/sceneIntro.js
+++ b/src/npc/descriptions/sceneIntro.js
@@ -1,11 +1,11 @@
/**
+ * @param {App.Entity.SlaveState} slave
* @param {object} params
- * @param {App.Entity.SlaveState} [params.slave]
* @param {number} [params.market]
* @param {number} [params.eventDescription]
* @returns {string}
*/
-App.Desc.sceneIntro = function({slave, market, eventDescription} = {}) {
+App.Desc.sceneIntro = function(slave, {market, eventDescription} = {}) {
const r = [];
const {
he, him, his, He, His, himself, wife
diff --git a/src/npc/descriptions/skin.js b/src/npc/descriptions/skin.js
index 2b6f71cec01fd4c7c0abd3fde690d9b5dc1d038a..633fc5cce4a04ccc9b601c7bef8485887f904730 100644
--- a/src/npc/descriptions/skin.js
+++ b/src/npc/descriptions/skin.js
@@ -1,11 +1,11 @@
/**
+ * @param {App.Entity.SlaveState} slave
* @param {object} params
- * @param {App.Entity.SlaveState} [params.slave]
* @param {number} [params.market]
* @param {number} [params.eventDescription]
* @returns {string}
*/
-App.Desc.skin = function({slave, market, eventDescription} = {}) {
+App.Desc.skin = function(slave, {market, eventDescription} = {}) {
let r = [];
const {
he, him, his, hers, himself, boy, He, His
diff --git a/src/npc/descriptions/style/clothing.js b/src/npc/descriptions/style/clothing.js
index 3b28d5006464d60fee88a69f82851cb2beb8b8fd..7fd86ff59c8d43c60b73a06c4bccbe3ef266ce98 100644
--- a/src/npc/descriptions/style/clothing.js
+++ b/src/npc/descriptions/style/clothing.js
@@ -1,11 +1,11 @@
/**
+ * @param {App.Entity.SlaveState} slave
* @param {object} params
- * @param {App.Entity.SlaveState} [params.slave]
* @param {number} [params.market]
* @param {number} [params.eventDescription]
* @returns {string}
*/
-App.Desc.clothing = function({slave, market, eventDescription} = {}) {
+App.Desc.clothing = function(slave, {market, eventDescription} = {}) {
const r = [];
const {
he, him, his, hers, himself, boy, He, His
diff --git a/src/npc/descriptions/womb/pregnancy.js b/src/npc/descriptions/womb/pregnancy.js
index 8b94ce5d2944733ebd8037abad1ddf49b6811839..9b30e76f732e3ad12167b4fbcb55a1f448451c5b 100644
--- a/src/npc/descriptions/womb/pregnancy.js
+++ b/src/npc/descriptions/womb/pregnancy.js
@@ -1,11 +1,11 @@
/**
+ * @param {App.Entity.SlaveState} slave
* @param {object} params
- * @param {App.Entity.SlaveState} [params.slave]
* @param {number} [params.market]
* @param {number} [params.eventDescription]
* @returns {string}
*/
-App.Desc.pregnancy = function({slave, market, eventDescription} = {}) {
+App.Desc.pregnancy = function(slave, {market, eventDescription} = {}) {
const r = [];
const {
he, him, his, hers, himself, boy, He, His
@@ -67,7 +67,7 @@ App.Desc.pregnancy = function({slave, market, eventDescription} = {}) {
} else {
r.push(`a staggering ${slave.pregType} babies.`);
}
- r.push(App.Desc.superfetation({slave: slave, market: market}));
+ r.push(App.Desc.superfetation(slave, {market: market}));
} else if (slave.bellyPreg >= 750000) {
r.push(`${He} is`);
if (slave.belly > (slave.pregAdaptation * 1000)) {
@@ -82,7 +82,7 @@ App.Desc.pregnancy = function({slave, market, eventDescription} = {}) {
} else if (slave.preg >= slave.pregData.normalBirth * 1.075) {
r.push(`${He} is very overdue; ${he} should have given birth ${(slave.preg - slave.pregData.normalBirth)} weeks ago.`);
}
- r.push(App.Desc.superfetation({slave: slave, market: market}));
+ r.push(App.Desc.superfetation(slave, {market: market}));
} else if (slave.bellyImplant >= 750000) {
r.push(`${He} looks <span class="red">ready to pop!</span> ${His} stomach is`);
if (slave.belly > (slave.pregAdaptation * 1000)) {
@@ -123,7 +123,7 @@ App.Desc.pregnancy = function({slave, market, eventDescription} = {}) {
} else {
r.push(`${slave.pregType} babies.`);
}
- r.push(App.Desc.superfetation({slave: slave, market: market}));
+ r.push(App.Desc.superfetation(slave, {market: market}));
} else if (slave.bellyImplant >= 600000) {
r.push(`${He} looks <span class="pink">dangerously pregnant.</span> ${He} stomach is massively stretched by ${his} absurdly overfilled ${slave.bellyImplant}cc belly implant.`);
} else if (slave.bellyPreg >= 450000) {
@@ -158,7 +158,7 @@ App.Desc.pregnancy = function({slave, market, eventDescription} = {}) {
} else {
r.push(`${slave.pregType} babies.`);
}
- r.push(App.Desc.superfetation({slave: slave, market: market}));
+ r.push(App.Desc.superfetation(slave, {market: market}));
} else if (slave.bellyImplant >= 450000) {
r.push(`${He} looks <span class="pink">absurdly pregnant.</span> ${He} stomach is massively stretched by ${his} overfilled ${slave.bellyImplant}cc belly implant.`);
} else if (slave.bellyPreg >= 300000) {
@@ -193,7 +193,7 @@ App.Desc.pregnancy = function({slave, market, eventDescription} = {}) {
} else {
r.push(`${slave.pregType} children.`);
}
- r.push(App.Desc.superfetation({slave: slave, market: market}));
+ r.push(App.Desc.superfetation(slave, {market: market}));
} else if (slave.bellyImplant >= 300000) {
r.push(`${He} looks <span class="pink">absurdly pregnant.</span> ${His} overburdened middle is filled by ${his} ${slave.bellyImplant}cc belly implant.`);
} else if (slave.bellyPreg >= 120000) {
@@ -247,7 +247,7 @@ App.Desc.pregnancy = function({slave, market, eventDescription} = {}) {
r.push(`ready to give birth to octuplets.`);
}
}
- r.push(App.Desc.superfetation({slave: slave, market: market}));
+ r.push(App.Desc.superfetation(slave, {market: market}));
} else if (slave.bellyImplant >= 120000) {
r.push(`${He} looks <span class="pink">obscenely pregnant with octuplets.</span> ${His} overburdened middle is filled by ${his} ${slave.bellyImplant}cc belly implant.`);
} else if (slave.bellyPreg >= 15000) {
@@ -603,7 +603,7 @@ App.Desc.pregnancy = function({slave, market, eventDescription} = {}) {
}
}
}
- r.push(App.Desc.superfetation({slave: slave, market: market}));
+ r.push(App.Desc.superfetation(slave, {market: market}));
} else if (slave.bellyImplant >= 105000) {
r.push(`${He} looks <span class="pink">massively pregnant with septuplets.</span> ${He} greatly rounded middle is filled by ${his} ${slave.bellyImplant}cc belly implant.`);
} else if (slave.bellyImplant >= 90000) {
@@ -639,7 +639,7 @@ App.Desc.pregnancy = function({slave, market, eventDescription} = {}) {
r.push(`almost ready to give birth.`);
}
}
- r.push(`${App.Desc.superfetation({slave: slave, market: market})}`);
+ r.push(`${App.Desc.superfetation(slave, {market: market})}`);
} else if (slave.bellyImplant >= 10000) {
r.push(`${He} looks <span class="pink">hugely pregnant.</span> ${He} greatly rounded middle is filled by ${his} ${slave.bellyImplant}cc belly implant.`);
} else if (slave.bellyPreg >= 5000) {
@@ -663,7 +663,7 @@ App.Desc.pregnancy = function({slave, market, eventDescription} = {}) {
r.push(`the baby inside ${him} is growing rapidly.`);
}
}
- r.push(App.Desc.superfetation({slave: slave, market: market}));
+ r.push(App.Desc.superfetation(slave, {market: market}));
} else if (slave.bellyImplant >= 5000) {
r.push(`${He} looks <span class="pink">very pregnant.</span> ${He} rounded middle is filled by ${his} ${slave.bellyImplant}cc belly implant.`);
} else if (slave.bellyPreg >= 1500) {
@@ -682,19 +682,19 @@ App.Desc.pregnancy = function({slave, market, eventDescription} = {}) {
} else {
r.push(`<span class="pink">visibly pregnant.</span>`);
}
- r.push(App.Desc.superfetation({slave: slave, market: market}));
+ r.push(App.Desc.superfetation(slave, {market: market}));
} else if (slave.bellyImplant >= 1500) {
r.push(`${He} looks <span class="pink">visibly pregnant.</span> ${He} rounded middle is caused by ${his} ${slave.bellyImplant}cc belly implant.`);
} else if (slave.bellyPreg >= 100) {
r.push(`${He} is <span class="pink">pregnant</span> and just beginning to show, though it is hard to tell at a glance.`);
- r.push(App.Desc.superfetation({slave: slave, market: market}));
+ r.push(App.Desc.superfetation(slave, {market: market}));
} else if (slave.bellyImplant > 0) {
r.push(`${He} has an abdominal implant, though it doesn't round out ${his} belly too much yet at a tiny ${slave.bellyImplant}ccs.`);
} else if (slave.bellyImplant === 0) {
r.push(`${He} has an abdominal implant, but it is completely empty.`);
} else if (slave.pregKnown === 1) {
r.push(`${He} is <span class="pink">pregnant,</span> though it isn't visible yet.`);
- r.push(App.Desc.superfetation({slave: slave, market: market}));
+ r.push(App.Desc.superfetation(slave, {market: market}));
} else if (slave.preg > 0 && slave.pregKnown === 0) {
r.push(`${His} period is late.`);
}
diff --git a/src/npc/descriptions/womb/superfetation.js b/src/npc/descriptions/womb/superfetation.js
index 1ff11a4223eea32253deaa6a2812e3ce9e84d79c..d03dced0f897bb02076e9d32c8cbad7a02297d89 100644
--- a/src/npc/descriptions/womb/superfetation.js
+++ b/src/npc/descriptions/womb/superfetation.js
@@ -1,11 +1,11 @@
/**
+ * @param {App.Entity.SlaveState} slave
* @param {object} params
- * @param {App.Entity.SlaveState} [params.slave]
* @param {number} [params.market]
* @param {number} [params.eventDescription]
* @returns {string}
*/
-App.Desc.superfetation = function({slave, market, eventDescription} = {}) {
+App.Desc.superfetation = function(slave, {market, eventDescription} = {}) {
const r = [];
const {
he, him, his, hers, himself, boy, He, His
diff --git a/src/npc/interaction/fBeg.tw b/src/npc/interaction/fBeg.tw
index 7115d7e2172ac710285458aeb7e618d93027ec9d..a1f94f2c2159a3d0613fdecb2d92607a40a3f36f 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)})>> /* this part needs expansion */
+<<print App.Desc.boobs(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/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index a0452f7ad2e731ead082e87e89d5cdb595bdd479..d38b5191a3dc3a63f6d9a2bae933bc439ff0fee3 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -362,7 +362,7 @@
<</if>>
<</if>>
-<h2>You are customizing this slave:</h2> <<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: "generic"})>>
+<h2>You are customizing this slave:</h2> <<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
<div class="tabbar">
<button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Overview')" id="tab Overview">Overview</button>
diff --git a/src/pregmod/FCTV/seFCTVshows.tw b/src/pregmod/FCTV/seFCTVshows.tw
index f0b55b4a6ba0f55e98c396feeb49e90641444161..62758a85b784c9b852a8ee49b770c3400d998131 100644
--- a/src/pregmod/FCTV/seFCTVshows.tw
+++ b/src/pregmod/FCTV/seFCTVshows.tw
@@ -479,7 +479,7 @@
<<else>>
//@@.red;You lack the necessary funds.@@//
<</if>>
- <br><br> <<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: "generic"})>>
+ <br><br> <<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
<<run FCTV.incrementShow()>>
<<case 5>>
diff --git a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw
index c298a9fbd94633b9ceb6cd4b14d54a9e1a7a7798..41b4e563ec27d13f7517e8e7d746b4d2852a6f24 100644
--- a/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw
+++ b/src/pregmod/JobFulfillmentCenter/JobFulfillmentCenterDelivery.tw
@@ -11,7 +11,7 @@ A slave dealer has submitted a slave to satisfy your ''$Role'' order.
<br><br>//As usual, the asking price is quite high, to cover the costs of training a proper <<print $Role>>. In compensation, you can freely decline the slave should $he not meet your standards or the job has already been filled.//
-<br><br><<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: "generic"})>>
+<br><br><<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
<br><br>$His price is <<print cashFormat(_slaveCost)>>.
diff --git a/src/pregmod/analyzePregnancy.tw b/src/pregmod/analyzePregnancy.tw
index 2015aeeedc2b99b00182474155de0457209acc15..bbccf88550517b2b4d46b9ab91545adcc993f30d 100644
--- a/src/pregmod/analyzePregnancy.tw
+++ b/src/pregmod/analyzePregnancy.tw
@@ -14,7 +14,7 @@
<<= getSlave($activeSlave.ID).slaveName>> is <<if getSlave($activeSlave.ID).devotion < 20>>restrained<<else>>comfortably reclined<</if>> with $his stomach prepped for examination. $He shudders slightly at the cold touch of the sensor against $his skin.
</p>
- <<= App.Desc.pregnancy({slave: $activeSlave, market: "generic"})>>
+ <<= App.Desc.pregnancy($activeSlave, {market: "generic"})>>
<p>
<h2>Overall statistics</h2>
diff --git a/src/pregmod/criminalMarkets.tw b/src/pregmod/criminalMarkets.tw
index 0539eddbd44a99fc27b0218e00307f9a6cdc3f88..3c935d09c25e87a034ff7b86cc2ec14baaee1185 100644
--- a/src/pregmod/criminalMarkets.tw
+++ b/src/pregmod/criminalMarkets.tw
@@ -69,6 +69,6 @@ It will cost <<print cashFormat(_slaveCost)>> to enslave $him.
<</if>>
<br><br>
-<<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: "generic"})>>
+<<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
<<set _slaveCost = slaveCost($activeSlave)>>
diff --git a/src/pregmod/eliteSlave.tw b/src/pregmod/eliteSlave.tw
index 52b527ab387a966801e176c50c14d03242c96010..c2814c58e847d4bbf2a76bbd70153399003522e7 100644
--- a/src/pregmod/eliteSlave.tw
+++ b/src/pregmod/eliteSlave.tw
@@ -254,6 +254,6 @@ It will take <<print cashFormat(_slaveCost)>> to win the auction.
<br><br>
-<<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: "Elite Slave"})>>
+<<includeDOM App.Desc.longSlave(V.activeSlave, {market: "Elite Slave"})>>
<</if>>
diff --git a/src/pregmod/incubatorRetrievalWorkaround.tw b/src/pregmod/incubatorRetrievalWorkaround.tw
index 1612446667ad21e2302ed6fff76fb2c084014967..8826d551814165dae0912a2e1097831ebb61c2f0 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})>>
+ <<includeDOM App.Desc.longSlave(V.activeSlave)>>
<<if $readySlave.tankBaby != 3>>
<<if $incubatorOrgans.length > 0>>
<<for _irw = 0; _irw < $incubatorOrgans.length; _irw++>>
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index 8e5c406c57d7e08d3ad52f4a99bf3dd8f402969f..3b3f74bc797350cc5dcb90d0804e52129a835007 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -238,7 +238,7 @@ While returning from a meeting with a prospective investor, an unfortunate wrong
<br>
//Applying enslavement as punishment will cost <<print cashFormat(_ContractCost)>>. Doing so and then selling $him immediately will bring in approximately <<print cashFormat(_slaveCost)>>.//
<br>
- <<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: "generic"})>>
+ <<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
<span id="result">
<<if $cash >= _ContractCost>>
diff --git a/src/pregmod/seHuskSlaveDelivery.tw b/src/pregmod/seHuskSlaveDelivery.tw
index 49ac199fff82eff95eeacd87951fe5f72364b600..318855e4c148b70b70e67e389137a476054a6260 100644
--- a/src/pregmod/seHuskSlaveDelivery.tw
+++ b/src/pregmod/seHuskSlaveDelivery.tw
@@ -70,7 +70,7 @@ A slave came in fitting the description you provided.
<br>
//As expected, $he is a complete vegetable, but that is what you ordered after all. You lack the facilities to care for $him in this state, so you should do what you are planning quickly. Or you could return $him to the Flesh Heap, though you won't get your credits back.//
<br><br>
-<<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: "generic"})>>
+<<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
<br><br>
<span id="result">
<<if $cash >= $surgeryCost>>
diff --git a/src/uncategorized/bulkSlaveIntro.tw b/src/uncategorized/bulkSlaveIntro.tw
index 09905e7b18ba64841a20987a6dbfc120c215d406..525139e0917232858a097337402fb76bc0e2ff62 100644
--- a/src/uncategorized/bulkSlaveIntro.tw
+++ b/src/uncategorized/bulkSlaveIntro.tw
@@ -84,7 +84,7 @@
/* Due to possible gingering, the Long Slave Description must be displayed before the New Slave Intro */
/* policies were applied earlier, if needed */
- <<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: "generic"})>>
+ <<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
<br>
diff --git a/src/uncategorized/completeCatalog.tw b/src/uncategorized/completeCatalog.tw
index 80d100c1938a02583e615f6657b5992a9a005f41..e21482654a17a8b6bf3b873fac6ebbecf20e8407 100644
--- a/src/uncategorized/completeCatalog.tw
+++ b/src/uncategorized/completeCatalog.tw
@@ -20,7 +20,7 @@
</p>
<p>
- <<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: "generic"})>>
+ <<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
<<set _slaveCost = heroSlaveCost($activeSlave, 40000)>>
</p>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index 6d9580b0d427ac8d5274ddaa018024e2900480ab..d231f04529c313738f8089def1a90c4b3a357c57 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})>>
+ <<includeDOM App.Desc.longSlave(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})>>
+ <<includeDOM App.Desc.longSlave(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 61081b9a345f36a164aa26eb683cecf8fdaa9ad8..55247d219b9ec8ef8d85871a0c6663837b6f7c34 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})>>
+<<includeDOM App.Desc.longSlave(V.activeSlave)>>
<br><<include "New Slave Intro">>
diff --git a/src/uncategorized/prestigiousSlave.tw b/src/uncategorized/prestigiousSlave.tw
index 6e1acfd3b0fe777b556d443981351f291cf7f42a..8743bd05991cdc3d3e6f22e05cdd6359babf14b6 100644
--- a/src/uncategorized/prestigiousSlave.tw
+++ b/src/uncategorized/prestigiousSlave.tw
@@ -929,6 +929,6 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres
//You lack the necessary funds to place a winning bid.//
<</if>>
-<br><br><<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: "generic"})>>
+<br><br><<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
<</if>>
diff --git a/src/uncategorized/reBoomerang.tw b/src/uncategorized/reBoomerang.tw
index 20d4f7e489d30b9932b23875fb440be350cbecc2..c86dfd5987e0205339e1fe41c543362231dadf07 100644
--- a/src/uncategorized/reBoomerang.tw
+++ b/src/uncategorized/reBoomerang.tw
@@ -370,7 +370,7 @@ It isn't obvious how $he managed to escape, though no doubt you could review the
<br><br>
-<<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: "generic"})>>
+<<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
<br><br>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index ac9c1aa1713462bb966b24c7358b252643b0e598..07b8472bd5d776dd689e437289f5c7bd3dad8f69 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})>>
+<<includeDOM App.Desc.longSlave(V.activeSlave)>>
<br><br>
diff --git a/src/uncategorized/reMalefactor.tw b/src/uncategorized/reMalefactor.tw
index 6ce63f292e9a09448d9993ff18e9d8fd18574391..6a50e97b428c3c2ccb35954fafd22eab79bb6c02 100644
--- a/src/uncategorized/reMalefactor.tw
+++ b/src/uncategorized/reMalefactor.tw
@@ -388,7 +388,7 @@ $He is easily taken into custody and $his contraband confiscated once the jeerin
<br><br>
-<<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: "generic"})>>
+<<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
<br><br>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index f3ed860e31b811edc9f36bde78525e3efc95f339..c24fed15d327a8ca9e34ada18bc0ca52df0aa7d1 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -2557,7 +2557,7 @@ He explains that one of his servant <<= $girl>>s was impregnated by his fool of
<br><br>
-<<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: "generic"})>>
+<<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
<br><br>
diff --git a/src/uncategorized/seCustomSlaveDelivery.tw b/src/uncategorized/seCustomSlaveDelivery.tw
index 1b6e664b79470a07697e54bef4d2b4e719a94fac..0cb1f84118a80b9939e782ebaa5e8b09628d6af7 100644
--- a/src/uncategorized/seCustomSlaveDelivery.tw
+++ b/src/uncategorized/seCustomSlaveDelivery.tw
@@ -218,7 +218,7 @@ A slave dealer has submitted a slave to satisfy the order you posted.
<br><br>
-<<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: "generic"})>>
+<<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
<br><br>
diff --git a/src/uncategorized/seRecruiterSuccess.tw b/src/uncategorized/seRecruiterSuccess.tw
index fa3afd69bb967f304b7ff1bc4a3cc8bd82181111..12711a41e4f1cdb9bc001119e94a4e8438c6f8e0 100644
--- a/src/uncategorized/seRecruiterSuccess.tw
+++ b/src/uncategorized/seRecruiterSuccess.tw
@@ -194,7 +194,7 @@ Your recruiter $Recruiter.slaveName has succeeded; _he2's convinced a desperate
<br><br>
-<<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: "generic"})>>
+<<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
<br><br>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index c5b6a4763920488be532dc8e5dcd3129c6443ba8..35cd7740e7d22ebeab3aaa41d1377262dfded73d 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)}))" id="tab Description">Description</button>
+ <button class="tablinks" onclick="App.UI.tabbar.openTab(event, 'Description'), jQuery('#LSD').empty().append(App.Desc.longSlave(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>
diff --git a/src/uncategorized/slaveShelter.tw b/src/uncategorized/slaveShelter.tw
index 7707141a60ce074bca2719449bcfe62dd2fc208a..1e560ec3a079d582f6a0b5c4108831555846bb8a 100644
--- a/src/uncategorized/slaveShelter.tw
+++ b/src/uncategorized/slaveShelter.tw
@@ -377,7 +377,7 @@ The placement fee is <<print cashFormat(_slaveCost)>>.
<br><br>
-<<set $activeSlave = $shelterSlave>><<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: "generic"})>>
+<<set $activeSlave = $shelterSlave>><<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
<br><br>
diff --git a/src/uncategorized/specialSlave.tw b/src/uncategorized/specialSlave.tw
index ac6764ba9a9dc81579a24602b527ad877fbbbd4d..5ba1d97e47eaa0207214d3a0975b7bb4c1b0018a 100644
--- a/src/uncategorized/specialSlave.tw
+++ b/src/uncategorized/specialSlave.tw
@@ -31,6 +31,6 @@
<br><br>
- <<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: "generic"})>>
+ <<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
<</if>>
diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw
index 46e4398d5e71dbd5edb357f7db56147432aeec5f..465a3259a160d412b940361e79ba30818ed7ee37 100644
--- a/src/utility/slaveCreationWidgets.tw
+++ b/src/utility/slaveCreationWidgets.tw
@@ -789,7 +789,7 @@
<br>[[Finish your order of slaves|Bulk Slave Intro]]
<</if>>
<br><br>
-<<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: V.slaveMarket})>>
+<<includeDOM App.Desc.longSlave(V.activeSlave, {market: V.slaveMarket})>>
<</widget>>
/%
@@ -818,5 +818,5 @@
<</if>>
<br><br>
-<<includeDOM App.Desc.longSlave({slave: V.activeSlave, market: "generic"})>>
+<<includeDOM App.Desc.longSlave(V.activeSlave, {market: "generic"})>>
<</widget>>