diff --git a/css/menupages.css b/css/menupages.css index 756dca2de..34d6162a6 100644 --- a/css/menupages.css +++ b/css/menupages.css @@ -508,12 +508,8 @@ div.faction-clear { /* Location */ #location-container { - color: var(--my-font-color); position: fixed; padding: 6px; - height: 100%; - margin-left: 10%; - width: 99%; } #location-slums-description { @@ -533,3 +529,9 @@ div.faction-clear { #location-job-reputation, #location-company-favor { display: inline; } + +/* Infiltration */ +#infiltration-container { + position: fixed; + padding: 6px; +} diff --git a/index.html b/index.html index f9cd95be5..92a07748d 100644 --- a/index.html +++ b/index.html @@ -683,16 +683,16 @@

- - - - - - - - - - + + + + + + + + + +
diff --git a/src/Augmentations.js b/src/Augmentations.js index c6b811983..517201949 100644 --- a/src/Augmentations.js +++ b/src/Augmentations.js @@ -1379,6 +1379,8 @@ initAugmentations = function() { Augmentations[name].baseCost *= mult; } } + + Player.reapplyAllAugmentations(); } applyAugmentation = function(aug, reapply=false) { diff --git a/src/Constants.js b/src/Constants.js index 1ca6a45c9..43024237d 100644 --- a/src/Constants.js +++ b/src/Constants.js @@ -91,6 +91,9 @@ CONSTANTS = { //How much a TOR router costs TorRouterCost: 200000, + //Infiltration constants + InfiltrationBribeBaseAmount: 100000, //Amount per clearance level + MillisecondsPer20Hours: 72000000, GameCyclesPer20Hours: 72000000 / 200, diff --git a/src/Player.js b/src/Player.js index 70a1a77e9..a2bbd4bfc 100644 --- a/src/Player.js +++ b/src/Player.js @@ -1204,6 +1204,14 @@ PlayerObject.prototype.finishCrime = function(cancelled) { Engine.loadLocationContent(); } +PlayerObject.prototype.takeDamage = function() { + +} + +PlayerObject.prototype.hospitalize = function() { + +} + /* Functions for saving and loading the Player data */ PlayerObject.prototype.toJSON = function() { return Generic_toJSON("PlayerObject", this); diff --git a/src/engine.js b/src/engine.js index b9160ec53..e6f51e3d5 100644 --- a/src/engine.js +++ b/src/engine.js @@ -54,6 +54,7 @@ var Engine = { factionAugmentationsContent: null, augmentationsContent: null, tutorialContent: null, + infiltrationContent: null, locationContent: null, workInProgressContent: null, @@ -682,7 +683,7 @@ var Engine = { Engine.setDisplayElements(); //Sets variables for important DOM elements Engine.init(); //Initialize buttons, work, etc. CompanyPositions.init(); - initAugmentations(); + initAugmentations(); //Also calls Player.reapplyAllAugmentations() //Calculate the number of cycles have elapsed while offline Engine._lastUpdate = new Date().getTime(); @@ -721,9 +722,6 @@ var Engine = { Player.totalPlaytime += time; Player.playtimeSinceLastAug += time; - //Re-apply augmentations - Player.reapplyAllAugmentations(); - Player.lastUpdate = Engine._lastUpdate; Engine.start(); //Run main game loop and Scripts loop dialogBoxCreate("While you were offline, your scripts generated $" + @@ -787,6 +785,9 @@ var Engine = { Engine.Display.tutorialContent = document.getElementById("tutorial-container"); Engine.Display.tutorialContent.style.visibility = "hidden"; + Engine.Display.infiltrationContent = document.getElementById("infiltration-container"); + Engine.Display.infiltrationContent.style.visibility = "hidden"; + //Character info Engine.Display.characterInfo = document.getElementById("character-info");