From 08b0c7710dac2cdee941d59040207947c171d38b Mon Sep 17 00:00:00 2001 From: Daniel Ferri Date: Tue, 11 May 2021 19:27:02 +0200 Subject: [PATCH 1/2] Changed import so it saves and reloads the page --- src/SaveObject.jsx | 71 ++-------------------------------------------- src/engine.jsx | 16 ++++++----- 2 files changed, 11 insertions(+), 76 deletions(-) diff --git a/src/SaveObject.jsx b/src/SaveObject.jsx index 884d47d02..5c5b2f485 100755 --- a/src/SaveObject.jsx +++ b/src/SaveObject.jsx @@ -460,75 +460,8 @@ function loadImportedGame(saveObj, saveString) { console.error("ERROR: Failed to parse AllGangsSave: " + e); } } - - var popupId = "import-game-restart-game-notice"; - var txt = createElement("p", { - innerText:"Imported game! You need to SAVE the game and then RELOAD the page " + - "to make sure everything runs smoothly", - }); - var gotitBtn = createElement("a", { - class:"a-link-button", float:"right", padding:"6px", innerText:"Got it!", - clickListener:() => { - removeElementById(popupId); - }, - }); - createPopup(popupId, [txt, gotitBtn]); - gameOptionsBoxClose(); - - // Re-start game - Engine.setDisplayElements(); // Sets variables for important DOM elements - Engine.init(); // Initialize buttons, work, etc. - - // Calculate the number of cycles have elapsed while offline - Engine._lastUpdate = new Date().getTime(); - var lastUpdate = Player.lastUpdate; - var numCyclesOffline = Math.floor((Engine._lastUpdate - lastUpdate) / Engine._idleSpeed); - - // Process offline progress - var offlineProductionFromScripts = loadAllRunningScripts(); // This also takes care of offline production for those scripts - if (Player.isWorking) { - if (Player.workType == CONSTANTS.WorkTypeFaction) { - Player.workForFaction(numCyclesOffline); - } else if (Player.workType == CONSTANTS.WorkTypeCreateProgram) { - Player.createProgramWork(numCyclesOffline); - } else if (Player.workType == CONSTANTS.WorkTypeStudyClass) { - Player.takeClass(numCyclesOffline); - } else if (Player.workType == CONSTANTS.WorkTypeCrime) { - Player.commitCrime(numCyclesOffline); - } else if (Player.workType == CONSTANTS.WorkTypeCompanyPartTime) { - Player.workPartTime(numCyclesOffline); - } else { - Player.work(numCyclesOffline); - } - } - - // Hacknet Nodes offline progress - var offlineProductionFromHacknetNodes = processHacknetEarnings(numCyclesOffline); - - // Passive faction rep gain offline - processPassiveFactionRepGain(numCyclesOffline); - - // Update total playtime - var time = numCyclesOffline * Engine._idleSpeed; - if (Player.totalPlaytime == null) {Player.totalPlaytime = 0;} - if (Player.playtimeSinceLastAug == null) {Player.playtimeSinceLastAug = 0;} - if (Player.playtimeSinceLastBitnode == null) {Player.playtimeSinceLastBitnode = 0;} - Player.totalPlaytime += time; - Player.playtimeSinceLastAug += time; - Player.playtimeSinceLastBitnode += time; - - // Re-apply augmentations - Player.reapplyAllAugmentations(); - - // Clear terminal - $("#terminal tr:not(:last)").remove(); - - Player.lastUpdate = Engine._lastUpdate; - Engine.start(); // Run main game loop and Scripts loop - const timeOfflineString = convertTimeMsToTimeElapsedString(time); - dialogBoxCreate(<>Offline for {timeOfflineString}. While you were offline, your scripts -generated {Money(offlineProductionFromScripts)} -and your Hacknet Nodes generated hacknetProdInfo); + saveObject.saveGame(Engine.indexedDb); + location.reload(); return true; } diff --git a/src/engine.jsx b/src/engine.jsx index 540328fa3..da215de96 100644 --- a/src/engine.jsx +++ b/src/engine.jsx @@ -236,6 +236,8 @@ const Engine = { characterInfo: null, }, + indexedDb: undefined, + // Time variables (milliseconds unix epoch time) _lastUpdate: new Date().getTime(), _idleSpeed: 200, // Speed (in ms) at which the main loop is updated @@ -815,7 +817,7 @@ const Engine = { Engine.Counters.autoSaveCounter = Infinity; } else { Engine.Counters.autoSaveCounter = Settings.AutosaveInterval * 5; - saveObject.saveGame(indexedDb); + saveObject.saveGame(Engine.indexedDb); } } @@ -1468,13 +1470,13 @@ const Engine = { // Save, Delete, Import/Export buttons Engine.Clickables.saveMainMenuButton = document.getElementById("save-game-link"); Engine.Clickables.saveMainMenuButton.addEventListener("click", function() { - saveObject.saveGame(indexedDb); + saveObject.saveGame(Engine.indexedDb); return false; }); Engine.Clickables.deleteMainMenuButton = document.getElementById("delete-game-link"); Engine.Clickables.deleteMainMenuButton.addEventListener("click", function() { - saveObject.deleteGame(indexedDb); + saveObject.deleteGame(Engine.indexedDb); return false; }); @@ -1485,7 +1487,7 @@ const Engine = { // Character Overview buttons document.getElementById("character-overview-save-button").addEventListener("click", function() { - saveObject.saveGame(indexedDb); + saveObject.saveGame(Engine.indexedDb); return false; }); @@ -1597,7 +1599,7 @@ const Engine = { }, }; -var indexedDb, indexedDbRequest; +var indexedDbRequest; window.onload = function() { if (!window.indexedDB) { return Engine.load(null); // Will try to load from localstorage @@ -1617,8 +1619,8 @@ window.onload = function() { }; indexedDbRequest.onsuccess = function(e) { - indexedDb = e.target.result; - var transaction = indexedDb.transaction(["savestring"]); + Engine.indexedDb = e.target.result; + var transaction = Engine.indexedDb.transaction(["savestring"]); var objectStore = transaction.objectStore("savestring"); var request = objectStore.get("save"); request.onerror = function(e) { From 0cb2fd1a878a3b1b25894f2e00f32a17f8fe9416 Mon Sep 17 00:00:00 2001 From: Daniel Ferri Date: Tue, 11 May 2021 19:46:51 +0200 Subject: [PATCH 2/2] Removed useless code --- src/SaveObject.jsx | 48 ++++++++-------------------------------------- 1 file changed, 8 insertions(+), 40 deletions(-) diff --git a/src/SaveObject.jsx b/src/SaveObject.jsx index 5c5b2f485..9434bad3a 100755 --- a/src/SaveObject.jsx +++ b/src/SaveObject.jsx @@ -8,16 +8,10 @@ import { Companies, loadCompanies } from "./Company/Companies"; import { CONSTANTS } from "./Constants"; import { Engine } from "./engine"; import { Factions, loadFactions } from "./Faction/Factions"; -import { processPassiveFactionRepGain } from "./Faction/FactionHelpers"; import { loadFconf } from "./Fconf/Fconf"; import { FconfSettings } from "./Fconf/FconfSettings"; import { loadAllGangs, AllGangs } from "./Gang"; -import { - hasHacknetServers, - processHacknetEarnings, -} from "./Hacknet/HacknetHelpers"; import { loadMessages, initMessages, Messages } from "./Message/MessageHelpers"; -import { loadAllRunningScripts } from "./NetscriptWorker"; import { Player, loadPlayer } from "./Player"; import { AllServers, loadAllServers } from "./Server/AllServers"; import { Settings } from "./Settings/Settings"; @@ -34,17 +28,12 @@ import { setTimeoutRef } from "./utils/SetTimeoutRef"; import { LastExportBonus } from "./ExportBonus"; import { dialogBoxCreate } from "../utils/DialogBox"; -import { gameOptionsBoxClose } from "../utils/GameOptions"; -import { convertTimeMsToTimeElapsedString } from "../utils/StringHelperFunctions"; import { clearEventListeners } from "../utils/uiHelpers/clearEventListeners"; import { Reviver, Generic_toJSON, Generic_fromJSON, } from "../utils/JSONReviver"; -import { createElement } from "../utils/uiHelpers/createElement"; -import { createPopup } from "../utils/uiHelpers/createPopup"; -import { removeElementById } from "../utils/uiHelpers/removeElementById"; import Decimal from "decimal.js"; @@ -288,22 +277,11 @@ function loadGame(saveString) { function loadImportedGame(saveObj, saveString) { var tempSaveObj = null; var tempPlayer = null; - var tempAllServers = null; - var tempCompanies = null; - var tempFactions = null; - var tempSpecialServerIps = null; - var tempAliases = null; - var tempGlobalAliases = null; - var tempMessages = null; - var tempStockMarket = null; - var tempAllGangs = null; - let tempCorporationResearchTrees = null; // Check to see if the imported save file can be parsed. If any // errors are caught it will fail try { var decodedSaveString = decodeURIComponent(escape(atob(saveString))); - tempSaveObj = new BitburnerSaveObject(); tempSaveObj = JSON.parse(decodedSaveString, Reviver); tempPlayer = JSON.parse(tempSaveObj.PlayerSave, Reviver); @@ -311,33 +289,27 @@ function loadImportedGame(saveObj, saveString) { // Parse Decimal.js objects tempPlayer.money = new Decimal(tempPlayer.money); - tempAllServers = JSON.parse(tempSaveObj.AllServersSave, Reviver); - tempCompanies = JSON.parse(tempSaveObj.CompaniesSave, Reviver); - tempFactions = JSON.parse(tempSaveObj.FactionsSave, Reviver); - tempSpecialServerIps = JSON.parse(tempSaveObj.SpecialServerIpsSave, Reviver); + JSON.parse(tempSaveObj.AllServersSave, Reviver); + JSON.parse(tempSaveObj.CompaniesSave, Reviver); + JSON.parse(tempSaveObj.FactionsSave, Reviver); + JSON.parse(tempSaveObj.SpecialServerIpsSave, Reviver); if (tempSaveObj.hasOwnProperty("AliasesSave")) { try { - tempAliases = JSON.parse(tempSaveObj.AliasesSave, Reviver); + JSON.parse(tempSaveObj.AliasesSave, Reviver); } catch(e) { console.error(`Parsing Aliases save failed: ${e}`); - tempAliases = {}; } - } else { - tempAliases = {}; } if (tempSaveObj.hasOwnProperty("GlobalAliases")) { try { - tempGlobalAliases = JSON.parse(tempSaveObj.AliasesSave, Reviver); + JSON.parse(tempSaveObj.AliasesSave, Reviver); } catch(e) { console.error(`Parsing Global Aliases save failed: ${e}`); - tempGlobalAliases = {}; } - } else { - tempGlobalAliases = {}; } if (tempSaveObj.hasOwnProperty("MessagesSave")) { try { - tempMessages = JSON.parse(tempSaveObj.MessagesSave, Reviver); + JSON.parse(tempSaveObj.MessagesSave, Reviver); } catch(e) { console.error(`Parsing Messages save failed: ${e}`); initMessages(); @@ -347,13 +319,10 @@ function loadImportedGame(saveObj, saveString) { } if (saveObj.hasOwnProperty("StockMarketSave")) { try { - tempStockMarket = JSON.parse(tempSaveObj.StockMarketSave, Reviver); + JSON.parse(tempSaveObj.StockMarketSave, Reviver); } catch(e) { console.error(`Parsing StockMarket save failed: ${e}`); - tempStockMarket = {}; } - } else { - tempStockMarket = {}; } if (tempSaveObj.hasOwnProperty("VersionSave")) { try { @@ -362,7 +331,6 @@ function loadImportedGame(saveObj, saveString) { } catch(e) { console.error("Parsing Version save failed: " + e); } - } else { } if (tempPlayer.inGang() && tempSaveObj.hasOwnProperty("AllGangsSave")) { try {