diff --git a/src/facilities/clinic/clinicFramework.js b/src/facilities/clinic/clinicFramework.js index f8b15403f97d616347f2c5e5adf5c34200ae8157..32be8848509ef63171fe4d6b8660663172d3c311 100644 --- a/src/facilities/clinic/clinicFramework.js +++ b/src/facilities/clinic/clinicFramework.js @@ -41,7 +41,7 @@ App.Entity.Facilities.ClinicPatientJob = class extends App.Entity.Facilities.Fac checkRequirements(slave) { let r = super.checkRequirements(slave); - if ((slave.health.illness < 2) && + if ((slave.health.condition >= 20 && slave.health.illness < 2) && (V.Nurse === 0 || ((slave.chem <= 15 || this.facility.upgrade("Filters") !== 1) && (V.bellyImplants !== 1 || slave.bellyImplant <= -1) && (slave.pregKnown !== 1 || (this.facility.option("SpeedGestation") <= 0 && slave.pregControl !== "speed up")) && (slave.pregAdaptation * 1000 >= slave.bellyPreg && slave.preg <= slave.pregData.normalBirth / 1.33)))) { diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js index 81898f9964094dced2218c0b558fe5a889b3f9e3..438f3079333effb9f84912244f5fda99d23b0733 100644 --- a/src/js/eventSelectionJS.js +++ b/src/js/eventSelectionJS.js @@ -1810,7 +1810,7 @@ window.generateRandomEventPoolStandard = function(eventSlave) { } } } - if (eventSlave.career === "a breeding bull" && eventSlave.assignment === "serve in the master suite" && canPenetrate(eventSlave) && eventSlave.dick >= 5 && hasAllLimbs(eventSlave) && State.variables.PC.vagina > -1 && State.variables.PC.preg === 0 && (eventSlave.muscles > 30 || eventSlave.weight > 30)) { + if (eventSlave.career === "a breeding bull" && canImpreg($PC, $activeSlave) && eventSlave.assignment === "serve in the master suite" && canPenetrate(eventSlave) && eventSlave.dick >= 5 && hasAllLimbs(eventSlave) && State.variables.PC.vagina > -1 && State.variables.PC.preg === 0 && (eventSlave.muscles > 30 || eventSlave.weight > 30)) { State.variables.RESSevent.push("breeding bull"); if (State.variables.PC.fertDrugs > 0) { State.variables.RESSevent.push("breeding bull"); diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index c177c5a47dc9fdbfb27aab67c682af6772ee7618..c752d958e4174a65a242daa04a724a03f9c27c6f 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -3842,6 +3842,7 @@ Setting missing slave variables: <</if>> <</for>> <<if $hostage !== 0>> + <<PMODinit $hostage>> <<run App.Entity.Utils.SlaveDataSchemeCleanup($hostage)>> <<run SlaveDatatypeCleanup($hostage)>> <</if>> @@ -3849,6 +3850,23 @@ Setting missing slave variables: <<run App.Entity.Utils.SlaveDataSchemeCleanup($slaveAfterRA)>> <<run SlaveDatatypeCleanup($slaveAfterRA)>> <</if>> +<<if $customSlave !== 0>> + <<PMODinit $customSlave>> + <<run App.Entity.Utils.SlaveDataSchemeCleanup($customSlave)>> + <<run SlaveDatatypeCleanup($customSlave)>> +<</if>> +<<if $boomerangSlave !== 0>> + <<PMODinit $boomerangSlave>> + <<run App.Entity.Utils.SlaveDataSchemeCleanup($boomerangSlave)>> + <<run SlaveDatatypeCleanup($boomerangSlave)>> +<</if>> +<<if $traitor !== 0>> + <<PMODinit $traitor>> + <<run App.Entity.Utils.SlaveDataSchemeCleanup($traitor)>> + <<run SlaveDatatypeCleanup($traitor)>> +<</if>> + + Done<br> <<if $tanks.length > 0>> diff --git a/src/uncategorized/summaryOptions.tw b/src/uncategorized/summaryOptions.tw index 782bf645c95690eda9d14fe2937f0047cde13c73..8eb2b027a890cac2107754a2e4ce6dea420e8c44 100644 --- a/src/uncategorized/summaryOptions.tw +++ b/src/uncategorized/summaryOptions.tw @@ -43,6 +43,7 @@ <<option "visualAge" "How old they look">> <<option "physicalAge" "Age of their body">> <<option "assignment" "Assignment">> + <<option "weeklyIncome" "Weekly Income">> <</options>> <</if>>