Merge branch 'fixes-saGuardYou-JS' into 'pregmod-master'

fixes-saGuardYou-JS

See merge request !6526

src/endWeek/saGuardYou.js

@@ -268,7 +268,7 @@ window.saGuardYou = (function saGuardYou() {
 					candidate = getSlave(slave.relationshipTarget);
 					if (candidate !== undefined && candidate.skill.combat === 0 && bodyguardSuccessorEligible(candidate)) {
 						const candidatePronouns = getPronouns(candidate);
-						r.push(`${He} does ${his} best to train candidate.slaveName whenever ${he} can, hoping that ${his}`);
+						r.push(`${He} does ${his} best to train ${candidate.slaveName} whenever ${he} can, hoping that ${his}`);
 						if (slave.relationship > 4) {
 							r.push(`${candidatePronouns.wife}`);
 						} else if (slave.relationship === 4) {
@@ -289,7 +289,7 @@ window.saGuardYou = (function saGuardYou() {
 				}
 				if (!candidate) {
 					if (V.Concubine !== 0 && V.Concubine.skill.combat === 0 && V.Concubine.devotion > 50 && V.Concubine.muscles >= -30 && V.Concubine.weight < 150 && V.Concubine.butt < 10 && V.Concubine.boobs < 25000 && V.Concubine.belly < 5000 && V.Concubine.balls < 20 && V.Concubine.dick < 15 && V.Concubine.fuckdoll === 0 && V.Concubine.fetish !== "mindbroken" && canWalk(V.Concubine)) {
-						r.push(`${He} does ${his} best to train V.Concubine.slaveName whenever ${he} can, hoping that your Concubine can be made capable of stepping into ${his} place.`);
+						r.push(`${He} does ${his} best to train ${V.Concubine.slaveName} whenever ${he} can, hoping that your Concubine can be made capable of stepping into ${his} place.`);
 						if (V.Concubine.boobs >= 8000 || V.Concubine.butt >= 10 || V.Concubine.belly >= 5000 || V.Concubine.balls >= 10 || V.Concubine.dick >= 10 || V.Concubine.muscles < 0 || V.Concubine.weight >= 100) {
 							r.push(`${His} body is poorly suited for combat, but ${he} can learn to work around it with enough effort.`);
 							flawedTrainee = jsRandom(0, 50);
@@ -299,19 +299,19 @@ window.saGuardYou = (function saGuardYou() {
 				}
 				if (!candidate) {
 					if (V.Wardeness !== 0 && V.Wardeness.skill.combat === 0 && V.Wardeness.fetish !== "mindbroken" && bodyguardSuccessorEligible(V.Wardeness)) {
-						r.push(`${He} does ${his} best to train V.Wardeness.slaveName whenever ${he} can, hoping that your Wardeness can be made capable of stepping into ${his} place.`);
+						r.push(`${He} does ${his} best to train ${V.Wardeness.slaveName} whenever ${he} can, hoping that your Wardeness can be made capable of stepping into ${his} place.`);
 						candidate = V.Wardeness;
 					}
 				}
 				if (!candidate) {
 					candidate = successorCandidates.find(function(s) { return s.skill.combat === 0; });
 					if (candidate) {
-						r.push(`${He} does ${his} best to train candidate.slaveName whenever ${he} can, hoping that ${his} subordinate can be made capable of stepping into ${his} place.`);
+						r.push(`${He} does ${his} best to train ${candidate.slaveName} whenever ${he} can, hoping that ${his} subordinate can be made capable of stepping into ${his} place.`);
 					}
 				}
 				if (candidate) {
 					if ((slave.intelligence + slave.intelligenceImplant - flawedTrainee) > jsRandom(1, 500)) {
-						r.push(`By the end of the week, ${he} is satisfied that V.subSlave.slaveName <span class="green">has the combat skill</span> to contribute to your defense.`);
+						r.push(`By the end of the week, ${he} is satisfied that ${candidate.slaveName} <span class="green">has the combat skill</span> to contribute to your defense.`);
 						V.slaves[V.slaveIndices[candidate.ID]].skill.combat = 1;
 					}
 				} else {