Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-11-19 06:03:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #78 from danielyxie/dev

Browse Source 
initAugmentations() now called applyAugmentations() at the end
This commit is contained in:
danielyxie 2017-06-28 15:54:52 -05:00 committed by GitHub
commit 410266d288
6 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
css/menupages.css
View File

@ -508,12 +508,8 @@ div.faction-clear {
/* Location */ /* Location */
#location-container { #location-container {
color: var(--my-font-color);
position: fixed; position: fixed;
padding: 6px; padding: 6px;
height: 100%;
margin-left: 10%;
width: 99%;
} }
#location-slums-description { #location-slums-description {
@ -533,3 +529,9 @@ div.faction-clear {
#location-job-reputation, #location-company-favor { #location-job-reputation, #location-company-favor {
display: inline; display: inline;
} }
/* Infiltration */
#infiltration-container {
position: fixed;
padding: 6px;
}

20
index.html
View File

@ -683,16 +683,16 @@
<div id="infiltration-left-panel"> <div id="infiltration-left-panel">
<p id="infiltration-level-text"> </p> <p id="infiltration-level-text"> </p>
<div id="infiltration-buttons"> <div id="infiltration-buttons">
<a id="infiltration-kill"> </a> <a class="a-link-button tooltip" id="infiltration-kill"> </a>
<a id="infiltration-knockout"> </a> <a class="a-link-button tooltip" id="infiltration-knockout"> </a>
<a id="infiltration-stealthknockout"> </a> <a class="a-link-button tooltip" id="infiltration-stealthknockout"> </a>
<a id="infiltration-assassinate"> </a> <a class="a-link-button tooltip" id="infiltration-assassinate"> </a>
<a id="infiltration-hacksecurity"> </a> <a class="a-link-button tooltip" id="infiltration-hacksecurity"> </a>
<a id="infiltration-destroysecurity"> </a> <a class="a-link-button tooltip" id="infiltration-destroysecurity"> </a>
<a id="infiltration-sneak"> </a> <a class="a-link-button tooltip" id="infiltration-sneak"> </a>
<a id="infiltration-pickdoor"> </a> <a class="a-link-button tooltip" id="infiltration-pickdoor"> </a>
<a id="infiltration-bribe"> </a> <a class="a-link-button tooltip" id="infiltration-bribe"> </a>
<a id="infiltration-escape"> </a> <a class="a-link-button tooltip" id="infiltration-escape"> </a>
</div> </div>
</div> </div>
<div id="infiltration-right-panel"> <div id="infiltration-right-panel">

2
src/Augmentations.js
View File

@ -1379,6 +1379,8 @@ initAugmentations = function() {
Augmentations[name].baseCost *= mult; Augmentations[name].baseCost *= mult;
} }
} }
Player.reapplyAllAugmentations();
} }
applyAugmentation = function(aug, reapply=false) { applyAugmentation = function(aug, reapply=false) {

3
src/Constants.js
View File

@ -91,6 +91,9 @@ CONSTANTS = {
//How much a TOR router costs //How much a TOR router costs
TorRouterCost: 200000, TorRouterCost: 200000,
//Infiltration constants
InfiltrationBribeBaseAmount: 100000, //Amount per clearance level
MillisecondsPer20Hours: 72000000, MillisecondsPer20Hours: 72000000,
GameCyclesPer20Hours: 72000000 / 200, GameCyclesPer20Hours: 72000000 / 200,

8
src/Player.js
View File

@ -1204,6 +1204,14 @@ PlayerObject.prototype.finishCrime = function(cancelled) {
Engine.loadLocationContent(); Engine.loadLocationContent();
} }
PlayerObject.prototype.takeDamage = function() {
}
PlayerObject.prototype.hospitalize = function() {
}
/* Functions for saving and loading the Player data */ /* Functions for saving and loading the Player data */
PlayerObject.prototype.toJSON = function() { PlayerObject.prototype.toJSON = function() {
return Generic_toJSON("PlayerObject", this); return Generic_toJSON("PlayerObject", this);

9
src/engine.js
View File

@ -54,6 +54,7 @@ var Engine = {
factionAugmentationsContent: null, factionAugmentationsContent: null,
augmentationsContent: null, augmentationsContent: null,
tutorialContent: null, tutorialContent: null,
infiltrationContent: null,
locationContent: null, locationContent: null,
workInProgressContent: null, workInProgressContent: null,
@ -682,7 +683,7 @@ var Engine = {
Engine.setDisplayElements(); //Sets variables for important DOM elements Engine.setDisplayElements(); //Sets variables for important DOM elements
Engine.init(); //Initialize buttons, work, etc. Engine.init(); //Initialize buttons, work, etc.
CompanyPositions.init(); CompanyPositions.init();
initAugmentations(); initAugmentations(); //Also calls Player.reapplyAllAugmentations()
//Calculate the number of cycles have elapsed while offline //Calculate the number of cycles have elapsed while offline
Engine._lastUpdate = new Date().getTime(); Engine._lastUpdate = new Date().getTime();
@ -721,9 +722,6 @@ var Engine = {
Player.totalPlaytime += time; Player.totalPlaytime += time;
Player.playtimeSinceLastAug += time; Player.playtimeSinceLastAug += time;
//Re-apply augmentations
Player.reapplyAllAugmentations();
Player.lastUpdate = Engine._lastUpdate; Player.lastUpdate = Engine._lastUpdate;
Engine.start(); //Run main game loop and Scripts loop Engine.start(); //Run main game loop and Scripts loop
dialogBoxCreate("While you were offline, your scripts generated $" + dialogBoxCreate("While you were offline, your scripts generated $" +
@ -787,6 +785,9 @@ var Engine = {
Engine.Display.tutorialContent = document.getElementById("tutorial-container"); Engine.Display.tutorialContent = document.getElementById("tutorial-container");
Engine.Display.tutorialContent.style.visibility = "hidden"; Engine.Display.tutorialContent.style.visibility = "hidden";
Engine.Display.infiltrationContent = document.getElementById("infiltration-container");
Engine.Display.infiltrationContent.style.visibility = "hidden";
//Character info //Character info
Engine.Display.characterInfo = document.getElementById("character-info"); Engine.Display.characterInfo = document.getElementById("character-info");