diff --git a/src/Bladeburner.js b/src/Bladeburner.js index e2cc07699..086299357 100644 --- a/src/Bladeburner.js +++ b/src/Bladeburner.js @@ -7,7 +7,7 @@ import {Faction, Factions, factionExists, import {Locations} from "./Location"; import {Player} from "./Player"; import {hackWorldDaemon, redPillFlag} from "./RedPill"; -import {KEY} from "./Terminal"; +import {KEY} from "../utils/helpers/keyCodes"; import {createProgressBarText} from "../utils/helpers/createProgressBarText"; import {dialogBoxCreate} from "../utils/DialogBox"; diff --git a/src/Terminal.js b/src/Terminal.js index 3c21b6724..a7f709fd0 100644 --- a/src/Terminal.js +++ b/src/Terminal.js @@ -35,6 +35,7 @@ import {TextFile, getTextFile} from "./TextFile"; import {containsAllStrings, longestCommonStart, formatNumber} from "../utils/StringHelperFunctions"; +import {KEY} from "../utils/helpers/keyCodes"; import {addOffset} from "../utils/helpers/addOffset"; import {isString} from "../utils/helpers/isString"; import {arrayToString} from "../utils/helpers/arrayToString"; @@ -75,34 +76,6 @@ function postNetburnerText() { post("Bitburner v" + CONSTANTS.Version); } - -//Key Codes -var KEY = { - TAB: 9, - ENTER: 13, - CTRL: 17, - UPARROW: 38, - DOWNARROW: 40, - A: 65, - B: 66, - C: 67, - D: 68, - E: 69, - F: 70, - H: 72, - J: 74, - K: 75, - L: 76, - M: 77, - N: 78, - O: 79, - P: 80, - R: 82, - S: 83, - U: 85, - W: 87, -} - //Defines key commands in terminal $(document).keydown(function(event) { //Terminal @@ -2084,4 +2057,4 @@ let Terminal = { } }; -export {postNetburnerText, post, Terminal, KEY}; +export {postNetburnerText, post, Terminal}; diff --git a/src/engine.js b/src/engine.js index 6dc573c3d..3d82e37fe 100644 --- a/src/engine.js +++ b/src/engine.js @@ -63,7 +63,8 @@ import {StockMarket, StockSymbols, initSymbolToStockMap, stockMarketCycle, updateStockPrices, displayStockMarketContent} from "./StockMarket"; -import {Terminal, postNetburnerText, post, KEY} from "./Terminal"; +import {Terminal, postNetburnerText} from "./Terminal"; +import {KEY} from "../utils/helpers/keyCodes"; // These should really be imported with the module that is presenting that UI, but because they very much depend on the // cascade order, we'll pull them all in here. diff --git a/utils/helpers/keyCodes.ts b/utils/helpers/keyCodes.ts new file mode 100644 index 000000000..dfffa20cf --- /dev/null +++ b/utils/helpers/keyCodes.ts @@ -0,0 +1,30 @@ +import { IMap } from "../../src/types"; + +/** + * Keyboard key codes + */ +export const KEY: IMap = { + A: 65, + B: 66, + C: 67, + CTRL: 17, + D: 68, + DOWNARROW: 40, + E: 69, + ENTER: 13, + F: 70, + H: 72, + J: 74, + K: 75, + L: 76, + M: 77, + N: 78, + O: 79, + P: 80, + R: 82, + S: 83, + TAB: 9, + U: 85, + UPARROW: 38, + W: 87, +};