From 7c036d98cd3aa0623629b9bafcfe341b50e2b17e Mon Sep 17 00:00:00 2001 From: Jones <Jones> Date: Thu, 4 Apr 2019 15:08:48 +0200 Subject: [PATCH] Fix for too many public sluts breaking the NPC market --- src/uncategorized/slaveAssignmentsReport.tw | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw index cc717d20f0c..a90dccde3e1 100644 --- a/src/uncategorized/slaveAssignmentsReport.tw +++ b/src/uncategorized/slaveAssignmentsReport.tw @@ -74,9 +74,10 @@ $slaveJobValues = slaveJobValues()>> <</if>> /*Public slut sex supply. Top and upper class won't partake*/ -<<if $slaveJobValues.club * $slaveJobValues.clubSP < _lowerClassSexDemand + _middleClassSexDemand + _visitorsSexDemand>> - <<set _clubDemand = _lowerClassSexDemand + _middleClassSexDemand + _visitorsSexDemand, - _lowerClassSexDemand -= Math.trunc($slaveJobValues.club * $slaveJobValues.clubSP * (_lowerClassSexDemand / _clubDemand)), +<<set _clubDemand = _lowerClassSexDemand + _middleClassSexDemand + _visitorsSexDemand, +_lowerClassClubRatio = _lowerClassSexDemand / _clubDemand>> +<<if $slaveJobValues.club * $slaveJobValues.clubSP < _clubDemand>> + <<set _lowerClassSexDemand -= Math.trunc($slaveJobValues.club * $slaveJobValues.clubSP * (_lowerClassSexDemand / _clubDemand)), _middleClassSexDemand -= Math.trunc($slaveJobValues.club * $slaveJobValues.clubSP * (_middleClassSexDemand / _clubDemand)), _visitorsSexDemand -= Math.trunc($slaveJobValues.club * $slaveJobValues.clubSP * (_visitorsSexDemand / _clubDemand))>> <<else>> @@ -113,8 +114,12 @@ $slaveJobValues = slaveJobValues()>> /*NPC sex supply*/ <<set $NPCSexSupply = NPCSexSupply(_lowerClassSexDemand/_lowerClassSexDemandRef), -$NPCMarketShareLC = Math.trunc(($NPCSexSupply.lowerClass * 1000) / ($NPCSexSupply.lowerClass + $slaveJobValues.arcade + Math.trunc($slaveJobValues.club * $slaveJobValues.clubSP * (_lowerClassSexDemand / _clubDemand)))), -_lowerClassSexDemand -= $NPCSexSupply.lowerClass>> +$NPCMarketShareLC = Math.trunc(($NPCSexSupply.lowerClass * 1000) / ($NPCSexSupply.lowerClass + $slaveJobValues.arcade + Math.trunc($slaveJobValues.club * $slaveJobValues.clubSP * _lowerClassClubRatio)))>> +<<if _lowerClassSexDemand < $NPCSexSupply.lowerClass>> + <<set _lowerClassSexDemand = 0>> +<<else>> + <<set _lowerClassSexDemand -= $NPCSexSupply.lowerClass>> +<</if>> <<if ($cheatMode == 1) || ($debugMode == 1)>> <br>NPC Supply Lower Class: $NPCSexSupply.lowerClass <</if>> -- GitLab