1. Remove unnecessary SA global setting (V.i and App.Utils.SetLocalPronouns) since they're not needed anymore by any of the subreports
2. Fix a pronoun issue in the brothel report
3. Remove the last few traces of the $bedSlaves global
4. Fix a capitalization issue in reFullBed

i107760 authored 4 years ago and Pregmodder committed 4 years ago

This reverts commit e1c06682.

supanintendo authored 4 years ago and Pregmodder committed 4 years ago

Updated eye functions to accept PlayerState. Updated sePCBirthday to use App.Desc.eyeColor(). Added lastBDayEvent to gameVariableData.

1. Add a new release rule to control whether development facility leaders (Nurse, Attendant, Matron, Warden, and Schoolteacher) are allowed to have sex with the slave.  Does not affect production facility leaders.
2. Determine employee-leader sexual contact before running slave reports at all, and adjust need and counters based only on ACTUAL sex, not hypotheticals.  Fixes bugs for Cellblock and Clinic even without no rules changes, but also accounts for the new rule.  Counters for both slaves are always adjusted on the *employee* end.
3. Friends may satisfy sexual needs in the clinic, if they're allowed to under general release rules; if relationship rules are *also* permissive, their relationship will advance automatically to FWB.
4. Fix many instances of counter mismatch throughout these scenarios.  Use seX() where it makes sense to do so.
5. Add hints to Slave Interact to describe the release rules in more detail.  Doesn't look great but should get the message across.  Someone's welcome to reformat these if they want.

Factor out the "usual" nonassignment sex block from saRules, with variant text for jobs that need it.  Some jobs are special and don't call this code because they use totally different release logic (Clinic, Cellblock, Master Suite, etc).

Remove $pornFameBonus global (moving to saVars).  Remove FutureSocieties.ChangePorn (which only had one remaining call site) to help ensure that nobody accidentally tries to access pornFameBonus when it's out of scope.

1. Accept the facility multiplier as a parameter instead of using $servantMilkersMultiplier.
2. Return a results object containing all the necessary information instead of using $milk, $milkSale, $cum, $cumSale, $fluid, and $fluidSale.  This also means we have an invariant return type between preview and execution modes, which things much easier from a type-safety perspective (i.e. we don't have to jump through as many hoops to make TS happy).
3. Merge logic between text and calculation.  Reduce the structural impact of preview mode; it's OK to generate and return text that we're not going to use.