Merge branch 'pregmod-master' into 'pregmod-master'

Fixes

Closes #3662 and #3658

See merge request pregmodfan/fc-pregmod!10421

src/events/recETS/recetsIdenticalHermPair.js

@@ -71,6 +71,11 @@ App.Events.recetsIdenticalHermPair = class recetsIdenticalHermPair extends App.E
 		let contractCost = cost;
 
 		const thing2 = generateRelatedSlave(thing1, "twin");
+		thing2.fetish = "pregnancy";
+		thing2.fetishStrength = 100;
+		thing2.sexualQuirk = "perverted";
+		thing2.sexualFlaw = "none";
+		thing2.behavioralFlaw = "none";
 		WombFlush(thing2);
 		thing2.preg = 30;
 		thing2.pregType = 2;

src/js/utilsMisc.js

@@ -153,7 +153,7 @@ App.Utils.getRaceArrayWithoutParamRace = function(badRace) {
  * @returns {App.Entity.PlayerState}
  */
 globalThis.asPlayer = function(human) {
-	if (human.ID !== -1) {
+	if (!human || human.ID !== -1) {
 		return null;
 	}
 	return /** @type {App.Entity.PlayerState} */(human);
@@ -164,7 +164,7 @@ globalThis.asPlayer = function(human) {
  * @returns {App.Entity.SlaveState}
  */
 globalThis.asSlave = function(human) {
-	if (human && human.ID === -1) {
+	if (!human || human.ID === -1) {
 		return null;
 	}
 	return /** @type {App.Entity.SlaveState} */(human);

src/js/utilsSlaves.js

@@ -220,7 +220,7 @@ globalThis.penthouseCensus = function() {
 			return false; // lives in dojo
 		} else if (slave.relationship >= 4) {
 			const partner = getSlave(slave.relationshipTarget);
-			if (assignmentVisible(partner) && partner.ID < slave.ID && partner.rules.living === "luxurious") {
+			if (partner && assignmentVisible(partner) && partner.ID < slave.ID && partner.rules.living === "luxurious") {
 				return false; // living with partner, who is already assigned a room (always allocate a room to the partner with the lower ID)
 			}
 		}