[refactor] Moved 'getRandomInt' to its own TS file

src/Bladeburner.js

@@ -11,7 +11,7 @@ import {KEY}                                        from "./Terminal";
 
 import {createProgressBarText}                      from "../utils/helpers/createProgressBarText";
 import {dialogBoxCreate}                            from "../utils/DialogBox";
-import {getRandomInt, addOffset, clearObject,
+import {addOffset, clearObject,
         createElement, removeChildrenFromElement,
         createPopup, appendLineBreaks,
         removeElementById, removeElement}           from "../utils/HelperFunctions";
@@ -20,6 +20,7 @@ import {Reviver, Generic_toJSON,
 import numeral                                      from "numeral/min/numeral.min";
 import {exceptionAlert}                             from "../utils/helpers/exceptionAlert";
 import {formatNumber}                               from "../utils/StringHelperFunctions";
+import {getRandomInt}                               from "../utils/helpers/getRandomInt";
 
 
 var CityNames = ["Aevum", "Chongqing", "Sector-12", "New Tokyo", "Ishima", "Volhaven"];

src/CompanyManagement.js

@@ -7,7 +7,7 @@ import {Player}                                         from "./Player";
 
 import Decimal                                          from "decimal.js";
 import {dialogBoxCreate}                                from "../utils/DialogBox";
-import {getRandomInt, removeElementById,
+import {removeElementById,
         createElement, createAccordionElement,
         removeChildrenFromElement, createPopup,
         clearSelector}                                  from "../utils/HelperFunctions";
@@ -15,6 +15,7 @@ import {Reviver, Generic_toJSON,
         Generic_fromJSON}                               from "../utils/JSONReviver";
 import numeral                                          from "numeral/min/numeral.min";
 import {formatNumber, generateRandomString}             from "../utils/StringHelperFunctions";
+import {getRandomInt}                                   from "../utils/helpers/getRandomInt";
 import {isString}                                       from "../utils/helpers/isString";
 import {yesNoBoxCreate, yesNoTxtInpBoxCreate,
         yesNoBoxGetYesButton, yesNoBoxGetNoButton,

src/Gang.js

@@ -6,12 +6,13 @@ import {Player}                                 from "./Player";
 import {dialogBoxCreate}                        from "../utils/DialogBox";
 import {Reviver, Generic_toJSON,
         Generic_fromJSON}                       from "../utils/JSONReviver";
-import {getRandomInt, createElement,
+import {createElement,
         removeChildrenFromElement,
         createAccordionElement, createPopup,
         removeElementById, removeElement}       from "../utils/HelperFunctions";
 import  numeral                                 from "numeral/min/numeral.min";
 import {formatNumber}                           from "../utils/StringHelperFunctions";
+import {getRandomInt}                           from "../utils/helpers/getRandomInt";
 import {yesNoBoxCreate, yesNoTxtInpBoxCreate,
         yesNoBoxGetYesButton, yesNoBoxGetNoButton,
         yesNoTxtInpBoxGetYesButton, yesNoTxtInpBoxGetNoButton,

src/Infiltration.js

@@ -3,7 +3,8 @@ import {CONSTANTS}                              from "./Constants";
 import {Engine}                                 from "./engine";
 import {Player}                                 from "./Player";
 import {dialogBoxCreate}                        from "../utils/DialogBox";
-import {clearEventListeners, getRandomInt}      from "../utils/HelperFunctions";
+import {clearEventListeners}                    from "../utils/HelperFunctions";
+import {getRandomInt}                           from "../utils/helpers/getRandomInt";
 import {infiltrationBoxCreate}                  from "../utils/InfiltrationBox";
 import {formatNumber}                           from "../utils/StringHelperFunctions";
 

src/Missions.js

@@ -3,10 +3,11 @@ import {Engine}                                     from "./engine";
 import {displayFactionContent}                      from "./Faction";
 import {Player}                                     from "./Player";
 import {dialogBoxCreate}                            from "../utils/DialogBox";
-import {addOffset, getRandomInt,
+import {addOffset,
         clearEventListenersEl,
         clearEventListeners}                        from "../utils/HelperFunctions";
 import {formatNumber}                               from "../utils/StringHelperFunctions";
+import {getRandomInt}                               from "../utils/helpers/getRandomInt";
 import {isString}                                   from "../utils/helpers/isString";
 import jsplumb                                      from 'jsplumb'
 

src/Server.js

@@ -4,7 +4,7 @@ import {Programs}                                   from "./CreateProgram";
 import {Player}                                     from "./Player";
 import {RunningScript, Script}                      from "./Script";
 import {SpecialServerNames, SpecialServerIps}       from "./SpecialServerIps";
-import {getRandomInt}                               from "../utils/HelperFunctions";
+import {getRandomInt}                               from "../utils/helpers/getRandomInt";
 import {createRandomIp, isValidIPAddress, ipExists} from "../utils/IPAddress";
 import {Reviver, Generic_toJSON,
         Generic_fromJSON}                           from "../utils/JSONReviver";

src/StockMarket.js

@@ -6,13 +6,14 @@ import {WorkerScript}                           from "./NetscriptWorker";
 import {Player}                                 from "./Player";
 
 import {dialogBoxCreate}                        from "../utils/DialogBox";
-import {clearEventListeners, getRandomInt,
+import {clearEventListeners,
         removeElementById,
         clearEventListenersEl}                  from "../utils/HelperFunctions";
 import {Reviver, Generic_toJSON,
         Generic_fromJSON}                       from "../utils/JSONReviver";
 import numeral                                  from "numeral/min/numeral.min";
 import {formatNumber}                           from "../utils/StringHelperFunctions";
+import {getRandomInt}                           from "../utils/helpers/getRandomInt";
 import {yesNoBoxCreate, yesNoTxtInpBoxCreate,
         yesNoBoxGetYesButton, yesNoBoxGetNoButton,
         yesNoTxtInpBoxGetYesButton, yesNoTxtInpBoxGetNoButton,

utils/HelperFunctions.js

@@ -214,11 +214,6 @@ function clearSelector(selector) {
     }
 }
 
-function getRandomInt(min, max) {
-    if (min > max) {return getRandomInt(max, min);}
-    return Math.floor(Math.random() * (max - min + 1)) + min;
-}
-
 //Returns true if all elements are equal, and false otherwise
 //Assumes both arguments are arrays and that there are no nested arrays
 function compareArrays(a1, a2) {
@@ -246,7 +241,6 @@ export {sizeOfObject,
         clearObject,
         addOffset,
         clearEventListeners,
-        getRandomInt,
         compareArrays,
         printArray,
         powerOfTwo,

utils/helpers/getRandomInt.ts

@@ -0,0 +1,11 @@
+/**
+ * Gets a random integer bounded by the values passed in.
+ * @param min The minimum value in the range.
+ * @param max The maximum value in the range.
+ */
+export function getRandomInt(min: number, max: number) {
+    const lower: number = Math.min(min, max);
+    const upper: number = Math.max(min, max);
+
+    return Math.floor(Math.random() * (upper - lower + 1)) + lower;
+}