From 77abb354d437d69b29cdd4a2db64f61cd7782000 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Wed, 5 Aug 2020 02:18:59 -0400
Subject: [PATCH] more toys
---
src/interaction/slaveInteract.js | 6 +++---
src/js/rulesAssistantOptions.js | 4 ++--
src/npc/children/childInteract.tw | 6 +++---
src/uncategorized/genericPlotEvents.tw | 2 +-
src/uncategorized/wardrobe.tw | 18 +++++++++---------
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index 014d6b37e57..a8fb52dce16 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -1057,12 +1057,12 @@ App.UI.SlaveInteract.useSlaveDisplay = function(slave) {
fillFaceOptions.push({text: `Cum`, disabled: `${V.dairyNameCaps} is not producing enough cum to pump through the pipes`});
}
} /* dairyPiping === 1 */
- if (V.enema === 1) {
+ if (V.boughtItem.toys.enema === 1) {
if ((slave.inflation < 3 && slave.pregKnown === 0 && slave.bellyImplant < 1500) || slave.inflation < 1) {
if (slave.inflationType === "water" || slave.inflationType === "none") {
fillAssOptions.push({text: `Water`, scene: `FillUpButt`, updateSlave: {inflationType: "water", inflationMethod: 2}});
}
- if (V.medicalEnema === 1) {
+ if (V.boughtItem.toys.medicalEnema === 1) {
if (slave.inflationType === "aphrodisiac" || slave.inflationType === "none") {
fillAssOptions.push({text: `Aphrodisiacs`, scene: `FillUpButt`, updateSlave: {inflationType: "aphrodisiac", inflationMethod: 2}});
}
@@ -1085,7 +1085,7 @@ App.UI.SlaveInteract.useSlaveDisplay = function(slave) {
} /* assigned to dairy or arcade */
if (slave.inflation === 0 && slave.bellyImplant < 1500) {
if (slave.assignment !== Job.DAIRY && slave.assignment !== Job.ARCADE && slave.assignment !== Job.CELLBLOCK) {
- if (V.buckets === 1) {
+ if (V.boughtItem.toys.buckets === 1) {
fillFaceOptions.push({text: `Two liters of slave food`, scene: `forceFeeding`, updateSlave: {inflation: 1, inflationType: "food", inflationMethod: 1}});
if (slave.pregKnown === 0) {
fillFaceOptions.push({text: `A gallon of slave food`, scene: `forceFeeding`, updateSlave: {inflation: 2, inflationType: "food", inflationMethod: 1}});
diff --git a/src/js/rulesAssistantOptions.js b/src/js/rulesAssistantOptions.js
index 6d9513588ce..806996a492d 100644
--- a/src/js/rulesAssistantOptions.js
+++ b/src/js/rulesAssistantOptions.js
@@ -1628,7 +1628,7 @@ globalThis.rulesAssistantOptions = (function() {
this.appendChild(new ShemaleHormonesList());
this.appendChild(new GeldingHormonesList());
this.appendChild(new OtherDrugsList());
- if (V.enema === 1) {
+ if (V.boughtItem.toys.enema === 1) {
this.appendChild(new EnemaList());
}
this.appendChild(new WeightEditor());
@@ -2436,7 +2436,7 @@ globalThis.rulesAssistantOptions = (function() {
["none"],
["water"]
];
- if (V.medicalEnema === 1) {
+ if (V.boughtItem.toys.medicalEnema === 1) {
enemas.push(
["aphrodisiac"],
["curative"],
diff --git a/src/npc/children/childInteract.tw b/src/npc/children/childInteract.tw
index d8f2ee10ad0..16bc93ff74c 100644
--- a/src/npc/children/childInteract.tw
+++ b/src/npc/children/childInteract.tw
@@ -169,7 +169,7 @@ FIXME:
/* TODO: will children be able to be inflated? */
<<if $activeChild.assignment != "work in the dairy" && $activeChild.assignment != "be confined in the arcade" && $activeChild.assignment != "be confined in the cellblock">>
- <<if $enema>>
+ <<if $boughtItem.toys.enema>>
<<if ($activeChild.inflation < 3 && $activeChild.pregKnown == 0 && $activeChild.bellyImplant < 1500) || ($activeChild.inflation < 1)>>
<<if $activeChild.inflationType == "water" || $activeChild.inflationType == "none">>
| <<link "Fill $his ass with water">>
@@ -179,7 +179,7 @@ FIXME:
<<include "FillUpButt">><br><</replace>>
<</link>>
<</if>>
- <<if $medicalEnema>>
+ <<if $boughtItem.toys.medicalEnema>>
<<if $activeChild.inflationType == "aphrodisiac" || $activeChild.inflationType == "none">>
| <<link "Fill $his ass with aphrodisiacs">>
<<set $activeChild.inflationType = "aphrodisiac">>
@@ -264,7 +264,7 @@ FIXME:
<<if $activeChild.inflation == 0 && $activeChild.bellyImplant < 1500>>
| <<link "Use another slave to force-feed $him" "SlaveOnSlaveFeedingWorkAround">>
<</link>>
- <<if $buckets>>
+ <<if $boughtItem.toys.buckets>>
| <<link "Make $him consume two liters of slave food">>
<<set $activeChild.inflationType = "food">>
<<set $activeChild.inflationMethod = 1>>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index d81fcd7b21f..dc75545c66f 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -26,7 +26,7 @@ Early one morning, you hear convulsive dry heaving coming from one of the bathro
<br><br>
It doesn't take much investigation before you find other slaveowners reporting the same thing. Elementary detective work fingers a particular drug supplier as the culprit, and before long the unfortunate pharmaceutical concern is drowning under a rain of harsh public comment and harsher private contract warfare. As the day wears on, the poor slaves feel a bit better, but begin to report discomfort in their breasts. Apparently the problem has to do with contamination of the curative production line with A-HGH production reactants.
<br><br>
-The firm promptly pays @@.yellowgreen;fair compensation@@ for the minor damage to your slaves' health. However, you're left with the matter of the boobs to deal with. Over the week, all your slaves on curatives experience at least a little @@.lime;breast growth,@@ and some gain several cup sizes.<<if $medicalEnema == 1>> Those with bellies full of curative mixture, on the other hand, have not stopped growing yet and won't until they completely absorb their load. They will likely end up @@.lime;sporting enormous tits@@ by the end of this.<</if>>
+The firm promptly pays @@.yellowgreen;fair compensation@@ for the minor damage to your slaves' health. However, you're left with the matter of the boobs to deal with. Over the week, all your slaves on curatives experience at least a little @@.lime;breast growth,@@ and some gain several cup sizes.<<if $boughtItem.toys.medicalEnema == 1>> Those with bellies full of curative mixture, on the other hand, have not stopped growing yet and won't until they completely absorb their load. They will likely end up @@.lime;sporting enormous tits@@ by the end of this.<</if>>
<<case "bad breasts">>
diff --git a/src/uncategorized/wardrobe.tw b/src/uncategorized/wardrobe.tw
index 6f1985688da..5fded2f29ae 100644
--- a/src/uncategorized/wardrobe.tw
+++ b/src/uncategorized/wardrobe.tw
@@ -29,13 +29,13 @@ The room containing all the clothes and accessories you have available to dress
<<elseif $boughtItem.clothing.dildos == 1 || $toysBoughtGags == 1 || $boughtItem.clothing.buttPlugs == 1 || $boughtItem.clothing.buttPlugTails == 1 || $boughtItem.clothing.vaginalAttachments == 1>>
Some sex toys line the shelves.
<</if>>
-<<if $buckets == 1>>
+<<if $boughtItem.toys.buckets == 1>>
Several buckets of various sizes and a sturdy cup have been set aside for you in feeding slaves to their limit.
<</if>>
-<<if $enema == 1>>
+<<if $boughtItem.toys.enema == 1>>
A number of drums of specially formulated water for use in enemas line one of the walls.
<</if>>
-<<if $medicalEnema == 1>>
+<<if $boughtItem.toys.medicalEnema == 1>>
Alongside them, multiple drums of mixtures for use in medical enemas.
<</if>>
</p>
@@ -627,8 +627,8 @@ The room containing all the clothes and accessories you have available to dress
<p>
<div>
- <<if $buckets == 0>>
- [[Gather up everything you need to force-feed slaves|Wardrobe][$buckets = 1]]
+ <<if $boughtItem.toys.buckets == 0>>
+ [[Gather up everything you need to force-feed slaves|Wardrobe][$boughtItem.toys.buckets = 1]]
<span class="detail">Some supplies from the cafeteria and a slight adjustment to the feeder settings is all it would take.</span>
<<else>>
You have everything you need in one place to force-feed slaves. You've also adjusted the feeders to cheaply produce filler food to save on money. However, said food is just empty calories and probably bad for a slave's waistline.
@@ -636,13 +636,13 @@ The room containing all the clothes and accessories you have available to dress
</div>
<div>
- <<if $enema == 0>>
- [[Order enema supplies|Wardrobe][cashX(forceNeg(Math.trunc(5000 * $upgradeMultiplierTrade)), "capEx"), $enema = 1]]
+ <<if $boughtItem.toys.enema == 0>>
+ [[Order enema supplies|Wardrobe][cashX(forceNeg(Math.trunc(5000 * $upgradeMultiplierTrade)), "capEx"), $boughtItem.toys.enema = 1]]
<span class="detail">Costs <<print cashFormat(Math.trunc(5000 * $upgradeMultiplierTrade))>></span>
<<else>>
You are well stocked with specially formulated liquids to be used safely for long term enemas along with the tools needed to keep a slave bloated for extended periods of time.
- <<if $medicalEnema == 0>>
- [[Order medical enema supplies|Wardrobe][cashX(forceNeg(Math.trunc(25000 * $upgradeMultiplierTrade)), "capEx"), $medicalEnema = 1]]
+ <<if $boughtItem.toys.medicalEnema == 0>>
+ [[Order medical enema supplies|Wardrobe][cashX(forceNeg(Math.trunc(25000 * $upgradeMultiplierTrade)), "capEx"), $boughtItem.toys.medicalEnema = 1]]
<span class="detail">Costs <<print cashFormat(Math.trunc(25000 * $upgradeMultiplierTrade))>></span>
<<else>>
You are also well stocked with drugs to be mixed with the enema water for use in medical enemas.
--
GitLab