diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw index 61f94cc466c30bfa986f65c6cb87254c035ecc43..491c884981e02a0e72d3310398f0eda3c221a66a 100644 --- a/src/uncategorized/arcmgmt.tw +++ b/src/uncategorized/arcmgmt.tw @@ -1025,17 +1025,6 @@ _percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>> <<if $arcologies[0].FSPhysicalIdealistSMR == 1>>The arcology must import a very large quantity of nutritive protein to nourish its slaves.<</if>> <<if $arcologies[0].FSHedonisticDecadenceSMR == 1>>The arcology must import a very large quantity of fattening food to plump up its slaves.<</if>> -/*Arcade Demand*/ -<<set _LCRent = 1 + (20 - $LCRent) / 100>> -<<set $arcadeDemand = $lowerClass * 7 * _LCRent - ($fuckdolls - $fuckdollsArcade) * 140 - $fuckdollsArcade * (175 + 35 * $arcadeUpgradeInjectors)>> -<<if $arcologies[0].FSDegradationist != "unset">> - <<set _MCRent = 1 + (50 - $MCRent) / 800, _UCRent = 1 + (180 - $UCRent) / 3600, $arcadeDemand += Math.trunc(($lowerClass * 3 * _LCRent + $middleClass * 5 * _MCRent + $upperClass * 3 * _UCRent + $visitors * 3) * Math.min($arcologies[0].FSDegradationist / 100, 1))>> -<</if>> -<<if $arcologies[0].FSDegradationistLaw == 1>> - <<set $arcadeDemand += ($NPCSlaves + $menials) * 5>> -<</if>> - - <<if $ACitizens > $ASlaves*2>> /*This will need to go away Eventually*/ Since most citizens do not own sex slaves, @@.yellowgreen;demand for sexual services is intense.@@ <<elseif $ACitizens > $ASlaves>> diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw index fecbdffc8a033cf664952ccb324a10c7edc99a71..a3c5abb40a8381bdbc9297ec8cc4591ff6174954 100644 --- a/src/uncategorized/slaveAssignmentsReport.tw +++ b/src/uncategorized/slaveAssignmentsReport.tw @@ -4,11 +4,16 @@ <h1> $arcologies[0].name Weekly Slave Report - Week $week</h1> -<<for $i = 0; $i < _SL; $i++>> - <<if $slaves[$i].assignment == "work a glory hole">> - <<set $gloryiIDs.push($slaves[$i].ID)>> - <</if>> -<</for>> +/*Arcade Demand*/ +<<set _LCRent = 1 + (20 - $LCRent) / 100>> +<<set $arcadeDemand = $lowerClass * 7 * _LCRent - ($fuckdolls - $fuckdollsArcade) * 140 - $fuckdollsArcade * (175 + 35 * $arcadeUpgradeInjectors)>> +<<if $arcologies[0].FSDegradationist != "unset">> + <<set _MCRent = 1 + (50 - $MCRent) / 800, _UCRent = 1 + (180 - $UCRent) / 3600, $arcadeDemand += Math.trunc(($lowerClass * 3 * _LCRent + $middleClass * 5 * _MCRent + $upperClass * 3 * _UCRent + $visitors * 3) * Math.min($arcologies[0].FSDegradationist / 100, 1))>> +<</if>> +<<if $arcologies[0].FSDegradationistLaw == 1>> + <<set $arcadeDemand += ($NPCSlaves + $menials) * 5>> +<</if>> +<<run $slaves.forEach(function(s) { if (s.assignment === "work a glory hole") $gloryiIDs.push(s.ID); })>> <<for $i = 0; $i < _SL; $i++>>