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/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; +};