diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 026c65e29eced2edfa9a37d88c829d697530cc61..99506112fb311cc155888ffd65b41485ff1775c9 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -867,8 +867,6 @@ App.Data.resetOnNGPlus = {
},
},
dairyPiping: 0,
- inflatedSlavesMilk: 0,
- inflatedSlavesCum: 0,
milkPipeline: 0,
cumPipeline: 0,
wcPiping: 0,
diff --git a/src/endWeek/endWeek.js b/src/endWeek/endWeek.js
index 2eea987692c23666f2d788ad879704de14e2be60..0c9b1e88b201aacb086546e1465be6395523adf2 100644
--- a/src/endWeek/endWeek.js
+++ b/src/endWeek/endWeek.js
@@ -38,19 +38,10 @@ globalThis.endWeek = (function() {
}
function resetSlaveCounters() {
- V.inflatedSlavesCum = 0;
- V.inflatedSlavesMilk = 0;
V.subSlaves = 0;
}
function slavePrep(s) {
- if (s.inflationMethod === 1 || s.inflationMethod === 2) {
- if (s.inflationType === "milk") {
- V.inflatedSlavesMilk++;
- } else if (s.inflationType === "cum") {
- V.inflatedSlavesCum++;
- }
- }
if (s.assignment === Job.SUBORDINATE && s.subTarget === 0) {
V.subSlaves++;
}
diff --git a/src/endWeek/saClothes.js b/src/endWeek/saClothes.js
index 7d4733cf5e3ee62324788223a12d07e5bd4b6f41..2c32a0f8e58afa5311d199f5b095f747386c599f 100644
--- a/src/endWeek/saClothes.js
+++ b/src/endWeek/saClothes.js
@@ -631,8 +631,7 @@ App.SlaveAssignment.clothes = (function() {
slave.preg = 0;
}
TerminatePregnancy(slave);
- slave.counter.miscarriages++;
- V.miscarriagesTotal++;
+ actX(slave, "miscarriages");
if (slave.fuckdoll === 0 && slave.fetish !== "mindbroken") {
if (slave.devotion < -50) {
r.push(`${He} is <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.`);
@@ -1042,8 +1041,7 @@ App.SlaveAssignment.clothes = (function() {
slave.preg = 0;
}
TerminatePregnancy(slave);
- slave.counter.miscarriages++;
- V.miscarriagesTotal++;
+ actX(slave, "miscarriages");
r.push(`${He} is`);
if (slave.devotion < -50) {
r.push(`<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.`);
diff --git a/src/endWeek/saDrugs.js b/src/endWeek/saDrugs.js
index d2ae2f83de4e73448ba9bc6d8321594f7208f757..794e1fdb090c75197ccd886001090fb484304102 100644
--- a/src/endWeek/saDrugs.js
+++ b/src/endWeek/saDrugs.js
@@ -1636,8 +1636,7 @@ App.SlaveAssignment.drugs = (function() {
slave.preg = 0;
}
TerminatePregnancy(slave);
- slave.counter.miscarriages++;
- V.miscarriagesTotal++;
+ actX(slave, "miscarriages");
if (slave.fetish !== "mindbroken" && slave.fuckdoll === 0) {
r += ` ${He} is`;
if (slave.devotion < -50) {
diff --git a/src/endWeek/saLongTermEffects.js b/src/endWeek/saLongTermEffects.js
index 0ec051747d259c26ad0c05e3f07d097bc339e370..d227fae9f10f2a753626e38503c6ecb598db95ae 100644
--- a/src/endWeek/saLongTermEffects.js
+++ b/src/endWeek/saLongTermEffects.js
@@ -2249,8 +2249,7 @@ App.SlaveAssignment.longTermEffects = (function() {
if (slave.pregSource !== -1 && slave.pregSource !== -6) {
r.push(`${slave.slaveName}'s weekly health checkup revealed ${he} is pregnant with an unacceptable child. <span class="elites loss">Its life has been terminated, you have been fined ${cashFormat(100000)}, and your rep among the Elite has been severely damaged.</span>`);
TerminatePregnancy(slave);
- slave.counter.abortions++;
- V.abortionsTotal++;
+ actX(slave, "abortions");
cashX(-100000, "fines", slave);
V.failedElite += 150;
if (slave.abortionTat > -1) {
@@ -2444,8 +2443,7 @@ App.SlaveAssignment.longTermEffects = (function() {
}
}
TerminatePregnancy(slave);
- slave.counter.abortions++;
- V.abortionsTotal++;
+ actX(slave, "abortions");
if (slave.abortionTat > -1) {
slave.abortionTat++;
r.push(`The temporary tattoo of a child has been replaced with ${his} ${ordinalSuffix(slave.abortionTat)} crossed out infant.`);
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index c576d479d20414a8e2b8b727addc89f4f579e891..6b17e48aab38a9fed4b457a585b3f2ae27739a11 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -1084,8 +1084,7 @@ globalThis.DefaultRules = (function() {
}
if (WL === 0) {
TerminatePregnancy(slave);
- slave.counter.abortions++;
- V.abortionsTotal++;
+ actX(slave, "abortions");
}
}
return res;
@@ -1142,8 +1141,7 @@ globalThis.DefaultRules = (function() {
cashX(forceNeg(V.modCost), "slaveMod", slave);
}
TerminatePregnancy(slave);
- slave.counter.abortions++;
- V.abortionsTotal++;
+ actX(slave, "abortions");
} else if (ar === "male") {
if (conditionalTermination(slave, fetus => fetus.genetics.gender === "XY")) {
r += `<br>${slave.slaveName}'s male fetuses have been terminated.`;
diff --git a/src/js/sexActsJS.js b/src/js/sexActsJS.js
index 85c410ffd4021940224388e8e780f7cf5a8c1dfa..c3a42134b2da58bcd8436ae4c2f035e1fa0cc268 100644
--- a/src/js/sexActsJS.js
+++ b/src/js/sexActsJS.js
@@ -445,6 +445,9 @@ globalThis.actX = function(slave, act, count = 1) {
case "pitKills":
V.pitKillsTotal += count;
break;
+ case "miscarriages":
+ V.miscarriagesTotal += count;
+ break;
case "publicUse":
break;
case "slavesFathered":
diff --git a/src/npc/generate/lawCompliance.js b/src/npc/generate/lawCompliance.js
index b5f2cb594262fed1296b8d2e95b821777189feff..105b40a315607c27e324bf8384ea9922a17a4876 100644
--- a/src/npc/generate/lawCompliance.js
+++ b/src/npc/generate/lawCompliance.js
@@ -276,8 +276,7 @@ App.Desc.lawCompliance = function(slave, market = 0) {
const r = [];
if (slave.balls > 0 || slave.ovaries > 0) {
TerminatePregnancy(slave);
- slave.counter.abortions++;
- V.abortionsTotal++;
+ actX(slave, "abortions");
slave.balls = 0;
slave.ovaries = 0;
r.push(`As a member of the lowest class,`);
@@ -790,8 +789,7 @@ App.Desc.lawCompliance = function(slave, market = 0) {
}
r.push(`tubes were promptly tied to prevent ${him} from passing on ${his} inferior genes, <span class="mediumorchid">saddening</span> and <span class="gold">frightening</span> ${him}.`);
TerminatePregnancy(slave);
- slave.counter.abortions++;
- V.abortionsTotal++;
+ actX(slave, "abortions");
slave.devotion -= 30;
slave.trust -= 30;
} else if (slave.balls > 0) {
@@ -814,8 +812,7 @@ App.Desc.lawCompliance = function(slave, market = 0) {
}
r.push(`tubes were promptly tied to prevent ${him} from passing on ${his} inferior genes, <span class="mediumorchid">saddening</span> and <span class="gold">frightening</span> ${him}.`);
TerminatePregnancy(slave);
- slave.counter.abortions++;
- V.abortionsTotal++;
+ actX(slave, "abortions");
slave.devotion -= 10;
slave.trust -= 10;
} else {
diff --git a/src/pregmod/personalNotes.tw b/src/pregmod/personalNotes.tw
index fee3bd9ad7f40d239f1676816f288896515ffcd4..bc2ab16cd9d4734f2f9d8253bc4c7ab0e36d6e7b 100644
--- a/src/pregmod/personalNotes.tw
+++ b/src/pregmod/personalNotes.tw
@@ -344,8 +344,7 @@
<<set $PC.devotion -= 10, $PC.trust -= 10>>
<</if>>
<<set TerminatePregnancy($PC)>>
- <<set $PC.counter.abortions++>>
- <<set $abortionsTotal++>>
+ <<run actX($PC, "abortions")>>
<<if $PC.abortionTat > -1>>
<<set $PC.abortionTat++>>
The temporary tattoo of a child has been replaced with $his <<= ordinalSuffix($PC.abortionTat)>> crossed out infant.
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 429b93a5c22b31e46ec0e9a43924ddcb14a2a68e..8fc702d6f8aab12ac4bb7b85f9c3f867270e7845 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -6,7 +6,7 @@
<<set _MMWorkout = 0>>
<<set _BF = App.Data.misc.bioreactorFluids>>
<<set _slaves = App.Utils.sortedEmployees(App.Entity.facilities.dairy)>>
-<<set _DL = _slaves.length, _SL = $slaves.length, $bioreactorPerfectedID = 0, $legendaryBallsID = 0, $legendaryCowID = 0, $milkmaidDevotionBonus = 1, $milkmaidHealthBonus = 0, $milkmaidTrustBonus = 1, $milkmaidDevotionThreshold = 45, $milkmaidTrustThreshold = 35, _anusesStretched = 0, _birthers = 0, _births = 0, _cumWeek = 0, _femCumWeek = 0, _FLsFetish = 0, _milkWeek = 0, _balltacular = 0, _boobtacular = 0, _careerForgotten = 0, _chemMinor = 0, _chemSevere = 0, _desterilized = 0, _hateFilled = 0, _horrified = 0, _intelligenceLost = 0, _mindbroken = 0, _profits = 0, _skillsLost = 0, _stupidified = 0, _vaginasStretched = 0, _cmSlave = 0, _dsSlave = 0, _hfSlave = 0, _hrSlave = 0, _slSlave = 0, _cfSlave = 0, _stSlave = 0, _btSlave = 0>>
+<<set _DL = _slaves.length, _SL = $slaves.length, $bioreactorPerfectedID = 0, $legendaryBallsID = 0, $legendaryCowID = 0, $milkmaidDevotionBonus = 1, $milkmaidHealthBonus = 0, $milkmaidTrustBonus = 1, $milkmaidDevotionThreshold = 45, $milkmaidTrustThreshold = 35, _anusesStretched = 0, _birthers = 0, _births = 0, _cumWeek = 0, _femCumWeek = 0, _FLsFetish = 0, _milkWeek = 0, _balltacular = 0, _boobtacular = 0, _careerForgotten = 0, _chemMinor = 0, _chemSevere = 0, _desterilized = 0, _hateFilled = 0, _horrified = 0, _intelligenceLost = 0, _mindbroken = 0, _profits = 0, _skillsLost = 0, _stupidified = 0, _vaginasStretched = 0, _cmSlave = 0, _dsSlave = 0, _hfSlave = 0, _hrSlave = 0, _slSlave = 0, _cfSlave = 0, _stSlave = 0, _btSlave = 0, _inflatedSlaves = App.Facilities.Dairy.inflation()>>
<!-- Statistics gathering -->
<<set $facility = $facility || {}, $facility.dairy = initFacilityStatistics($facility.dairy)>>
@@ -922,11 +922,11 @@
<</if>>
<</for>>
-<<if $inflatedSlavesMilk > 0>>
- <<set _milkWeek -= ((8*$inflatedSlavesMilk*10)+8)>>
+<<if _inflatedSlaves.milk > 0>>
+ <<set _milkWeek -= ((8*_inflatedSlaves.milk*10)+8)>>
<</if>>
-<<if $inflatedSlavesCum > 0>>
- <<set _cumWeek -= ((80*$inflatedSlavesCum*10)+80)>>
+<<if _inflatedSlaves.cum > 0>>
+ <<set _cumWeek -= ((80*_inflatedSlaves.cum*10)+80)>>
<<if _cumWeek < 0>>
<<set _cumWeek = 0>>
<</if>>
@@ -973,12 +973,12 @@
<br><br>_Tadd permanently converted biological "machine<<if _Tadd > 1>>s<</if>>" produce<<if _Tadd == 1>>s<</if>> @@.yellowgreen;<<print cashFormat($cash-_tempCash)>>@@ income.
<</if>>
-<<if $inflatedSlavesMilk > 0>>
- <<set _cashX -= Math.trunc(((600*($inflatedSlavesMilk)+8)+random(50,200)))>>
+<<if _inflatedSlaves.milk > 0>>
+ <<set _cashX -= Math.trunc(((600*(_inflatedSlaves.milk)+8)+random(50,200)))>>
<<run cashX(_cashX, "slaveAssignmentDairy")>>
<</if>>
-<<if $inflatedSlavesCum > 0>>
- <<set _cashX -= Math.trunc(((300*($inflatedSlavesCum+8))+random(25,100)))>>
+<<if _inflatedSlaves.cum > 0>>
+ <<set _cashX -= Math.trunc(((300*(_inflatedSlaves.cum+8))+random(25,100)))>>
<<run cashX(_cashX, "slaveAssignmentDairy")>>
<</if>>
@@ -1072,22 +1072,22 @@
<</if>>
<<set _cumWeek = Math.trunc(_cumWeek/10)>>
<<set $cumPipeline = _cumWeek, $milkPipeline = _milkWeek>>
-<<if $inflatedSlavesMilk > 0>>
- <<set _outputMilk = ((8*$inflatedSlavesMilk*10)+8)>>
+<<if _inflatedSlaves.milk > 0>>
+ <<set _outputMilk = ((8*_inflatedSlaves.milk*10)+8)>>
<<else>>
<<set _outputMilk = 0>>
<</if>>
-<<if $inflatedSlavesCum > 0>>
- <<set _outputCum = (((80*$inflatedSlavesCum*10)+80)/10)>>
+<<if _inflatedSlaves.cum > 0>>
+ <<set _outputCum = (((80*_inflatedSlaves.cum*10)+80)/10)>>
<<else>>
<<set _outputCum = 0>>
<</if>>
_dairyNameCaps produced <<print _milkWeek+_outputMilk>> liters of milk<<if _cumWeek > 0>> and <<print _cumWeek+_outputCum>> liters of cum<</if>> this week.
-<<if $inflatedSlavesMilk > 0>>
+<<if _inflatedSlaves.milk > 0>>
_outputMilk liters of milk were pumped into your penthouse for filling slaves this week.
<</if>>
-<<if $inflatedSlavesCum > 0>>
- <<if $inflatedSlavesMilk > 0>>and <</if>>_outputCum liters of cum were pumped into your penthouse<<if $inflatedSlavesMilk > 0>> as well<<else>> this week<</if>>.
+<<if _inflatedSlaves.cum > 0>>
+ <<if _inflatedSlaves.milk > 0>>and <</if>>_outputCum liters of cum were pumped into your penthouse<<if _inflatedSlaves.milk > 0>> as well<<else>> this week<</if>>.
<</if>>
<<if _femCumWeek > 0>>
The machines also managed to reclaim _femCumWeek liters of salable vaginal secretions.
diff --git a/src/uncategorized/dairyReportUtilities.js b/src/uncategorized/dairyReportUtilities.js
new file mode 100644
index 0000000000000000000000000000000000000000..0ec04674de12890ce4bd72c52d560eaa629d4eba
--- /dev/null
+++ b/src/uncategorized/dairyReportUtilities.js
@@ -0,0 +1,16 @@
+App.Facilities.Dairy.inflation = function() {
+ const inflatedSlaves = {
+ milk: 0,
+ cum: 0
+ };
+ for (const s of V.slaves) {
+ if (s.inflationMethod === 1 || s.inflationMethod === 2) {
+ if (s.inflationType === "milk") {
+ inflatedSlaves.milk++;
+ } else if (s.inflationType === "cum") {
+ inflatedSlaves.cum++;
+ }
+ }
+ }
+ return inflatedSlaves;
+};
diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw
index 04a2edfdd14f9a43dfd3870613a884b179839726..3090acf5a33451d74be5f6e2c91b41c062c69250 100644
--- a/src/uncategorized/saLiveWithHG.tw
+++ b/src/uncategorized/saLiveWithHG.tw
@@ -372,8 +372,7 @@
<<else>>
_S.HeadGirl.slaveName promptly aborts the child growing in $slaves[$i].slaveName since _he2 prefers _his2 <<= $girl>>s not harboring someone else's child or loaded down with _his2 own unwanted spawn.
<<run TerminatePregnancy($slaves[$i])>>
- <<set $slaves[$i].counter.abortions++>>
- <<set $abortionsTotal++>>
+ <<run actX($slaves[$i], "abortions")>>
<</if>>
<</if>>
<</if>>