From c2c68747964464d45532e8301a83174f54714b2e Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Mon, 26 Oct 2020 10:23:05 -0400
Subject: [PATCH] induce using param in other places
---
src/endWeek/saBeYourHeadGirl.js | 3 +-
src/endWeek/saPleaseYou.js | 3 +-
src/endWeek/saRules.js | 69 +++++++++------------------
src/endWeek/saServeYourOtherSlaves.js | 6 +--
src/js/utilsFC.js | 6 ++-
src/uncategorized/REFI.tw | 6 +--
src/uncategorized/RESS.tw | 18 +++----
src/uncategorized/dairyReport.tw | 3 +-
8 files changed, 40 insertions(+), 74 deletions(-)
diff --git a/src/endWeek/saBeYourHeadGirl.js b/src/endWeek/saBeYourHeadGirl.js
index 46c674721f2..752a166b712 100644
--- a/src/endWeek/saBeYourHeadGirl.js
+++ b/src/endWeek/saBeYourHeadGirl.js
@@ -240,8 +240,7 @@ App.SlaveAssignment.beYourHeadGirl = (function() {
if (slave.rules.lactation === "induce") {
r.push(`${He} works mammary stimulation into ${his} slave training regimen in an effort to bring in ${his} milk for you.`);
- slave.induceLactation += 3;
- r.push(`${induceLactation(slave)}`);
+ r.push(induceLactation(slave, 3));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
diff --git a/src/endWeek/saPleaseYou.js b/src/endWeek/saPleaseYou.js
index bc907c81e61..9d6d59b55af 100644
--- a/src/endWeek/saPleaseYou.js
+++ b/src/endWeek/saPleaseYou.js
@@ -882,8 +882,7 @@ App.SlaveAssignment.pleaseYou = (function() {
slave.boobsMilk = 0;
}
} else {
- slave.induceLactation += 2;
- r.push(`${induceLactation(slave)}`);
+ r.push(induceLactation(slave, 2));
}
slave.counter.mammary += mammaryUse;
V.mammaryTotal += mammaryUse;
diff --git a/src/endWeek/saRules.js b/src/endWeek/saRules.js
index 3d985ae7ba2..53de665009c 100644
--- a/src/endWeek/saRules.js
+++ b/src/endWeek/saRules.js
@@ -96,8 +96,7 @@ App.SlaveAssignment.rules = function(slave) {
if (slave.rules.lactation === "induce") {
r.push(`Whenever ${he} finds a free moment from ${his} duties, ${he} spends that time massaging ${his} breasts and working ${his} nipples.`);
- slave.induceLactation += 2;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 2));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
@@ -269,8 +268,7 @@ App.SlaveAssignment.rules = function(slave) {
if (slave.rules.lactation === "induce") {
r.push(`Customers are encouraged to work ${his} breasts and nipples in an effort to induce lactation; whoever gets ${him} to start dribbling milk wins a week of drinks on the house.`);
- slave.induceLactation += 4;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 4));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
@@ -335,8 +333,7 @@ App.SlaveAssignment.rules = function(slave) {
if (slave.rules.lactation === "induce") {
r.push(`Whenever ${he} finds a free moment between ${his} sets, ${he} spends that time massaging ${his} breasts and working ${his} nipples.`);
- slave.induceLactation += 2;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 2));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
@@ -466,8 +463,7 @@ App.SlaveAssignment.rules = function(slave) {
if (slave.rules.lactation === "induce") {
r.push(`Citizens are encouraged to work ${his} breasts and nipples in an effort to induce lactation; whoever gets ${him} to start dribbling milk wins a week of drinks on the house.`);
- slave.induceLactation += 4;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 4));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
@@ -533,8 +529,7 @@ App.SlaveAssignment.rules = function(slave) {
if (slave.rules.lactation === "induce") {
r.push(`${He} spends much of ${his} time with a pair of automatic breast pumps attached to ${his} chest. The constant stimulation will have ${him} milky soon enough.`);
- slave.induceLactation += 8;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 8));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
@@ -801,8 +796,7 @@ App.SlaveAssignment.rules = function(slave) {
if (slave.rules.lactation === "induce") {
r.push(`${He} spends ${his} stay with a pair of automatic breast pumps attached to ${his} chest. The constant stimulation will have ${him} milky soon enough.`);
- slave.induceLactation += 10;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 10));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
@@ -864,8 +858,7 @@ App.SlaveAssignment.rules = function(slave) {
if (slave.rules.lactation === "induce") {
r.push(`Whenever ${he} finds a free moment from ${his} duties, ${he} spends that time massaging ${his} breasts and working ${his} nipples.`);
- slave.induceLactation += 3;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 3));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
@@ -986,8 +979,7 @@ App.SlaveAssignment.rules = function(slave) {
if (slave.rules.lactation === "induce") {
r.push(`${He} spends ${his} sentence with a pair of automatic breast pumps locked to ${his} chest. If all goes well, ${he}'ll be both reformed and lactating by ${his} release.`);
- slave.induceLactation += 10;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 10));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
@@ -1054,8 +1046,7 @@ App.SlaveAssignment.rules = function(slave) {
if (slave.rules.lactation === "induce") {
r.push(`Whenever ${he} finds a free moment from ${his} duties, ${he} spends that time massaging ${his} breasts and working ${his} nipples.`);
- slave.induceLactation += 4;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 4));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
@@ -1205,8 +1196,7 @@ App.SlaveAssignment.rules = function(slave) {
} else {
r.push(`${He} tries to relax as best ${he} can with a pair of automatic breast pumps attached to ${his} chest in an attempt to induce lactation.`);
}
- slave.induceLactation += 4;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 4));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
@@ -1260,8 +1250,7 @@ App.SlaveAssignment.rules = function(slave) {
if (slave.rules.lactation === "induce") {
r.push(`Whenever ${he} finds a free moment from ${his} duties, ${he} spends that time massaging ${his} breasts and working ${his} nipples.`);
- slave.induceLactation += 4;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 4));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
@@ -1400,8 +1389,7 @@ App.SlaveAssignment.rules = function(slave) {
/* update me, things like wet nursing and the like are important here */
if (slave.rules.lactation === "induce") {
r.push(`${He} spends ${his} stay with a pair of automatic breast pumps attached to ${his} chest. The constant stimulation will have ${him} milky soon enough.`);
- slave.induceLactation += 10;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 10));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
@@ -1461,8 +1449,7 @@ App.SlaveAssignment.rules = function(slave) {
if (slave.rules.lactation === "induce") {
r.push(`${His} lectures frequently include demonstrations on the proper way to induce lactation.`);
- slave.induceLactation += 5;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 5));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
@@ -1572,8 +1559,7 @@ App.SlaveAssignment.rules = function(slave) {
if (slave.rules.lactation === "induce") {
r.push(`${He} is taught and tested on how to properly induce lactation.`);
- slave.induceLactation += 2;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 2));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
@@ -1624,8 +1610,7 @@ App.SlaveAssignment.rules = function(slave) {
if (slave.rules.lactation === "induce") {
r.push(`Whenever ${he} finds a free moment from ${his} duties, ${he} spends that time massaging ${his} breasts and working ${his} nipples.`);
- slave.induceLactation += 2;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 2));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
@@ -1835,8 +1820,7 @@ App.SlaveAssignment.rules = function(slave) {
if (slave.rules.lactation === "induce") {
r.push(`${He} carries out ${his} daily tasks with a pair of automatic breast pumps attached to ${his} chest to help bring in ${his} lactation.`);
- slave.induceLactation += 6;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 6));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
@@ -1886,8 +1870,7 @@ App.SlaveAssignment.rules = function(slave) {
if (slave.rules.lactation === "induce") {
r.push(`Whenever ${he} finds a free moment from ${his} duties, ${he} spends that time hooked up to a milker to hasten ${his} milk production.`);
- slave.induceLactation += 10;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 10));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
@@ -2188,8 +2171,7 @@ App.SlaveAssignment.rules = function(slave) {
if (slave.rules.lactation === "induce") {
r.push(`Whenever ${he} finds a free moment from ${his} duties, ${he} spends that time massaging ${his} breasts and working ${his} nipples.`);
- slave.induceLactation += 2;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 2));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
@@ -2369,8 +2351,7 @@ App.SlaveAssignment.rules = function(slave) {
if (slave.rules.lactation === "induce") {
r.push(`${He} carries out ${his} daily tasks with a pair of automatic breast pumps attached to ${his} chest to help bring in ${his} lactation.`);
- slave.induceLactation += 6;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 6));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
@@ -2402,8 +2383,7 @@ App.SlaveAssignment.rules = function(slave) {
if (slave.rules.lactation === "induce") {
r.push(`${He} spends ${his} time away from you fervently working to induce lactation, eager to enjoy it with you.`);
- slave.induceLactation += 9;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 9));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
@@ -2469,8 +2449,7 @@ App.SlaveAssignment.rules = function(slave) {
if (slave.rules.lactation === "induce") {
r.push(`When you have the free time, you message ${his} breasts and work ${his} nipples in an effort to bring in ${his} lactation.`);
- slave.induceLactation += 2;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 2));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
@@ -2546,8 +2525,7 @@ App.SlaveAssignment.rules = function(slave) {
} else {
r.push(`${He} carries out ${his} daily tasks with a pair of automatic breast pumps attached to ${his} chest to help bring in ${his} lactation.`);
}
- slave.induceLactation += 4;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 4));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
@@ -2771,8 +2749,7 @@ App.SlaveAssignment.rules = function(slave) {
} else {
r.push(`${He} spends ${his} nights with a pair of automatic breast pumps attached to ${his} chest in order to bring in ${his} lactation.`);
}
- slave.induceLactation += 4;
- r.push(induceLactation(slave));
+ r.push(induceLactation(slave, 4));
if (slave.lactation === 1) {
slave.rules.lactation = "maintain";
}
diff --git a/src/endWeek/saServeYourOtherSlaves.js b/src/endWeek/saServeYourOtherSlaves.js
index 8f90c164438..10cd5d2480c 100644
--- a/src/endWeek/saServeYourOtherSlaves.js
+++ b/src/endWeek/saServeYourOtherSlaves.js
@@ -1443,8 +1443,7 @@ App.SlaveAssignment.serveYourOtherSlaves = (function() {
slave.fetishKnown = 1;
}
subSlaveLikedFetish = 1;
- slave.induceLactation += 2;
- r.push(`${induceLactation(slave)}`);
+ r.push(induceLactation(slave, 2));
}
break;
}
@@ -1626,8 +1625,7 @@ App.SlaveAssignment.serveYourOtherSlaves = (function() {
slave.fetishKnown = 1;
}
slave.need = 0;
- slave.induceLactation += 2;
- r.push(`${induceLactation(slave)}`);
+ r.push(induceLactation(slave, 2));
}
break;
}
diff --git a/src/js/utilsFC.js b/src/js/utilsFC.js
index 29ba225e22d..9528b93dd33 100644
--- a/src/js/utilsFC.js
+++ b/src/js/utilsFC.js
@@ -1575,12 +1575,14 @@ globalThis.lengthToEitherUnit = function(length) {
/**
* @param {App.Entity.SlaveState} slave
+ * @param {number} [induce]
* @returns {string}
*/
-globalThis.induceLactation = function(slave) {
+globalThis.induceLactation = function(slave, induce = 0) {
const {His} = getPronouns(slave);
let r = "";
let lactationStartChance = jsRandom(10, 100);
+ slave.induceLactation += induce;
if (slave.boobs < 300) {
lactationStartChance *= 1.5;
} else if (slave.boobs < 400 || slave.boobs >= 5000) {
@@ -1605,7 +1607,7 @@ globalThis.induceLactation = function(slave) {
lactationStartChance = (lactationStartChance / (slave.lactationAdaptation / 10));
}
if (slave.geneticQuirks.galactorrhea === 2) {
- lactationStartChance *= .5
+ lactationStartChance *= .5;
}
lactationStartChance = Math.floor(lactationStartChance);
if (slave.induceLactation >= lactationStartChance) {
diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw
index faa66635bbb..7621d9b22ad 100644
--- a/src/uncategorized/REFI.tw
+++ b/src/uncategorized/REFI.tw
@@ -56,8 +56,7 @@
<<set $slaves[_refi].lactationDuration = 2>>
<<set $slaves[_refi].boobs -= $slaves[_refi].boobsMilk, $slaves[_refi].boobsMilk = 0>>
<<else>>
- <<set $slaves[_refi].induceLactation += 4>>
- <<run induceLactation($slaves[_refi])>>
+ <<run induceLactation($slaves[_refi], 4)>>
<</if>>
<<case "dom">>
/* TODO: expand this */
@@ -1562,8 +1561,7 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
<<set $activeSlave.lactationDuration = 2>>
<<set $activeSlave.boobs -= $activeSlave.boobsMilk, $activeSlave.boobsMilk = 0>>
<<else>>
- <<set $activeSlave.induceLactation += 5>>
- <<= induceLactation($activeSlave)>>
+ <<= induceLactation($activeSlave, 5)>>
<</if>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 0cf72b8a1e0..6e869d4dd39 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -1680,8 +1680,7 @@ $He stops and <<if canSee($activeSlave)>>stares<<else>>faces you<</if>>, struggl
<<set $activeSlave.lactationDuration = 2>>
<<set $activeSlave.boobs -= $activeSlave.boobsMilk, $activeSlave.boobsMilk = 0>>
<<else>>
- <<set $activeSlave.induceLactation += 2>>
- <<= induceLactation($activeSlave)>>
+ <<= induceLactation($activeSlave, 2)>>
<</if>>
<<else>>
Even $his nipples show signs of wear, having prolapsed slightly from heavy use.
@@ -10029,8 +10028,7 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
<<set $activeSlave.lactationDuration = 2>>
<<set $activeSlave.boobs -= $activeSlave.boobsMilk, $activeSlave.boobsMilk = 0>>
<<else>>
- <<set $activeSlave.induceLactation += 4>>
- <<= induceLactation($activeSlave)>>
+ <<= induceLactation($activeSlave, 4)>>
<</if>>
<<case "pregnancy">>
<<if !canDoAnal($activeSlave) && !canDoVaginal($activeSlave)>>
@@ -11974,8 +11972,7 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
<<set $activeSlave.lactationDuration = 2>>
<<set $activeSlave.boobs -= $activeSlave.boobsMilk, $activeSlave.boobsMilk = 0>>
<<else>>
- <<set $activeSlave.induceLactation += 3>>
- <<= induceLactation($activeSlave)>>
+ <<= induceLactation($activeSlave, 3)>>
<</if>>
<</replace>>
<</link>>
@@ -15448,8 +15445,7 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
<<set $activeSlave.lactationDuration = 2>>
<<set $activeSlave.boobs -= $activeSlave.boobsMilk, $activeSlave.boobsMilk = 0>>
<<else>>
- <<set $activeSlave.induceLactation += 5>>
- <<= induceLactation($activeSlave)>>
+ <<= induceLactation($activeSlave, 5)>>
<</if>>
<<case "pregnancy">>
$He doesn't have permission to impregnate them, but they don't know that, and $he lies shamelessly. <<if canPenetrate($activeSlave)>>They beg $him not to cum inside them, but $he does anyway,<<else>>$He uses a strap-on with a reservoir to fill them with cum,<</if>> and they cry themselves to sleep every night.
@@ -15517,8 +15513,7 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
<<set $activeSlave.lactationDuration = 2>>
<<set $activeSlave.boobs -= $activeSlave.boobsMilk, $activeSlave.boobsMilk = 0>>
<<else>>
- <<set $activeSlave.induceLactation += 3>>
- <<= induceLactation($activeSlave)>>
+ <<= induceLactation($activeSlave, 3)>>
<</if>>
<</replace>>
<</link>>
@@ -15957,8 +15952,7 @@ brought in to you. This time <<= App.UI.slaveDescriptionDialog($activeSlave)>> h
<<set $activeSlave.lactationDuration = 2>>
<<set $activeSlave.boobs -= $activeSlave.boobsMilk, $activeSlave.boobsMilk = 0>>
<<else>>
- <<set $activeSlave.induceLactation += 3>>
- <<= induceLactation($activeSlave)>>
+ <<= induceLactation($activeSlave, 3)>>
<</if>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 4b8757d8b50..14409cb005a 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -484,8 +484,7 @@
<</if>>
<<elseif $dairyImplantsSetting == 3>>
<<if (_slave.lactation < 1) && (_slave.boobs > 300 || _slave.balls == 0)>>
- <<set _slave.induceLactation += 9>>
- <<run induceLactation(_slave)>>
+ <<run induceLactation(_slave, 9)>>
<</if>>
<</if>>
<</if>>
--
GitLab