From e9362c683b8b848f28f3a0ed84186f8c51fa117c Mon Sep 17 00:00:00 2001 From: Trashman1138 <11461-Trashman1138@users.noreply.gitgud.io> Date: Thu, 4 Jul 2019 01:28:21 -0700 Subject: [PATCH] Self-assignment moved higher to ensure that slaveJobValues uses correct assignments --- src/uncategorized/slaveAssignmentsReport.tw | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw index 11699931175..d239cfa9be3 100644 --- a/src/uncategorized/slaveAssignmentsReport.tw +++ b/src/uncategorized/slaveAssignmentsReport.tw @@ -4,6 +4,15 @@ <h1> $arcologies[0].name Weekly Slave Report - Week $week</h1> +/** silent pass for any reassignments before generating reports */ +<<for $i = 0; $i < _SL; $i++>> + <<if $slaves[$i].choosesOwnAssignment == 1>> + <<silently>> + <<include "SA chooses own job">> + <</silently>> + <</if>> +<</for>> + /*Sexual services demand per class*/ /*We can add milk etc. to this as well, though this is a good that can be traded beyond the arcology and also needs its own market much like the slavemarket. TODO*/ /*In the default scenario these numbers indicate the amount of money each individual citizen of a particular class is looking to spend on sex (and milk) every week @@ -633,15 +642,6 @@ $NPCMarketShareLC = Math.trunc(($NPCSexSupply.lowerClass * 1000) / ($NPCSexSuppl <</if>> <</if>> -/** silent pass for any reassignments before generating reports */ -<<for $i = 0; $i < _SL; $i++>> - <<if $slaves[$i].choosesOwnAssignment == 1>> - <<silently>> - <<include "SA chooses own job">> - <</silently>> - <</if>> -<</for>> - <<if $HeadGirl>> <<set _HGPossibleSlaves = [[], [], [], [], [], []]>> <<for $i = 0; $i < _SL; $i++>> -- GitLab