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

saServant variable tweak

Closes #847

See merge request pregmodfan/fc-pregmod!4826

src/endWeek/saServant.js

@@ -121,15 +121,15 @@ window.saServant = function saServant(slave) {
 		const vignette = GetVignette(slave);
 		t += ` __This week__ ${vignette.text} `;
 		if (vignette.type === "cash") {
-			let FResult = FResult(slave);
+			let modifier = FResult(slave);
 			if (vignette.effect > 0) {
-				t += `<span class="yellowgreen">making you an extra ${cashFormat(Math.trunc(FResult * vignette.effect))}.</span>`;
+				t += `<span class="yellowgreen">making you an extra ${cashFormat(Math.trunc(modifier * vignette.effect))}.</span>`;
 			} else if (vignette.effect < 0) {
-				t += `<span class="red">losing you ${cashFormat(Math.abs(Math.trunc(FResult * vignette.effect)))}.</span>`;
+				t += `<span class="red">losing you ${cashFormat(Math.abs(Math.trunc(modifier * vignette.effect)))}.</span>`;
 			} else {
 				t += `an incident without lasting effect.`;
 			}
-			cashX(Math.trunc(FResult * vignette.effect), "houseServant", slave);
+			cashX(Math.trunc(modifier * vignette.effect), "houseServant", slave);
 		} else if (vignette.type === "devotion") {
 			if (vignette.effect > 0) {
 				if (slave.devotion > 50) {
@@ -186,7 +186,7 @@ window.saServant = function saServant(slave) {
 			}
 			slave.health += (2 * vignette.effect);
 		} else {
-			let FResult = FResult(slave);
+			let modifier = FResult(slave);
 			if (vignette.effect > 0) {
 				t += `<span class="green">gaining you a bit of reputation.</span>`;
 			} else if (vignette.effect < 0) {
@@ -194,7 +194,7 @@ window.saServant = function saServant(slave) {
 			} else {
 				t += `an incident without lasting effect.`;
 			}
-			repX((FResult * vignette.effect * 0.1), "vignette", slave);
+			repX((modifier * vignette.effect * 0.1), "vignette", slave);
 		}
 	}