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

Fixes

See merge request pregmodfan/fc-pregmod!7222

js/003-data/policiesData.js

@@ -497,12 +497,12 @@ App.Data.Policies.Selection = {
 				}
 			}
 		],
-		"mercenariesHelpCorp": [
+		"policies.raidingMercenaries": [
 			{
 				title: "Raiding Mercenaries",
 				text: "you will allow your mercenaries to occasionally conduct a raid directly for your benefit.",
 				activatedText: "you are allowing your mercenaries to occasionally raid for your direct benefit.",
-				requirements: function() { return (V.mercenaries > 0); },
+				requirements: function() { return (V.mercenaries > 0) && (V.mercenariesHelpCorp > 0); },
 				get note() { return `Will cost ${cashFormat(policies.cost())} weekly to maintain`; }
 			}
 		],

src/events/reRelativeRecruiter.js

@@ -285,7 +285,7 @@ App.Events.RERelativeRecruiter = class RERelativeRecruiter extends App.Events.Ba
 			App.Events.addParagraph(frag, t);
 
 			t = [];
-			t.push(`You look up the ${_this.params.relative}. ${He2} costs ${cashFormat(cost)}, a bargain, but you won't be able to inspect ${him2} beyond his likely resemblance to ${eventSlave.slaveName}.`);
+			t.push(`You look up the ${_this.params.relative}. ${He2} costs ${cashFormat(cost)}, a bargain, but you won't be able to inspect ${him2} beyond ${his2} likely resemblance to ${eventSlave.slaveName}.`);
 			t.push(_this._getBackgroundDescription(V.activeSlave, _this.params.background));
 			App.Events.addParagraph(frag, t);
 
@@ -561,7 +561,8 @@ App.Events.RERelativeRecruiter = class RERelativeRecruiter extends App.Events.Ba
 			}
 
 			const origSlave = BaseSlave();
-			const genepoolRec = App.Entity.Utils.GenePoolRecordCleanup(V.genePool.find(s => s.ID === _this.actors[0]));
+			const genepoolRec = V.genePool.find(s => s.ID === _this.actors[0]);
+			App.Entity.Utils.GenePoolRecordCleanup(genepoolRec);
 			Object.assign(origSlave, genepoolRec);
 
 			const newSlave = generateRelatedSlave(origSlave, _this.params.relative);

src/uncategorized/randomNonindividualEvent.tw

@@ -439,7 +439,7 @@
 		<<set $PETSevent.push("comforting attendant")>>
 	<</if>>
 
-	<<if _S.Nurse && (_L.clinic > 0) && (_S.Nurse.energy > 95) || ((_S.Nurse.fetishStrength > 60) && (_S.Nurse.fetish == "sadist" || _S.Nurse.fetish == "dom"))>>
+	<<if _S.Nurse && (_L.clinic > 0) && (_S.Nurse.energy > 95 || (_S.Nurse.fetishStrength > 60 && (_S.Nurse.fetish == "sadist" || _S.Nurse.fetish == "dom")))>>
 		<<set $subSlave = $slaves.find(function(s) { return s.anus != 0 && s.assignment == "get treatment in the clinic"; })>>
 		<<if (def $subSlave)>>
 			<<set $PETSevent.push("nurse molestation")>>