Merge branch 'fixes' into 'pregmod-master'

RA Template Literal Fixes

See merge request !2190

src/js/DefaultRules.tw

@@ -403,7 +403,7 @@ window.DefaultRules = (function() {
 					} else {
 						if (slave.eyewear != "none") {
 							slave.eyewear = "none";
-							r += `<br>Since ${slave.slaveName}'s eyewear has been removed.`;
+							r += `<br>${slave.slaveName}'s eyewear has been removed.`;
 						}
 					}
 					break;
@@ -634,7 +634,7 @@ window.DefaultRules = (function() {
 						if (slave.dickAccessory == "none")
 							r += `<br>${slave.slaveName} has been instructed not to wear a dick accessory.`;
 						else
-							r += `<br>${slave.slaveName} has been given a slave.dickAccessory accessory for her cock.`;
+							r += `<br>${slave.slaveName} has been given a ${slave.dickAccessory} accessory for her cock.`;
 					}
 				}
 			}
@@ -999,9 +999,9 @@ window.DefaultRules = (function() {
 						slave.drugs = "intensive " + slave.drugs;
 						r += `${slave.drugs}, since she's healthy enough to take them, and `;
 					} else {
-						r += `${slave.drugs}, since`;
+						r += `${slave.drugs}, since `;
 					}
-					r += `that part of her body is ${Math.trunc(_priorities[0].weight*100)}>>% `;
+					r += `that part of her body is ${Math.trunc(_priorities[0].weight*100)}% `;
 					if (_priorities[0].weight < 1) r+= "below ";
 					else r+= "above ";
 					r += "the targeted size.";
@@ -1479,13 +1479,13 @@ window.DefaultRules = (function() {
 		if (slave.pregKnown == 1 && rule.pregSpeed != "no default setting" && slave.breedingMark != 1 && slave.indentureRestrictions < 1 && slave.broodmother === 0) {
 			if (rule.pregSpeed == "slow" && slave.preg < 35) {
 				slave.pregControl = "slow gestation";
-				r += `<br>slave.slaveName is pregnant, so she has been put on the gestation slowing agents.`;
+				r += `<br>${slave.slaveName} is pregnant, so she has been put on the gestation slowing agents.`;
 			} else if (rule.pregSpeed == "fast" && slave.preg < 35 && slave.health > -50) {
 				slave.pregControl = "speed up";
-				r += `<br>slave.slaveName is pregnant, so she has been put on rapid gestation  agents. CAUTION! Can be dangerous. Clinic supervision is recommended.`;
+				r += `<br>${slave.slaveName} is pregnant, so she has been put on rapid gestation  agents. CAUTION! Can be dangerous. Clinic supervision is recommended.`;
 			} else if (rule.pregSpeed == "suppress" && slave.preg > 34 && slave.health > -50) {
 				slave.pregControl = "labor supressors";
-				r += `<br>slave.slaveName is ready to birth, so she has been put on labor suppressing agents.`;
+				r += `<br>${slave.slaveName} is ready to birth, so she has been put on labor suppressing agents.`;
 			} else if (rule.pregSpeed == "stimulate" && slave.preg >= 37 && slave.health > -50) {
 				slave.labor = 1;
 				slave.induce = 1;
@@ -1493,10 +1493,10 @@ window.DefaultRules = (function() {
 				r += `<br>slave.slaveName is ready to birth, so her labor has been stimulated.`;
 			} else if (rule.pregSpeed == "fast" && slave.pregControl == "speed up" && slave.health <= -50) {
 				slave.pregControl = "none";
-				r += `<br>slave.slaveName is on rapid gestation agents and dangerously unhealthy, so her agent regimen has been stopped.`;
+				r += `<br>${slave.slaveName} is on rapid gestation agents and dangerously unhealthy, so her agent regimen has been stopped.`;
 			} else if (rule.pregSpeed == "suppress" && slave.pregControl == "labor supressors" && slave.health <= -50) {
 				slave.pregControl = "none";
-				r += `<br>slave.slaveName is on labor suppression agents and unhealthy, so her agent regimen has been stopped.`;
+				r += `<br>${slave.slaveName} is on labor suppression agents and unhealthy, so her agent regimen has been stopped.`;
 			}
 		}
 	}
@@ -1723,7 +1723,7 @@ window.DefaultRules = (function() {
 						V.cash -= V.modCost*Math.trunc((rule.hLength-slave.hLength)/10);
 						r += `<br>${slave.slaveName} has been given extensions; her hair `;
 					}
-				r += `is now rule.hLength cm long.`;
+				r += `is now ${rule.hLength} cm long.`;
 				slave.hLength = rule.hLength;
 				}
 			}