diff --git a/devTools/javaSanityCheck/ignoredVariables b/devTools/javaSanityCheck/ignoredVariables
index ef2a46e9c6edd1f70669e346992902e5ac0692e5..cfc4b040f57bba1aa49d44df7e505bf55ddc95b5 100644
--- a/devTools/javaSanityCheck/ignoredVariables
+++ b/devTools/javaSanityCheck/ignoredVariables
@@ -42,7 +42,6 @@ anCup
linkHandlers
op
unborn
-childSurname;nurseryUpgrade
facilityRemove
boobsWombVolume;emptyDefaultRule;rule;removeImplant;changeImplant
assign;commit;thigh;breast;mouth
diff --git a/src/endWeek/saAgent.js b/src/endWeek/saAgent.js
index 699f452906467fdbf0c2b2b608a7b831be219eaf..e98fa74c9d783636a985dd6034f43524b5bf9b7a 100644
--- a/src/endWeek/saAgent.js
+++ b/src/endWeek/saAgent.js
@@ -146,10 +146,7 @@ App.SlaveAssignment.agent = function(slave) {
}
if (slave.inflation > 0) {
- slave.inflation = 0;
- slave.inflationType = "none";
- slave.inflationMethod = 0;
- slave.milkSource = 0;
+ deflate(slave);
}
if (slave.preg > 0) { // EFFECTS OF PREGNANCY
diff --git a/src/endWeek/saDrugs.js b/src/endWeek/saDrugs.js
index 02256807e9ba9818830084d6028d6abf75a82422..83ebf9cc69ce278cf454c23b831b1269822dd003 100644
--- a/src/endWeek/saDrugs.js
+++ b/src/endWeek/saDrugs.js
@@ -1594,13 +1594,16 @@ App.SlaveAssignment.drugs = (function() {
r += ` ${He} is`;
if (slave.devotion < -50) {
r += ` <span class="mediumorchid">filled with violent, consuming hatred</span> and <span class="gold">fear.</span> Even though ${he} knew ${his} baby was destined for a slave orphanage, it seems ${he} cared for it and views you as its killer.`;
- slave.devotion -= 25, slave.trust -= 25;
+ slave.devotion -= 25;
+ slave.trust -= 25;
} else if (slave.devotion < -20) {
r += ` <span class="mediumorchid">afflicted by desperate, inconsolable grief</span> and <span class="gold">horror.</span> Even though ${he} knew ${his} baby was destined for a slave orphanage, it seems ${he} cared for it.`;
- slave.devotion -= 10, slave.trust -= 20;
+ slave.devotion -= 10;
+ slave.trust -= 20;
} else if (slave.devotion <= 20) {
r += ` <span class="mediumorchid">consumed by enduring sorrow</span> and <span class="gold">horror.</span> Even though ${he} knew ${his} baby was destined for a slave orphanage, it seems ${he} cared for it.`;
- slave.devotion -= 5, slave.trust -= 5;
+ slave.devotion -= 5;
+ slave.trust -= 5;
} else if (slave.devotion <= 50) {
r += ` dully obedient. ${He} has been broken to slave life so thoroughly that even this is neither surprising nor affecting.`;
} else {
diff --git a/src/endWeek/saGetMilked.js b/src/endWeek/saGetMilked.js
index 9f60351945202e1a9eb49715032766a772f21e8a..818d51a7d9e0e3560e87bed6949803d105e3f8b4 100644
--- a/src/endWeek/saGetMilked.js
+++ b/src/endWeek/saGetMilked.js
@@ -499,8 +499,6 @@ App.SlaveAssignment.getMilked = (function() {
r += `pendulous`;
} else if (slave.balls >= 5) {
r += `huge`;
- } else if (slave.balls >= 4) {
- r += `swinging`;
} else if (slave.balls >= 4) {
r += `big`;
} else if (slave.balls >= 3) {
diff --git a/src/endWeek/saInflation.js b/src/endWeek/saInflation.js
index cb4a3d9983666ac2449ab35ce156442c8f78e6a4..059c2b33f72788d4a5c0b4f3a044717ddc98ffac 100644
--- a/src/endWeek/saInflation.js
+++ b/src/endWeek/saInflation.js
@@ -61,33 +61,19 @@ App.SlaveAssignment.inflation = (function() {
*/
function inflationCancellation(slave) {
if (slave.assignment === Job.ARCADE || slave.assignment === Job.DAIRY) {
- slave.inflation = 0, slave.inflationType = "none", slave.inflationMethod = 0, slave.milkSource = 0, SetBellySize(slave);
+ deflate(slave);
} else if (slave.inflationType === "milk" && (slave.inflationMethod === 1 || slave.inflationMethod === 2) && (dairyL === 0 || V.dairy === 0) && V.arcologies[0].FSPastoralistLaw !== 1 && (slave.assignment !== Job.CELLBLOCK || V.cellblockDecoration !== "Pastoralist")) {
r.push(`You no longer have a functional dairy. <span class="yellow">${His} inflation regimen has been ended.</span>`);
- slave.inflation = 0;
- slave.inflationType = "none";
- slave.inflationMethod = 0;
- SetBellySize(slave);
+ deflate(slave);
} else if (slave.inflationType === "milk" && slave.inflationMethod === 3 && cow.lactation === 0) {
r.push(`${cow.slaveName} is no longer lactating and thus can no longer keep ${slave.slaveName} filled with milk. <span class="yellow">${His} inflation regimen has been ended.</span>`);
- slave.inflation = 0;
- slave.inflationType = "none";
- slave.inflationMethod = 0;
- slave.milkSource = 0;
- SetBellySize(slave);
+ deflate(slave);
} else if (slave.inflationType === "cum" && (slave.inflationMethod === 1 || slave.inflationMethod === 2) && (dairyL === 0 || V.cumSlaves === 0 || V.dairy === 0) && V.arcologies[0].FSPastoralistLaw !== 1) {
r.push(`You no longer have a functional cum dairy. <span class="yellow">${His} inflation regimen has been ended.</span>`);
- slave.inflation = 0;
- slave.inflationType = "none";
- slave.inflationMethod = 0;
- SetBellySize(slave);
+ deflate(slave);
} else if (slave.inflationType === "cum" && slave.inflationMethod === 3 && cow.balls === 0) {
r.push(`${cow.slaveName} no longer has testicles and thus can no longer keep ${slave.slaveName} filled with cum. <span class="yellow">${His} inflation regimen has been ended.</span>`);
- slave.inflation = 0;
- slave.inflationType = "none";
- slave.inflationMethod = 0;
- slave.cumSource = 0;
- SetBellySize(slave);
+ deflate(slave);
} else if (slave.bellyImplant >= 1500) {
if (slave.inflation > 1) {
r.push(`Due to the mounting pressure from ${his} filled abdominal implant, ${he} can no longer fill ${himself} as large as ${he} used to.`);
@@ -245,7 +231,7 @@ App.SlaveAssignment.inflation = (function() {
}
if (slave.health.condition >= 90) {
r.push(`${He} is as healthy as ${he} can be. <span class="yellow">${His} curative enema regimen has been ended.</span>`);
- slave.inflation = 0, slave.inflationType = "none", slave.inflationMethod = 0, SetBellySize(slave);
+ deflate(slave);
}
slave.chem += 2;
break;
@@ -310,7 +296,7 @@ App.SlaveAssignment.inflation = (function() {
r.push(`it`);
}
r.push(`with the treatment counteracting their efforts. <span class="yellow">${His} tightening enema regimen has been ended.</span>`);
- slave.inflation = 0, slave.inflationType = "none", slave.inflationMethod = 0, SetBellySize(slave);
+ deflate(slave);
} else if ([Job.CLUB, Job.BROTHEL].includes(slave.assignment)) {
if (slave.vagina >= 0) {
r.push(`them,`);
@@ -325,7 +311,7 @@ App.SlaveAssignment.inflation = (function() {
r.push(`it.`);
}
r.push(`<span class="yellow">${His} tightening enema regimen has been ended.</span>`);
- slave.inflation = 0, slave.inflationType = "none", slave.inflationMethod = 0, SetBellySize(slave);
+ deflate(slave);
}
}
slave.chem += 2;
diff --git a/src/endWeek/slaveAssignmentReport.js b/src/endWeek/slaveAssignmentReport.js
index 504fc7d72887c91a61dcad2d299f4b94a3bf70f9..d32528aa920399d3ab9622b6c5bba18e48195050 100644
--- a/src/endWeek/slaveAssignmentReport.js
+++ b/src/endWeek/slaveAssignmentReport.js
@@ -51,7 +51,8 @@ App.EndWeek.slaveAssignmentReport = function() {
}
if ((V.seeDicks > 0) && canPenetrate(slave) && App.Utils.hasNonassignmentSex(slave)) {
- V.averageDick += slave.dick, V.slavesWithWorkingDicks++;
+ V.averageDick += slave.dick;
+ V.slavesWithWorkingDicks++;
}
if (slave.lactation === 1) {
@@ -63,13 +64,15 @@ App.EndWeek.slaveAssignmentReport = function() {
switch (slave.assignment) {
case Job.HEADGIRLSUITE:
if (slave.devotion >= random(-30, 20)) {
- V.HGSlaveSuccess++, V.HGEnergy++;
+ V.HGSlaveSuccess++;
+ V.HGEnergy++;
} else {
V.HGSlaveSuccess--;
}
break;
case Job.CONCUBINE:
- V.Concubine = slave, V.fuckSlaves++;
+ V.Concubine = slave;
+ V.fuckSlaves++;
break;
case Job.MASTERSUITE:
case Job.FUCKTOY:
@@ -289,14 +292,14 @@ App.EndWeek.slaveAssignmentReport = function() {
}
/**
- * Accordion
- * @version 0.7RC
- * @author 000-250-006
- *
- * @param array _facListArr V.args
- * Multidimensional temporary array
- * 0: The passage name for the facility's report
- * 1: The facility name capitalized (@see todo)
+ * Accordion
+ * @version 0.7RC
+ * @author 000-250-006
+ *
+ * @param array _facListArr V.args
+ * Multidimensional temporary array
+ * 0: The passage name for the facility's report
+ * 1: The facility name capitalized (@see todo)
* 2: max number of slaves allowed in facility - > 0 implies open
* 3: number of slaves assigned to facility
* 4: ID of the slave assigned to run the facility ("Boss")
diff --git a/src/endWeek/standardSlaveReport.js b/src/endWeek/standardSlaveReport.js
index 7e669a80033415724c8b4042da1fad0d3fcad487..4f9a4640488cbeff69805508cbc04eae11aaf2f8 100644
--- a/src/endWeek/standardSlaveReport.js
+++ b/src/endWeek/standardSlaveReport.js
@@ -1,28 +1,29 @@
/**
- * Generates (and returns if not silent) a standard slave report
- * @param {App.Entity.SlaveState} slave
- * @param {boolean} silent
- * @returns {HTMLElement|null}
- */
- App.SlaveAssignment.standardSlaveReport = function(slave, silent=false) {
- const
- clothes = App.SlaveAssignment.choosesOwnClothes(slave);
- tired(slave);
+ * Generates (and returns if not silent) a standard slave report
+ * @param {App.Entity.SlaveState} slave
+ * @param {boolean} silent
+ * @returns {HTMLElement|null}
+ */
+App.SlaveAssignment.standardSlaveReport = function(slave, silent=false) {
+ const
+ clothes = App.SlaveAssignment.choosesOwnClothes(slave);
- const
- rules = App.UI.DOM.renderPassage("SA rules"),
- diet = App.UI.DOM.renderPassage("SA diet"),
- ltEffects = App.UI.DOM.renderPassage("SA long term effects"),
- drugs = App.SlaveAssignment.drugs(slave),
- relationships = App.UI.DOM.renderPassage("SA relationships"),
- rivalries = App.UI.DOM.renderPassage("SA rivalries"),
- devotion = App.UI.DOM.renderPassage("SA devotion");
+ tired(slave);
- if (!silent) {
- const content = App.UI.DOM.makeElement("div", '', "indent");
+ const
+ rules = App.UI.DOM.renderPassage("SA rules"),
+ diet = App.UI.DOM.renderPassage("SA diet"),
+ ltEffects = App.UI.DOM.renderPassage("SA long term effects"),
+ drugs = App.SlaveAssignment.drugs(slave),
+ relationships = App.UI.DOM.renderPassage("SA relationships"),
+ rivalries = App.UI.DOM.renderPassage("SA rivalries"),
+ devotion = App.UI.DOM.renderPassage("SA devotion");
- $(content).append(clothes, rules, diet, ltEffects, drugs, relationships, rivalries, document.createElement('br'), devotion);
+ if (!silent) {
+ const content = App.UI.DOM.makeElement("div", '', "indent");
- return content;
- }
+ $(content).append(clothes, rules, diet, ltEffects, drugs, relationships, rivalries, document.createElement('br'), devotion);
+
+ return content;
}
+};
diff --git a/src/events/RESS/assFitting.js b/src/events/RESS/assFitting.js
index 2cdd89c48490456d676bbb30050af275972291d5..7b4aa6026867dc589b668f24a3c995353ea000dd 100644
--- a/src/events/RESS/assFitting.js
+++ b/src/events/RESS/assFitting.js
@@ -23,10 +23,7 @@ App.Events.RESSAssFitting = class RESSAssFitting extends App.Events.BaseEvent {
const {
He, he, His, his, hers, him, himself, girl
} = getPronouns(eventSlave);
- const {s, S, ss, title: Master} = getEnunciation(eventSlave);
-
- /** @type {App.Entity.PlayerState} */
- let PC = V.PC;
+ const {title: Master} = getEnunciation(eventSlave);
V.nextLink = "Next Week";
diff --git a/src/events/reRelativeRecruiter.js b/src/events/reRelativeRecruiter.js
index 0a1e9893aa061cbfb9a5d862e55d618211e9bc85..a323f7988d442e49cce7fe00daa0190a1e8f2158 100644
--- a/src/events/reRelativeRecruiter.js
+++ b/src/events/reRelativeRecruiter.js
@@ -303,11 +303,11 @@ App.Events.RERelativeRecruiter = class RERelativeRecruiter extends App.Events.Ba
const refreshCallback = (effect) => { effect(); $(cheatDiv).empty().append(cheatModeSelectors); $(eventTextDiv).empty().append(eventText); };
let relativeTypeLinks = _.uniq(_this._getTargetRelativeChoices(getSlave(_this.actors[0]))).map((choice) =>
- App.UI.DOM.link(choice, refreshCallback, [() => { _this.params.relative = choice; _this.params.background = _this._getRelativeBackgrounds(choice).random(); }])
- );
+ App.UI.DOM.link(choice, refreshCallback, [() => { _this.params.relative = choice; _this.params.background = _this._getRelativeBackgrounds(choice).random(); }])
+ );
let backgroundTypeLinks = _.uniq(_this._getRelativeBackgrounds(_this.params.relative)).map((choice) =>
- App.UI.DOM.link(choice, refreshCallback, [() => { _this.params.background = choice; }])
- );
+ App.UI.DOM.link(choice, refreshCallback, [() => { _this.params.background = choice; }])
+ );
let frag = document.createDocumentFragment();
$(frag).append(
diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index f8a8a4efe1dd2b261628a1694d674d1e1b5903c4..e485043b328268ab1281a47770ff9fb2b561f76d 100644
--- a/src/facilities/nursery/childInteract.tw
+++ b/src/facilities/nursery/childInteract.tw
@@ -1202,23 +1202,9 @@ Aphrodisiacs: <b><span id="aphrodisiacs">$activeChild.aphrodisiacs</span>.</b>
<<if $activeChild.inflation > 0>>
<br>
__Required Bloating__: <b><span id="inflate"><<if $activeChild.inflation == 3>><<print "$He is required to keep 2 gallons of $activeChild.inflationType in $him at all times">><<elseif $activeChild.inflation == 2>><<print "$He is required to keep 4 liters of $activeChild.inflationType in $him at all times">><<elseif $activeChild.inflation>><<print "$He is required to keep 2 liters of $activeChild.inflationType in $him at all times">><</if>></span></b>.
- <<if $activeChild.inflationMethod == 3>>
- <<link "Let $him deflate">>
- <<set $activeChild.inflation = 0, $activeChild.inflationType = "none" ,$activeChild.inflationMethod = 0, $activeChild.cumSource = 0, $activeChild.milkSource = 0, SetBellySize($activeChild)>>
- <</link>>
- <<elseif $activeChild.inflationType == "milk">>
- <<link "Let $him deflate">>
- <<set $activeChild.inflation = 0, $activeChild.inflationType = "none" ,$activeChild.inflationMethod = 0, SetBellySize($activeChild)>>
- <</link>>
- <<elseif $activeChild.inflationType == "cum">>
- <<link "Let $him deflate">>
- <<set $activeChild.inflation = 0, $activeChild.inflationType = "none" ,$activeChild.inflationMethod = 0, SetBellySize($activeChild)>>
- <</link>>
- <<else>>
- <<link "Let $him deflate">>
- <<set $activeChild.inflation = 0, $activeChild.inflationType = "none" ,$activeChild.inflationMethod = 0, SetBellySize($activeChild)>>
- <</link>>
- <</if>>
+ <<link "Let $him deflate">>
+ <<run deflate($activeChild)>>
+ <</link>>
<</if>>
</span>
diff --git a/src/facilities/nursery/widgets/utils/nurseryUtils.js b/src/facilities/nursery/widgets/utils/nurseryUtils.js
index 383717caf0b055d12c578705df109f08fd597260..b05e16a745919abfa1c026517b99d2afe15fc224 100644
--- a/src/facilities/nursery/widgets/utils/nurseryUtils.js
+++ b/src/facilities/nursery/widgets/utils/nurseryUtils.js
@@ -665,7 +665,7 @@ App.Facilities.Nursery.newChild = function newChild(child) {
};
if (V.surnamesForbidden === 1) {
- child.childSurname = 0;
+ child.slaveSurname = 0;
}
if (child.clone !== 0) {
diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index c6523cfd62c71feeb8022255cbf2ddd8e7280afd..ece5008630319f904ed221bafaa1ec53ed6061d3 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -1374,33 +1374,14 @@ App.UI.SlaveInteract.bloating = function(slave) {
bloating.append(requirement);
bloating.append(". ");
- if (slave.inflationMethod === 3) {
- let link = App.UI.DOM.link(
- `Let ${him} deflate`,
- () => {
- slave.inflation = 0;
- slave.inflationType = "none";
- slave.inflationMethod = 0;
- slave.cumSource = 0;
- slave.milkSource = 0;
- SetBellySize(slave);
- App.UI.SlaveInteract.refreshAll(slave);
- },
- );
- bloating.append(link);
- } else {
- let link = App.UI.DOM.link(
- `Let ${him} deflate`,
- () => {
- slave.inflation = 0;
- slave.inflationType = "none";
- slave.inflationMethod = 0;
- SetBellySize(slave);
- App.UI.SlaveInteract.refreshAll(slave);
- },
- );
- bloating.append(link);
- }
+ let link = App.UI.DOM.link(
+ `Let ${him} deflate`,
+ () => {
+ deflate(slave);
+ App.UI.SlaveInteract.refreshAll(slave);
+ },
+ );
+ bloating.append(link);
}
// make sure it updates itself after run
return jQuery('#bloating').empty().append(bloating);
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index 64098f25463e2189ed1ba1e9832580923b5060a1..1e355321f4068dd0cdbdaee54b22067fc37ff3f3 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -1507,12 +1507,7 @@ globalThis.DefaultRules = (function() {
if (slave.inflationType !== rule.inflationType) {
if ((slave.inflationType === "curative" && slave.health.condition > 90) || (slave.inflationType === "tightener" && slave.anus <= 1 && slave.vagina <= 1)) {
r += `<br>${slave.slaveName} cannot benefit from ${his} assigned enema and has been defaulted to none.`;
- slave.inflation = 0;
- slave.inflationType = "none";
- slave.inflationMethod = 0;
- slave.milkSource = 0;
- slave.cumSource = 0;
- SetBellySize(slave);
+ deflate(slave);
} else if ((rule.inflationType === "curative" && slave.health.condition > 90) || (rule.inflationType === "tightener" && slave.anus <= 1 && slave.vagina <= 1)) {
// empty block
} else {
@@ -1534,11 +1529,7 @@ globalThis.DefaultRules = (function() {
slave.inflation = 1;
SetBellySize(slave);
} else if (slave.inflationType === "none") {
- slave.inflation = 0;
- slave.inflationMethod = 0;
- slave.milkSource = 0;
- slave.cumSource = 0;
- SetBellySize(slave);
+ deflate(slave);
}
}
}
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index 6a83d473be17548a27046b8b750df70d777b2c2c..3cbfd18eee4d090bb4030a7032ae7381ba85a752 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -548,10 +548,7 @@ globalThis.removeJob = function(slave, assignment, saveRecord = false) {
case "cellblock":
slave.assignment = Job.REST;
if (slave.inflation > 0) {
- slave.inflation = 0;
- slave.inflationType = "none";
- slave.inflationMethod = 0;
- SetBellySize(slave);
+ deflate(slave);
}
break;
diff --git a/src/js/removeActiveSlave.js b/src/js/removeActiveSlave.js
index 1f216d784f9ab4094b256527d0e40362d917ccb6..95ea18e2bda23cc26107f1a28c8f14fe641dbe28 100644
--- a/src/js/removeActiveSlave.js
+++ b/src/js/removeActiveSlave.js
@@ -80,21 +80,8 @@ globalThis.removeActiveSlave = function() {
slave.sisters--;
}
}
- if (slave.milkSource !== 0) {
- if (slave.milkSource === AS_ID) {
- slave.milkSource = 0;
- slave.inflation = 0;
- slave.inflationType = "none";
- slave.inflationMethod = 0;
- }
- }
- if (slave.cumSource !== 0) {
- if (slave.cumSource === AS_ID) {
- slave.cumSource = 0;
- slave.inflation = 0;
- slave.inflationType = "none";
- slave.inflationMethod = 0;
- }
+ if (slave.cumSource === AS_ID || slave.milkSource === AS_ID) {
+ deflate(slave);
}
if (slave.ID === V.activeSlave.relationshipTarget) {
slave.relationship = 0;
@@ -291,21 +278,8 @@ globalThis.removeNonNGPSlave = function(removedSlave) {
}
missing = true;
}
- if (slave.milkSource !== 0) {
- if (slave.milkSource === ID) {
- slave.milkSource = 0;
- slave.inflation = 0;
- slave.inflationType = "none";
- slave.inflationMethod = 0;
- }
- }
- if (slave.cumSource !== 0) {
- if (slave.cumSource === ID) {
- slave.cumSource = 0;
- slave.inflation = 0;
- slave.inflationType = "none";
- slave.inflationMethod = 0;
- }
+ if (slave.milkSource === ID || slave.cumSource === ID) {
+ deflate(slave);
}
if (slave.ID === removedSlave.relationshipTarget) {
slave.relationship = 0;
diff --git a/src/js/utilsFC.js b/src/js/utilsFC.js
index 027493e3581d47792cd4c05ab4108728bd65432e..3f0b2ea0c45f2219e313b57b5cc1b3913b992612 100644
--- a/src/js/utilsFC.js
+++ b/src/js/utilsFC.js
@@ -2984,3 +2984,15 @@ App.Utils.economicUncertainty = function(arcologyID) {
}
return jsRandom(100 - uncertainty, 100 + uncertainty) / 100;
};
+
+/** Deflate a slave (reset inflation to none)
+ * @param {App.Entity.SlaveState} slave
+ */
+globalThis.deflate = function(slave) {
+ slave.inflation = 0;
+ slave.inflationType = "none";
+ slave.inflationMethod = 0;
+ slave.milkSource = 0;
+ slave.cumSource = 0;
+ SetBellySize(slave);
+};
diff --git a/src/npc/descriptions/crotch/crotch.js b/src/npc/descriptions/crotch/crotch.js
index e7ed8b389003c7a6ae0ebdc2689b44beb94485fa..b613a20bb655c5643a87569ef984f5adf32d07ee 100644
--- a/src/npc/descriptions/crotch/crotch.js
+++ b/src/npc/descriptions/crotch/crotch.js
@@ -507,7 +507,7 @@ App.Desc.crotch = function(slave, {market, eventDescription} = {}) {
break;
case "striped panties":
r.push(`${slave.slaveName}'s`);
- if (slave.dick > 5 && canAchieveErection(slave) && slave.devotion > 20 && slave.belly >= 5000) {
+ if (slave.dick > 7 && canAchieveErection(slave) && slave.devotion > 20 && slave.belly >= 5000) {
r.push(`massive erection is agonizingly pressed down by ${his}`);
if (slave.bellyPreg > 2000) {
r.push(`pregnancy.`);
diff --git a/src/npc/interaction/fAbuse.tw b/src/npc/interaction/fAbuse.tw
index 34bec7207e359d2f668dc1736df19e1a53c97f16..8ca0f3933661cc7f6182cbf2e30f2e57ee0ca269 100644
--- a/src/npc/interaction/fAbuse.tw
+++ b/src/npc/interaction/fAbuse.tw
@@ -58,12 +58,10 @@
<<if getSlave($AS).bellyFluid >= 10000>>
<<if getSlave($AS).inflationMethod == 2>>
which causes $him to discharge $his contained <<= getSlave($AS).inflationType>> all over $himself before collapsing into $his puddle on the floor in agony.
- <<set getSlave($AS).inflation = 0, getSlave($AS).inflationType = "none", getSlave($AS).inflationMethod = 0, getSlave($AS).cumSource = 0, getSlave($AS).milkSource = 0>>
- <<run SetBellySize(getSlave($AS))>>
+ <<run deflate(getSlave($AS))>>
<<else>>
which causes $him to vomit up $his contained <<= getSlave($AS).inflationType>> all over $himself before collapsing into $his puddle on the floor in agony.
- <<set getSlave($AS).inflation = 0, getSlave($AS).inflationType = "none", getSlave($AS).inflationMethod = 0, getSlave($AS).cumSource = 0, getSlave($AS).milkSource = 0>>
- <<run SetBellySize(getSlave($AS))>>
+ <<run deflate(getSlave($AS))>>
<</if>>
<<elseif getSlave($AS).bellyFluid >= 5000>>
<<if random(1,100) > getSlave($AS).devotion>>
@@ -71,12 +69,10 @@
<<else>>
<<if getSlave($AS).inflationMethod == 2>>
which causes $him to discharge $his contained <<= getSlave($AS).inflationType>> all over $himself before collapsing into $his puddle on the floor in agony.
- <<set getSlave($AS).inflation = 0, getSlave($AS).inflationType = "none", getSlave($AS).inflationMethod = 0, getSlave($AS).cumSource = 0, getSlave($AS).milkSource = 0>>
- <<run SetBellySize(getSlave($AS))>>
+ <<run deflate(getSlave($AS))>>
<<else>>
which causes $him to vomit up $his contained <<= getSlave($AS).inflationType>> all over $himself before collapsing into $his puddle on the floor in agony.
- <<set getSlave($AS).inflation = 0, getSlave($AS).inflationType = "none", getSlave($AS).inflationMethod = 0, getSlave($AS).cumSource = 0, getSlave($AS).milkSource = 0>>
- <<run SetBellySize(getSlave($AS))>>
+ <<run deflate(getSlave($AS))>>
<</if>>
<</if>>
<<else>>
diff --git a/src/npc/interaction/fSlaveFeed.tw b/src/npc/interaction/fSlaveFeed.tw
index c621bc715e69a3cdc4b039f1325aa630c1445ff3..a91527177c410e4195e867e669f2ece6366613a6 100644
--- a/src/npc/interaction/fSlaveFeed.tw
+++ b/src/npc/interaction/fSlaveFeed.tw
@@ -151,8 +151,8 @@ Next, you see to <<= getSlave($AS).slaveName>>.
<<if getSlave($AS).preg > getSlave($AS).pregData.normalBirth/13.33 && getSlave($AS).pregKnown == 0 && getSlave($AS).inflation > 1>>
It becomes abundantly clear that something is wrong with <<= getSlave($AS).slaveName>> as $he struggles to down $his milky meal. Before $his health can be affected further, you pull $him into a medical exam. While most of the tests come back normal, one in particular catches your eye; @@.lime;$he is pregnant<<if getSlave($AS).preg > getSlave($AS).pregData.normalBirth/4>> and surprisingly far along<</if>>.@@ $he should be able to still handle at least two liters of milk, however.
- <<set getSlave($AS).inflation = 0, getSlave($AS).inflationType = "none", getSlave($AS).inflationMethod = 0, getSlave($AS).pregKnown = 1>>
- <<set _pregDiscovery = 1>>
+ <<run deflate(getSlave($AS))>>
+ <<set getSlave($AS).pregKnown = 1, _pregDiscovery = 1>>
<<elseif $milkTap.fuckdoll > 0>>
Slight moaning emanates from the Fuckdoll as <<= getSlave($AS).slaveName>> drinks from _his2 breasts. You enjoy the show, specifically the sight of <<= getSlave($AS).slaveName>>'s belly steadily growing larger until <<if getSlave($AS).inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off _his2 nipple and settles into _his2 breasts for a short rest while hiccupping<<if hasAnyArms(getSlave($AS))>> and rubbing $his gurgling stomach<</if>><<elseif getSlave($AS).inflation == 2>>$his belly is round, jiggling and sloshing with milk. $He pops off _his2 nipple and settles into _his2 breasts for a short rest while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his wobbling, gurgling stomach<</if>><<elseif getSlave($AS).inflation == 1>>$his belly is distended and sloshing with milk. $He pops off _his2 nipple and settles into _his2 breasts for a short rest while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his gurgling stomach<</if>><</if>>.
@@ -494,8 +494,8 @@ Next, you see to <<= getSlave($AS).slaveName>>.
<<if getSlave($AS).preg > 3 && getSlave($AS).pregKnown == 0 && getSlave($AS).inflation > 1>>
It becomes abundantly clear that something is wrong with <<= getSlave($AS).slaveName>> as $he struggles to down $his thick meal. Before $his health can be affected further, you pull $him into a medical exam. While most of the tests come back normal, one in particular catches your eye; @@.lime;$he is pregnant<<if getSlave($AS).preg > 10>> and surprisingly far along<</if>>.@@ $he should be able to still handle at least two liters of cum, however.
- <<set getSlave($AS).inflation = 0, getSlave($AS).inflationType = "none", getSlave($AS).inflationMethod = 0, getSlave($AS).pregKnown = 1>>
- <<set _pregDiscovery = 1>>
+ <<run deflate(getSlave($AS))>>
+ <<set getSlave($AS).pregKnown = 1, _pregDiscovery = 1>>
<<elseif $milkTap.fuckdoll > 0>>
Slight moaning emanates from the Fuckdoll as <<= getSlave($AS).slaveName>> sucks _his2 dick. You enjoy the show, specifically the sight of <<= getSlave($AS).slaveName>>'s belly steadily growing larger until <<if getSlave($AS).inflation == 3>>$his belly is round and taut, making $him look pregnant. $He pops off _his2 cock and settles into _his2 balls for a short rest while hiccupping<<if hasAnyArms(getSlave($AS))>> and rubbing $his gurgling stomach<</if>><<elseif getSlave($AS).inflation == 2>>$his belly is round, jiggling and sloshing with cum. $He pops off _his2 cock and settles into _his2 balls for a short rest while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his wobbling, gurgling stomach<</if>><<elseif getSlave($AS).inflation == 1>>$his belly is distended and sloshing with cum. $He pops off _his2 cock and settles into _his2 balls for a short rest while hiccupping<<if hasAnyArms(getSlave($AS))>> and teasing $his gurgling stomach<</if>><</if>>.
diff --git a/src/npc/interaction/fillUpButt.tw b/src/npc/interaction/fillUpButt.tw
index b369ec7e73482ca2679b0c435320023779ef829c..fb6591c6a9dbaf3b75947e3c07b870080a9b6435 100644
--- a/src/npc/interaction/fillUpButt.tw
+++ b/src/npc/interaction/fillUpButt.tw
@@ -71,7 +71,8 @@ before shoving the equipment into $his
<<if _pregDiscovery == 1>>
Not wanting to risk such a mess, you send $him for a medical examination. While most of the tests come back normal, one in particular catches your eye; @@.lime;$he is pregnant<<if getSlave($AS).preg > getSlave($AS).pregData.normalBirth/4>> and surprisingly far along<</if>>.@@ $he should be able to still handle at least two liters of <<= getSlave($AS).inflationType>> up $his ass, however.
- <<set getSlave($AS).inflation = 0, getSlave($AS).inflationType = "none", getSlave($AS).inflationMethod = 0, getSlave($AS).pregKnown = 1>>
+ <<run deflate(getSlave($AS))>>
+ <<set getSlave($AS).pregKnown = 1>>
<<elseif getSlave($AS).fetish == "mindbroken">>
<<if canWalk(getSlave($AS))>>
You instruct $him to present $his buttocks and anus but $he remains still and unresponsive. Talking to a broken mind is pointless.
diff --git a/src/npc/interaction/fillUpFace.tw b/src/npc/interaction/fillUpFace.tw
index fa1034e68fd38d49180ee464fbc85fff518ed35c..f2986ca9e036c430a48d1c2940d8ee1b38d3ae81 100644
--- a/src/npc/interaction/fillUpFace.tw
+++ b/src/npc/interaction/fillUpFace.tw
@@ -25,7 +25,8 @@ You attach a hose to $dairyName tap with the pipes set to pump <<= getSlave($AS)
<<if _pregDiscovery == 1>>
Not wanting to risk such a mess, you send $him for a medical examination. While most of the tests come back normal, one in particular catches your eye; @@.lime;$He is pregnant<<if getSlave($AS).preg > getSlave($AS).pregData.normalBirth/4>> and surprisingly far along<</if>>.@@ $He should be able to still handle at least two liters of <<= getSlave($AS).inflationType>>, however.
- <<set getSlave($AS).inflation = 0, getSlave($AS).inflationType = "none", getSlave($AS).inflationMethod = 0, getSlave($AS).pregKnown = 1>>
+ <<run deflate(getSlave($AS))>>
+ <<set getSlave($AS).pregKnown = 1>>
<<elseif getSlave($AS).fetish == "mindbroken">>
<<if canWalk(getSlave($AS))>>
You instruct $him to take a seat on your lap and open $his mouth wide for the hose, but $he remains still and unresponsive. Talking to a broken mind is pointless.
diff --git a/src/npc/interaction/forceFeeding.tw b/src/npc/interaction/forceFeeding.tw
index 263e4f0d5f54682692e2182e19dad3aeaa89fefe..4c7a27e63d93a67806cc30ecc7da60c985774059 100644
--- a/src/npc/interaction/forceFeeding.tw
+++ b/src/npc/interaction/forceFeeding.tw
@@ -523,7 +523,8 @@ and a little jiggle from $his gut.
<<if _pregDiscovery == 1>>
Once you've managed to stop $his heaving and clean up, you decide to get to the root of this mess. While most of the tests come back normal, one in particular catches your eye; @@.lime;$he is pregnant <<if getSlave($AS).preg > getSlave($AS).pregData.normalBirth/4>> and surprisingly far along<</if>>.@@
- <<set getSlave($AS).inflation = 0, getSlave($AS).inflationType = "none", getSlave($AS).inflationMethod = 0, getSlave($AS).pregKnown = 1>>
+ <<run deflate(getSlave($AS))>>
+ <<set getSlave($AS).pregKnown = 1>>
<<else>>
<<if getSlave($AS).inflation == 3>>
<<if canWalk(getSlave($AS))>>
diff --git a/src/npc/surgery/surgery.js b/src/npc/surgery/surgery.js
index 7db885a87d40195fbe2de9ff715665fa2434dd65..cfb05caf0ff60361193086aa80f64dfaac8953fe 100644
--- a/src/npc/surgery/surgery.js
+++ b/src/npc/surgery/surgery.js
@@ -1120,9 +1120,5 @@ globalThis.beginFuckdoll = function(slave) {
slave.subTarget = 0;
slave.sentence = 0;
slave.training = 0;
- slave.inflation = 0;
- slave.inflationType = "none";
- slave.inflationMethod = 0;
- slave.milkSource = 0;
- slave.cumSource = 0;
+ deflate(slave);
};
diff --git a/src/pregmod/widgets/bodyswapWidgets.tw b/src/pregmod/widgets/bodyswapWidgets.tw
index c69a68d7bdb3ea609b87f64eca017a2cf397ab43..ee9c226b664eca66be129389643e7659a3df1411 100644
--- a/src/pregmod/widgets/bodyswapWidgets.tw
+++ b/src/pregmod/widgets/bodyswapWidgets.tw
@@ -194,8 +194,8 @@
<<set $args[0].dietMilk = $args[1].dietMilk>>
<<set $args[0].clothes = $args[1].clothes>>
<<set $args[0].collar = $args[1].collar>>
- <<set $args[0].faceAccessory = $args[1].faceAccessory >>
- <<set $args[0].mouthAccessory = $args[1].mouthAccessory >>
+ <<set $args[0].faceAccessory = $args[1].faceAccessory>>
+ <<set $args[0].mouthAccessory = $args[1].mouthAccessory>>
<<set $args[0].shoes = $args[1].shoes>>
<<set $args[0].makeup = $args[1].makeup>>
<<set $args[0].nails = $args[1].nails>>
@@ -205,7 +205,6 @@
<<set $args[0].buttplugAttachment = $args[1].buttplugAttachment>>
<<set $args[0].induce = $args[1].induce>>
<<set $args[0].mpreg = $args[1].mpreg>>
- <<set $args[0].inflation = 0, $args[0].inflationType = "none", $args[0].inflationMethod = 0, $args[0].milkSource = 0, $args[0].cumSource = 0>>
<<set $args[0].pregKnown = $args[1].pregKnown>>
<<set $args[0].pregWeek = $args[1].pregWeek>>
<<set $args[0].belly = $args[1].belly>>
@@ -218,6 +217,7 @@
<<set $args[0].cervixImplant = $args[1].cervixImplant>>
<<set $args[0].scar = $args[1].scar>>
<<set $args[0].pregControl = $args[1].pregControl>>
+ <<run deflate($args[0])>>
<</if>>
/*
<<if def $args[2]>>
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index 627820383a6d90e10fb7ea0502ac91f15c914894..12a2ec97d1d6e9cdde525b8c29ef2d4cfde6e7de 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -136,8 +136,7 @@
<</if>>
<</if>>
<<if (_slave.inflation > 0)>>
- <<set _slave.inflation = 0, _slave.inflationType = "none", _slave.inflationMethod = 0, _slave.milkSource = 0>>
- <<run SetBellySize(_slave)>>
+ <<run deflate(_slave)>>
<</if>>
<<if $showEWD != 0>>
<br>
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index 3dda3ca2d91be55d7e7d5db85e5f37a9ce08ba41..4738d770d7e24663572434213105fd598108cdc2 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -178,8 +178,7 @@
<<case "Paternalist">>
<<set _slave.rules.living = "normal">>
<<if (_slave.inflation > 0)>>
- <<set _slave.inflation = 0, _slave.inflationType = "none", _slave.inflationMethod = 0, _slave.milkSource = 0>>
- <<run SetBellySize(_slave)>>
+ <<run deflate(_slave)>>
<</if>>
<<case "Pastoralist">>
<<set _slave.rules.living = "spare">>
@@ -216,8 +215,7 @@
<<default>>
<<set _slave.rules.living = "spare">>
<<if (_slave.inflation > 0)>>
- <<set _slave.inflation = 0, _slave.inflationType = "none", _slave.inflationMethod = 0, _slave.milkSource = 0>>
- <<run SetBellySize(_slave)>>
+ <<run deflate(_slave)>>
<</if>>
<</switch>>
<<if $cellblockUpgrade == 1>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index b83bd981ccb9bdb28f637c38a4c50cdc36e605ad..4004c7f2d221c535da500a3e67b4d8e82c8c6538 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -431,8 +431,7 @@
<<run improveCondition(_slave, 3)>>
<</if>>
<<if (_slave.inflation > 0)>>
- <<set _slave.inflation = 0, _slave.inflationType = "none", _slave.inflationMethod = 0, _slave.milkSource = 0>>
- <<run SetBellySize(_slave)>>
+ <<run deflate(_slave)>>
<</if>>
<<set _gigantomastiaMod = _slave.geneticQuirks.gigantomastia == 2 ? (_slave.geneticQuirks.macromastia == 2 ? 3 : 2) : 1>>
<<if (_slave.lactation > 0) && (($dairySlimMaintain == 0) || (_slave.boobs > 700))>>
diff --git a/src/uncategorized/pUndergroundRailroad.tw b/src/uncategorized/pUndergroundRailroad.tw
index a341d1473d1a8b708daaa10f4e316f2f7df0fe3d..9dc6a6247b3e04a5c5bd8d10f9370f55417fc9c2 100644
--- a/src/uncategorized/pUndergroundRailroad.tw
+++ b/src/uncategorized/pUndergroundRailroad.tw
@@ -135,7 +135,7 @@ This is disturbing, to say the least. After close investigation, it appears some
<<set $traitor = clone($activeSlave)>>
<<set $traitor.assignment = "rest">>
<<set $traitor.pregControl = "none">>
- <<set $traitor.inflation = 0, $traitor.inflationType = "none", $traitor.inflationMethod = 0, SetBellySize($traitor)>>
+ <<run deflate($traitor)>>
<<set $traitorStats = {PCpregSource: 0, PCmother: 0, PCfather: 0, traitorMother: [], traitorFather: [], traitorPregSources: [], traitorMotherTank: [], traitorFatherTank: [], traitorBody: 0}>>
<<if $traitor.ID == $PC.pregSource>>
<<set $traitorStats.PCpregSource = $traitor.ID>>
@@ -265,7 +265,7 @@ This is disturbing, to say the least. After close investigation, it appears some
<<set $traitor = clone($activeSlave)>>
<<set $traitor.assignment = "rest">>
<<set $traitor.pregControl = "none">>
- <<set $traitor.inflation = 0, $traitor.inflationType = "none", $traitor.inflationMethod = 0, SetBellySize($traitor)>>
+ <<run deflate($traitor)>>
<<set $traitorStats = {PCpregSource: 0, PCmother: 0, PCfather: 0, traitorMother: [], traitorFather: [], traitorPregSources: [], traitorMotherTank: [], traitorFatherTank: [], traitorBody: 0}>>
<<if $traitor.ID == $PC.pregSource>>
<<set $traitorStats.PCpregSource = $traitor.ID>>