Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2025-03-15 06:42:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflicts with hydroflame's PRs

Browse Source
This commit is contained in:
danielyxie
2019-03-13 15:19:29 -07:00
parent 3e10f5de6d 6969a8f92c
commit 963cb0039d
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
css/buttons.scss
View File

@ -47,6 +47,11 @@ button {
border: 1px solid #333;
cursor: default;
-moz-user-select: none;
-ms-user-select: none;
-khtml-user-select: none;
-webkit-user-select: none;
&:hover {
.tooltiptext,
.tooltiptexthigh,

1
doc/source/netscript/bladeburnerapi/getActionCountRemaining.rst
View File

@ -10,3 +10,4 @@ getActionCountRemaining() Netscript Function
Note that this is meant to be used for Contracts and Operations.
This function will return 'Infinity' for actions such as Training and Field Analysis.
This function will return 1 for BlackOps not yet completed regardless of wether the player has the required rank to attempt the mission or not.

4
src/Bladeburner.js
View File

@ -2641,7 +2641,7 @@ Bladeburner.prototype.updateOperationsUIElement = function(el, action) {
display:"inline-block",
innerHTML:action.desc + "\n\n" +
"Estimated success chance: " + formatNumber(estimatedSuccessChance*100, 1) + "%\n" +
"Time Required(s): " + formatNumber(actionTime, 1) + "\n" +
"Time Required(s): " + formatNumber(actionTime, 0) + "\n" +
"Operations remaining: " + Math.floor(action.count) + "\n" +
"Successes: " + action.successes + "\n" +
"Failures: " + action.failures,
@ -2761,7 +2761,7 @@ Bladeburner.prototype.updateBlackOpsUIElement = function(el, action) {
el.appendChild(createElement("p", {
display:"inline-block",
innerHTML:"Estimated Success Chance: " + formatNumber(estimatedSuccessChance*100, 1) + "%\n" +
"Time Required(s): " + formatNumber(actionTime, 1),
"Time Required(s): " + formatNumber(actionTime, 0),
}))
}

2
src/ScriptEditor/AceNetscriptMode.js
View File

@ -119,7 +119,7 @@ let NetscriptFunctions =
"getActionMaxLevel|getActionCurrentLevel|getActionAutolevel|" +
"getActionRepGain|setActionAutolevel|setActionLevel|" +
"getRank|getSkillPoints|getSkillLevel|getSkillUpgradeCost|" +
"upgradeSkill|getTeamSize|getCity|" +
"upgradeSkill|getTeamSize|getCity|getCurrentAction|" +
"setTeamSize|getCityEstimatedPopulation|getCityEstimatedCommunities|" +
"getCityChaos|switchCity|getStamina|joinBladeburnerFaction|getBonusTime|" +

1
src/engine.js
View File

@ -55,6 +55,7 @@ import { getCurrentEditor,
updateScriptEditorContent } from "./Script/ScriptHelpers";
import { AllServers,
initForeignServers } from "./Server/AllServers";
import { Server } from "./Server/Server";
import {Settings} from "./Settings/Settings";
import { initSourceFiles, SourceFiles } from "./SourceFile";