Merge branch 'tweakBatch' into 'pregmod-master'

tweakBatch

Closes #4140

See merge request !10959

js/random.js

@@ -21,7 +21,6 @@ function gaussianPair(mean = 0, deviation = 1) {
  * @param {number} [max]
  * @returns {number}
  */
-/* exported normalRandInt */
 function normalRandInt(mean = 0, deviation = 1, min = mean - 3 * deviation, max = mean + 3 * deviation) {
 	let val = gaussianPair(mean, deviation)[0];
 	while (val < min || val > max) {
@@ -38,7 +37,6 @@ function normalRandInt(mean = 0, deviation = 1, min = mean - 3 * deviation, max
  * @param {number} [count]
  * @returns {number}
  */
-/* exported jsRandom */
 function jsRandom(min, max, count = 1) {
 	function rand() {
 		return Math.random() * (max - min + 1) + min;
@@ -62,7 +60,6 @@ function jsRandom(min, max, count = 1) {
  * @param {number} count
  * @returns {Array<T>}
  */
-/* exported jsRandomMany */
 function jsRandomMany(arr, count) {
 	let result = [];
 	let tmp = arr.slice();
@@ -80,7 +77,6 @@ function jsRandomMany(arr, count) {
  * @param {...T} [otherChoices]
  * @returns {T}
  */
-/* exported jsEither */
 function jsEither(choices, ...otherChoices) {
 	if (otherChoices.length === 0 && Array.isArray(choices)) {
 		return choices[Math.floor(Math.random() * choices.length)];

src/005-passages/bcPassages.js

@@ -2,10 +2,8 @@ new App.DomPassage("Backwards Compatibility",
 	() => {
 		V.nextButton = "Continue";
 		V.nextLink = "Main";
-		V.returnTo = "Main";
 
 		App.Update.setNonexistentProperties(V, App.Data.defaultGameStateVariables);
-
 		// resetOnNGPlus contains half of the variables we need, but we use it politely here instead of forcing it so it
 		// fills in holes instead of overwriting data.
 		App.Update.setNonexistentProperties(V, App.Data.resetOnNGPlus);