embedded variables

src/endWeek/reports/penthouseReport.js

@@ -231,7 +231,7 @@ App.EndWeek.penthouseReport = function() {
 		}
 
 		if (headGirlsTraining === "health") {
-			r.push(`${He} helps slave.slaveName however ${he} can. The tender care has <span class="green">improved ${slave.slaveName}'s health.</span>`);
+			r.push(`${He} helps ${slave.slaveName} however ${he} can. The tender care has <span class="green">improved ${slave.slaveName}'s health.</span>`);
 			improveCondition(slave, 10);
 			slave.health.tired = Math.clamp(slave.health.tired - 10, 0, 1000);
 			slave.training = 0;
@@ -346,7 +346,7 @@ App.EndWeek.penthouseReport = function() {
 					slave.trust -= 1;
 				}
 			} else {
-				r.push(`You require ${him} to use respect when punishing; ${he} does ${his} best to motivate, but is unable to use real fear as a tool. slave.slaveName understands this, and <span class="mediumaquamarine">trusts</span> that if ${he2} fails, the consequences won't be too awful.`);
+				r.push(`You require ${him} to use respect when punishing; ${he} does ${his} best to motivate, but is unable to use real fear as a tool. ${slave.slaveName} understands this, and <span class="mediumaquamarine">trusts</span> that if ${he2} fails, the consequences won't be too awful.`);
 				slave.trust += 1;
 			}
 
@@ -368,7 +368,7 @@ App.EndWeek.penthouseReport = function() {
 			} else if (headGirlsTraining === "paraphilia") {
 				_effectiveness -= (slave.intelligence + slave.intelligenceImplant) / 3;
 				slave.training += _effectiveness;
-				r.push(`${S.HeadGirl.slaveName} does ${his} best to get slave.slaveName past it with punishments and rewards,`);
+				r.push(`${S.HeadGirl.slaveName} does ${his} best to get ${slave.slaveName} past it with punishments and rewards,`);
 				if (slave.training > 100) {
 					r.push(`and <span class="green">resolves ${slave.slaveName}'s paraphilia.</span>`);
 					slave.training = 0;
@@ -379,7 +379,7 @@ App.EndWeek.penthouseReport = function() {
 			} else if (headGirlsTraining === "flaw") {
 				_effectiveness -= (slave.intelligence + slave.intelligenceImplant) / 3;
 				slave.training += _effectiveness;
-				r.push(`${S.HeadGirl.slaveName} punishes slave.slaveName whenever ${he} catches ${him2} indulging in ${his2} bad habits,`);
+				r.push(`${S.HeadGirl.slaveName} punishes ${slave.slaveName} whenever ${he} catches ${him2} indulging in ${his2} bad habits,`);
 				if (slave.training > 100) {
 					r.push(`and <span class="green">fixes ${slave.slaveName}'s flaw.</span>`);
 					slave.training = 0;
@@ -394,7 +394,7 @@ App.EndWeek.penthouseReport = function() {
 			} else if (headGirlsTraining === "soften") {
 				_effectiveness -= (slave.intelligence + slave.intelligenceImplant) / 3;
 				slave.training += _effectiveness;
-				r.push(`${He} punishes slave.slaveName whenever ${he} sees ${him2} breaking the rules yet does ${his} best to retain what makes the slave special,`);
+				r.push(`${He} punishes ${slave.slaveName} whenever ${he} sees ${him2} breaking the rules yet does ${his} best to retain what makes the slave special,`);
 				if (slave.training > 150) {
 					slave.training = 0;
 					r.push(`and successfully <span class="green">softens ${slave.slaveName}'s flaw.</span>`);
@@ -536,9 +536,9 @@ App.EndWeek.penthouseReport = function() {
 					slave.nosePiercing = 0;
 				} else {
 					if (V.arcologies[0].FSDegradationist !== "unset") {
-						r.push(`${S.HeadGirl.slaveName} knows that ${slave.slaveName} needs to adjust to life as a slave ${girl2}, so ${he} gives the slave nasal studs and a large septum ring. It should push slave.slaveName to see ${himself2} as a sexual object for others to use.`);
+						r.push(`${S.HeadGirl.slaveName} knows that ${slave.slaveName} needs to adjust to life as a slave ${girl2}, so ${he} gives the slave nasal studs and a large septum ring. It should push ${slave.slaveName} to see ${himself2} as a sexual object for others to use.`);
 					} else {
-						r.push(`${S.HeadGirl.slaveName} knows that ${slave.slaveName} needs help adjusting to life as a slave ${girl2}, so ${he} gives the slave a cute little nose piercing. It should help slave.slaveName see ${himself2} as a bit more feminine.`);
+						r.push(`${S.HeadGirl.slaveName} knows that ${slave.slaveName} needs help adjusting to life as a slave ${girl2}, so ${he} gives the slave a cute little nose piercing. It should help ${slave.slaveName} see ${himself2} as a bit more feminine.`);
 					}
 					cashX(forceNeg(V.modCost), "slaveMod", slave);
 					return;